Drop use of GL types in the driver

Still used in i810 for building the glx visuals.

src/intel.h

@@ -65,7 +65,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define _XF86DRI_SERVER_
 #include "dri.h"
 #include "dri2.h"
-#include "GL/glxint.h"
 #include "intel_bufmgr.h"
 #include "i915_drm.h"
 

src/intel_batchbuffer.h

@@ -51,7 +51,7 @@ static inline int intel_vertex_space(intel_screen_private *intel)
 }
 
 static inline void
-intel_batch_require_space(ScrnInfoPtr scrn, intel_screen_private *intel, GLuint sz)
+intel_batch_require_space(ScrnInfoPtr scrn, intel_screen_private *intel, unsigned int sz)
 {
 	assert(sz < intel->batch_bo->size - 8);
 	if (intel_batch_space(intel) < sz)

src/intel_dri.c

@@ -58,8 +58,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "windowstr.h"
 #include "shadow.h"
 
-#include "GL/glxtokens.h"
-
 #include "intel.h"
 #include "i830_reg.h"