16 files changed, 17 insertions, 31 deletions
diff --git a/Xext/appgroup.c b/Xext/appgroup.c
index cf42a7d35..61c1aa0d5 100644
--- a/Xext/appgroup.c
+++ b/Xext/appgroup.c
@@ -44,8 +44,7 @@ from The Open Group.
 #define _XAG_SERVER_
 #include <X11/extensions/Xagstr.h>
 #include <X11/extensions/Xagsrv.h>
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
 #include <X11/Xfuncproto.h>
 
 #define XSERV_t
diff --git a/Xext/security.c b/Xext/security.c
index 48a45d0a2..31f2b928b 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group.
 #include "gcstruct.h"
 #include "colormapst.h"
 #include "propertyst.h"
-#define _SECURITY_SERVER
+#include "securitysrv.h"
 #include <X11/extensions/securstr.h>
 #include <assert.h>
 #include <stdarg.h>
diff --git a/dix/devices.c b/dix/devices.c
index c7d3494e8..40afac96f 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -73,8 +73,7 @@ SOFTWARE.
 #include <X11/extensions/XKBsrv.h>
 #endif
 #ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
 #endif
 
 #include "dispatch.h"
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 04e2ba11f..4b4eb2bc5 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -108,8 +108,7 @@ int ProcInitialConnection();
 #include "panoramiXsrv.h"
 #endif
 #ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
 #endif
 #ifdef XAPPGROUP
 #include <X11/extensions/Xagsrv.h>
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 91796eade..8cf9daa67 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -98,8 +98,7 @@ Author:  Adobe Systems Incorporated
 #define  XK_LATIN1
 #include <X11/keysymdef.h>
 #ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
 #endif
 
 /*
diff --git a/dix/events.c b/dix/events.c
index b014fdbb7..c67cf8ce4 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -139,8 +139,7 @@ extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
 #endif
 
 #ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
 #endif
 
 #ifdef XEVIE
diff --git a/dix/extension.c b/dix/extension.c
index f6f38fcf3..fd8727069 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -62,8 +62,7 @@ SOFTWARE.
 #include "scrnintstr.h"
 #include "dispatch.h"
 #ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
 #endif
 
 #define EXTENSION_BASE  128
diff --git a/dix/property.c b/dix/property.c
index e074c68dd..35799f836 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -61,8 +61,7 @@ SOFTWARE.
 #include "dispatch.h"
 #include "swaprep.h"
 #ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
 #endif
 
 /*****************************************************************
diff --git a/dix/window.c b/dix/window.c
index 9fba5f832..2be01df45 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -130,8 +130,7 @@ Equipment Corporation.
 #include <X11/extensions/Xagsrv.h>
 #endif
 #ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
 #endif
 
 /******
diff --git a/hw/xwin/winauth.c b/hw/xwin/winauth.c
index 3d24ef426..b57a35abf 100644
--- a/hw/xwin/winauth.c
+++ b/hw/xwin/winauth.c
@@ -35,9 +35,8 @@
 #include "win.h"
 
 /* Includes for authorization */
-#include "X11/Xauth.h"
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <X11/Xauth.h>
+#include "securitysrv.h"
 #include <X11/extensions/securstr.h>
 
 
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 091ac6b26..51faac935 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -244,7 +244,7 @@ typedef void (*InitExtension)(INITARGS);
 #include <X11/extensions/Xagstr.h>
 #endif
 #ifdef XCSECURITY
-#define _SECURITY_SERVER
+#include "securitysrv.h"
 #include <X11/extensions/securstr.h>
 #endif
 #ifdef PANORAMIX
diff --git a/os/access.c b/os/access.c
index 62af2f91f..db52aa038 100644
--- a/os/access.c
+++ b/os/access.c
@@ -203,8 +203,7 @@ SOFTWARE.
 #include "osdep.h"
 
 #ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
 #endif
 
 #ifndef PATH_MAX
diff --git a/os/auth.c b/os/auth.c
index 19c5534d3..d170ef8d8 100644
--- a/os/auth.c
+++ b/os/auth.c
@@ -48,8 +48,7 @@ from The Open Group.
 # include   <sys/types.h>
 # include   <sys/stat.h>
 #ifdef XCSECURITY
-#define _SECURITY_SERVER
-# include   <X11/extensions/security.h>
+# include   "securitysrv.h"
 #endif
 #ifdef WIN32
 #include    <X11/Xw32defs.h>
diff --git a/os/connection.c b/os/connection.c
index 21c1ea641..697ff4e74 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -151,8 +151,7 @@ extern __const__ int _nfiles;
 #include <X11/extensions/Xagsrv.h>
 #endif
 #ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
 #endif
 
 #ifdef X_NOT_POSIX
diff --git a/os/secauth.c b/os/secauth.c
index 1000b4e79..8c8700812 100644
--- a/os/secauth.c
+++ b/os/secauth.c
@@ -37,8 +37,7 @@ from The Open Group.
 #include "swaprep.h"
 
 #ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
 #endif
 
 static char InvalidPolicyReason[] = "invalid policy specification";
diff --git a/os/utils.c b/os/utils.c
index 617d20119..f977b837c 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -120,8 +120,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/XKBsrv.h>
 #endif
 #ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
 #endif
 
 #ifdef RENDER