summaryrefslogtreecommitdiff
path: root/cfb
diff options
context:
space:
mode:
Diffstat (limited to 'cfb')
-rw-r--r--cfb/cfb.h4
-rw-r--r--cfb/cfb16.h4
-rw-r--r--cfb/cfb24.h4
-rw-r--r--cfb/cfb32.h4
-rw-r--r--cfb/cfb8bit.c4
-rw-r--r--cfb/cfb8bit.h4
-rw-r--r--cfb/cfb8line.c4
-rw-r--r--cfb/cfballpriv.c4
-rw-r--r--cfb/cfbbitblt.c4
-rw-r--r--cfb/cfbblt.c4
-rw-r--r--cfb/cfbbres.c4
-rw-r--r--cfb/cfbbresd.c4
-rw-r--r--cfb/cfbbstore.c4
-rw-r--r--cfb/cfbcmap.c4
-rw-r--r--cfb/cfbcppl.c4
-rw-r--r--cfb/cfbfillarc.c4
-rw-r--r--cfb/cfbfillrct.c4
-rw-r--r--cfb/cfbfillsp.c4
-rw-r--r--cfb/cfbgc.c6
-rw-r--r--cfb/cfbgetsp.c4
-rw-r--r--cfb/cfbglblt8.c6
-rw-r--r--cfb/cfbhrzvert.c4
-rw-r--r--cfb/cfbigblt8.c6
-rw-r--r--cfb/cfbimage.c4
-rw-r--r--cfb/cfbline.c4
-rw-r--r--cfb/cfbmap.h4
-rw-r--r--cfb/cfbmskbits.c4
-rw-r--r--cfb/cfbmskbits.h4
-rw-r--r--cfb/cfbpixmap.c4
-rw-r--r--cfb/cfbply1rct.c4
-rw-r--r--cfb/cfbpntwin.c4
-rw-r--r--cfb/cfbpolypnt.c4
-rw-r--r--cfb/cfbpush8.c4
-rw-r--r--cfb/cfbrctstp8.c4
-rw-r--r--cfb/cfbrrop.c4
-rw-r--r--cfb/cfbrrop.h4
-rw-r--r--cfb/cfbscrinit.c4
-rw-r--r--cfb/cfbsetsp.c4
-rw-r--r--cfb/cfbsolid.c4
-rw-r--r--cfb/cfbtab.h4
-rw-r--r--cfb/cfbteblt8.c6
-rw-r--r--cfb/cfbtegblt.c6
-rw-r--r--cfb/cfbtile32.c4
-rw-r--r--cfb/cfbtileodd.c4
-rw-r--r--cfb/cfbwindow.c4
-rw-r--r--cfb/cfbzerarc.c4
46 files changed, 189 insertions, 5 deletions
diff --git a/cfb/cfb.h b/cfb/cfb.h
index 960f6756b..71e0d89bc 100644
--- a/cfb/cfb.h
+++ b/cfb/cfb.h
@@ -29,6 +29,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
/* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.29tsi Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#if !defined(__CFB_H__) || defined(CFB_PROTOTYPES_ONLY)
#include <X11/X.h>
diff --git a/cfb/cfb16.h b/cfb/cfb16.h
index 3d51cd142..1ad8972ef 100644
--- a/cfb/cfb16.h
+++ b/cfb/cfb16.h
@@ -25,6 +25,10 @@
* XFree86 Project.
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifndef _CFB16_H_
#define _CFB16_H_
diff --git a/cfb/cfb24.h b/cfb/cfb24.h
index f1876f74d..3a99934b7 100644
--- a/cfb/cfb24.h
+++ b/cfb/cfb24.h
@@ -25,6 +25,10 @@
* XFree86 Project.
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifndef _CFB24_H_
#define _CFB24_H_
diff --git a/cfb/cfb32.h b/cfb/cfb32.h
index 5ea4c13c8..48b48cbaf 100644
--- a/cfb/cfb32.h
+++ b/cfb/cfb32.h
@@ -25,6 +25,10 @@
* XFree86 Project.
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifndef _CFB32_H_
#define _CFB32_H_
diff --git a/cfb/cfb8bit.c b/cfb/cfb8bit.c
index 4d10cb0ce..0bc5debbb 100644
--- a/cfb/cfb8bit.c
+++ b/cfb/cfb8bit.c
@@ -35,6 +35,10 @@ from The Open Group.
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#if PSZ == 8
#include <X11/X.h>
diff --git a/cfb/cfb8bit.h b/cfb/cfb8bit.h
index 2bfdace35..767549af7 100644
--- a/cfb/cfb8bit.h
+++ b/cfb/cfb8bit.h
@@ -36,6 +36,10 @@ in this Software without prior written authorization from The Open Group.
/* $Xorg: cfb8bit.h,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include "servermd.h"
#if (BITMAP_BIT_ORDER == MSBFirst)
diff --git a/cfb/cfb8line.c b/cfb/cfb8line.c
index 74e10cc03..0f27f1d47 100644
--- a/cfb/cfb8line.c
+++ b/cfb/cfb8line.c
@@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group.
* Jeff Anton'x fixes: cfb8line.c 97/02/07
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include "gcstruct.h"
diff --git a/cfb/cfballpriv.c b/cfb/cfballpriv.c
index 4739589d8..68edb281b 100644
--- a/cfb/cfballpriv.c
+++ b/cfb/cfballpriv.c
@@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.11 2001/01/30 22:06:15 tsi Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include "servermd.h"
diff --git a/cfb/cfbbitblt.c b/cfb/cfbbitblt.c
index 0a68c0712..a9dd438fe 100644
--- a/cfb/cfbbitblt.c
+++ b/cfb/cfbbitblt.c
@@ -33,6 +33,10 @@ Author: Keith Packard
*/
/* $Xorg: cfbbitblt.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
diff --git a/cfb/cfbblt.c b/cfb/cfbblt.c
index 06e271640..7a0b192cc 100644
--- a/cfb/cfbblt.c
+++ b/cfb/cfbblt.c
@@ -34,6 +34,10 @@ Author: Keith Packard
/* 24-bit bug fixes: Peter Wainwright, 1998/11/28 */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
diff --git a/cfb/cfbbres.c b/cfb/cfbbres.c
index ee20c981e..fc6de4898 100644
--- a/cfb/cfbbres.c
+++ b/cfb/cfbbres.c
@@ -46,6 +46,10 @@ SOFTWARE.
******************************************************************/
/* $Xorg: cfbbres.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/misc.h>
#include "cfb.h"
diff --git a/cfb/cfbbresd.c b/cfb/cfbbresd.c
index 44c8e0c8e..ada5034d5 100644
--- a/cfb/cfbbresd.c
+++ b/cfb/cfbbresd.c
@@ -46,6 +46,10 @@ SOFTWARE.
******************************************************************/
/* $Xorg: cfbbresd.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/misc.h>
#include "cfb.h"
diff --git a/cfb/cfbbstore.c b/cfb/cfbbstore.c
index 1ca165524..64adc4050 100644
--- a/cfb/cfbbstore.c
+++ b/cfb/cfbbstore.c
@@ -17,6 +17,10 @@
*/
/* $Xorg: cfbbstore.c,v 1.3 2000/08/17 19:48:13 cpqbld Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include "cfb.h"
#include <X11/X.h>
#include "mibstore.h"
diff --git a/cfb/cfbcmap.c b/cfb/cfbcmap.c
index 7d7f39a0e..a7777eda8 100644
--- a/cfb/cfbcmap.c
+++ b/cfb/cfbcmap.c
@@ -30,6 +30,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.12 2000/02/12 03:39:23 dawes Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xproto.h>
#include "scrnintstr.h"
diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c
index b2b53999b..037a516f2 100644
--- a/cfb/cfbcppl.c
+++ b/cfb/cfbcppl.c
@@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.6 2001/12/14 19:59:22 dawes Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include "gcstruct.h"
diff --git a/cfb/cfbfillarc.c b/cfb/cfbfillarc.c
index 837067ff9..6fb6bb728 100644
--- a/cfb/cfbfillarc.c
+++ b/cfb/cfbfillarc.c
@@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group.
/* $Xorg: cfbfillarc.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xprotostr.h>
#include "regionstr.h"
diff --git a/cfb/cfbfillrct.c b/cfb/cfbfillrct.c
index 4ea3177d1..657865114 100644
--- a/cfb/cfbfillrct.c
+++ b/cfb/cfbfillrct.c
@@ -30,6 +30,10 @@ in this Software without prior written authorization from The Open Group.
/* $Xorg: cfbfillrct.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include "servermd.h"
diff --git a/cfb/cfbfillsp.c b/cfb/cfbfillsp.c
index d460fad1d..efb462b6c 100644
--- a/cfb/cfbfillsp.c
+++ b/cfb/cfbfillsp.c
@@ -77,6 +77,10 @@ SOFTWARE.
/* $Xorg: cfbfillsp.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include "servermd.h"
diff --git a/cfb/cfbgc.c b/cfb/cfbgc.c
index 3937bd649..9cf53d35b 100644
--- a/cfb/cfbgc.c
+++ b/cfb/cfbgc.c
@@ -48,11 +48,15 @@ SOFTWARE.
/* $Xorg: cfbgc.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
#include "cfb.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
#include "dixfontstr.h"
#include "gcstruct.h"
#include "windowstr.h"
diff --git a/cfb/cfbgetsp.c b/cfb/cfbgetsp.c
index b3d5b91c3..08651a9ba 100644
--- a/cfb/cfbgetsp.c
+++ b/cfb/cfbgetsp.c
@@ -47,6 +47,10 @@ SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.9tsi Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include "servermd.h"
diff --git a/cfb/cfbglblt8.c b/cfb/cfbglblt8.c
index 290970a50..fda848fde 100644
--- a/cfb/cfbglblt8.c
+++ b/cfb/cfbglblt8.c
@@ -30,11 +30,15 @@ in this Software without prior written authorization from The Open Group.
* only.
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
#include "cfb.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
#include "dixfontstr.h"
#include "gcstruct.h"
#include "windowstr.h"
diff --git a/cfb/cfbhrzvert.c b/cfb/cfbhrzvert.c
index 408f60533..4df991b00 100644
--- a/cfb/cfbhrzvert.c
+++ b/cfb/cfbhrzvert.c
@@ -46,6 +46,10 @@ SOFTWARE.
******************************************************************/
/* $Xorg: cfbhrzvert.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include "gc.h"
diff --git a/cfb/cfbigblt8.c b/cfb/cfbigblt8.c
index c0ea250f6..97356e8bd 100644
--- a/cfb/cfbigblt8.c
+++ b/cfb/cfbigblt8.c
@@ -28,12 +28,16 @@ in this Software without prior written authorization from The Open Group.
/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.5 2001/10/28 03:33:01 tsi Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
#include "mi.h"
#include "cfb.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
#include "dixfontstr.h"
#include "gcstruct.h"
#include "windowstr.h"
diff --git a/cfb/cfbimage.c b/cfb/cfbimage.c
index 44c27151b..ce3909e63 100644
--- a/cfb/cfbimage.c
+++ b/cfb/cfbimage.c
@@ -47,6 +47,10 @@ SOFTWARE.
******************************************************************/
/* $Xorg: cfbimage.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include "windowstr.h"
#include "pixmapstr.h"
diff --git a/cfb/cfbline.c b/cfb/cfbline.c
index 8fec8fbd0..392fe483e 100644
--- a/cfb/cfbline.c
+++ b/cfb/cfbline.c
@@ -46,6 +46,10 @@ SOFTWARE.
******************************************************************/
/* $Xorg: cfbline.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include "gcstruct.h"
diff --git a/cfb/cfbmap.h b/cfb/cfbmap.h
index 802517aac..9ed10acaa 100644
--- a/cfb/cfbmap.h
+++ b/cfb/cfbmap.h
@@ -32,6 +32,10 @@ in this Software without prior written authorization from The Open Group.
* Map names around so that multiple depths can be supported simultaneously
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#if 0
#undef QuartetBitsTable
#undef QuartetPixelMaskTable
diff --git a/cfb/cfbmskbits.c b/cfb/cfbmskbits.c
index cc21efc35..05954e62c 100644
--- a/cfb/cfbmskbits.c
+++ b/cfb/cfbmskbits.c
@@ -48,6 +48,10 @@ bit index 32-n in a longword
see also cfbmskbits.h
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include <servermd.h>
diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h
index a803cac72..8d6f118df 100644
--- a/cfb/cfbmskbits.h
+++ b/cfb/cfbmskbits.h
@@ -31,6 +31,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
/* $Xorg: cfbmskbits.h,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */
/* Optimizations for PSZ == 32 added by Kyle Marvin (marvin@vitec.com) */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include "servermd.h"
diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c
index 46bd90f6f..f7e06bd13 100644
--- a/cfb/cfbpixmap.c
+++ b/cfb/cfbpixmap.c
@@ -52,6 +52,10 @@ SOFTWARE.
on a monchrome device, a pixmap is a bitmap.
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/Xmd.h>
#include "servermd.h"
#include "scrnintstr.h"
diff --git a/cfb/cfbply1rct.c b/cfb/cfbply1rct.c
index 5d2213682..99a2379c9 100644
--- a/cfb/cfbply1rct.c
+++ b/cfb/cfbply1rct.c
@@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.10 2003/10/29 22:44:53 tsi Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include "gcstruct.h"
diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c
index 9cb1c7b1d..9bfdfe64f 100644
--- a/cfb/cfbpntwin.c
+++ b/cfb/cfbpntwin.c
@@ -48,6 +48,10 @@ SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.7tsi Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include "windowstr.h"
diff --git a/cfb/cfbpolypnt.c b/cfb/cfbpolypnt.c
index 607fc1b3c..59ef0cf89 100644
--- a/cfb/cfbpolypnt.c
+++ b/cfb/cfbpolypnt.c
@@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group.
/* $Xorg: cfbpolypnt.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include "gcstruct.h"
#include "windowstr.h"
diff --git a/cfb/cfbpush8.c b/cfb/cfbpush8.c
index 26e509c37..3492c8e25 100644
--- a/cfb/cfbpush8.c
+++ b/cfb/cfbpush8.c
@@ -30,6 +30,10 @@ in this Software without prior written authorization from The Open Group.
*/
/* $Xorg: cfbpush8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#if PSZ == 8
#include <X11/X.h>
diff --git a/cfb/cfbrctstp8.c b/cfb/cfbrctstp8.c
index e8509b029..9f753cdd7 100644
--- a/cfb/cfbrctstp8.c
+++ b/cfb/cfbrctstp8.c
@@ -32,6 +32,10 @@ Author: Keith Packard, MIT X Consortium
/* $Xorg: cfbrctstp8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#if PSZ == 8
#include <X11/X.h>
diff --git a/cfb/cfbrrop.c b/cfb/cfbrrop.c
index 909d03a9b..77487bc6a 100644
--- a/cfb/cfbrrop.c
+++ b/cfb/cfbrrop.c
@@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group.
/* cfb reduced rasterop computations */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
diff --git a/cfb/cfbrrop.h b/cfb/cfbrrop.h
index cfa3a93fa..6deb7b899 100644
--- a/cfb/cfbrrop.h
+++ b/cfb/cfbrrop.h
@@ -28,6 +28,10 @@ in this Software without prior written authorization from The Open Group.
/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.10tsi Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifndef GXcopy
#include <X11/X.h>
#endif
diff --git a/cfb/cfbscrinit.c b/cfb/cfbscrinit.c
index 2aae7d5a0..7299bbdf8 100644
--- a/cfb/cfbscrinit.c
+++ b/cfb/cfbscrinit.c
@@ -29,6 +29,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
/* $Xorg: cfbscrinit.c,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include "servermd.h"
diff --git a/cfb/cfbsetsp.c b/cfb/cfbsetsp.c
index 9bf126a12..7501d938b 100644
--- a/cfb/cfbsetsp.c
+++ b/cfb/cfbsetsp.c
@@ -47,6 +47,10 @@ SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.5tsi Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include "servermd.h"
diff --git a/cfb/cfbsolid.c b/cfb/cfbsolid.c
index 1fd3acf02..9f9093647 100644
--- a/cfb/cfbsolid.c
+++ b/cfb/cfbsolid.c
@@ -28,6 +28,10 @@ in this Software without prior written authorization from The Open Group.
/* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.8tsi Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include "servermd.h"
diff --git a/cfb/cfbtab.h b/cfb/cfbtab.h
index f81855103..d95efd66d 100644
--- a/cfb/cfbtab.h
+++ b/cfb/cfbtab.h
@@ -1,5 +1,9 @@
/* $XFree86$ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifndef _CFBTAB_H_
#define _CFBTAB_H_
diff --git a/cfb/cfbteblt8.c b/cfb/cfbteblt8.c
index 2be72262e..f58a07dc6 100644
--- a/cfb/cfbteblt8.c
+++ b/cfb/cfbteblt8.c
@@ -31,13 +31,17 @@ in this Software without prior written authorization from The Open Group.
/* $Xorg: cfbteblt8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#if PSZ == 8
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
#include "cfb.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
#include "dixfontstr.h"
#include "gcstruct.h"
#include "windowstr.h"
diff --git a/cfb/cfbtegblt.c b/cfb/cfbtegblt.c
index 8893479b3..e3fb06f59 100644
--- a/cfb/cfbtegblt.c
+++ b/cfb/cfbtegblt.c
@@ -47,11 +47,15 @@ SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.6tsi Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
#include "cfb.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
#include "dixfontstr.h"
#include "gcstruct.h"
#include "windowstr.h"
diff --git a/cfb/cfbtile32.c b/cfb/cfbtile32.c
index c9f64f15c..96e5620b7 100644
--- a/cfb/cfbtile32.c
+++ b/cfb/cfbtile32.c
@@ -31,6 +31,10 @@ in this Software without prior written authorization from The Open Group.
/* $Xorg: cfbtile32.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include "servermd.h"
diff --git a/cfb/cfbtileodd.c b/cfb/cfbtileodd.c
index dd5860894..6c46aa4db 100644
--- a/cfb/cfbtileodd.c
+++ b/cfb/cfbtileodd.c
@@ -31,6 +31,10 @@ in this Software without prior written authorization from The Open Group.
/* $Xorg: cfbtileodd.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xmd.h>
#include "servermd.h"
diff --git a/cfb/cfbwindow.c b/cfb/cfbwindow.c
index 2c5eada23..7160f5436 100644
--- a/cfb/cfbwindow.c
+++ b/cfb/cfbwindow.c
@@ -47,6 +47,10 @@ SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/cfb/cfbwindow.c,v 1.5tsi Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include "scrnintstr.h"
#include "windowstr.h"
diff --git a/cfb/cfbzerarc.c b/cfb/cfbzerarc.c
index 358658afc..a9e0b2f9d 100644
--- a/cfb/cfbzerarc.c
+++ b/cfb/cfbzerarc.c
@@ -33,6 +33,10 @@ in this Software without prior written authorization from The Open Group.
* The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289
*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#include <X11/X.h>
#include <X11/Xprotostr.h>
#include "regionstr.h"