diff --git a/glx/vndext.c b/glx/vndext.c
index a0519ff65..b424dadb0 100644
--- a/glx/vndext.c
+++ b/glx/vndext.c
@@ -42,6 +42,8 @@
 
 #include "dix/dix_priv.h"
 
+Bool noGlxExtension = FALSE;
+
 ExtensionEntry *GlxExtensionEntry;
 int GlxErrorBase = 0;
 static CallbackListRec vndInitCallbackList;
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index cd3838649..f7c7a5b35 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -50,11 +50,15 @@ is" without express or implied warranty.
 
 Bool xnestDoFullGeneration = TRUE;
 
+/* Xnest doesn't support GLX yet, so we don't link it, but still have
+   satisfy DIX's symbol requirements */
 #ifdef GLXEXT
 void
 GlxExtensionInit(void)
 {
 }
+
+Bool noGlxExtension = FALSE;
 #endif
 
 void
diff --git a/include/extinit.h b/include/extinit.h
index 8852c4b95..ffdcced5a 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -56,10 +56,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef COMPOSITE
 extern _X_EXPORT Bool noCompositeExtension;
 #endif
-#ifdef GLXEXT
-extern _X_EXPORT Bool noGlxExtension;
-#endif
-
 #ifdef PANORAMIX
 extern _X_EXPORT Bool noPanoramiXExtension;
 #endif
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index b4a8fd827..e17535e33 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -12,6 +12,7 @@ extern Bool noDamageExtension;
 extern Bool noDbeExtension;
 extern Bool noDPMSExtension;
 extern Bool noGEExtension;
+extern Bool noGlxExtension;
 
 void CompositeExtensionInit(void);
 void DamageExtensionInit(void);
diff --git a/os/utils.c b/os/utils.c
index c2d05bdd6..73c973b16 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -126,9 +126,6 @@ Bool noTestExtensions;
 #ifdef COMPOSITE
 Bool noCompositeExtension = FALSE;
 #endif
-#ifdef GLXEXT
-Bool noGlxExtension = FALSE;
-#endif
 #ifdef SCREENSAVER
 Bool noScreenSaverExtension = FALSE;
 #endif