4 files changed, 6 insertions, 6 deletions
diff --git a/mesalib/src/mapi/glapi/gen/gl_table.py b/mesalib/src/mapi/glapi/gen/gl_table.py
index afcd17d38..0c9c0b8a1 100755
--- a/mesalib/src/mapi/glapi/gen/gl_table.py
+++ b/mesalib/src/mapi/glapi/gen/gl_table.py
@@ -157,7 +157,7 @@ class PrintRemapTable(gl_XML.gl_print_base):
             remap_table = "driDispatchRemapTable"
 
             print '#define %s_size %u' % (remap_table, count)
-            print 'extern int %s[ %s_size ];' % (remap_table, remap_table)
+            print 'SERVEXTERN int %s[ %s_size ];' % (remap_table, remap_table)
             print ''
 
         for f, index in functions:
diff --git a/mesalib/src/mapi/glapi/gen/remap_helper.py b/mesalib/src/mapi/glapi/gen/remap_helper.py
index e1a13d0b3..8ac047ccc 100755
--- a/mesalib/src/mapi/glapi/gen/remap_helper.py
+++ b/mesalib/src/mapi/glapi/gen/remap_helper.py
@@ -64,8 +64,8 @@ class PrintGlRemap(gl_XML.gl_print_base):
 
 
     def printRealHeader(self):
-        print '#include "main/dispatch.h"'
-        print '#include "main/remap.h"'
+        print '#include "dispatch.h"'
+        print '#include "remap.h"'
         print ''
         return
 
diff --git a/mesalib/src/mesa/main/remap.c b/mesalib/src/mesa/main/remap.c
index 44ec96498..1ae924555 100644
--- a/mesalib/src/mesa/main/remap.c
+++ b/mesalib/src/mesa/main/remap.c
@@ -36,9 +36,9 @@
  * a dynamic entry, or the corresponding static entry, in glapi.
  */
 
+#include "glapi/glapi.h"
 #include "remap.h"
 #include "imports.h"
-#include "glapi/glapi.h"
 
 #define MAX_ENTRY_POINTS 16
 
@@ -47,7 +47,7 @@
 
 
 /* this is global for quick access */
-int driDispatchRemapTable[driDispatchRemapTable_size];
+SERVEXTERN int driDispatchRemapTable[driDispatchRemapTable_size];
 
 
 /**
diff --git a/mesalib/src/mesa/main/remap.h b/mesalib/src/mesa/main/remap.h
index bfef6ac4e..65d4f5faa 100644
--- a/mesalib/src/mesa/main/remap.h
+++ b/mesalib/src/mesa/main/remap.h
@@ -41,7 +41,7 @@ struct gl_function_remap {
 };
 
 
-extern int
+SERVEXTERN int
 driDispatchRemapTable[];
 
 extern const char *