diff --git a/Makefile.gc b/Makefile.gc
index 62f694d..58cf2f0 100644
--- a/Makefile.gc
+++ b/Makefile.gc
@@ -18,23 +18,21 @@ include $(DEVKITPPC)/gamecube_rules
 TARGET		:=	fceugx_gc
 TARGETDIR   :=  executables
 BUILD		:=	build_gc
-SOURCES		:=	source/fceultra \
-				source/fceultra/boards source/fceultra/mappers source/fceultra/input \
-				source/fceultra/mbshare source/fceultra/drivers/common source/fceultra/roms \
+SOURCES		:=	source/fceultra source/fceultra/boards \
+				source/fceultra/drivers/common source/fceultra/input \
+				source/fceultra/mappers source/fceultra/mbshare \
 				source/ngc
-DATA		:=	data  
+DATA		:=	data
 INCLUDES	:=	source/fceultra source/ngc
-# Specify language in all capitals
-# Supported languages: ENGLISH
-LANG		:=	ENGLISH
+LANG		:=	ENGLISH # Supported languages: ENGLISH
 
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
-CFLAGS  = -g -O2 -Wall $(MACHDEP) $(INCLUDE) -DFCEU_VERSION_NUMERIC=9812 -DNGC=1 \
-		-DZLIB -DBIG_ENDIAN -DHAVE_ASPRINTF=1 -DSTDC \
-	    -D_SZ_ONE_DIRECTORY=1 -D_LZMA_IN_CB=1 -D_LZMA_OUT_READ \
-	    -DINTL_$(LANG)
+CFLAGS  = -g -O2 -Wall $(MACHDEP) $(INCLUDE) -DNGC \
+		-DHAVE_ASPRINTF -DSTDC -DFCEU_VERSION_NUMERIC=9812 \
+	    -D_SZ_ONE_DIRECTORY -D_LZMA_IN_CB -D_LZMA_OUT_READ \
+	    -DLANG_$(LANG)
 CXXFLAGS	=	$(CFLAGS)
 
 LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map -Wl,--cref
diff --git a/Makefile.wii b/Makefile.wii
index 9f6f44d..82be63f 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -18,23 +18,21 @@ include $(DEVKITPPC)/wii_rules
 TARGET		:=	fceugx_wii
 TARGETDIR   :=  executables
 BUILD		:=	build_wii
-SOURCES		:=	source/fceultra \
-				source/fceultra/boards source/fceultra/mappers source/fceultra/input \
-				source/fceultra/mbshare source/fceultra/drivers/common source/fceultra/roms \
+SOURCES		:=	source/fceultra source/fceultra/boards \
+				source/fceultra/drivers/common source/fceultra/input \
+				source/fceultra/mappers source/fceultra/mbshare \
 				source/ngc
 DATA		:=	data  
 INCLUDES	:=	source/fceultra source/ngc
-# Specify language in all capitals
-# Supported languages: ENGLISH
-LANG		:=	ENGLISH
+LANG		:=	ENGLISH # Supported languages: ENGLISH
 
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
-CFLAGS  = -g -O2 -Wall $(MACHDEP) $(INCLUDE) -DFCEU_VERSION_NUMERIC=9812 -DNGC=1 \
-		-DZLIB -DBIG_ENDIAN -DWORDS_BIGENDIAN -DHAVE_ASPRINTF=1 -DSTDC \
-	    -DWII_DVD -D_SZ_ONE_DIRECTORY=1 -D_LZMA_IN_CB=1 -D_LZMA_OUT_READ \
-	    -DINTL_$(LANG)
+CFLAGS  = -g -O2 -Wall $(MACHDEP) $(INCLUDE) -DNGC -DWII_DVD \
+		-DHAVE_ASPRINTF -DSTDC -DFCEU_VERSION_NUMERIC=9812 \
+	    -D_SZ_ONE_DIRECTORY -D_LZMA_IN_CB -D_LZMA_OUT_READ \
+	    -DLANG_$(LANG)
 CXXFLAGS	=	$(CFLAGS)
 
 LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map -Wl,--cref
diff --git a/readme.txt b/readme.txt
index 5300802..4178617 100644
--- a/readme.txt
+++ b/readme.txt
@@ -33,7 +33,7 @@ SNES9x GX and Genesis Plus GX projects.
 * Fixed network freeze-up problem
 * Zapper now mapped to A and B
 * Fixed auto-save feature
-* Performance slowdowns should be fixed
+* Performance slowdowns on Gamecube should be fixed
 * Update core to 0.98.13pre
 * Will now attempt to load old save states with CRC filename