Merge branch 'XACE-modular' into my-XACE-modular

50 files changed, 25 insertions, 101 deletions

diff --git a/include/XIstubs.h b/include/XIstubs.h
index e005493c4..45f6eb10c 100644
--- a/include/XIstubs.h
+++ b/include/XIstubs.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/XIstubs.h,v 3.1 1996/04/15 11:34:22 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/bstore.h b/include/bstore.h
index 098abcd86..843d6bb35 100644
--- a/include/bstore.h
+++ b/include/bstore.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/bstore.h,v 1.1 1998/04/05 16:44:25 robin Exp $*/
 /*
  * Copyright (c) 1987 by the Regents of the University of California
  *
diff --git a/include/bstorestr.h b/include/bstorestr.h
index 8f21855c4..14e2fe1da 100644
--- a/include/bstorestr.h
+++ b/include/bstorestr.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/bstorestr.h,v 1.2 2001/01/06 20:58:12 tsi Exp $*/
 /*
  * Copyright (c) 1987 by the Regents of the University of California
  *
diff --git a/include/closestr.h b/include/closestr.h
index d70f754b2..8855a5f93 100644
--- a/include/closestr.h
+++ b/include/closestr.h
@@ -1,4 +1,3 @@
-/* $Xorg: closestr.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.4 2001/12/14 19:59:53 dawes Exp $ */
 
 
 #ifndef CLOSESTR_H
diff --git a/include/closure.h b/include/closure.h
index 839303c96..b261f5e0d 100644
--- a/include/closure.h
+++ b/include/closure.h
@@ -1,4 +1,3 @@
-/* $Xorg: closure.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/colormap.h b/include/colormap.h
index 1f2c33075..8513c0a09 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.5 2001/12/14 19:59:53 dawes Exp $ */
 /*
 
 Copyright 1987, 1998  The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 */
-/* $Xorg: colormap.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */
 
 #ifndef CMAP_H
 #define CMAP_H 1
diff --git a/include/colormapst.h b/include/colormapst.h
index fdfc8f397..c9d9514ad 100644
--- a/include/colormapst.h
+++ b/include/colormapst.h
@@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 */
-/* $Xorg: colormapst.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */
 
 #ifndef CMAPSTRUCT_H
 #define CMAPSTRUCT_H 1
diff --git a/include/cursor.h b/include/cursor.h
index d51cc79e6..bdf4fd301 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -1,5 +1,3 @@
-/* $XdotOrg: xc/programs/Xserver/include/cursor.h,v 1.2 2004/04/23 19:54:23 eich Exp $ */
-/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.6 2002/09/17 01:15:14 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $Xorg: cursor.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 
 #ifndef CURSOR_H
 #define CURSOR_H 
diff --git a/include/cursorstr.h b/include/cursorstr.h
index c877d6cc9..b7beaa0c5 100644
--- a/include/cursorstr.h
+++ b/include/cursorstr.h
@@ -1,4 +1,3 @@
-/* $Xorg: cursorstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.8 2002/11/30 06:21:51 keithp Exp $ */
 
 #ifndef CURSORSTRUCT_H
 #define CURSORSTRUCT_H 
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index a6b871951..3481c779f 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -231,6 +231,9 @@
 /* Disable some debugging code */
 #undef NDEBUG
 
+/* Enable some debugging code */
+#undef DEBUG
+
 /* Name of package */
 #undef PACKAGE
 
diff --git a/include/dix.h b/include/dix.h
index 56c55b3da..f346b43a2 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.26 2003/01/12 02:44:27 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $Xorg: dix.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 
 #ifndef DIX_H
 #define DIX_H
@@ -811,4 +809,10 @@ typedef struct {
     SelectionCallbackKind   kind;
 } SelectionInfoRec;
 
+/* strcasecmp.c */
+#if NEED_STRCASECMP
+#define strcasecmp xstrcasecmp
+extern int xstrcasecmp(char *s1, char *s2);
+#endif
+
 #endif /* DIX_H */
