diff --git a/src/glx/applegl_glx.c b/src/glx/applegl_glx.c
index f2ca3b74910..384314c45d0 100644
--- a/src/glx/applegl_glx.c
+++ b/src/glx/applegl_glx.c
@@ -170,7 +170,7 @@ static const struct glx_screen_vtable applegl_screen_vtable = {
    .query_renderer_string  = NULL,
 };
 
-_X_HIDDEN struct glx_screen *
+struct glx_screen *
 applegl_create_screen(int screen, struct glx_display * priv)
 {
    struct glx_screen *psc;
@@ -185,7 +185,7 @@ applegl_create_screen(int screen, struct glx_display * priv)
    return psc;
 }
 
-_X_HIDDEN int
+int
 applegl_create_display(struct glx_display *glx_dpy)
 {
    if(!apple_init_glx(glx_dpy->dpy))
diff --git a/src/glx/create_context.c b/src/glx/create_context.c
index eced2430b36..7f3f92365b6 100644
--- a/src/glx/create_context.c
+++ b/src/glx/create_context.c
@@ -41,7 +41,7 @@
 #define X_GLXCreateContextAttribsARB X_GLXCreateContextAtrribsARB
 #endif
 
-_X_HIDDEN GLXContext
+GLXContext
 glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
                            GLXContext share_context, Bool direct,
                            const int *attrib_list)
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 35a726074bf..362ebc34a1b 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -619,7 +619,7 @@ static const __DRIdri2LoaderExtension dri2LoaderExtension = {
    .getBuffersWithFormat    = dri2GetBuffersWithFormat,
 };
 
-_X_HIDDEN void
+void
 dri2InvalidateBuffers(Display *dpy, XID drawable)
 {
    __GLXDRIdrawable *pdraw =
@@ -750,7 +750,7 @@ handle_error:
    return NULL;
 }
 
-_X_HIDDEN __GLXDRIdrawable *
+__GLXDRIdrawable *
 dri2GetGlxDrawableFromXDrawableId(Display *dpy, XID id)
 {
    struct glx_display *d = __glXInitialize(dpy);
diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index b275eaf9680..2c6b07ee0b2 100644
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -209,7 +209,7 @@ createDriMode(struct glx_config *config, const struct dri_config **driConfigs)
    return &driConfig->base;
 }
 
-_X_HIDDEN struct glx_config *
+struct glx_config *
 driConvertConfigs(struct glx_config *configs, const struct dri_config **driConfigs)
 {
    struct glx_config head, *tail, *m;
@@ -230,7 +230,7 @@ driConvertConfigs(struct glx_config *configs, const struct dri_config **driConfi
    return head.next;
 }
 
-_X_HIDDEN void
+void
 driDestroyConfigs(const struct dri_config **configs)
 {
    int i;
@@ -273,7 +273,7 @@ driInferDrawableConfig(struct glx_screen *psc, GLXDrawable draw)
    return NULL;
 }
 
-_X_HIDDEN __GLXDRIdrawable *
+__GLXDRIdrawable *
 driFetchDrawable(struct glx_context *gc, GLXDrawable glxDrawable)
 {
    Display *dpy = gc->psc->dpy;
@@ -424,7 +424,7 @@ releaseDrawable(const struct glx_display *priv, GLXDrawable drawable)
    }
 }
 
-_X_HIDDEN void
+void
 driReleaseDrawables(struct glx_context *gc)
 {
    const struct glx_display *priv = gc->psc->display;
@@ -437,7 +437,7 @@ driReleaseDrawables(struct glx_context *gc)
 
 }
 
-_X_HIDDEN int
+int
 dri_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs,
                         struct dri_ctx_attribs *dca)
 {
diff --git a/src/glx/dri_common.h b/src/glx/dri_common.h
index ff7fce93255..8f40006f55a 100644
--- a/src/glx/dri_common.h
+++ b/src/glx/dri_common.h
@@ -104,10 +104,10 @@ dri_create_context_attribs(struct glx_screen *base,
                            unsigned num_attribs,
                            const uint32_t *attribs,
                            unsigned *error);
-_X_HIDDEN int
+int
 glx_dri_query_renderer_integer(struct glx_screen *base, int attribute,
                             unsigned int *value);
-_X_HIDDEN int
+int
 glx_dri_query_renderer_string(struct glx_screen *base, int attribute,
                            const char **value);
 char *
diff --git a/src/glx/dri_common_query_renderer.c b/src/glx/dri_common_query_renderer.c
index 09838ded5cb..0a5b18a1a2f 100644
--- a/src/glx/dri_common_query_renderer.c
+++ b/src/glx/dri_common_query_renderer.c
@@ -74,7 +74,7 @@ dri_convert_context_profile_bits(int attribute, unsigned int *value)
    }
 }
 
