diff --git a/glx/glapi.c b/glx/glapi.c
index 94a804329..62597e469 100644
--- a/glx/glapi.c
+++ b/glx/glapi.c
@@ -53,7 +53,8 @@
 #ifdef HAVE_DIX_CONFIG_H
 
 #include <dix-config.h>
-#define PUBLIC
+#include <X11/Xfuncproto.h>
+#define PUBLIC _X_EXPORT
 
 #else
 
diff --git a/glx/glxdri.c b/glx/glxdri.c
index 090e7ef97..8fb90cbeb 100644
--- a/glx/glxdri.c
+++ b/glx/glxdri.c
@@ -1171,7 +1171,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     return NULL;
 }
 
-__GLXprovider __glXDRIProvider = {
+_X_EXPORT __GLXprovider __glXDRIProvider = {
     __glXDRIscreenProbe,
     "DRI",
     NULL
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 4e76c7135..87c39595a 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -580,7 +580,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     return NULL;
 }
 
-__GLXprovider __glXDRI2Provider = {
+_X_EXPORT __GLXprovider __glXDRI2Provider = {
     __glXDRIscreenProbe,
     "DRI2",
     NULL
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index b42501280..5b3ecb077 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -516,7 +516,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     return NULL;
 }
 
-__GLXprovider __glXDRISWRastProvider = {
+_X_EXPORT __GLXprovider __glXDRISWRastProvider = {
     __glXDRIscreenProbe,
     "DRISWRAST",
     NULL