diff --git a/glx/glxcontext.h b/glx/glxcontext.h
index 5dd0ebca6..6395a6175 100644
--- a/glx/glxcontext.h
+++ b/glx/glxcontext.h
@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _GLX_context_h_
 #define _GLX_context_h_
 
diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h
index 441d72dd7..35a11aaf0 100644
--- a/glx/glxdrawable.h
+++ b/glx/glxdrawable.h
@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _GLX_drawable_h_
 #define _GLX_drawable_h_
 
diff --git a/glx/glxext.h b/glx/glxext.h
index abaf1225c..77f8f2897 100644
--- a/glx/glxext.h
+++ b/glx/glxext.h
@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _glxext_h_
 #define _glxext_h_
 
diff --git a/glx/glxscreens.h b/glx/glxscreens.h
index 02170b0c6..6cae0c268 100644
--- a/glx/glxscreens.h
+++ b/glx/glxscreens.h
@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _GLX_screens_h_
 #define _GLX_screens_h_
 
diff --git a/glx/glxserver.h b/glx/glxserver.h
index 79f4944d0..4c82e28d2 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _GLX_server_h_
 #define _GLX_server_h_
 
diff --git a/glx/glxutil.h b/glx/glxutil.h
index 314606da2..1940de043 100644
--- a/glx/glxutil.h
+++ b/glx/glxutil.h
@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _glxcmds_h_
 #define _glxcmds_h_
 
diff --git a/glx/indirect_table.c b/glx/indirect_table.c
index c4f56f2ef..1e593f515 100644
--- a/glx/indirect_table.c
+++ b/glx/indirect_table.c
@@ -22,6 +22,7 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include <dix-config.h>
 
 #include <inttypes.h>
 #include "glxserver.h"
diff --git a/glx/singlesize.h b/glx/singlesize.h
index dc85d3d36..fcb1ed98b 100644
--- a/glx/singlesize.h
+++ b/glx/singlesize.h
@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _singlesize_h_
 #define _singlesize_h_
 
diff --git a/glx/unpack.h b/glx/unpack.h
index 256073470..01994a3cc 100644
--- a/glx/unpack.h
+++ b/glx/unpack.h
@@ -1,7 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef __GLX_unpack_h__
 #define __GLX_unpack_h__
 
diff --git a/glx/vndserver_priv.h b/glx/vndserver_priv.h
index 3f5b9a22f..a7b557f4f 100644
--- a/glx/vndserver_priv.h
+++ b/glx/vndserver_priv.h
@@ -26,11 +26,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
  */
-
 #ifndef _XSERVER_VNDSERVER_PRIV_H
 #define _XSERVER_VNDSERVER_PRIV_H
 
-#include <dix-config.h>
 #include "glxvndabi.h"
 #include "vndserver.h"
 
diff --git a/glx/vndservervendor.h b/glx/vndservervendor.h
index 77cb983a6..bb2efe2ab 100644
--- a/glx/vndservervendor.h
+++ b/glx/vndservervendor.h
@@ -26,12 +26,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
  */
-
 #ifndef VND_SERVER_VENDOR_H
 #define VND_SERVER_VENDOR_H
 
-#include <dix-config.h>
-
 #include "glxvndabi.h"
 #include "list.h"