diff --git a/Makefile.host b/Makefile.host
index 84b7e25..557fc23 100644
--- a/Makefile.host
+++ b/Makefile.host
@@ -23,7 +23,7 @@ SRCS := $(filter-out src/compemu_raw_x86.c src/compemu_fpp.c src/compemu_support
 	src/cdrom.c src/blkdev-libscg.c src/blkdev.c src/blitops.c src/akiko.c src/filesys_bootrom.c \
 	src/filesys.c src/fsdb.c src/fsdb_unix.c src/hardfile_unix.c src/genblitter.c src/gencomp.c src/gencpu.c \
 	src/hardfile.c src/genlinetoscr.c src/compemu.c src/compstbl.c src/fsusage.c src/filesys_unix.c \
-	src/enforcer.c src/ar.c \
+	src/enforcer.c src/ar.c src/debug.c \
 	src/readdisk.c src/gengenblitter.c src/scsiemul.c src/tui.c src/linetoscr.c, $(SRCS))
 
 # Library object files.
@@ -80,7 +80,7 @@ $(BIN_DIR)/%.dol: %.elf
 COMMON_FLAGS	:= -g -Wall $(MACHDEP)
 INCLUDES	:= -Isrc/md-generic/ -Isrc/include -Isrc -I/usr/include/SDL
 DEFINES		:= -DFPUEMU -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 -DAGA \
-		   -DSUPPORT_THREADS -DUSE_SDL -DFDI2RAW -DDEBUGGER -DSAVESTATE
+		   -DSUPPORT_THREADS -DUSE_SDL -DFDI2RAW -DSAVESTATE
 CFLAGS		:= $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
 
 # Test link flags.
diff --git a/Makefile.wii b/Makefile.wii
index 8cd8cd1..ab0e97d 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -28,7 +28,7 @@ SRCS := $(filter-out src/compemu_raw_x86.c src/compemu_fpp.c src/compemu_support
 	src/cdrom.c src/blkdev-libscg.c src/blkdev.c src/blitops.c src/akiko.c src/filesys_bootrom.c \
 	src/filesys.c src/fsdb.c src/fsdb_unix.c src/hardfile_unix.c src/genblitter.c src/gencomp.c src/gencpu.c \
 	src/hardfile.c src/genlinetoscr.c src/compemu.c src/compstbl.c src/fsusage.c src/filesys_unix.c \
-	src/enforcer.c src/ar.c \
+	src/enforcer.c src/ar.c src/debug.c \
 	src/readdisk.c src/gengenblitter.c src/scsiemul.c src/tui.c src/linetoscr.c, $(SRCS))
 
 # Library object files.
@@ -85,7 +85,7 @@ $(BIN_DIR)/%.dol: %.elf
 COMMON_FLAGS	:= -g -O2 -mrvl -Wall $(MACHDEP)
 INCLUDES	:=  -Isrc/md-generic/ -Isrc/include -Isrc -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL
 DEFINES		:= -DFPUEMU -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 -DAGA \
-		   -DSUPPORT_THREADS -DUSE_SDL -DFDI2RAW -DDEBUGGER -DSAVESTATE
+		   -DSUPPORT_THREADS -DUSE_SDL -DFDI2RAW -DSAVESTATE
 CFLAGS		:= $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
 
 # Test link flags.
diff --git a/src/main.c b/src/main.c
index 7eb83f5..1017007 100644
--- a/src/main.c
+++ b/src/main.c
@@ -939,7 +939,7 @@ void real_main (int argc, char **argv)
 #ifdef USE_SDL
 int init_sdl (void)
 {
-    int result = (SDL_Init (SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE /*| SDL_INIT_AUDIO*/) == 0);
+    int result = (SDL_Init (SDL_INIT_TIMER /*| SDL_INIT_AUDIO*/) == 0);
     if (result)
         atexit (SDL_Quit);