diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 57df75cd7259c..804b0831be175 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -417,7 +417,7 @@ _eglConvertAttribsToInt(const EGLAttrib *attr_list)
  * This is typically the first EGL function that an application calls.
  * It associates a private _EGLDisplay object to the native display.
  */
-EGLDisplay EGLAPIENTRY
+PUBLIC EGLDisplay EGLAPIENTRY
 eglGetDisplay(EGLNativeDisplayType nativeDisplay)
 {
    _EGLPlatformType plat;
@@ -500,7 +500,7 @@ eglGetPlatformDisplayEXT(EGLenum platform, void *native_display,
    return disp;
 }
 
-EGLDisplay EGLAPIENTRY
+PUBLIC EGLDisplay EGLAPIENTRY
 eglGetPlatformDisplay(EGLenum platform, void *native_display,
                       const EGLAttrib *attrib_list)
 {
@@ -674,7 +674,7 @@ _eglComputeVersion(_EGLDisplay *disp)
  * This is typically the second EGL function that an application calls.
  * Here we load/initialize the actual hardware driver.
  */
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
 {
    _EGLDisplay *disp = _eglLockDisplay(dpy);
@@ -768,7 +768,7 @@ eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
 }
 
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglTerminate(EGLDisplay dpy)
 {
    _EGLDisplay *disp = _eglWriteLockDisplay(dpy);
@@ -791,7 +791,7 @@ eglTerminate(EGLDisplay dpy)
 }
 
 
-const char * EGLAPIENTRY
+PUBLIC const char * EGLAPIENTRY
 eglQueryString(EGLDisplay dpy, EGLint name)
 {
    _EGLDisplay *disp;
@@ -821,7 +821,7 @@ eglQueryString(EGLDisplay dpy, EGLint name)
 }
 
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglGetConfigs(EGLDisplay dpy, EGLConfig *configs,
               EGLint config_size, EGLint *num_config)
 {
@@ -841,7 +841,7 @@ eglGetConfigs(EGLDisplay dpy, EGLConfig *configs,
 }
 
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs,
                 EGLint config_size, EGLint *num_config)
 {
@@ -862,7 +862,7 @@ eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs,
 }
 
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config,
                    EGLint attribute, EGLint *value)
 {
@@ -880,7 +880,7 @@ eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config,
 }
 
 
-EGLContext EGLAPIENTRY
+PUBLIC EGLContext EGLAPIENTRY
 eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_list,
                  const EGLint *attrib_list)
 {
@@ -920,7 +920,7 @@ eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_list,
 }
 
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglDestroyContext(EGLDisplay dpy, EGLContext ctx)
 {
    _EGLDisplay *disp = _eglLockDisplay(dpy);
@@ -937,7 +937,7 @@ eglDestroyContext(EGLDisplay dpy, EGLContext ctx)
 }
 
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read,
                EGLContext ctx)
 {
@@ -1003,7 +1003,7 @@ eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read,
 }
 
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglQueryContext(EGLDisplay dpy, EGLContext ctx,
                 EGLint attribute, EGLint *value)
 {
@@ -1095,7 +1095,7 @@ _eglCreateWindowSurfaceCommon(_EGLDisplay *disp, EGLConfig config,
 }
 
 
-EGLSurface EGLAPIENTRY
+PUBLIC EGLSurface EGLAPIENTRY
 eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config,
                        EGLNativeWindowType window, const EGLint *attrib_list)
 {
@@ -1149,7 +1149,7 @@ eglCreatePlatformWindowSurfaceEXT(EGLDisplay dpy, EGLConfig config,
 }
 
 
-EGLSurface EGLAPIENTRY
+PUBLIC EGLSurface EGLAPIENTRY
 eglCreatePlatformWindowSurface(EGLDisplay dpy, EGLConfig config,
                                void *native_window,
                                const EGLAttrib *attrib_list)
@@ -1240,7 +1240,7 @@ _eglCreatePixmapSurfaceCommon(_EGLDisplay *disp, EGLConfig config,
 }
 
 
-EGLSurface EGLAPIENTRY
+PUBLIC EGLSurface EGLAPIENTRY
 eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config,
                        EGLNativePixmapType pixmap, const EGLint *attrib_list)
 {
@@ -1266,7 +1266,7 @@ eglCreatePlatformPixmapSurfaceEXT(EGLDisplay dpy, EGLConfig config,
 }
 
 
-EGLSurface EGLAPIENTRY
+PUBLIC EGLSurface EGLAPIENTRY
 eglCreatePlatformPixmapSurface(EGLDisplay dpy, EGLConfig config,
                                void *native_pixmap,
                                const EGLAttrib *attrib_list)
@@ -1289,7 +1289,7 @@ eglCreatePlatformPixmapSurface(EGLDisplay dpy, EGLConfig config,
 }
 
 
-EGLSurface EGLAPIENTRY
+PUBLIC EGLSurface EGLAPIENTRY
 eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config,
                         const EGLint *attrib_list)
 {
@@ -1313,7 +1313,7 @@ eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config,
 }
 
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglDestroySurface(EGLDisplay dpy, EGLSurface surface)
 {
    _EGLDisplay *disp = _eglLockDisplay(dpy);
@@ -1330,7 +1330,7 @@ eglDestroySurface(EGLDisplay dpy, EGLSurface surface)
    RETURN_EGL_EVAL(disp, ret);
 }
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglQuerySurface(EGLDisplay dpy, EGLSurface surface,
                 EGLint attribute, EGLint *value)
 {
@@ -1349,7 +1349,7 @@ eglQuerySurface(EGLDisplay dpy, EGLSurface surface,
    RETURN_EGL_EVAL(disp, ret);
 }
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface,
                  EGLint attribute, EGLint value)
 {
@@ -1366,7 +1366,7 @@ eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface,
 }
 
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
 {
    _EGLDisplay *disp = _eglLockDisplay(dpy);
@@ -1384,7 +1384,7 @@ eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
 }
 
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
 {
    _EGLDisplay *disp = _eglLockDisplay(dpy);
@@ -1402,7 +1402,7 @@ eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
 }
 
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglSwapInterval(EGLDisplay dpy, EGLint interval)
 {
    _EGLDisplay *disp = _eglLockDisplay(dpy);
@@ -1442,7 +1442,7 @@ eglSwapInterval(EGLDisplay dpy, EGLint interval)
 }
 
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglSwapBuffers(EGLDisplay dpy, EGLSurface surface)
 {
    _EGLContext *ctx = _eglGetCurrentContext();
@@ -1605,7 +1605,7 @@ eglSetDamageRegionKHR(EGLDisplay dpy, EGLSurface surface,
    RETURN_EGL_EVAL(disp, ret);
 }
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)
 {
    _EGLDisplay *disp = _eglLockDisplay(dpy);
@@ -1656,14 +1656,14 @@ _eglWaitClientCommon(void)
    RETURN_EGL_EVAL(disp, ret);
 }
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglWaitClient(void)
 {
    _EGL_FUNC_START(NULL, EGL_OBJECT_CONTEXT_KHR, _eglGetCurrentContext());
    return _eglWaitClientCommon();
 }
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglWaitGL(void)
 {
    /* Since we only support OpenGL and GLES, eglWaitGL is equivalent to eglWaitClient. */
@@ -1672,7 +1672,7 @@ eglWaitGL(void)
 }
 
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglWaitNative(EGLint engine)
 {
    _EGLContext *ctx = _eglGetCurrentContext();
@@ -1701,8 +1701,7 @@ eglWaitNative(EGLint engine)
    RETURN_EGL_EVAL(disp, ret);
 }
 
