diff --git a/src/xrt/state_trackers/oxr/CMakeLists.txt b/src/xrt/state_trackers/oxr/CMakeLists.txt
index 655ad9c68..cbc237060 100644
--- a/src/xrt/state_trackers/oxr/CMakeLists.txt
+++ b/src/xrt/state_trackers/oxr/CMakeLists.txt
@@ -54,12 +54,13 @@ if(XRT_HAVE_OPENGLES)
 endif()
 
 if(XRT_HAVE_OPENGL OR XRT_HAVE_OPENGLES)
-	target_sources(st_oxr PRIVATE oxr_session_gfx_gl.c oxr_swapchain_gl.c)
+	target_sources(st_oxr PRIVATE oxr_swapchain_gl.c)
 	target_link_libraries(st_oxr PUBLIC aux_ogl)
 endif()
 
 if(XRT_HAVE_XLIB)
 	target_compile_definitions(st_oxr PRIVATE XR_USE_PLATFORM_XLIB)
+	target_sources(st_oxr PRIVATE oxr_session_gfx_gl_xlib.c)
 endif()
 
 if(XRT_HAVE_EGL)
diff --git a/src/xrt/state_trackers/oxr/oxr_session_gfx_gl.c b/src/xrt/state_trackers/oxr/oxr_session_gfx_gl_xlib.c
similarity index 92%
rename from src/xrt/state_trackers/oxr/oxr_session_gfx_gl.c
rename to src/xrt/state_trackers/oxr/oxr_session_gfx_gl_xlib.c
index ff21bdada..82e61e6e6 100644
--- a/src/xrt/state_trackers/oxr/oxr_session_gfx_gl.c
+++ b/src/xrt/state_trackers/oxr/oxr_session_gfx_gl_xlib.c
@@ -1,4 +1,4 @@
-// Copyright 2018-2020, Collabora, Ltd.
+// Copyright 2018-2022, Collabora, Ltd.
 // SPDX-License-Identifier: BSL-1.0
 /*!
  * @file
@@ -49,6 +49,4 @@ oxr_session_populate_gl_xlib(struct oxr_logger *log,
 
 #endif // XR_USE_PLATFORM_XLIB
 
-//! @todo add the other OpenGL graphics binding structs here
-
 #endif // XR_USE_GRAPHICS_API_OPENGL