diff --git a/include/dixevents.h b/include/dixevents.h
index 46a5faef0..2a9458f08 100644
--- a/include/dixevents.h
+++ b/include/dixevents.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/dixevents.h,v 3.4 2001/09/04 14:03:27 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/dixfont.h b/include/dixfont.h
index c6b8676da..709da6272 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -1,4 +1,3 @@
-/* $Xorg: dixfont.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */
 /***********************************************************
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
@@ -21,7 +20,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.7 2001/02/02 21:39:02 herrb Exp $ */
 
 #ifndef DIXFONT_H
 #define DIXFONT_H 1
diff --git a/include/dixfontstr.h b/include/dixfontstr.h
index 948bf1adb..463b2fdc5 100644
--- a/include/dixfontstr.h
+++ b/include/dixfontstr.h
@@ -1,4 +1,3 @@
-/* $Xorg: dixfontstr.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */
 /***********************************************************
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
diff --git a/include/dixgrabs.h b/include/dixgrabs.h
index 042e063db..2d66d6ba1 100644
--- a/include/dixgrabs.h
+++ b/include/dixgrabs.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/dixgrabs.h,v 3.0 1996/04/15 11:34:27 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/dixstruct.h b/include/dixstruct.h
index a6f674990..b5ffcca49 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.19tsi Exp $ */
 /***********************************************************
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
@@ -21,7 +20,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $Xorg: dixstruct.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */
 
 #ifndef DIXSTRUCT_H
 #define DIXSTRUCT_H
diff --git a/include/exevents.h b/include/exevents.h
index 91c7acb6b..1169a6c4e 100644
--- a/include/exevents.h
+++ b/include/exevents.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/exevents.h,v 3.1 1996/04/15 11:34:29 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/extension.h b/include/extension.h
index fb7d741de..74975c50b 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -1,4 +1,3 @@
-/* $Xorg: extension.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
 
 #ifndef EXTENSION_H
 #define EXTENSION_H 
diff --git a/include/extinit.h b/include/extinit.h
index 37fa9a245..b1a0f215d 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.2 2001/08/01 00:44:58 tsi Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/extnsionst.h b/include/extnsionst.h
index e28732f80..38d4bd7d9 100644
--- a/include/extnsionst.h
+++ b/include/extnsionst.h
@@ -1,4 +1,3 @@
-/* $Xorg: extnsionst.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */
 
 #ifndef EXTENSIONSTRUCT_H
 #define EXTENSIONSTRUCT_H 
diff --git a/include/gc.h b/include/gc.h
index 77c2f20c6..6c7add620 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $Xorg: gc.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 
 #ifndef GC_H
 #define GC_H 
diff --git a/include/gcstruct.h b/include/gcstruct.h
index 1d0072674..14f747836 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -1,4 +1,3 @@
-/* $Xorg: gcstruct.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -47,7 +46,6 @@ SOFTWARE.
 ******************************************************************/
 
 
-/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */
 
 #ifndef GCSTRUCT_H
 #define GCSTRUCT_H
diff --git a/include/globals.h b/include/globals.h
index d396d19c8..821b12bdb 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -1,5 +1,3 @@
-/* $XdotOrg: xserver/xorg/include/globals.h,v 1.11 2006/04/05 21:08:45 fredrik Exp $ */
-/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */
 
 #ifndef _XSERV_GLOBAL_H_
 #define _XSERV_GLOBAL_H_
diff --git a/include/input.h b/include/input.h
index e32182d4c..c0cee2458 100644
--- a/include/input.h
+++ b/include/input.h
@@ -1,4 +1,3 @@
-/* $Xorg: input.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */
 
 #ifndef INPUT_H
 #define INPUT_H
diff --git a/include/inputstr.h b/include/inputstr.h
index b54e8a1d5..5e2e26968 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -46,7 +45,6 @@ SOFTWARE.
 
 ********************************************************/
 