-
-EGLDisplay EGLAPIENTRY
+PUBLIC EGLDisplay EGLAPIENTRY
 eglGetCurrentDisplay(void)
 {
    _EGLContext *ctx = _eglGetCurrentContext();
@@ -1714,7 +1713,7 @@ eglGetCurrentDisplay(void)
 }
 
 
-EGLContext EGLAPIENTRY
+PUBLIC EGLContext EGLAPIENTRY
 eglGetCurrentContext(void)
 {
    _EGLContext *ctx = _eglGetCurrentContext();
@@ -1726,7 +1725,7 @@ eglGetCurrentContext(void)
 }
 
 
-EGLSurface EGLAPIENTRY
+PUBLIC EGLSurface EGLAPIENTRY
 eglGetCurrentSurface(EGLint readdraw)
 {
    _EGLContext *ctx = _eglGetCurrentContext();
@@ -1758,7 +1757,7 @@ eglGetCurrentSurface(EGLint readdraw)
 }
 
 
-EGLint EGLAPIENTRY
+PUBLIC EGLint EGLAPIENTRY
 eglGetError(void)
 {
    _EGLThreadInfo *t = _eglGetCurrentThread();
@@ -1783,7 +1782,7 @@ eglGetError(void)
  *  eglWaitNative()
  * See section 3.7 "Rendering Context" in the EGL specification for details.
  */
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglBindAPI(EGLenum api)
 {
    _EGLThreadInfo *t;
@@ -1804,7 +1803,7 @@ eglBindAPI(EGLenum api)
 /**
  * Return the last value set with eglBindAPI().
  */
-EGLenum EGLAPIENTRY
+PUBLIC EGLenum EGLAPIENTRY
 eglQueryAPI(void)
 {
    _EGLThreadInfo *t = _eglGetCurrentThread();
@@ -1817,7 +1816,7 @@ eglQueryAPI(void)
 }
 
 
-EGLSurface EGLAPIENTRY
+PUBLIC EGLSurface EGLAPIENTRY
 eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype,
                                  EGLClientBuffer buffer, EGLConfig config,
                                  const EGLint *attrib_list)
@@ -1834,7 +1833,7 @@ eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype,
 }
 
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglReleaseThread(void)
 {
    /* unbind current contexts */
@@ -1895,7 +1894,7 @@ eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target,
 }
 
 
