diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index a4d67cfe1..cdb342f5d 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -110,7 +110,7 @@ endif # COGL_DRIVER_GLES
 
 # winsys sources, common to all backends
 cogl_winsys_common_sources = \
-	$(srcdir)/winsys/cogl-winsys.h				\
+	$(srcdir)/winsys/cogl-winsys-private.h			\
 	$(srcdir)/winsys/cogl-context-winsys.h          	\
 	$(srcdir)/winsys/cogl-context-winsys.c          	\
 	$(srcdir)/winsys/cogl-winsys-feature-functions.h	\
@@ -282,42 +282,42 @@ cogl_experimental_h += \
        $(srcdir)/winsys/cogl-texture-pixmap-x11.h
 
 cogl_sources_c += \
-       $(srcdir)/winsys/cogl-xlib.h \
-       $(srcdir)/winsys/cogl-xlib.c \
+       $(srcdir)/winsys/cogl-winsys-xlib.h \
+       $(srcdir)/winsys/cogl-winsys-xlib.c \
        $(srcdir)/winsys/cogl-texture-pixmap-x11.c \
        $(srcdir)/winsys/cogl-texture-pixmap-x11-private.h
 endif
 if SUPPORT_GLX
 cogl_sources_c += \
-       $(srcdir)/winsys/cogl-glx.c
+       $(srcdir)/winsys/cogl-winsys-glx.c
 endif
 if SUPPORT_EGL_PLATFORM_POWERVR_X11
 cogl_sources_c += \
-       $(srcdir)/winsys/cogl-egl.c
+       $(srcdir)/winsys/cogl-winsys-egl.c
 endif
 if SUPPORT_EGL_PLATFORM_POWERVR_NULL
 cogl_sources_c += \
-       $(srcdir)/winsys/cogl-egl.c
+       $(srcdir)/winsys/cogl-winsys-egl.c
 endif
 if SUPPORT_EGL_PLATFORM_POWERVR_GDL
 cogl_sources_c += \
-       $(srcdir)/winsys/cogl-egl.c
+       $(srcdir)/winsys/cogl-winsys-egl.c
 endif
 if SUPPORT_EGL_PLATFORM_FRUITY
 cogl_sources_c += \
-       $(srcdir)/winsys/cogl-fruity.c
+       $(srcdir)/winsys/cogl-winsys-fruity.c
 endif
 if SUPPORT_EGL_PLATFORM_DRM_SURFACELESS
 cogl_sources_c += \
-       $(srcdir)/winsys/cogl-egl.c
+       $(srcdir)/winsys/cogl-winsys-egl.c
 endif
 if SUPPORT_WIN32
 cogl_sources_c += \
-       $(srcdir)/winsys/cogl-win32.c
+       $(srcdir)/winsys/cogl-winsys-win32.c
 endif
 if SUPPORT_OSX
 cogl_sources_c += \
-       $(srcdir)/winsys/cogl-osx.c
+       $(srcdir)/winsys/cogl-winsys-osx.c
 endif
 
 EXTRA_DIST += stb_image.c
diff --git a/cogl/winsys/cogl-texture-pixmap-x11.c b/cogl/winsys/cogl-texture-pixmap-x11.c
index fa94e0946..98ecf3149 100644
--- a/cogl/winsys/cogl-texture-pixmap-x11.c
+++ b/cogl/winsys/cogl-texture-pixmap-x11.c
@@ -42,7 +42,7 @@
 #include "cogl-texture-rectangle-private.h"
 #include "cogl-context-private.h"
 #include "cogl-handle.h"
-#include "cogl-xlib.h"
+#include "cogl-winsys-xlib.h"
 #include "cogl-pipeline-opengl-private.h"
 
 #include <X11/Xlib.h>
diff --git a/cogl/winsys/cogl-egl.c b/cogl/winsys/cogl-winsys-egl.c
similarity index 100%
rename from cogl/winsys/cogl-egl.c
rename to cogl/winsys/cogl-winsys-egl.c
diff --git a/cogl/winsys/cogl-fruity.c b/cogl/winsys/cogl-winsys-fruity.c
similarity index 100%
rename from cogl/winsys/cogl-fruity.c
rename to cogl/winsys/cogl-winsys-fruity.c
diff --git a/cogl/winsys/cogl-glx.c b/cogl/winsys/cogl-winsys-glx.c
similarity index 100%
rename from cogl/winsys/cogl-glx.c
rename to cogl/winsys/cogl-winsys-glx.c
diff --git a/cogl/winsys/cogl-osx.c b/cogl/winsys/cogl-winsys-osx.c
similarity index 100%
rename from cogl/winsys/cogl-osx.c
rename to cogl/winsys/cogl-winsys-osx.c
diff --git a/cogl/winsys/cogl-winsys.h b/cogl/winsys/cogl-winsys-private.h
similarity index 89%
rename from cogl/winsys/cogl-winsys.h
rename to cogl/winsys/cogl-winsys-private.h
index 04c9dcf40..4cf326e3b 100644
--- a/cogl/winsys/cogl-winsys.h
+++ b/cogl/winsys/cogl-winsys-private.h
@@ -21,10 +21,10 @@
  *
  */
 
-#ifndef __COGL_WINSYS_H
-#define __COGL_WINSYS_H
+#ifndef __COGL_WINSYS_PRIVATE_H
+#define __COGL_WINSYS_PRIVATE_H
 
 CoglFuncPtr
 _cogl_winsys_get_proc_address (const char *name);
 
-#endif /* __COGL_WINSYS_H */
+#endif /* __COGL_WINSYS_PRIVATE_H */
diff --git a/cogl/winsys/cogl-sdl.c b/cogl/winsys/cogl-winsys-sdl.c
similarity index 100%
rename from cogl/winsys/cogl-sdl.c
rename to cogl/winsys/cogl-winsys-sdl.c
diff --git a/cogl/winsys/cogl-win32.c b/cogl/winsys/cogl-winsys-win32.c
similarity index 100%
rename from cogl/winsys/cogl-win32.c
rename to cogl/winsys/cogl-winsys-win32.c
diff --git a/cogl/winsys/cogl-xlib.c b/cogl/winsys/cogl-winsys-xlib.c
similarity index 100%
rename from cogl/winsys/cogl-xlib.c
rename to cogl/winsys/cogl-winsys-xlib.c
diff --git a/cogl/winsys/cogl-xlib.h b/cogl/winsys/cogl-winsys-xlib.h
similarity index 100%
rename from cogl/winsys/cogl-xlib.h
rename to cogl/winsys/cogl-winsys-xlib.h