diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index f43ae2a956..75f9e37b2f 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -63,6 +63,9 @@ extern VisualPtr glxMatchVisual(ScreenPtr pScreen,
                                 VisualPtr pVisual, ScreenPtr pMatchScreen);
 #endif
 
+/* Xinerama is disabled by default unless enabled via +xinerama */
+Bool noPanoramiXExtension = TRUE;
+
 /*
  *	PanoramiX data declarations
  */
diff --git a/include/extinit.h b/include/extinit.h
index ffdcced5ad..e08d67e9bb 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -56,6 +56,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef COMPOSITE
 extern _X_EXPORT Bool noCompositeExtension;
 #endif
+
+/* required by: several video drivers (eg. vmware and sis) */
 #ifdef PANORAMIX
 extern _X_EXPORT Bool noPanoramiXExtension;
 #endif
diff --git a/os/utils.c b/os/utils.c
index 3737b48fa8..f7a9b42774 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -154,10 +154,6 @@ Bool noXFree86DRIExtension = FALSE;
 Bool noXFree86VidModeExtension = FALSE;
 #endif
 Bool noXFixesExtension = FALSE;
-#ifdef PANORAMIX
-/* Xinerama is disabled by default unless enabled via +xinerama */
-Bool noPanoramiXExtension = TRUE;
-#endif
 #ifdef DRI2
 Bool noDRI2Extension = FALSE;
 #endif