diff --git a/include/GL/mesa_glinterop.h b/include/GL/mesa_glinterop.h
index ae71fea0087..b76bd7ec2f5 100644
--- a/include/GL/mesa_glinterop.h
+++ b/include/GL/mesa_glinterop.h
@@ -51,13 +51,16 @@
 #define MESA_GLINTEROP_H
 
 #include <stddef.h>
-#include <GL/glx.h>
 #include <EGL/egl.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/* Forward declarations to avoid inclusion of GL/glx.h */
+typedef struct _XDisplay Display;
+typedef struct __GLXcontextRec *GLXContext;
+
 /** Returned error codes. */
 enum {
    MESA_GLINTEROP_SUCCESS = 0,