diff --git a/zsnes/src/Makefile.in b/zsnes/src/Makefile.in
index 5a19a82b..bb422ffa 100644
--- a/zsnes/src/Makefile.in
+++ b/zsnes/src/Makefile.in
@@ -80,7 +80,7 @@ OBJS=${CHIPSOBJ} ${CPUOBJ} ${WINOBJ} ${WINDOSOBJ} ${GUIOBJ} ${VIDEOBJ} ${MAINOBJ
 	@CXX@ @CFLAGS@ -o $@ -c $<
 
 %.o: %.c
-	@CC@ @CFLAGS@ -o $@ -c $<
+	@CC@ @CFLAGS@ -I. -o $@ -c $<
 
 %.o: %.asm
 	@NASMPATH@ @NFLAGS@ -o $@ $<
diff --git a/zsnes/src/cpu/zstate.c b/zsnes/src/cpu/zstate.c
index 3a16c86f..62697760 100755
--- a/zsnes/src/cpu/zstate.c
+++ b/zsnes/src/cpu/zstate.c
@@ -31,7 +31,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <string.h>
 #define DIR_SLASH "\\"
 #endif
-#include "glbvars.h"
+#include "gblvars.h"
 
 //C++ style code in C
 #define bool unsigned char
diff --git a/zsnes/src/gblvars.h b/zsnes/src/gblvars.h
index f9dbf870..f1025c43 100644
--- a/zsnes/src/gblvars.h
+++ b/zsnes/src/gblvars.h
@@ -20,6 +20,11 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+//C++ style code in C
+#define bool unsigned char
+#define true 1
+#define false 0
+
 extern unsigned int cycpbl, PH65816regsize;
 extern unsigned int *wramdata, *vram, PHspcsave, PHdspsave, *C4Ram, *sfxramdata;
 extern unsigned int PHnum2writesa1reg, SA1Mode, prevedi, SA1xpc, sa1dmaptr;
diff --git a/zsnes/src/makefile.ms b/zsnes/src/makefile.ms
index 4b30f4fb..d2ba5352 100644
--- a/zsnes/src/makefile.ms
+++ b/zsnes/src/makefile.ms
@@ -40,7 +40,7 @@ CPUOPT=i586
 ifneq ($(CPU),)
 CPUOPT=$(CPU)
 endif
-CFLAGSORIG=-march=${CPUOPT} -ffast-math -fomit-frame-pointer -fno-unroll-loops -Wall -Wno-unused
+CFLAGSORIG=-march=${CPUOPT} -ffast-math -fomit-frame-pointer -fno-unroll-loops -Wall -Wno-unused -I.
 LIBSORIG=-lz -lpng
 DRESOBJ=${WINDIR}/zsnes.obj
 CROSS=no
@@ -233,7 +233,7 @@ patch${OE}: $<
 endmem${OE}: $< macros.mac
 
 ${CPUDIR}/execute${OE}: $< macros.mac
-${CPUDIR}/zstate${OE}: $<
+${CPUDIR}/zstate${OE}: $< gblvars.h
 ${CPUDIR}/table${OE}: $< ${CPUDIR}/65816d.inc ${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816.inc\
 	           ${CPUDIR}/regs.mac ${CPUDIR}/regs.inc ${CPUDIR}/regsw.mac ${CPUDIR}/regsw.inc macros.mac
 ${CPUDIR}/tableb${OE}: $< ${CPUDIR}/65816db.inc ${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816b.inc\