-_X_HIDDEN int
+int
 glx_dri_query_renderer_integer(struct glx_screen *base, int attribute,
                             unsigned int *value)
 {
@@ -92,7 +92,7 @@ glx_dri_query_renderer_integer(struct glx_screen *base, int attribute,
    return ret;
 }
 
-_X_HIDDEN int
+int
 glx_dri_query_renderer_string(struct glx_screen *base, int attribute,
                            const char **value)
 {
diff --git a/src/glx/glx_error.h b/src/glx/glx_error.h
index f97a2a84e30..b114991b793 100644
--- a/src/glx/glx_error.h
+++ b/src/glx/glx_error.h
@@ -43,7 +43,7 @@ void __glXSendError(Display * dpy, int_fast8_t errorCode,
           uint_fast32_t resourceID, uint_fast16_t minorCode,
           bool coreX11error);
 
-_X_HIDDEN void __glXSendErrorForXcb(Display * dpy,
+void __glXSendErrorForXcb(Display * dpy,
                 const xcb_generic_error_t *err);
 
 #ifdef __cplusplus
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index ec1de6929f0..48ebfe126e9 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -45,7 +45,7 @@
  * \returns  A pointer to the context's struct dri_drawable on success, or NULL if
  *           the drawable is not associated with a direct-rendering context.
  */
-_X_HIDDEN __GLXDRIdrawable *
+__GLXDRIdrawable *
 GetGLXDRIDrawable(Display * dpy, GLXDrawable drawable)
 {
    struct glx_display *priv = __glXInitialize(dpy);
@@ -62,7 +62,7 @@ GetGLXDRIDrawable(Display * dpy, GLXDrawable drawable)
 
 #endif
 
-_X_HIDDEN struct glx_drawable *
+struct glx_drawable *
 GetGLXDrawable(Display *dpy, GLXDrawable drawable)
 {
    struct glx_display *priv = __glXInitialize(dpy);
@@ -77,7 +77,7 @@ GetGLXDrawable(Display *dpy, GLXDrawable drawable)
    return NULL;
 }
 
-_X_HIDDEN int
+int
 InitGLXDrawable(Display *dpy, struct glx_drawable *glxDraw, XID xDrawable,
       GLXDrawable drawable)
 {
@@ -94,7 +94,7 @@ InitGLXDrawable(Display *dpy, struct glx_drawable *glxDraw, XID xDrawable,
    return __glxHashInsert(priv->glXDrawHash, drawable, glxDraw);
 }
 
-_X_HIDDEN void
+void
 DestroyGLXDrawable(Display *dpy, GLXDrawable drawable)
 {
    struct glx_display *priv = __glXInitialize(dpy);
@@ -122,7 +122,7 @@ DestroyGLXDrawable(Display *dpy, GLXDrawable drawable)
  *       number range for \c dpy?
  */
 
-_X_HIDDEN struct glx_screen *
+struct glx_screen *
 GetGLXScreenConfigs(Display * dpy, int scrn)
 {
    struct glx_display *const priv = __glXInitialize(dpy);
@@ -229,7 +229,7 @@ validate_renderType_against_config(const struct glx_config *config,
    return 0;
 }
 
-_X_HIDDEN Bool
+Bool
 glx_context_init(struct glx_context *gc,
        struct glx_screen *psc, struct glx_config *config)
 {
@@ -1540,7 +1540,7 @@ glXGetVisualFromFBConfig(Display * dpy, GLXFBConfig fbconfig)
 /*
 ** GLX_SGI_swap_control
 */
-_X_HIDDEN int
+int
 glXSwapIntervalSGI(int interval)
 {
    xGLXVendorPrivateReq *req;
@@ -1600,7 +1600,7 @@ glXSwapIntervalSGI(int interval)
 /*
 ** GLX_MESA_swap_control
 */
-_X_HIDDEN int
+int
 glXSwapIntervalMESA(unsigned int interval)
 {
 #ifdef GLX_DIRECT_RENDERING
@@ -1630,7 +1630,7 @@ glXSwapIntervalMESA(unsigned int interval)
 }
 
 
-_X_HIDDEN int
+int
 glXGetSwapIntervalMESA(void)
 {
 #ifdef GLX_DIRECT_RENDERING
@@ -1654,7 +1654,7 @@ glXGetSwapIntervalMESA(void)
 /*
 ** GLX_EXT_swap_control
 */
-_X_HIDDEN void
+void
 glXSwapIntervalEXT(Display *dpy, GLXDrawable drawable, int interval)
 {
 #ifdef GLX_DIRECT_RENDERING
@@ -1683,7 +1683,7 @@ glXSwapIntervalEXT(Display *dpy, GLXDrawable drawable, int interval)
 /*
 ** GLX_SGI_video_sync
 */
-_X_HIDDEN int
+int
 glXGetVideoSyncSGI(unsigned int *count)
 {
 #ifdef GLX_DIRECT_RENDERING
@@ -1718,7 +1718,7 @@ glXGetVideoSyncSGI(unsigned int *count)
    return GLX_BAD_CONTEXT;
 }
 
-_X_HIDDEN int
+int
 glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count)
 {
    struct glx_context *gc = __glXGetCurrentContext();
@@ -1804,7 +1804,7 @@ glXGetFBConfigFromVisualSGIX(Display * dpy, XVisualInfo * vis)
 /*
 ** GLX_OML_sync_control
 */
-_X_HIDDEN Bool
+Bool
 glXGetSyncValuesOML(Display *dpy, GLXDrawable drawable,
                     int64_t *ust, int64_t *msc, int64_t *sbc)
 {
@@ -1831,7 +1831,7 @@ glXGetSyncValuesOML(Display *dpy, GLXDrawable drawable,
 }
 
 #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
-_X_HIDDEN GLboolean
+GLboolean
 __glxGetMscRate(struct glx_screen *psc,
       int32_t * numerator, int32_t * denominator)
 {
@@ -1904,7 +1904,7 @@ __glxGetMscRate(struct glx_screen *psc,
  *       when GLX_OML_sync_control appears in the client extension string.
  */
 
-_X_HIDDEN Bool
+Bool
 glXGetMscRateOML(Display * dpy, GLXDrawable drawable,
                  int32_t * numerator, int32_t * denominator)
 {
@@ -1925,7 +1925,7 @@ glXGetMscRateOML(Display * dpy, GLXDrawable drawable,
 }
 
 
-_X_HIDDEN int64_t
+int64_t
 glXSwapBuffersMscOML(Display *dpy, GLXDrawable drawable,
                      int64_t target_msc, int64_t divisor, int64_t remainder)
 {
@@ -1966,7 +1966,7 @@ glXSwapBuffersMscOML(Display *dpy, GLXDrawable drawable,
 }
 
 
-_X_HIDDEN Bool
+Bool
 glXWaitForMscOML(Display *dpy, GLXDrawable drawable, int64_t target_msc,
                  int64_t divisor, int64_t remainder, int64_t *ust,
                  int64_t *msc, int64_t *sbc)
@@ -1998,7 +1998,7 @@ glXWaitForMscOML(Display *dpy, GLXDrawable drawable, int64_t target_msc,
 }
 
 
-_X_HIDDEN Bool
+Bool
 glXWaitForSbcOML(Display *dpy, GLXDrawable drawable, int64_t target_sbc,
                  int64_t *ust, int64_t *msc, int64_t *sbc)
 {
@@ -2031,7 +2031,7 @@ glXWaitForSbcOML(Display *dpy, GLXDrawable drawable, int64_t target_sbc,
  * GLX_MESA_copy_sub_buffer
  */
 #define X_GLXvop_CopySubBufferMESA 5154 /* temporary */
-_X_HIDDEN void
+void
 glXCopySubBufferMESA(Display * dpy, GLXDrawable drawable,
                      int x, int y, int width, int height)
 {
@@ -2096,7 +2096,7 @@ glXCopySubBufferMESA(Display * dpy, GLXDrawable drawable,
 }
 
 /*@{*/
-_X_HIDDEN void
+void
 glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer,
                    const int *attrib_list)
 {
@@ -2158,7 +2158,7 @@ glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer,
    SyncHandle();
 }
 
-_X_HIDDEN void
+void
 glXReleaseTexImageEXT(Display * dpy, GLXDrawable drawable, int buffer)
 {
    xGLXVendorPrivateReq *req;
diff --git a/src/glx/glxconfig.c b/src/glx/glxconfig.c
index 5c91a47119c..5cf3fd7cf2f 100644
--- a/src/glx/glxconfig.c
+++ b/src/glx/glxconfig.c
@@ -48,7 +48,7 @@
  * \return  If \c attribute is a valid attribute of \c mode, zero is
  *          returned.  Otherwise \c GLX_BAD_ATTRIBUTE is returned.
  */
-_X_HIDDEN int
+int
 glx_config_get(struct glx_config * mode, int attribute, int *value_return)
 {
    switch (attribute) {
@@ -214,7 +214,7 @@ glx_config_get(struct glx_config * mode, int attribute, int *value_return)
  * \returns A pointer to the first element in a linked list of \c count
  *          structures on success, or \c NULL on failure.
  */
-_X_HIDDEN struct glx_config *
+struct glx_config *
 glx_config_create_list(unsigned count)
 {
    const size_t size = sizeof(struct glx_config);
@@ -255,7 +255,7 @@ glx_config_create_list(unsigned count)
    return base;
 }
 
-_X_HIDDEN void
+void
 glx_config_destroy_list(struct glx_config *configs)
 {
    while (configs != NULL) {
@@ -276,7 +276,7 @@ glx_config_destroy_list(struct glx_config *configs)
  *          the list, or \c NULL if it was not.
  */
 
-_X_HIDDEN struct glx_config *
+struct glx_config *
 glx_config_find_visual(struct glx_config *configs, int vid)
 {
    struct glx_config *c;
@@ -288,7 +288,7 @@ glx_config_find_visual(struct glx_config *configs, int vid)
    return NULL;
 }
 
-_X_HIDDEN struct glx_config *
+struct glx_config *
 glx_config_find_fbconfig(struct glx_config *configs, int fbid)
 {
    struct glx_config *c;
diff --git a/src/glx/glxcurrent.c b/src/glx/glxcurrent.c
index 67f06093d9e..1a653c2a929 100644
--- a/src/glx/glxcurrent.c
+++ b/src/glx/glxcurrent.c
@@ -42,7 +42,7 @@ struct glx_context dummyContext = {
  * Current context management and locking
  */
 
-_X_HIDDEN pthread_mutex_t __glXmutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t __glXmutex = PTHREAD_MUTEX_INITIALIZER;
 
 /**
  * Per-thread GLX context pointer.
@@ -53,13 +53,13 @@ _X_HIDDEN pthread_mutex_t __glXmutex = PTHREAD_MUTEX_INITIALIZER;
  */
 __THREAD_INITIAL_EXEC void *__glX_tls_Context = &dummyContext;
 
-_X_HIDDEN void
+void
 __glXSetCurrentContext(struct glx_context * c)
 {
    __glX_tls_Context = (c != NULL) ? c : &dummyContext;
 }
 
-_X_HIDDEN void
+void
 __glXSetCurrentContextNull(void)
 {
    __glXSetCurrentContext(&dummyContext);
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 9cc4fab9ce6..e80d383cfa1 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -59,7 +59,7 @@
 #define __GLX_TOTAL_CONFIG \
    (__GLX_MIN_CONFIG_PROPS + 2 * __GLX_EXT_CONFIG_PROPS)
 
-_X_HIDDEN void
+void
 glx_message(int level, const char *f, ...)
 {
    va_list args;
@@ -86,7 +86,7 @@ glx_message(int level, const char *f, ...)
 ** You can set this cell to 1 to force the gl drawing stuff to be
 ** one command per packet
 */
-_X_HIDDEN int __glXDebug = 0;
+int __glXDebug = 0;
 
 /* Extension required boiler plate */
 
@@ -375,7 +375,7 @@ convert_from_x_visual_type(int visualType)
  * getVisualConfigs uses the !tagged_only path.
  * getFBConfigs uses the tagged_only path.
  */
-_X_HIDDEN void
+void
 __glXInitializeVisualConfigFromTags(struct glx_config * config, int count,
                                     const INT32 * bp, Bool tagged_only,
                                     Bool fbconfig_style_tags)
@@ -710,7 +710,7 @@ getFBConfigs(struct glx_screen *psc, struct glx_display *priv, int screen)
    return psc->configs != NULL;
 }
 
-_X_HIDDEN Bool
+Bool
 glx_screen_init(struct glx_screen *psc,
 		 int screen, struct glx_display * priv)
 {
@@ -729,7 +729,7 @@ glx_screen_init(struct glx_screen *psc,
    return GL_TRUE;
 }
 
-_X_HIDDEN void
+void
 glx_screen_cleanup(struct glx_screen *psc)
 {
    if (psc->configs) {
@@ -940,7 +940,7 @@ AllocAndFetchScreenConfigs(Display * dpy, struct glx_display * priv, enum glx_dr
 /*
 ** Initialize the client side extension code.
 */
- _X_HIDDEN struct glx_display *
+struct glx_display *
 __glXInitialize(Display * dpy)
 {
    XExtCodes *codes;
@@ -1129,7 +1129,7 @@ __glXInitialize(Display * dpy)
 ** Setup for sending a GLX command on dpy.  Make sure the extension is
 ** initialized.  Try to avoid calling __glXInitialize as its kinda slow.
 */
-_X_HIDDEN CARD8
+CARD8
 __glXSetupForCommand(Display * dpy)
 {
     struct glx_context *gc;
@@ -1171,7 +1171,7 @@ __glXSetupForCommand(Display * dpy)
  * Modify this function to use \c ctx->pc instead of the explicit
  * \c pc parameter.
  */
-_X_HIDDEN GLubyte *
+GLubyte *
 __glXFlushRenderBuffer(struct glx_context * ctx, GLubyte * pc)
 {
    Display *const dpy = ctx->currentDpy;
@@ -1205,7 +1205,7 @@ __glXFlushRenderBuffer(struct glx_context * ctx, GLubyte * pc)
  * \param data           Command data.
  * \param dataLen        Size, in bytes, of the command data.
  */
-_X_HIDDEN void
+void
 __glXSendLargeChunk(struct glx_context * gc, GLint requestNumber,
                     GLint totalRequests, const GLvoid * data, GLint dataLen)
 {
@@ -1231,7 +1231,7 @@ __glXSendLargeChunk(struct glx_context * gc, GLint requestNumber,
  * \param data       Command data.
  * \param dataLen    Size, in bytes, of the command data.
  */
-_X_HIDDEN void
+void
 __glXSendLargeCommand(struct glx_context * ctx,
                       const GLvoid * header, GLint headerLen,
                       const GLvoid * data, GLint dataLen)
diff --git a/src/glx/glxhash.c b/src/glx/glxhash.c
index 36c70bb9346..21b89831584 100644
--- a/src/glx/glxhash.c
+++ b/src/glx/glxhash.c
@@ -153,7 +153,7 @@ HashHash(unsigned long key)
    return hash;
 }
 
-_X_HIDDEN __glxHashTable *
+__glxHashTable *
 __glxHashCreate(void)
 {
    __glxHashTablePtr table;
@@ -172,7 +172,7 @@ __glxHashCreate(void)
    return table;
 }
 
-_X_HIDDEN int
+int
 __glxHashDestroy(__glxHashTable * t)
 {
    __glxHashTablePtr table = (__glxHashTablePtr) t;
@@ -227,7 +227,7 @@ HashFind(__glxHashTablePtr table, unsigned long key, unsigned long *h)
    return NULL;
 }
 
-_X_HIDDEN int
+int
 __glxHashLookup(__glxHashTable * t, unsigned long key, void **value)
 {
    __glxHashTablePtr table = (__glxHashTablePtr) t;
@@ -243,7 +243,7 @@ __glxHashLookup(__glxHashTable * t, unsigned long key, void **value)
    return 0;                    /* Found */
 }
 
-_X_HIDDEN int
+int
 __glxHashInsert(__glxHashTable * t, unsigned long key, void *value)
 {
    __glxHashTablePtr table = (__glxHashTablePtr) t;
@@ -269,7 +269,7 @@ __glxHashInsert(__glxHashTable * t, unsigned long key, void *value)
    return 0;                    /* Added to table */
 }
 
-_X_HIDDEN int
+int
 __glxHashDelete(__glxHashTable * t, unsigned long key)
 {
    __glxHashTablePtr table = (__glxHashTablePtr) t;
@@ -289,7 +289,7 @@ __glxHashDelete(__glxHashTable * t, unsigned long key)
    return 0;
 }
 
-_X_HIDDEN int
+int
 __glxHashNext(__glxHashTable * t, unsigned long *key, void **value)
 {
    __glxHashTablePtr table = (__glxHashTablePtr) t;
@@ -307,7 +307,7 @@ __glxHashNext(__glxHashTable * t, unsigned long *key, void **value)
    return 0;
 }
 
-_X_HIDDEN int
+int
 __glxHashFirst(__glxHashTable * t, unsigned long *key, void **value)
 {
    __glxHashTablePtr table = (__glxHashTablePtr) t;
diff --git a/src/glx/indirect_glx.c b/src/glx/indirect_glx.c
index 5326a8fb386..e81f12368b2 100644
--- a/src/glx/indirect_glx.c
+++ b/src/glx/indirect_glx.c
@@ -211,7 +211,7 @@ static const struct glx_context_vtable indirect_context_vtable = {
    .wait_x              = indirect_wait_x,
 };
 
-_X_HIDDEN struct glx_context *
+struct glx_context *
 indirect_create_context(struct glx_screen *psc,
          struct glx_config *mode,
          struct glx_context *shareList, int renderType)
@@ -228,7 +228,7 @@ indirect_create_context(struct glx_screen *psc,
  * function called \c __glXAllocateClientState that allocates the memory and
  * does all the initialization (including the pixel pack / unpack).
  */
-_X_HIDDEN struct glx_context *
+struct glx_context *
 indirect_create_context_attribs(struct glx_screen *psc,
             struct glx_config *mode,
             struct glx_context *shareList,
@@ -360,7 +360,7 @@ static const struct glx_screen_vtable indirect_screen_vtable = {
    .query_renderer_string  = NULL,
 };
 
-_X_HIDDEN struct glx_screen *
+struct glx_screen *
 indirect_create_screen(int screen, struct glx_display * priv)
 {
    struct glx_screen *psc;
diff --git a/src/glx/query_renderer.c b/src/glx/query_renderer.c
index 145116c580d..06d324c3f1d 100644
--- a/src/glx/query_renderer.c
+++ b/src/glx/query_renderer.c
@@ -75,7 +75,7 @@ __glXQueryRendererInteger(struct glx_screen *psc, int attribute,
    return err == 0;
 }
 
-_X_HIDDEN Bool
+Bool
 glXQueryRendererIntegerMESA(Display *dpy, int screen,
                             int renderer, int attribute,
                             unsigned int *value)
@@ -101,7 +101,7 @@ glXQueryRendererIntegerMESA(Display *dpy, int screen,
    return __glXQueryRendererInteger(psc, attribute, value);
 }
 
-_X_HIDDEN Bool
+Bool
 glXQueryCurrentRendererIntegerMESA(int attribute, unsigned int *value)
 {
    struct glx_context *gc = __glXGetCurrentContext();
@@ -136,7 +136,7 @@ __glXQueryRendererString(struct glx_screen *psc, int attribute)
    return (err == 0) ? value : NULL;
 }
 
-_X_HIDDEN const char *
+const char *
 glXQueryRendererStringMESA(Display *dpy, int screen,
                            int renderer, int attribute)
 {
@@ -161,7 +161,7 @@ glXQueryRendererStringMESA(Display *dpy, int screen,
    return __glXQueryRendererString(psc, attribute);
 }
 
-_X_HIDDEN const char *
+const char *
 glXQueryCurrentRendererStringMESA(int attribute)
 {
    struct glx_context *gc = __glXGetCurrentContext();
diff --git a/src/glx/xfont.c b/src/glx/xfont.c
index c893e61af45..d58b02f189a 100644
--- a/src/glx/xfont.c
+++ b/src/glx/xfont.c
@@ -146,7 +146,7 @@ isvalid(XFontStruct * fs, int which)
    return (NULL);
 }
 
-_X_HIDDEN void
+void
 DRI_glXUseXFont(struct glx_context *CC, Font font, int first, int count, int listbase)
 {
    Display *dpy;
diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py
index d10a85b99b9..800753abf31 100644
--- a/src/mapi/glapi/gen/glX_proto_send.py
+++ b/src/mapi/glapi/gen/glX_proto_send.py
@@ -1018,18 +1018,18 @@ class PrintGlxProtoInit_h(gl_XML.gl_print_base):
 #include <X11/Xfuncproto.h>
 #include "glxclient.h"
 
-extern _X_HIDDEN NOINLINE CARD32 __glXReadReply( Display *dpy, size_t size,
+extern NOINLINE CARD32 __glXReadReply( Display *dpy, size_t size,
     void * dest, GLboolean reply_is_always_array );
 
-extern _X_HIDDEN NOINLINE void __glXReadPixelReply( Display *dpy,
+extern NOINLINE void __glXReadPixelReply( Display *dpy,
     struct glx_context * gc, unsigned max_dim, GLint width, GLint height,
     GLint depth, GLenum format, GLenum type, void * dest,
     GLboolean dimensions_in_reply );
 
-extern _X_HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupSingleRequest(
+extern NOINLINE FASTCALL GLubyte * __glXSetupSingleRequest(
     struct glx_context * gc, GLint sop, GLint cmdlen );
 
-extern _X_HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest(
+extern NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest(
     struct glx_context * gc, GLint code, GLint vop, GLint cmdlen );
 """)
 
@@ -1038,13 +1038,13 @@ extern _X_HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest(
         for func in api.functionIterateGlx():
             params = func.get_parameter_string()
 
-            print('extern _X_HIDDEN %s __indirect_gl%s(%s);' % (func.return_type, func.name, params))
+            print('extern %s __indirect_gl%s(%s);' % (func.return_type, func.name, params))
 
             for n in func.entry_points:
                 if func.has_different_protocol(n):
                     asdf = func.static_glx_name(n)
                     if asdf not in func.static_entry_points:
-                        print('extern _X_HIDDEN %s gl%s(%s);' % (func.return_type, asdf, params))
+                        print('extern %s gl%s(%s);' % (func.return_type, asdf, params))
                         # give it a easy-to-remember name
                         if func.client_handcode:
                             print('#define gl_dispatch_stub_%s gl%s' % (n, asdf))
@@ -1055,7 +1055,7 @@ extern _X_HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest(
 
         print('')
         print('#ifdef GLX_INDIRECT_RENDERING')
-        print('extern _X_HIDDEN void (*__indirect_get_proc_address(const char *name))(void);')
+        print('extern void (*__indirect_get_proc_address(const char *name))(void);')
         print('#endif')
 
 
diff --git a/src/mapi/glapi/gen/glX_proto_size.py b/src/mapi/glapi/gen/glX_proto_size.py
index a7610b44911..b5362614ef4 100644
--- a/src/mapi/glapi/gen/glX_proto_size.py
+++ b/src/mapi/glapi/gen/glX_proto_size.py
@@ -225,7 +225,7 @@ class glx_enum_function(object):
 
 
     def Print(self, name):
-        print('_X_INTERNAL PURE FASTCALL GLint')
+        print('PURE FASTCALL GLint')
         print('__gl%s_size( GLenum e )' % (name))
         print('{')
 
@@ -271,12 +271,12 @@ class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common):
         print('')
         print('#ifdef HAVE_FUNC_ATTRIBUTE_ALIAS')
         print('#  define ALIAS2(from,to) \\')
-        print('    _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\')
+        print('    PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\')
         print('        __attribute__ ((alias( # to )));')
         print('#  define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )')
         print('#else')
         print('#  define ALIAS(from,to) \\')
-        print('    _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\')
+        print('    PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\')
         print('    { return __gl ## to ## _size( e ); }')
         print('#endif')
         print('')
@@ -331,7 +331,7 @@ class PrintGlxSizeStubs_h(PrintGlxSizeStubs_common):
                 continue
 
             if (ef.is_set() and self.emit_set) or (not ef.is_set() and self.emit_get):
-                print('extern _X_INTERNAL PURE FASTCALL GLint __gl%s_size(GLenum);' % (func.name))
+                print('extern PURE FASTCALL GLint __gl%s_size(GLenum);' % (func.name))
 
 
 class PrintGlxReqSize_common(gl_XML.gl_print_base):