-EGLImage EGLAPIENTRY
+PUBLIC EGLImage EGLAPIENTRY
 eglCreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target,
                EGLClientBuffer buffer, const EGLAttrib *attr_list)
 {
@@ -1932,7 +1931,7 @@ _eglDestroyImageCommon(_EGLDisplay *disp, _EGLImage *img)
    RETURN_EGL_EVAL(disp, ret);
 }
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglDestroyImage(EGLDisplay dpy, EGLImage image)
 {
    _EGLDisplay *disp = _eglLockDisplay(dpy);
@@ -2056,7 +2055,7 @@ eglCreateSync64KHR(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list)
 }
 
 
-EGLSync EGLAPIENTRY
+PUBLIC EGLSync EGLAPIENTRY
 eglCreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list)
 {
    _EGLDisplay *disp = _eglLockDisplay(dpy);
@@ -2085,7 +2084,7 @@ _eglDestroySync(_EGLDisplay *disp, _EGLSync *s)
    RETURN_EGL_EVAL(disp, ret);
 }
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglDestroySync(EGLDisplay dpy, EGLSync sync)
 {
    _EGLDisplay *disp = _eglLockDisplay(dpy);
@@ -2125,7 +2124,7 @@ _eglClientWaitSyncCommon(_EGLDisplay *disp, _EGLSync *s,
    RETURN_EGL_EVAL(disp, ret);
 }
 
-EGLint EGLAPIENTRY
+PUBLIC EGLint EGLAPIENTRY
 eglClientWaitSync(EGLDisplay dpy, EGLSync sync,
                   EGLint flags, EGLTime timeout)
 {
@@ -2179,7 +2178,7 @@ eglWaitSyncKHR(EGLDisplay dpy, EGLSync sync, EGLint flags)
 }
 
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags)
 {
    /* The KHR version returns EGLint, while the core version returns
@@ -2228,7 +2227,7 @@ _eglGetSyncAttribCommon(_EGLDisplay *disp, _EGLSync *s, EGLint attribute, EGLAtt
    RETURN_EGL_EVAL(disp, ret);
 }
 
-EGLBoolean EGLAPIENTRY
+PUBLIC EGLBoolean EGLAPIENTRY
 eglGetSyncAttrib(EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value)
 {
    _EGLDisplay *disp = _eglLockDisplay(dpy);
@@ -2869,7 +2868,7 @@ eglGetDisplayDriverName(EGLDisplay dpy)
     RETURN_EGL_EVAL(disp, ret);
 }
 
-__eglMustCastToProperFunctionPointerType EGLAPIENTRY
+PUBLIC __eglMustCastToProperFunctionPointerType EGLAPIENTRY
 eglGetProcAddress(const char *procname)
 {
    static const struct _egl_entrypoint egl_functions[] = {
diff --git a/src/egl/main/eglglvnd.c b/src/egl/main/eglglvnd.c
index 1e94678e66d19..8e8e52db8cc38 100644
--- a/src/egl/main/eglglvnd.c
+++ b/src/egl/main/eglglvnd.c
@@ -79,7 +79,7 @@ __eglGLVNDGetProcAddress(const char *procName)
    return (void *) eglGetProcAddress(procName);
 }
 
-EGLAPI EGLBoolean
+PUBLIC EGLAPI EGLBoolean
 __egl_Main(uint32_t version, const __EGLapiExports *exports,
      __EGLvendorInfo *vendor, __EGLapiImports *imports)
 {