diff --git a/src/xrt/state_trackers/oxr/oxr_api_verify.h b/src/xrt/state_trackers/oxr/oxr_api_verify.h
index c3bd0385b..ebfc4d6f4 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_verify.h
+++ b/src/xrt/state_trackers/oxr/oxr_api_verify.h
@@ -245,17 +245,23 @@ oxr_verify_XrSessionCreateInfo(struct oxr_logger *,
                                const struct oxr_instance *,
                                const XrSessionCreateInfo *);
 
+#if defined(XR_USE_PLATFORM_XLIB) && defined(XR_USE_GRAPHICS_API_OPENGL)
 XrResult
 oxr_verify_XrGraphicsBindingOpenGLXlibKHR(
     struct oxr_logger *, const XrGraphicsBindingOpenGLXlibKHR *);
+#endif // defined(XR_USE_PLATFORM_XLIB) && defined(XR_USE_GRAPHICS_API_OPENGL)
 
+#if defined(XR_USE_GRAPHICS_API_VULKAN)
 XrResult
 oxr_verify_XrGraphicsBindingVulkanKHR(struct oxr_logger *,
                                       const XrGraphicsBindingVulkanKHR *);
+#endif // defined(XR_USE_GRAPHICS_API_VULKAN)
 
+#if defined(XR_USE_PLATFORM_EGL) && defined(XR_USE_GRAPHICS_API_OPENGL)
 XrResult
 oxr_verify_XrGraphicsBindingEGLMND(struct oxr_logger *log,
                                    const XrGraphicsBindingEGLMND *next);
+#endif // defined(XR_USE_PLATFORM_EGL) && defined(XR_USE_GRAPHICS_API_OPENGL)
 
 /*!
  * @}
diff --git a/src/xrt/state_trackers/oxr/oxr_objects.h b/src/xrt/state_trackers/oxr/oxr_objects.h
index fad5ee29c..4bae6c823 100644
--- a/src/xrt/state_trackers/oxr/oxr_objects.h
+++ b/src/xrt/state_trackers/oxr/oxr_objects.h
@@ -713,7 +713,7 @@ oxr_session_populate_gl_xlib(struct oxr_logger *log,
                              struct oxr_system *sys,
                              XrGraphicsBindingOpenGLXlibKHR const *next,
                              struct oxr_session *sess);
-#endif
+#endif // XR_USE_PLATFORM_XLIB
 
 XrResult
 oxr_swapchain_gl_create(struct oxr_logger *,
@@ -721,7 +721,7 @@ oxr_swapchain_gl_create(struct oxr_logger *,
                         const XrSwapchainCreateInfo *,
                         struct oxr_swapchain **out_swapchain);
 
-#endif
+#endif // XR_USE_GRAPHICS_API_OPENGL
 
 
 /*
diff --git a/src/xrt/state_trackers/oxr/oxr_session.c b/src/xrt/state_trackers/oxr/oxr_session.c
index 5d303eb19..cd2a5fcf6 100644
--- a/src/xrt/state_trackers/oxr/oxr_session.c
+++ b/src/xrt/state_trackers/oxr/oxr_session.c
@@ -612,7 +612,7 @@ oxr_session_create_impl(struct oxr_logger *log,
                         const XrSessionCreateInfo *createInfo,
                         struct oxr_session **out_session)
 {
-#ifdef XR_USE_PLATFORM_XLIB
+#if defined(XR_USE_PLATFORM_XLIB) && defined(XR_USE_GRAPHICS_API_OPENGL)
 	XrGraphicsBindingOpenGLXlibKHR const *opengl_xlib =
 	    OXR_GET_INPUT_FROM_CHAIN(createInfo,
 	                             XR_TYPE_GRAPHICS_BINDING_OPENGL_XLIB_KHR,
diff --git a/src/xrt/state_trackers/oxr/oxr_session_gl.c b/src/xrt/state_trackers/oxr/oxr_session_gl.c
index 7d6390f97..86b965778 100644
--- a/src/xrt/state_trackers/oxr/oxr_session_gl.c
+++ b/src/xrt/state_trackers/oxr/oxr_session_gl.c
@@ -21,6 +21,7 @@
 #include "xrt/xrt_gfx_xlib.h"
 #endif
 
+#ifdef XR_USE_GRAPHICS_API_OPENGL
 #ifdef XR_USE_PLATFORM_XLIB
 
 XrResult
@@ -44,4 +45,8 @@ oxr_session_populate_gl_xlib(struct oxr_logger *log,
 	return XR_SUCCESS;
 }
 
-#endif
+#endif // XR_USE_PLATFORM_XLIB
+
+//! @todo add the other OpenGL graphics binding structs here
+
+#endif // XR_USE_GRAPHICS_API_OPENGL
diff --git a/src/xrt/state_trackers/oxr/oxr_swapchain_gl.c b/src/xrt/state_trackers/oxr/oxr_swapchain_gl.c
index 3ce72f5be..59f731723 100644
--- a/src/xrt/state_trackers/oxr/oxr_swapchain_gl.c
+++ b/src/xrt/state_trackers/oxr/oxr_swapchain_gl.c
@@ -18,6 +18,8 @@
 #include "oxr_logger.h"
 
 
+#ifdef XR_USE_GRAPHICS_API_OPENGL
+
 static XrResult
 oxr_swapchain_gl_destroy(struct oxr_logger *log, struct oxr_swapchain *sc)
 {
@@ -95,3 +97,5 @@ oxr_swapchain_gl_create(struct oxr_logger *log,
 
 	return XR_SUCCESS;
 }
+
+#endif // XR_USE_GRAPHICS_API_OPENGL
diff --git a/src/xrt/state_trackers/oxr/oxr_verify.c b/src/xrt/state_trackers/oxr/oxr_verify.c
index 38e914eb8..43638887f 100644
--- a/src/xrt/state_trackers/oxr/oxr_verify.c
+++ b/src/xrt/state_trackers/oxr/oxr_verify.c
@@ -527,7 +527,7 @@ oxr_verify_XrSessionCreateInfo(struct oxr_logger *log,
 }
 
 
-#ifdef XR_USE_PLATFORM_XLIB
+#if defined(XR_USE_PLATFORM_XLIB) && defined(XR_USE_GRAPHICS_API_OPENGL)
 
 XrResult
 oxr_verify_XrGraphicsBindingOpenGLXlibKHR(
@@ -557,7 +557,7 @@ oxr_verify_XrGraphicsBindingOpenGLXlibKHR(
 	return XR_SUCCESS;
 }
 
-#endif
+#endif // defined(XR_USE_PLATFORM_XLIB) && defined(XR_USE_GRAPHICS_API_OPENGL)
 
 
 #ifdef XR_USE_GRAPHICS_API_VULKAN