diff --git a/src/Makefile b/src/Makefile
index 381f052..26bfb95 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-OBJS=main.o sysinput.o fbinit.o log.o gpio.o msg_queue.o time_func.o splash.o
+OBJS=main.o sysinput.o fbinit.o log.o gpio.o msg_queue.o time_func.o config.o splash.o
 LIBS=-lbcm2835 -lpthread
 
 upiwin: $(OBJS)
diff --git a/src/config.c b/src/config.c
index 1ede164..89cdbfc 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,7 +1,10 @@
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <getopt.h>
 #include "config.h"
+#include "scode.h"
 #include "log.h"
 
 static const struct option long_options[] = {
@@ -78,7 +81,7 @@ static HRESULT parse_cmdline(int argc, char *argv[], GLOBAL_CONFIG *parsed)
 	  return E_OUTOFMEMORY;
 	}
 	if (parsed->framebuffer_device)
-	  free(parsed->framebuffer_device);
+	  free((PVOID)(parsed->framebuffer_device));
 	parsed->framebuffer_device = pstr;
 	break;
 
@@ -119,7 +122,7 @@ HRESULT Config_setup(int argc, char *argv[])
   hr = parse_cmdline(argc, argv, &from_commandline);
   if (hr != S_OK)
     return hr;
-  overlay_config(&from_commandline)
+  overlay_config(&from_commandline);
   return S_OK;
 }
 
diff --git a/src/sysinput.c b/src/sysinput.c
index 12aca3f..2cb2aff 100644
--- a/src/sysinput.c
+++ b/src/sysinput.c
@@ -3,6 +3,7 @@
 #include <string.h>
 #include <pthread.h>
 #include "scode.h"
+#include "config.h"
 #include "log.h"
 #include "msg_queue.h"
 #include "gpio.h"