-/* $Xorg: inputstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 
 #ifndef INPUTSTRUCT_H
 #define INPUTSTRUCT_H
diff --git a/include/kdrive-config.h.in b/include/kdrive-config.h.in
index 9e611c584..2f454d702 100644
--- a/include/kdrive-config.h.in
+++ b/include/kdrive-config.h.in
@@ -22,4 +22,7 @@
 /* Support tslib touchscreen abstraction library */
 #undef TSLIB
 
+/* Verbose debugging output hilarity */
+#undef DEBUG
+
 #endif /* _KDRIVE_CONFIG_H_ */
diff --git a/include/misc.h b/include/misc.h
index 5944a427f..2be1d66a6 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.28 2001/12/14 19:59:55 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -66,7 +65,6 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
 OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $Xorg: misc.h,v 1.5 2001/02/09 02:05:15 xorgcvs Exp $ */
 #ifndef MISC_H
 #define MISC_H 1
 /*
@@ -83,11 +81,7 @@ extern unsigned long serverGeneration;
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 
-#ifndef IN_MODULE
-#ifndef NULL
 #include <stddef.h>
-#endif
-#endif
 
 #ifndef MAXSCREENS
 #define MAXSCREENS	16
@@ -115,9 +109,7 @@ typedef struct _CallbackList *CallbackListPtr; /* also in dix.h */
 typedef struct _xReq *xReqPtr;
 
 #include "os.h" 	/* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */
-#ifndef IN_MODULE
 #include <X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */
-#endif
 
 #define NullBox ((BoxPtr)0)
 #define MILLI_PER_MIN (1000 * 60)
@@ -145,12 +137,10 @@ typedef struct _xReq *xReqPtr;
 
 #define min(a, b) (((a) < (b)) ? (a) : (b))
 #define max(a, b) (((a) > (b)) ? (a) : (b))
-#ifndef IN_MODULE
 /* abs() is a function, not a macro; include the file declaring
  * it in case we haven't done that yet.
- */  
+ */
 #include <stdlib.h>
-#endif /* IN_MODULE */
 #ifndef Fabs
 #define Fabs(a) ((a) > 0.0 ? (a) : -(a))	/* floating absolute value */
 #endif
@@ -166,7 +156,6 @@ typedef struct _xReq *xReqPtr;
  */
 #define lowbit(x) ((x) & (~(x) + 1))
 
-#ifndef IN_MODULE
 /* XXX Not for modules */
 #include <limits.h>
 #if !defined(MAXSHORT) || !defined(MINSHORT) || \
@@ -177,7 +166,6 @@ typedef struct _xReq *xReqPtr;
  */
 
 #include <math.h>
-#endif
 #undef MAXSHORT
 #define MAXSHORT SHRT_MAX
 #undef MINSHORT
@@ -189,7 +177,7 @@ typedef struct _xReq *xReqPtr;
 
 #include <assert.h>
 #include <ctype.h>
-#include <stdio.h>	/* for fopen, etc... */
+#include <stdio.h>     /* for fopen, etc... */
 
 #endif
 
diff --git a/include/miscstruct.h b/include/miscstruct.h
index 6a16007b7..c39f03ce8 100644
--- a/include/miscstruct.h
+++ b/include/miscstruct.h
@@ -1,4 +1,3 @@
-/* $Xorg: miscstruct.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.4 2003/04/27 21:31:04 herrb Exp $ */
 
 #ifndef MISCSTRUCT_H
 #define MISCSTRUCT_H 1
diff --git a/include/opaque.h b/include/opaque.h
index ca29afdc0..3d19d275f 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -1,4 +1,3 @@
-/* $Xorg: opaque.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /*
 
 Copyright 1987, 1998  The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.13 2003/07/24 13:50:25 eich Exp $ */
 
 #ifndef OPAQUE_H
 #define OPAQUE_H
@@ -72,10 +70,10 @@ extern int limitStackSpace;
 #ifdef RLIMIT_NOFILE
 extern int limitNoFile;
 #endif
-extern Bool permitOldBugs;
 extern Bool defeatAccessControl;
 extern long maxBigRequestSize;
 extern Bool blackRoot;
