diff --git a/src/glx/dri2.c b/src/glx/dri2.c
index 7e8fdeabf47..7cb9d2dba9c 100644
--- a/src/glx/dri2.c
+++ b/src/glx/dri2.c
@@ -38,7 +38,6 @@
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
 #include <X11/extensions/dri2proto.h>
-#include "xf86drm.h"
 #include "dri2.h"
 #include "glxclient.h"
 #include "GL/glxext.h"
diff --git a/src/glx/dri2.h b/src/glx/dri2.h
index 90efde8bcc1..72a608c508c 100644
--- a/src/glx/dri2.h
+++ b/src/glx/dri2.h
@@ -33,6 +33,7 @@
 #ifndef _DRI2_H_
 #define _DRI2_H_
 
+#include <xf86drm.h>
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/dri2tokens.h>
 
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index deeffa494d4..75fc9510bf4 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -37,17 +37,14 @@
 #include <X11/Xlib-xcb.h>
 #include <xcb/xcb.h>
 #include <xcb/dri2.h>
-#include "glapi.h"
 #include "glxclient.h"
 #include <X11/extensions/dri2proto.h>
-#include "xf86dri.h"
 #include <dlfcn.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/time.h>
-#include "xf86drm.h"
 #include "dri2.h"
 #include "dri_common.h"
 #include "dri2_priv.h"
diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri2_query_renderer.c
index 95560cb4a6b..a28ced6ae6a 100644
--- a/src/glx/dri2_query_renderer.c
+++ b/src/glx/dri2_query_renderer.c
@@ -25,7 +25,6 @@
 
 #include "glxclient.h"
 #include "glx_error.h"
-#include "xf86drm.h"
 #include "dri2.h"
 #include "dri_interface.h"
 #include "dri2_priv.h"
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index 8fbf125a7a2..f27a773981f 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -65,9 +65,7 @@
 #include <xcb/dri3.h>
 #include <xcb/present.h>
 #include <GL/gl.h>
-#include "glapi.h"
 #include "glxclient.h"
-#include "xf86dri.h"
 #include <dlfcn.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -75,7 +73,6 @@
 #include <sys/mman.h>
 #include <sys/time.h>
 
-#include "xf86drm.h"
 #include "dri_common.h"
 #include "dri3_priv.h"
 #include "loader.h"
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 837d8a269cf..4b17d7cecb7 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -48,9 +48,7 @@
 #ifdef XF86VIDMODE
 #include <X11/extensions/xf86vmode.h>
 #endif
-#include "xf86dri.h"
 #endif
-#else
 #endif
 
 #include <X11/Xlib-xcb.h>
diff --git a/src/glx/tests/query_renderer_implementation_unittest.cpp b/src/glx/tests/query_renderer_implementation_unittest.cpp
index 2bf88430263..35b3972d57f 100644
--- a/src/glx/tests/query_renderer_implementation_unittest.cpp
+++ b/src/glx/tests/query_renderer_implementation_unittest.cpp
@@ -29,7 +29,6 @@
 extern "C" {
 #include "glxclient.h"
 #include "glx_error.h"
-#include "xf86drm.h"
 #include "dri2.h"
 #include "dri_interface.h"
 #include "dri2_priv.h"