diff --git a/client/Makefile b/client/Makefile
index be726510..a8edac43 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,4 +1,4 @@
-CFLAGS=-g -Og -std=gnu99 -march=native -Wall -Werror -I./ -DDEBUG
+CFLAGS=-g -Og -std=gnu99 -march=native -Wall -Werror -I../common -DDEBUG
 LDFLAGS=-lrt -lGL
 
 CFLAGS+=`pkg-config --cflags sdl2`
diff --git a/client/spice/spice.c b/client/spice/spice.c
index 5bd2da28..20e803ee 100644
--- a/client/spice/spice.c
+++ b/client/spice/spice.c
@@ -21,7 +21,7 @@
 #include <spice/protocol.h>
 #include <spice/error_codes.h>
 
-#include "spice/messages.h"
+#include "messages.h"
 
 #ifdef DEBUG_SPICE_MOUSE
   #define DEBUG_MOUSE(fmt, args...) DEBUG_PRINT("[M]", fmt, ##args)
diff --git a/client/KVMGFXHeader.h b/common/KVMGFXHeader.h
similarity index 100%
rename from client/KVMGFXHeader.h
rename to common/KVMGFXHeader.h
diff --git a/client/debug.h b/common/debug.h
similarity index 100%
rename from client/debug.h
rename to common/debug.h