diff --git a/makefile.sdl b/makefile.sdl
index 3c97b5f3d..359b3804a 100644
--- a/makefile.sdl
+++ b/makefile.sdl
@@ -133,14 +133,14 @@ LDFLAGS	= -static
 
 CFLAGS	 = -pipe \
 	   -std=gnu99 -march=$(CPUTYPE) -O1 \
-	   -fforce-mem -fforce-addr -finline-limit=1200 -fthread-jumps \
+	   -fforce-addr -finline-limit=1200 -fthread-jumps \
 	   -fexpensive-optimizations \
 	   -Wall -Wno-long-long -Wno-sign-compare -Wno-uninitialized -Wno-unused \
 	   $(DEF) $(incdir) `sdl-config --cflags`
 
 CXXFLAGS = -pipe \
 	   -march=$(CPUTYPE) -O1 \
-	   -fforce-mem -fforce-addr -finline-limit=1200 -fthread-jumps \
+	    -fforce-addr -finline-limit=1200 -fthread-jumps \
 	    -fexpensive-optimizations \
 	   -fcheck-new \
 	   -Wall -W -pedantic -Wno-long-long \
diff --git a/makefile.sdlrules b/makefile.sdlrules
index dce552a84..2195de8a8 100644
--- a/makefile.sdlrules
+++ b/makefile.sdlrules
@@ -73,7 +73,7 @@ depobj	:= 	main.o stringset.o drv.o load.o misc.o \
 		    inp_interface.o inp_sdl.o\
 		    bzip.o unzip.o zipfn.o cong.o conc.o\
 		    interface.o sshot.o dat.o aud_sdl.o aud_interface.o aud_dsp.o \
-		    lowpass2.o \ 
+		    lowpass2.o \
 			\
 			$(drvobj) \
 			\
@@ -136,12 +136,6 @@ depobj	:= 	main.o stringset.o drv.o load.o misc.o \
 			snes_65816.o snes_io.o snes_main.o snes_mem.o snes_ppu.o snes_spc700.o
 			
 			
-ifdef	DEBUG
-depobj += m68kdasm.o
-endif
 
 autobj += $(depobj)
 
-ifdef	BUILD_X86_ASM
-autobj += burn_sound_a.o eagle_fm.o 2xsaimmx.o hq2x32.o hq3x32.o hq4x32.o superscale.o
-endif
\ No newline at end of file
diff --git a/src/burn/drivers/konami/d_hexion.cpp b/src/burn/drivers/konami/d_hexion.cpp
index d447611f2..9bb00e260 100644
--- a/src/burn/drivers/konami/d_hexion.cpp
+++ b/src/burn/drivers/konami/d_hexion.cpp
@@ -2,7 +2,7 @@
 // Based on MAME driver by Nicola Salmoria
 
 #include "tiles_generic.h"
-#include "K051649.h"
+#include "k051649.h"
 #include "msm6295.h"
 
 static UINT8 *AllMem;
diff --git a/src/burn/drivers/konami/d_mainevt.cpp b/src/burn/drivers/konami/d_mainevt.cpp
index e4adba0cc..5d2de67ac 100644
--- a/src/burn/drivers/konami/d_mainevt.cpp
+++ b/src/burn/drivers/konami/d_mainevt.cpp
@@ -5,7 +5,7 @@
 #include "hd6309_intf.h"
 #include "konamiic.h"
 #include "burn_ym2151.h"
-#include "UPD7759.h"
+#include "upd7759.h"
 #include "k007232.h"
 
 static UINT8 *AllMem;
diff --git a/src/burn/drivers/konami/d_twin16.cpp b/src/burn/drivers/konami/d_twin16.cpp
index 0d17a1dc1..3c7f6e045 100644
--- a/src/burn/drivers/konami/d_twin16.cpp
+++ b/src/burn/drivers/konami/d_twin16.cpp
@@ -3,7 +3,7 @@
 
 #include "tiles_generic.h"
 #include "burn_ym2151.h"
-#include "UPD7759.h"
+#include "upd7759.h"
 #include "k007232.h"
 
 static UINT8 *AllMem;
diff --git a/src/cpu/m6800_intf.h b/src/cpu/m6800_intf.h
index 9c8d95778..0d2716ec2 100644
--- a/src/cpu/m6800_intf.h
+++ b/src/cpu/m6800_intf.h
@@ -1,4 +1,4 @@
-#include "M6800.h"
+#include "m6800.h"
 
 typedef UINT8 (*pReadByteHandler)(UINT16 a);
 typedef void (*pWriteByteHandler)(UINT16 a, UINT8 d);