6 files changed, 26 insertions, 2 deletions
diff --git a/miext/layer/layer.h b/miext/layer/layer.h
index 1cb410e4c..e8f3a856e 100644
--- a/miext/layer/layer.h
+++ b/miext/layer/layer.h
@@ -22,6 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _LAYER_H_
 #define _LAYER_H_
 
diff --git a/miext/layer/layergc.c b/miext/layer/layergc.c
index b0153b49b..343edfcf5 100644
--- a/miext/layer/layergc.c
+++ b/miext/layer/layergc.c
@@ -22,6 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "layerstr.h"
 
 GCFuncs	layerGCFuncs = {
diff --git a/miext/layer/layerinit.c b/miext/layer/layerinit.c
index 615bed361..994c6747c 100644
--- a/miext/layer/layerinit.c
+++ b/miext/layer/layerinit.c
@@ -22,6 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include    "layerstr.h"
 
 int layerScrPrivateIndex;
diff --git a/miext/layer/layerpict.c b/miext/layer/layerpict.c
index 1719edd7b..16e46f0ab 100644
--- a/miext/layer/layerpict.c
+++ b/miext/layer/layerpict.c
@@ -22,6 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "layerstr.h"
 
 void
diff --git a/miext/layer/layerstr.h b/miext/layer/layerstr.h
index 91393adc4..fb5a0d411 100644
--- a/miext/layer/layerstr.h
+++ b/miext/layer/layerstr.h
@@ -22,15 +22,19 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _LAYERSTR_H_
 #define _LAYERSTR_H_
 
 #include    <X11/X.h>
 #include    "scrnintstr.h"
 #include    "windowstr.h"
-#include    "font.h"
+#include    <X11/fonts/font.h>
 #include    "dixfontstr.h"
-#include    "fontstruct.h"
+#include    <X11/fonts/fontstruct.h>
 #include    "mi.h"
 #include    "regionstr.h"
 #include    "globals.h"
diff --git a/miext/layer/layerwin.c b/miext/layer/layerwin.c
index 1119e6048..7afe90ade 100644
--- a/miext/layer/layerwin.c
+++ b/miext/layer/layerwin.c
@@ -22,6 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "layerstr.h"
 
 static LayerListPtr