diff --git a/src/gos/chibios.c b/src/gos/gfx_chibios.c
similarity index 100%
rename from src/gos/chibios.c
rename to src/gos/gfx_chibios.c
diff --git a/src/gos/chibios.h b/src/gos/gfx_chibios.h
similarity index 100%
rename from src/gos/chibios.h
rename to src/gos/gfx_chibios.h
diff --git a/src/gos/ecos.c b/src/gos/gfx_ecos.c
similarity index 100%
rename from src/gos/ecos.c
rename to src/gos/gfx_ecos.c
diff --git a/src/gos/ecos.h b/src/gos/gfx_ecos.h
similarity index 100%
rename from src/gos/ecos.h
rename to src/gos/gfx_ecos.h
diff --git a/src/gos/freertos.c b/src/gos/gfx_freertos.c
similarity index 100%
rename from src/gos/freertos.c
rename to src/gos/gfx_freertos.c
diff --git a/src/gos/freertos.h b/src/gos/gfx_freertos.h
similarity index 100%
rename from src/gos/freertos.h
rename to src/gos/gfx_freertos.h
diff --git a/src/gos/linux.c b/src/gos/gfx_linux.c
similarity index 100%
rename from src/gos/linux.c
rename to src/gos/gfx_linux.c
diff --git a/src/gos/linux.h b/src/gos/gfx_linux.h
similarity index 100%
rename from src/gos/linux.h
rename to src/gos/gfx_linux.h
diff --git a/src/gos/osx.c b/src/gos/gfx_osx.c
similarity index 100%
rename from src/gos/osx.c
rename to src/gos/gfx_osx.c
diff --git a/src/gos/osx.h b/src/gos/gfx_osx.h
similarity index 100%
rename from src/gos/osx.h
rename to src/gos/gfx_osx.h
diff --git a/src/gos/raw32.c b/src/gos/gfx_raw32.c
similarity index 100%
rename from src/gos/raw32.c
rename to src/gos/gfx_raw32.c
diff --git a/src/gos/raw32.h b/src/gos/gfx_raw32.h
similarity index 100%
rename from src/gos/raw32.h
rename to src/gos/gfx_raw32.h
diff --git a/src/gos/rawrtos.c b/src/gos/gfx_rawrtos.c
similarity index 100%
rename from src/gos/rawrtos.c
rename to src/gos/gfx_rawrtos.c
diff --git a/src/gos/rawrtos.h b/src/gos/gfx_rawrtos.h
similarity index 100%
rename from src/gos/rawrtos.h
rename to src/gos/gfx_rawrtos.h
diff --git a/src/gos/win32.c b/src/gos/gfx_win32.c
similarity index 100%
rename from src/gos/win32.c
rename to src/gos/gfx_win32.c
diff --git a/src/gos/win32.h b/src/gos/gfx_win32.h
similarity index 100%
rename from src/gos/win32.h
rename to src/gos/gfx_win32.h
diff --git a/src/gos/sys_defs.h b/src/gos/sys_defs.h
index dcd445e4..d116826f 100644
--- a/src/gos/sys_defs.h
+++ b/src/gos/sys_defs.h
@@ -440,21 +440,21 @@
  * (without any of the documentation overheads) is in the files below.
  */
 #elif GFX_USE_OS_RAWRTOS
- 	#include "src/gos/rawrtos.h"
+ 	#include "src/gos/gfx_rawrtos.h"
 #elif GFX_USE_OS_CHIBIOS
-	#include "src/gos/chibios.h"
+	#include "src/gos/gfx_chibios.h"
 #elif GFX_USE_OS_FREERTOS
-	#include "src/gos/freertos.h"
+	#include "src/gos/gfx_freertos.h"
 #elif GFX_USE_OS_WIN32
-	#include "src/gos/win32.h"
+	#include "src/gos/gfx_win32.h"
 #elif GFX_USE_OS_LINUX
-	#include "src/gos/linux.h"
+	#include "src/gos/gfx_linux.h"
 #elif GFX_USE_OS_OSX
-	#include "src/gos/osx.h"
+	#include "src/gos/gfx_osx.h"
 #elif GFX_USE_OS_RAW32
-	#include "src/gos/raw32.h"
+	#include "src/gos/gfx_raw32.h"
 #elif GFX_USE_OS_ECOS
-	#include "src/gos/ecos.h"
+	#include "src/gos/gfx_ecos.h"
 #else
 	#error "Your operating system is not supported yet"
 #endif
diff --git a/src/gos/sys_make.mk b/src/gos/sys_make.mk
index 5ad2370b..5efa7f80 100644
--- a/src/gos/sys_make.mk
+++ b/src/gos/sys_make.mk
@@ -1,9 +1,9 @@
-GFXSRC +=   $(GFXLIB)/src/gos/chibios.c	\
-			$(GFXLIB)/src/gos/freertos.c \
-			$(GFXLIB)/src/gos/win32.c \
-			$(GFXLIB)/src/gos/linux.c \
-			$(GFXLIB)/src/gos/osx.c \
-			$(GFXLIB)/src/gos/raw32.c \
-			$(GFXLIB)/src/gos/ecos.c \
-			$(GFXLIB)/src/gos/rawrtos.c
+GFXSRC +=   $(GFXLIB)/src/gos/gfx_chibios.c	\
+			$(GFXLIB)/src/gos/gfx_freertos.c \
+			$(GFXLIB)/src/gos/gfx_win32.c \
+			$(GFXLIB)/src/gos/gfx_linux.c \
+			$(GFXLIB)/src/gos/gfx_osx.c \
+			$(GFXLIB)/src/gos/gfx_raw32.c \
+			$(GFXLIB)/src/gos/gfx_ecos.c \
+			$(GFXLIB)/src/gos/gfx_rawrtos.c