Index: programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v
retrieving revision 1.2
diff -u -d -r1.2 cyrix_driver.c
--- programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c	23 Apr 2004 19:28:52 -0000	1.2
+++ programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c	24 Feb 2005 01:26:57 -0000
@@ -73,8 +73,10 @@
 
 #include "cyrix.h"
 
+#ifdef XFreeXDGA
 #define _XF86DGA_SERVER_
 #include "extensions/xf86dgastr.h"
+#endif
 
 #include "opaque.h"
 #define DPMS_SERVER
Index: programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v
retrieving revision 1.3
diff -u -d -r1.3 dummy_driver.c
--- programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c	26 May 2004 16:24:08 -0000	1.3
+++ programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c	24 Feb 2005 01:26:58 -0000
@@ -42,8 +42,10 @@
 #include "Xproto.h"
 #include "scrnintstr.h"
 #include "servermd.h"
+#ifdef XFreeXDGA
 #define _XF86DGA_SERVER_
 #include "extensions/xf86dgastr.h"
+#endif
 
 /* Mandatory functions */
 static const OptionInfoRec *	DUMMYAvailableOptions(int chipid, int busid);
Index: programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c,v
retrieving revision 1.7
diff -u -d -r1.7 glint_driver.c
--- programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c	16 Aug 2004 09:13:14 -0000	1.7
+++ programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c	24 Feb 2005 01:26:59 -0000
@@ -59,8 +59,10 @@
 #include "TI.h"
 #include "glint.h"
 
+#ifdef XFreeXDGA
 #define _XF86DGA_SERVER_
 #include "extensions/xf86dgastr.h"
+#endif
 
 #include "globals.h"
 #define DPMS_SERVER
Index: programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c,v
retrieving revision 1.7
diff -u -d -r1.7 neo_driver.c
--- programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c	16 Aug 2004 09:13:14 -0000	1.7
+++ programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c	24 Feb 2005 01:27:01 -0000
@@ -110,8 +110,10 @@
 #include "Xproto.h"
 #include "scrnintstr.h"
 #include "servermd.h"
+#ifdef XFreeXDGA
 #define _XF86DGA_SERVER_
 #include "extensions/xf86dgastr.h"
+#endif
 
 /* Mandatory functions */
 static const OptionInfoRec *	NEOAvailableOptions(int chipid, int busid);
Index: programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c,v
retrieving revision 1.3
diff -u -d -r1.3 tga_driver.c
--- programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c	30 Jul 2004 20:30:55 -0000	1.3
+++ programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c	24 Feb 2005 01:27:03 -0000
@@ -62,8 +62,10 @@
 #include "BT.h"
 #include "tga.h"
 
+#ifdef XFreeXDGA
 #define _XF86DGA_SERVER_
 #include "extensions/xf86dgastr.h"
+#endif
 
 #include "globals.h"
 #define DPMS_SERVER
Index: programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v
retrieving revision 1.5
diff -u -d -r1.5 trident_driver.c
--- programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c	16 Aug 2004 09:13:15 -0000	1.5
+++ programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c	24 Feb 2005 01:27:03 -0000
@@ -57,8 +57,10 @@
 #include "trident.h"
 #include "trident_regs.h"
 
+#ifdef XFreeXDGA
 #define _XF86DGA_SERVER_
 #include "extensions/xf86dgastr.h"
+#endif
 
 #include "globals.h"
 #define DPMS_SERVER