diff --git a/colorchord2/DisplayFileWrite.c b/colorchord2/DisplayFileWrite.c
index e6fa123..f90af8c 100644
--- a/colorchord2/DisplayFileWrite.c
+++ b/colorchord2/DisplayFileWrite.c
@@ -8,7 +8,7 @@
 #include <math.h>
 #include <string.h>
 #include "color.h"
-#include "DrawFunctions.h"
+#include "CNFG.h"
 #include <sys/mman.h>
 #include <sys/stat.h>        /* For mode constants */
 #include <fcntl.h>           /* For O_* constants */
diff --git a/colorchord2/DisplaySHM.c b/colorchord2/DisplaySHM.c
index e4eb3e1..2c80d14 100644
--- a/colorchord2/DisplaySHM.c
+++ b/colorchord2/DisplaySHM.c
@@ -8,7 +8,7 @@
 #include <math.h>
 #include <string.h>
 #include "color.h"
-#include "DrawFunctions.h"
+#include "CNFG.h"
 #include <sys/mman.h>
 #include <sys/stat.h>        /* For mode constants */
 #include <fcntl.h>           /* For O_* constants */
diff --git a/colorchord2/Makefile b/colorchord2/Makefile
index c06144a..08fb57c 100644
--- a/colorchord2/Makefile
+++ b/colorchord2/Makefile
@@ -17,7 +17,7 @@ EXTRALIBS:=-lusb-1.0
 OBJS:=main.o  dft.o decompose.o filter.o color.o notefinder.o util.o outdrivers.o $(OUTS) parameters.o chash.o hook.o ../embeddedcommon/DFT32.o configs.o
 
 colorchord : $(OBJS)
-	gcc -o $@ $^ $(CFLAGS) $(LDLIBS) $(EXTRALIBS) $(RAWDRAWLIBS)
+	cc -o $@ $^ $(CFLAGS) $(LDLIBS) $(EXTRALIBS) $(RAWDRAWLIBS)
 
 
 colorchord.exe : main.c  dft.c decompose.c filter.c color.c notefinder.c util.c outdrivers.c parameters.c chash.c OutputVoronoi.c OutputProminent.c DisplayArray.c OutputLinear.c DisplayPie.c DisplayNetwork.c hook.c RecorderPlugin.c ../embeddedcommon/DFT32.c OutputCells.c configs.c hidapi.c DisplayHIDAPI.c