Remove mesa include directories, be stricter about include paths.

src/mesa/math/m_vector.h

@@ -31,8 +31,8 @@
 #ifndef _M_VECTOR_H_
 #define _M_VECTOR_H_
 
-#include "glheader.h"
-#include "mtypes.h"		/* hack for GLchan */
+#include "main/glheader.h"
+#include "main/mtypes.h"		/* hack for GLchan */
 
 
 #define VEC_DIRTY_0        0x1

src/mesa/pipe/Makefile.template

@@ -14,10 +14,7 @@ OBJECTS = $(C_SOURCES:.c=.o) \
 ### Include directories
 INCLUDES = \
 	-I. \
-	-I$(TOP)/src/mesa/drivers/dri/common \
-	-I$(TOP)/src/mesa/main \
 	-I$(TOP)/src/mesa/pipe \
-	-I$(TOP)/include \
 	-I$(TOP)/src/mesa 
 
 

src/mesa/pipe/draw/draw_context.h

@@ -38,7 +38,7 @@
 #define DRAW_CONTEXT_H
 
 
-#include "glheader.h"
+#include "main/glheader.h"
 #include "pipe/p_state.h"
 
 

src/mesa/pipe/softpipe/sp_clear.c

@@ -35,7 +35,6 @@
 #include "sp_context.h"
 #include "sp_surface.h"
 #include "sp_state.h"
-//#include "colormac.h"
 
 
 /**

src/mesa/pipe/softpipe/sp_context.h

@@ -31,8 +31,6 @@
 #ifndef SP_CONTEXT_H
 #define SP_CONTEXT_H
 
-//#include "glheader.h"
-
 #include "pipe/p_state.h"
 #include "pipe/p_context.h"
 

src/mesa/pipe/softpipe/sp_prim_setup.c

@@ -33,9 +33,6 @@
  */
 
 
-//#include "imports.h"
-//#include "macros.h"
-
 #include "sp_context.h"
 #include "sp_headers.h"
 #include "sp_quad.h"

src/mesa/vf/vf.h

@@ -28,7 +28,7 @@
 #ifndef VF_VERTEX_H
 #define VF_VERTEX_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "math/m_vector.h"
 
 enum {