+extern Bool whiteRoot;
 
 extern Bool CoreDump;
 
diff --git a/include/os.h b/include/os.h
index 0885bb298..4c4967164 100644
--- a/include/os.h
+++ b/include/os.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/os.h,v 3.54 2003/10/30 21:21:06 herrb Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -46,7 +45,6 @@ SOFTWARE.
 
 ******************************************************************/
 
-/* $Xorg: os.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 
 #ifndef OS_H
 #define OS_H
@@ -88,12 +86,8 @@ typedef struct _NewClientRec *NewClientPtr;
 #define xnfstrdup(s) XNFstrdup(s)
 #endif
 
-#ifndef IN_MODULE
-#ifdef __SCO__
 #include <stdio.h>
-#endif
-#include <string.h>
-#endif
+#include <stdarg.h>
 
 /* have to put $(SIGNAL_DEFINES) in DEFINES in Imakefile to get this right */
 #ifdef SIGNALRETURNSINT
@@ -517,10 +511,4 @@ extern void ErrorF(const char *f, ...) _printf_attribute(1,2);
 extern void Error(char *str);
 extern void LogPrintMarkers(void);
 
-#if defined(NEED_SNPRINTF) && !defined(IN_MODULE)
-extern int snprintf(char *str, size_t size, const char *format, ...)
-	_printf_attribute(3,4);
-extern int vsnprintf(char *str, size_t size, const char *format, va_list ap);
-#endif
-
 #endif /* OS_H */
diff --git a/include/pixmap.h b/include/pixmap.h
index 6cea329ec..3276fadb6 100644
--- a/include/pixmap.h
+++ b/include/pixmap.h
@@ -1,4 +1,3 @@
-/* $Xorg: pixmap.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/pixmapstr.h b/include/pixmapstr.h
index 291f2a2e9..628465b97 100644
--- a/include/pixmapstr.h
+++ b/include/pixmapstr.h
@@ -1,4 +1,3 @@
-/* $Xorg: pixmapstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/property.h b/include/property.h
index 21a38d51c..8b6dc0912 100644
--- a/include/property.h
+++ b/include/property.h
@@ -1,4 +1,3 @@
-/* $Xorg: property.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/property.h,v 1.3 2001/12/14 19:59:55 dawes Exp $ */
 
 #ifndef PROPERTY_H
 #define PROPERTY_H 
diff --git a/include/propertyst.h b/include/propertyst.h
index 9502a7261..6add81d9a 100644
--- a/include/propertyst.h
+++ b/include/propertyst.h
@@ -1,4 +1,3 @@
-/* $Xorg: propertyst.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.2 2001/01/17 22:36:57 dawes Exp $ */
 
 #ifndef PROPERTYSTRUCT_H
 #define PROPERTYSTRUCT_H 
diff --git a/include/region.h b/include/region.h
index 0340b0db6..e9d7e778c 100644
--- a/include/region.h
+++ b/include/region.h
@@ -1,4 +1,3 @@
-/* $Xorg: region.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/regionstr.h b/include/regionstr.h
index f3b4ce6db..6c39324d1 100644
--- a/include/regionstr.h
+++ b/include/regionstr.h
@@ -1,5 +1,3 @@
-/* $XdotOrg: xserver/xorg/include/regionstr.h,v 1.7 2005/08/24 11:18:31 daniels Exp $ */
-/* $Xorg: regionstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.12tsi Exp $ */
 
 #ifndef REGIONSTRUCT_H
 #define REGIONSTRUCT_H
diff --git a/include/resource.h b/include/resource.h
index 613b50a72..fd0caaeb5 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -1,4 +1,3 @@
-/* $Xorg: resource.h,v 1.5 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1989, 1998  The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.11 2002/03/06 21:14:04 mvojkovi Exp $ */
 
 #ifndef RESOURCE_H
 #define RESOURCE_H 1
