7 files changed, 11 insertions, 5 deletions
diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
index 71231560852..98f654f4022 100644
--- a/src/mesa/glapi/dispatch.h
+++ b/src/mesa/glapi/dispatch.h
@@ -28,6 +28,9 @@
 #if !defined( _DISPATCH_H_ )
 #  define _DISPATCH_H_
 
+#include "glapitable.h"
+
+
 /**
  * \file dispatch.h
  * Macros for handling GL dispatch tables.
diff --git a/src/mesa/glapi/gl_table.py b/src/mesa/glapi/gl_table.py
index 69f7bd7c7b5..7023a4b71a3 100644
--- a/src/mesa/glapi/gl_table.py
+++ b/src/mesa/glapi/gl_table.py
@@ -56,7 +56,6 @@ class PrintGlTable(gl_XML.gl_print_base):
 		print '# define GLAPIENTRYP GLAPIENTRY *'
 		print '#endif'
 		print ''
-		print 'typedef void (*_glapi_proc)(void); /* generic function pointer */'
 		print ''
 		print 'struct _glapi_table'
 		print '{'
diff --git a/src/mesa/glapi/glapi.h b/src/mesa/glapi/glapi.h
index ddfb1cffb91..20d35769cf8 100644
--- a/src/mesa/glapi/glapi.h
+++ b/src/mesa/glapi/glapi.h
@@ -46,10 +46,13 @@
 
 
 #include "GL/gl.h"
-#include "glapitable.h"
 #include "glthread.h"
 
 
+struct _glapi_table;
+
+typedef void (*_glapi_proc)(void); /* generic function pointer */
+
 typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
 
 
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 48941f5590e..5d9d40a8a25 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -37,7 +37,6 @@
 # define GLAPIENTRYP GLAPIENTRY *
 #endif
 
-typedef void (*_glapi_proc)(void); /* generic function pointer */
 
 struct _glapi_table
 {
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index 81bd4c2f320..742247f8e21 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -36,6 +36,7 @@
 #include "enums.h"
 #include "macros.h"
 #include "mtypes.h"
+#include "glapi/glapitable.h"
 
 
 /**
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 96afbe8b7da..74f0add6f44 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -145,6 +145,8 @@
 #include "version.h"
 #include "vtxfmt.h"
 #include "glapi/glthread.h"
+#include "glapi/glapioffsets.h"
+#include "glapi/glapitable.h"
 #if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
 #include "shader/program.h"
 #endif
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 0a7a9306385..867072165a8 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -38,8 +38,7 @@
 #include "glheader.h"
 #include <GL/internal/glcore.h>	/* __GLcontextModes (GLvisual) */
 #include "config.h"		/* Hardwired parameters */
-#include "glapi/glapitable.h"
-#include "glapi/glthread.h"
+#include "glapi/glapi.h"
 #include "math/m_matrix.h"	/* GLmatrix */
 #include "bitset.h"