diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 8fe6af1df..10f84aa7b 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -376,11 +376,11 @@ endif
 
 if have_glx
   cogl_nonintrospected_headers += [
-    'cogl-glx.h',
+    'winsys/cogl-glx.h',
   ]
   cogl_sources += [
-    'cogl-glx-display-private.h',
-    'cogl-glx-renderer-private.h',
+    'winsys/cogl-glx-display-private.h',
+    'winsys/cogl-glx-renderer-private.h',
     'winsys/cogl-winsys-glx-feature-functions.h',
     'winsys/cogl-winsys-glx-private.h',
     'winsys/cogl-winsys-glx.c',
diff --git a/cogl/cogl/cogl-glx-display-private.h b/cogl/cogl/winsys/cogl-glx-display-private.h
similarity index 100%
rename from cogl/cogl/cogl-glx-display-private.h
rename to cogl/cogl/winsys/cogl-glx-display-private.h
diff --git a/cogl/cogl/cogl-glx-renderer-private.h b/cogl/cogl/winsys/cogl-glx-renderer-private.h
similarity index 100%
rename from cogl/cogl/cogl-glx-renderer-private.h
rename to cogl/cogl/winsys/cogl-glx-renderer-private.h
diff --git a/cogl/cogl/cogl-glx.h b/cogl/cogl/winsys/cogl-glx.h
similarity index 100%
rename from cogl/cogl/cogl-glx.h
rename to cogl/cogl/winsys/cogl-glx.h