diff --git a/glamor/glamor_addtraps.c b/glamor/glamor_addtraps.c
index 7ad9f30003..723d1ff25d 100644
--- a/glamor/glamor_addtraps.c
+++ b/glamor/glamor_addtraps.c
@@ -25,6 +25,7 @@
  *    Zhigang Gong <zhigang.gong@gmail.com>
  *
  */
+#include <dix-config.h>
 
 #include "glamor_priv.h"
 
diff --git a/glamor/glamor_compositerects.c b/glamor/glamor_compositerects.c
index 0796fed41f..f245cf69aa 100644
--- a/glamor/glamor_compositerects.c
+++ b/glamor/glamor_compositerects.c
@@ -26,6 +26,7 @@
  * 	original author is Chris Wilson at sna.
  *
  */
+#include <dix-config.h>
 
 #include "glamor_priv.h"
 #include "mipict.h"
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index e5b6532684..11ba189a89 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -26,8 +26,7 @@
  *    Zhigang Gong <zhigang.gong@linux.intel.com>
  *
  */
-
-#include "dix-config.h"
+#include <dix-config.h>
 
 #define GLAMOR_FOR_XORG
 #include <unistd.h>
diff --git a/glamor/glamor_eglmodule.c b/glamor/glamor_eglmodule.c
index 8ba9ba0375..7dbeb050ef 100644
--- a/glamor/glamor_eglmodule.c
+++ b/glamor/glamor_eglmodule.c
@@ -26,8 +26,7 @@
  * Authors:
  *    Zhigang Gong <zhigang.gong@gmail.com>
  */
-
-#include "dix-config.h"
+#include <dix-config.h>
 
 #include <xf86.h>
 #define GLAMOR_FOR_XORG
diff --git a/glamor/glamor_gradient.c b/glamor/glamor_gradient.c
index 7c22ccdb27..fb41bddf3e 100644
--- a/glamor/glamor_gradient.c
+++ b/glamor/glamor_gradient.c
@@ -29,6 +29,7 @@
  *
  * Gradient acceleration implementation
  */
+#include <dix-config.h>
 
 #include "glamor_priv.h"
 
diff --git a/glamor/glamor_image.c b/glamor/glamor_image.c
index 28bdc159f0..afb8a3f31d 100644
--- a/glamor/glamor_image.c
+++ b/glamor/glamor_image.c
@@ -19,6 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "glamor_priv.h"
 #include "glamor_transfer.h"
diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c
index 625849858f..772da6c037 100644
--- a/glamor/glamor_pixmap.c
+++ b/glamor/glamor_pixmap.c
@@ -26,6 +26,7 @@
  *    Zhigang Gong <zhigang.gong@linux.intel.com>
  *
  */
+#include <dix-config.h>
 
 #include <stdlib.h>
 
diff --git a/glamor/glamor_program.c b/glamor/glamor_program.c
index a02584fad5..bf1b33ac70 100644
--- a/glamor/glamor_program.c
+++ b/glamor/glamor_program.c
@@ -19,6 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "glamor_priv.h"
 #include "glamor_transform.h"
diff --git a/glamor/glamor_segs.c b/glamor/glamor_segs.c
index 7b0108f839..4428c7b9b6 100644
--- a/glamor/glamor_segs.c
+++ b/glamor/glamor_segs.c
@@ -19,6 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "glamor_priv.h"
 #include "glamor_program.h"
diff --git a/glamor/glamor_spans.c b/glamor/glamor_spans.c
index 93beb61d51..ffe1bfdd04 100644
--- a/glamor/glamor_spans.c
+++ b/glamor/glamor_spans.c
@@ -19,6 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "glamor_priv.h"
 #include "glamor_transform.h"
diff --git a/glamor/glamor_sync.c b/glamor/glamor_sync.c
index 3f98be4007..c6669973b5 100644
--- a/glamor/glamor_sync.c
+++ b/glamor/glamor_sync.c
@@ -19,7 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
-
+#include <dix-config.h>
 
 #include "glamor_priv.h"
 #include "misyncshm.h"
diff --git a/glamor/glamor_transform.c b/glamor/glamor_transform.c
index 891f7ee51c..ae014a87ba 100644
--- a/glamor/glamor_transform.c
+++ b/glamor/glamor_transform.c
@@ -19,6 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "glamor_priv.h"
 #include "glamor_transform.h"
diff --git a/glamor/glamor_trapezoid.c b/glamor/glamor_trapezoid.c
index a448a6b3e7..405e061ace 100644
--- a/glamor/glamor_trapezoid.c
+++ b/glamor/glamor_trapezoid.c
@@ -29,6 +29,7 @@
  *
  * Trapezoid acceleration implementation
  */
+#include <dix-config.h>
 
 #include "glamor_priv.h"
 
diff --git a/glamor/glamor_utils.c b/glamor/glamor_utils.c
index 8f085da3f8..23445137e9 100644
--- a/glamor/glamor_utils.c
+++ b/glamor/glamor_utils.c
@@ -19,6 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "glamor_priv.h"
 
diff --git a/glamor/glamor_vbo.c b/glamor/glamor_vbo.c
index 3b91bd8b5e..4a9914bee7 100644
--- a/glamor/glamor_vbo.c
+++ b/glamor/glamor_vbo.c
@@ -26,6 +26,7 @@
  *
  * Helpers for managing streamed vertex buffers used in glamor.
  */
+#include <dix-config.h>
 
 #include "glamor_priv.h"
 
diff --git a/glamor/glamor_window.c b/glamor/glamor_window.c
index 5fd463b43c..dfb7ebbaa4 100644
--- a/glamor/glamor_window.c
+++ b/glamor/glamor_window.c
@@ -20,6 +20,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "glamor_priv.h"