diff --git a/Xext/shape.c b/Xext/shape.c
index e3a616148..88911061b 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -72,6 +72,8 @@ static void SShapeNotifyEvent(xShapeNotifyEvent * /* from */ ,
 #include "panoramiXsrv.h"
 #endif
 
+Bool noShapeExtension = FALSE;
+
 static int ShapeEventBase = 0;
 static RESTYPE ClientType, ShapeEventType;      /* resource types for event masks */
 
diff --git a/include/extinit.h b/include/extinit.h
index b234dc95e..1d478f0a1 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -66,8 +66,6 @@ extern _X_EXPORT Bool noPanoramiXExtension;
 extern _X_EXPORT Bool noScreenSaverExtension;
 #endif
 
-extern _X_EXPORT Bool noShapeExtension;
-
 #ifdef MITSHM
 extern _X_EXPORT Bool noMITShmExtension;
 #endif
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index 6d1928122..9c28bf5c2 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -16,6 +16,7 @@ extern Bool noGlxExtension;
 extern Bool noRenderExtension;
 extern Bool noResExtension;
 extern Bool noRRExtension;
+extern Bool noShapeExtension;
 extern Bool noTestExtensions;
 
 void CompositeExtensionInit(void);
diff --git a/os/utils.c b/os/utils.c
index 9b765fee7..a6dcb3ca4 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -131,7 +131,6 @@ Bool noScreenSaverExtension = FALSE;
 #ifdef MITSHM
 Bool noMITShmExtension = FALSE;
 #endif
-Bool noShapeExtension = FALSE;
 
 #ifdef XCSECURITY
 Bool noSecurityExtension = FALSE;