diff --git a/glx/glxcontext.h b/glx/glxcontext.h
index 5dd0ebca6..b32a5ae60 100644
--- a/glx/glxcontext.h
+++ b/glx/glxcontext.h
@@ -1,10 +1,8 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _GLX_context_h_
 #define _GLX_context_h_
 
+#include <dix-config.h>
+
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h
index 441d72dd7..7d398cecb 100644
--- a/glx/glxdrawable.h
+++ b/glx/glxdrawable.h
@@ -1,10 +1,8 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _GLX_drawable_h_
 #define _GLX_drawable_h_
 
+#include <dix-config.h>
+
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
diff --git a/glx/glxext.h b/glx/glxext.h
index abaf1225c..21d094e07 100644
--- a/glx/glxext.h
+++ b/glx/glxext.h
@@ -1,10 +1,8 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _glxext_h_
 #define _glxext_h_
 
+#include <dix-config.h>
+
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
diff --git a/glx/glxscreens.h b/glx/glxscreens.h
index 02170b0c6..49dd0eebc 100644
--- a/glx/glxscreens.h
+++ b/glx/glxscreens.h
@@ -1,10 +1,8 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _GLX_screens_h_
 #define _GLX_screens_h_
 
+#include <dix-config.h>
+
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
diff --git a/glx/glxserver.h b/glx/glxserver.h
index 79f4944d0..af6db408d 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -1,10 +1,8 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _GLX_server_h_
 #define _GLX_server_h_
 
+#include <dix-config.h>
+
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
diff --git a/glx/glxutil.h b/glx/glxutil.h
index 314606da2..431be99e8 100644
--- a/glx/glxutil.h
+++ b/glx/glxutil.h
@@ -1,10 +1,8 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _glxcmds_h_
 #define _glxcmds_h_
 
+#include <dix-config.h>
+
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
diff --git a/glx/singlesize.h b/glx/singlesize.h
index dc85d3d36..04798023f 100644
--- a/glx/singlesize.h
+++ b/glx/singlesize.h
@@ -1,10 +1,8 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _singlesize_h_
 #define _singlesize_h_
 
+#include <dix-config.h>
+
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
diff --git a/glx/unpack.h b/glx/unpack.h
index 256073470..5a38f2cc5 100644
--- a/glx/unpack.h
+++ b/glx/unpack.h
@@ -1,10 +1,8 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef __GLX_unpack_h__
 #define __GLX_unpack_h__
 
+#include <dix-config.h>
+
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.