diff --git a/Makefile b/Makefile
index 284c37a..9afc504 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,10 @@ clean:
 	cd asm; make clean
 
 c2t: c2t.c c2t.h
-	gcc -Wall -Wno-unused-value -Wno-unused-function -O3 -o c2t c2t.c
+	gcc -Wall -Wno-unused-value -Wno-unused-function -I. -O3 -o c2t c2t.c
 
 c2t-96h: c2t-96h.c c2t.h
-	gcc -Wall -Wno-unused-value -Wno-unused-function -O3 -o c2t-96h c2t-96h.c
+	gcc -Wall -Wno-unused-value -Wno-unused-function -I. -O3 -o c2t-96h c2t-96h.c
 
 c2t.h: mon/dos33.boot1.mon mon/dos33.boot2.mon asm/autoload.s asm/diskload2.s asm/diskload3.s asm/diskload8000.s asm/diskload9600.s asm/fastload8000.s asm/fastload9600.s asm/fastloadcd.s asm/inflate.s
 	./makeheader
diff --git a/c2t-96h.c b/c2t-96h.c
index a238179..b447ca1 100644
--- a/c2t-96h.c
+++ b/c2t-96h.c
@@ -70,14 +70,14 @@ Bugs:
 */
 
 #include "miniz.h"
-#include "fake6502.h"
+#include <fake6502.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <unistd.h>
 #include <string.h>
 #include <math.h>
-#include "c2t.h"
+#include <c2t.h>
 
 #define ABS(x) (((x) < 0) ? -(x) : (x))
 
diff --git a/c2t.c b/c2t.c
index 7ddbdae..6367f1e 100644
--- a/c2t.c
+++ b/c2t.c
@@ -70,14 +70,14 @@ Bugs:
 */
 
 #include "miniz.h"
-#include "fake6502.h"
+#include <fake6502.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <unistd.h>
 #include <string.h>
 #include <math.h>
-#include "c2t.h"
+#include <c2t.h>
 
 #define ABS(x) (((x) < 0) ? -(x) : (x))
 
diff --git a/windows/Makefile b/windows/Makefile
index 3ac0dbc..e7f5d5e 100644
--- a/windows/Makefile
+++ b/windows/Makefile
@@ -5,23 +5,16 @@ CC = /usr/local/gcc-4.8.0-qt-4.8.4-for-mingw32/win32-gcc/bin/i586-mingw32-gcc
 all: c2t.exe c2t-96h.exe
 
 clean:
-	rm -f c2t.exe c2t-96h.exe c2t.c c2t-96h.c c2t.h fake6502.h
+	rm -f c2t.exe c2t-96h.exe c2t.c c2t-96h.c
 
-c2t.exe: c2t.c c2t.h fake6502.h miniz.h
-	$(CC) -Wall -Wno-unused-value -Wno-unused-function -O3 -o c2t.exe c2t.c
+c2t.exe: c2t.c ../c2t.h ../fake6502.h miniz.h
+	$(CC) -Wall -Wno-unused-value -Wno-unused-function -O3 -I.. -o c2t.exe c2t.c
 
-c2t-96h.exe: c2t-96h.c c2t.h fake6502.h miniz.h
-	$(CC) -Wall -Wno-unused-value -Wno-unused-function -O3 -o c2t-96h.exe c2t-96h.c
+c2t-96h.exe: c2t-96h.c ../c2t.h ../fake6502.h miniz.h
+	$(CC) -Wall -Wno-unused-value -Wno-unused-function -O3 -I.. -o c2t-96h.exe c2t-96h.c
 
 c2t.c: ../c2t.c
 	cp ../c2t.c .
 
 c2t-96h.c: ../c2t-96h.c
 	cp ../c2t-96h.c .
-
-c2t.h: ../c2t.h
-	cp ../c2t.h .
-
-fake6502.h: ../fake6502.h
-	cp ../fake6502.h .
-
diff --git a/windows/c2t-96h.exe b/windows/c2t-96h.exe
index d045d49..bc5d15b 100755
Binary files a/windows/c2t-96h.exe and b/windows/c2t-96h.exe differ
diff --git a/windows/c2t.exe b/windows/c2t.exe
index e82c8f4..802f653 100755
Binary files a/windows/c2t.exe and b/windows/c2t.exe differ