diff --git a/Xext/security.c b/Xext/security.c
index 3466ad961..db4ba0c42 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -46,9 +46,11 @@ in this Software without prior written authorization from The Open Group.
 #include "privates.h"
 #include "xacestr.h"
 #include "securitysrv.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "protocol-versions.h"
 
+Bool noSecurityExtension = FALSE;
+
 /* Extension stuff */
 static int SecurityErrorBase;   /* first Security error number */
 static int SecurityEventBase;   /* first Security event number */
diff --git a/include/extinit.h b/include/extinit.h
index 3622b0418..c8b5857b3 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -62,10 +62,6 @@ extern _X_EXPORT Bool noCompositeExtension;
 extern _X_EXPORT Bool noPanoramiXExtension;
 #endif
 
-#ifdef XCSECURITY
-extern _X_EXPORT Bool noSecurityExtension;
-#endif
-
 #ifdef XF86BIGFONT
 extern _X_EXPORT Bool noXFree86BigfontExtension;
 #endif
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index db9cdf52b..2f0c3f23b 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -18,6 +18,7 @@ extern Bool noRenderExtension;
 extern Bool noResExtension;
 extern Bool noRRExtension;
 extern Bool noScreenSaverExtension;
+extern Bool noSecurityExtension;
 extern Bool noShapeExtension;
 extern Bool noTestExtensions;
 
diff --git a/os/utils.c b/os/utils.c
index 62a459b79..e29283946 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -124,9 +124,6 @@ __stdcall unsigned long GetTickCount(void);
 #ifdef COMPOSITE
 Bool noCompositeExtension = FALSE;
 #endif
-#ifdef XCSECURITY
-Bool noSecurityExtension = FALSE;
-#endif
 #ifdef XF86BIGFONT
 Bool noXFree86BigfontExtension = FALSE;
 #endif