diff --git a/include/rgb.h b/include/rgb.h
index 5741a4efa..3e768b615 100644
--- a/include/rgb.h
+++ b/include/rgb.h
@@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $Xorg: rgb.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 
 #ifndef RGB_H
 #define RGB_H
diff --git a/include/screenint.h b/include/screenint.h
index 74d5e14a0..e60c2480c 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -1,4 +1,3 @@
-/* $Xorg: screenint.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */
 
 #ifndef SCREENINT_H
 #define SCREENINT_H
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 19abe33a1..36135153f 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -1,4 +1,3 @@
-/* $Xorg: scrnintstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */
 
 #ifndef SCREENINTSTRUCT_H
 #define SCREENINTSTRUCT_H
diff --git a/include/selection.h b/include/selection.h
index 9e6edfbd9..fbe7cfca6 100644
--- a/include/selection.h
+++ b/include/selection.h
@@ -1,4 +1,3 @@
-/* $Xorg: selection.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */
 
 #ifndef SELECTION_H
 #define SELECTION_H 1
diff --git a/include/servermd.h b/include/servermd.h
index 3a3bc5f65..e6ca11ed2 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.56tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,8 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $Xorg: servermd.h,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */
-/* $XdotOrg: xc/programs/Xserver/include/servermd.h,v 1.4 2005/05/21 07:46:38 alanc Exp $ */
 
 #ifndef SERVERMD_H
 #define SERVERMD_H 1
diff --git a/include/site.h b/include/site.h
index be8c003da..5b9f25815 100644
--- a/include/site.h
+++ b/include/site.h
@@ -1,4 +1,3 @@
-/* $Xorg: site.h,v 1.6 2001/02/09 02:05:16 xorgcvs Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/include/site.h,v 1.8 2001/12/19 21:37:35 dawes Exp $ */
 
 #ifndef SITE_H
 #define SITE_H
diff --git a/include/swaprep.h b/include/swaprep.h
index d18b39f0c..8a9dcf036 100644
--- a/include/swaprep.h
+++ b/include/swaprep.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/swaprep.h,v 3.0 1996/04/15 11:34:34 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/swapreq.h b/include/swapreq.h
index 9c59bbf84..9c785fe62 100644
--- a/include/swapreq.h
+++ b/include/swapreq.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/swapreq.h,v 1.3 2003/04/27 21:31:05 herrb Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/validate.h b/include/validate.h
index 467533d22..e88fb41a2 100644
--- a/include/validate.h
+++ b/include/validate.h
@@ -1,4 +1,3 @@
-/* $Xorg: validate.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */
 
 /*
 
@@ -24,7 +23,6 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 */
-/* $XFree86: xc/programs/Xserver/include/validate.h,v 1.4 2001/01/17 22:36:58 dawes Exp $ */
 
 #ifndef VALIDATE_H
 #define VALIDATE_H
diff --git a/include/window.h b/include/window.h
index 6464f1b0c..bddeb252b 100644
--- a/include/window.h
+++ b/include/window.h
@@ -1,4 +1,3 @@
-/* $Xorg: window.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/windowstr.h b/include/windowstr.h
index 89e3ee10b..a37dc6b75 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -1,4 +1,3 @@
-/* $Xorg: windowstr.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.6 2001/12/14 19:59:57 dawes Exp $ */
 
 #ifndef WINDOWSTRUCT_H
 #define WINDOWSTRUCT_H
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index a5074f6e1..4a64522a7 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -106,4 +106,10 @@
 /* Has backtrace support */
 #undef HAVE_BACKTRACE
 
+/* Name of the period field in struct kbd_repeat */
+#undef LNX_KBD_PERIOD_NAME
+
+/* Have execinfo.h */
+#undef HAVE_EXECINFO_H
+
 #endif /* _XORG_CONFIG_H_ */
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index f31d98a77..48196d8b6 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -235,4 +235,7 @@
 /* System has wscons console */
 #undef WSCONS_SUPPORT
 
+/* Loadable XFree86 server awesomeness */
+#undef XFree86LOADER
+
 #endif /* _XORG_SERVER_H_ */