Be more consistant with paths in #includes. Eventually, eliminate a bunch of -I flags.

src/mesa/main/api_arrayelt.c

@@ -31,8 +31,8 @@
 #include "context.h"
 #include "imports.h"
 #include "macros.h"
-#include "glapioffsets.h"
+#include "glapi/glapioffsets.h"
-#include "dispatch.h"
+#include "glapi/dispatch.h"
 
 typedef void (GLAPIENTRY *array_func)( const void * );
 

src/mesa/main/api_loopback.c

@@ -30,14 +30,14 @@
 
 
 #include "glheader.h"
-#include "glapi.h"
-#include "glapitable.h"
 #include "macros.h"
 #include "colormac.h"
 #include "api_loopback.h"
-#include "glthread.h"
 #include "mtypes.h"
-#include "dispatch.h"
+#include "glapi/glapi.h"
+#include "glapi/glapitable.h"
+#include "glapi/glthread.h"
+#include "glapi/dispatch.h"
 
 /* KW: A set of functions to convert unusual Color/Normal/Vertex/etc
  * calls to a smaller set of driver-provided formats.  Currently just

src/mesa/main/api_noop.c

@@ -31,7 +31,7 @@
 #include "light.h"
 #include "macros.h"
 #include "dlist.h"
-#include "dispatch.h"
+#include "glapi/dispatch.h"
 
 
 /**

src/mesa/main/arrayobj.c

@@ -46,7 +46,7 @@
 #include "bufferobj.h"
 #endif
 #include "arrayobj.h"
-#include "dispatch.h"
+#include "glapi/dispatch.h"
 
 
 /**

src/mesa/main/context.c

@@ -97,12 +97,9 @@
 #include "fog.h"
 #include "framebuffer.h"
 #include "get.h"
-#include "glthread.h"
-#include "glapioffsets.h"
 #include "histogram.h"
 #include "hint.h"
 #include "hash.h"
-#include "atifragshader.h"
 #include "light.h"
 #include "lines.h"
 #include "macros.h"
@@ -110,9 +107,6 @@
 #include "pixel.h"
 #include "points.h"
 #include "polygon.h"
-#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
-#include "program.h"
-#endif
 #include "queryobj.h"
 #include "rastpos.h"
 #include "simple_list.h"
@@ -126,13 +120,19 @@
 #include "varray.h"
 #include "version.h"
 #include "vtxfmt.h"
+#include "glapi/glthread.h"
+#include "glapi/glapioffsets.h"
+#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
+#include "shader/program.h"
+#endif
+#include "shader/shader_api.h"
+#include "shader/atifragshader.h"
 #if _HAVE_FULL_GL
 #include "math/m_translate.h"
 #include "math/m_matrix.h"
 #include "math/m_xform.h"
 #include "math/mathmod.h"
 #endif
-#include "shader_api.h"
 
 #ifdef USE_SPARC_ASM
 #include "sparc/sparc.h"

src/mesa/main/context.h

@@ -49,7 +49,7 @@
 #define CONTEXT_H
 
 
-#include "glapi.h"
+#include "glapi/glapi.h"
 #include "imports.h"
 #include "mtypes.h"
 

src/mesa/main/dlist.c

@@ -33,10 +33,6 @@
 #include "api_arrayelt.h"
 #include "api_loopback.h"
 #include "config.h"
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-#include "arbprogram.h"
-#include "program.h"
-#endif
 #include "attrib.h"
 #include "blend.h"
 #include "buffers.h"
@@ -57,7 +53,7 @@
 #include "extensions.h"
 #include "feedback.h"
 #include "get.h"
-#include "glapi.h"
+#include "glapi/glapi.h"
 #include "hash.h"
 #include "histogram.h"
 #include "image.h"
@@ -76,18 +72,22 @@
 #include "texstate.h"
 #include "mtypes.h"
 #include "varray.h"
+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
+#include "shader/arbprogram.h"
+#include "shader/program.h"
+#endif
 #if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
-#include "nvprogram.h"
+#include "shader/nvprogram.h"
-#include "program.h"
+#include "shader/program.h"
 #endif
 #if FEATURE_ATI_fragment_shader
-#include "atifragshader.h"
+#include "shader/atifragshader.h"
 #endif
 
 #include "math/m_matrix.h"
 #include "math/m_xform.h"
 
-#include "dispatch.h"
+#include "glapi/dispatch.h"
 
 
 /**

src/mesa/main/execmem.c

@@ -32,7 +32,7 @@
 
 
 #include "imports.h"
-#include "glthread.h"
+#include "glapi/glthread.h"
 
 
 

src/mesa/main/hash.c

@@ -37,7 +37,7 @@
 
 #include "glheader.h"
 #include "imports.h"
-#include "glthread.h"
+#include "glapi/glthread.h"
 #include "hash.h"
 
 

src/mesa/main/mtypes.h

@@ -38,8 +38,8 @@
 #include "glheader.h"
 #include <GL/internal/glcore.h>	/* __GLcontextModes (GLvisual) */
 #include "config.h"		/* Hardwired parameters */
-#include "glapitable.h"
+#include "glapi/glapitable.h"
-#include "glthread.h"
+#include "glapi/glthread.h"
 #include "math/m_matrix.h"	/* GLmatrix */
 #include "bitset.h"
 

src/mesa/main/state.c

@@ -35,10 +35,10 @@
 #include "accum.h"
 #include "api_loopback.h"
 #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-#include "arbprogram.h"
+#include "shader/arbprogram.h"
 #endif
 #if FEATURE_ATI_fragment_shader
-#include "atifragshader.h"
+#include "shader/atifragshader.h"
 #endif
 #include "attrib.h"
 #include "blend.h"
@@ -85,18 +85,18 @@
 #include "mtypes.h"
 #include "varray.h"
 #if FEATURE_NV_vertex_program
-#include "nvprogram.h"
+#include "shader/nvprogram.h"
 #endif
 #if FEATURE_NV_fragment_program
-#include "nvprogram.h"
+#include "shader/nvprogram.h"
-#include "program.h"
+#include "shader/program.h"
 #include "texenvprogram.h"
 #endif
 #if FEATURE_ARB_shader_objects
 #include "shaders.h"
 #endif
 #include "debug.h"
-#include "dispatch.h"
+#include "glapi/dispatch.h"
 
 
 

src/mesa/main/texenvprogram.c

@@ -28,10 +28,10 @@
 #include "glheader.h"
 #include "macros.h"
 #include "enums.h"
-#include "prog_parameter.h"
+#include "shader/prog_parameter.h"
-#include "prog_instruction.h"
+#include "shader/prog_instruction.h"
-#include "prog_print.h"
+#include "shader/prog_print.h"
-#include "prog_statevars.h"
+#include "shader/prog_statevars.h"
 #include "texenvprogram.h"
 
 /**

src/mesa/main/varray.c

@@ -32,7 +32,7 @@
 #include "mtypes.h"
 #include "varray.h"
 #include "arrayobj.h"
-#include "dispatch.h"
+#include "glapi/dispatch.h"
 
 
 /**

src/mesa/main/vtxfmt_tmp.h

@@ -29,8 +29,8 @@
 #define PRE_LOOPBACK( FUNC )
 #endif
 
-#include "dispatch.h"
+#include "glapi/dispatch.h"
-#include "glapioffsets.h"
+#include "glapi/glapioffsets.h"
 
 static void GLAPIENTRY TAG(ArrayElement)( GLint i )
 {

src/mesa/math/m_eval.c

@@ -37,8 +37,8 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "config.h"
+#include "main/config.h"
 #include "m_eval.h"
 
 static GLfloat inv_tab[MAX_EVAL_ORDER];

src/mesa/math/m_eval.h

@@ -26,7 +26,7 @@
 #ifndef _M_EVAL_H
 #define _M_EVAL_H
 
-#include "glheader.h"
+#include "main/glheader.h"
 
 void _math_init_eval( void );
 

src/mesa/math/m_translate.h

@@ -26,8 +26,8 @@
 #ifndef _M_TRANSLATE_H_
 #define _M_TRANSLATE_H_
 
-#include "config.h"
+#include "main/config.h"
-#include "mtypes.h"		/* hack for GLchan */
+#include "main/mtypes.h"		/* hack for GLchan */
 
 
 /**

src/mesa/math/m_xform.c

@@ -33,8 +33,8 @@
  * 3. Transformation of a point p by a matrix M is: p' = M * p
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "macros.h"
+#include "main/macros.h"
 
 #include "m_eval.h"
 #include "m_matrix.h"

src/mesa/shader/arbprogparse.c

@@ -30,10 +30,10 @@
  * \author Karl Rasche
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
+#include "shader/grammar/grammar_mesa.h"
 #include "arbprogparse.h"
-#include "grammar_mesa.h"
 #include "program.h"
 #include "prog_parameter.h"
 #include "prog_statevars.h"
@@ -3573,7 +3573,7 @@ parse_instructions(GLcontext * ctx, const GLubyte * inst,
 
 /* XXX temporary */
 LONGSTRING static char core_grammar_text[] =
-#include "grammar_syn.h"
+#include "shader/grammar/grammar_syn.h"
 ;
 
 

src/mesa/shader/prog_execute.c

@@ -43,7 +43,7 @@
 #include "prog_instruction.h"
 #include "prog_parameter.h"
 #include "prog_print.h"
-#include "slang_library_noise.h"
+#include "shader/slang/slang_library_noise.h"
 
 
 /* See comments below for info about this */

src/mesa/shader/shader_api.c

@@ -43,10 +43,9 @@
 #include "prog_parameter.h"
 #include "prog_print.h"
 #include "prog_statevars.h"
-#include "shader_api.h"
+#include "shader/shader_api.h"
-
+#include "shader/slang/slang_compile.h"
-#include "slang_compile.h"
+#include "shader/slang/slang_link.h"
-#include "slang_link.h"
 
 
 

src/mesa/shader/slang/slang_builtin.c

@@ -28,14 +28,14 @@
  * \author Brian Paul
  */
 
-#include "imports.h"
+#include "main/imports.h"
-#include "slang_builtin.h"
+#include "main/mtypes.h"
-#include "slang_ir.h"
+#include "shader/program.h"
-#include "mtypes.h"
+#include "shader/prog_instruction.h"
-#include "program.h"
+#include "shader/prog_parameter.h"
-#include "prog_instruction.h"
+#include "shader/prog_statevars.h"
-#include "prog_parameter.h"
+#include "shader/slang/slang_ir.h"
-#include "prog_statevars.h"
+#include "shader/slang/slang_builtin.h"
 
 
 /**

src/mesa/shader/slang/slang_builtin.h

@@ -26,7 +26,7 @@
 #ifndef SLANG_BUILTIN_H
 #define SLANG_BUILTIN_H
 
-#include "prog_parameter.h"
+#include "shader/prog_parameter.h"
 #include "slang_utility.h"
 #include "slang_ir.h"
 

src/mesa/shader/slang/slang_codegen.c

@@ -37,13 +37,13 @@
 
 
 
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
-#include "program.h"
+#include "shader/program.h"
-#include "prog_instruction.h"
+#include "shader/prog_instruction.h"
-#include "prog_parameter.h"
+#include "shader/prog_parameter.h"
-#include "prog_statevars.h"
+#include "shader/prog_statevars.h"
 #include "slang_typeinfo.h"
 #include "slang_codegen.h"
 #include "slang_compile.h"

src/mesa/shader/slang/slang_compile.c

@@ -28,11 +28,11 @@
  * \author Michal Krol
  */
 
-#include "imports.h"
+#include "main/imports.h"
-#include "context.h"
+#include "main/context.h"
-#include "program.h"
+#include "shader/program.h"
-#include "prog_parameter.h"
+#include "shader/prog_parameter.h"
-#include "grammar_mesa.h"
+#include "shader/grammar/grammar_mesa.h"
 #include "slang_codegen.h"
 #include "slang_compile.h"
 #include "slang_preprocess.h"

src/mesa/shader/slang/slang_emit.c

@@ -36,13 +36,13 @@
  ***/
 
 
-#include "imports.h"
+#include "main/imports.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "program.h"
+#include "shader/program.h"
-#include "prog_instruction.h"
+#include "shader/prog_instruction.h"
-#include "prog_parameter.h"
+#include "shader/prog_parameter.h"
-#include "prog_print.h"
+#include "shader/prog_print.h"
 #include "slang_builtin.h"
 #include "slang_emit.h"
 #include "slang_mem.h"

src/mesa/shader/slang/slang_ir.c

@@ -27,7 +27,7 @@
 #include "context.h"
 #include "slang_ir.h"
 #include "slang_mem.h"
-#include "prog_print.h"
+#include "shader/prog_print.h"
 
 
 static const slang_ir_info IrInfo[] = {

src/mesa/shader/slang/slang_label.h

@@ -1,9 +1,9 @@
 #ifndef SLANG_LABEL_H
 #define SLANG_LABEL_H 1
 
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
-#include "prog_instruction.h"
+#include "shader/prog_instruction.h"
 
 
 struct slang_label_

src/mesa/shader/slang/slang_link.c

@@ -28,16 +28,16 @@
  * \author Brian Paul
  */
 
-#include "imports.h"
+#include "main/imports.h"
-#include "context.h"
+#include "main/context.h"
-#include "hash.h"
+#include "main/hash.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "program.h"
+#include "shader/program.h"
-#include "prog_instruction.h"
+#include "shader/prog_instruction.h"
-#include "prog_parameter.h"
+#include "shader/prog_parameter.h"
-#include "prog_print.h"
+#include "shader/prog_print.h"
-#include "prog_statevars.h"
+#include "shader/prog_statevars.h"
-#include "shader_api.h"
+#include "shader/shader_api.h"
 #include "slang_link.h"
 
 

src/mesa/shader/slang/slang_preprocess.c

@@ -29,7 +29,7 @@
  */
 
 #include "imports.h"
-#include "grammar_mesa.h"
+#include "shader/grammar/grammar_mesa.h"
 #include "slang_preprocess.h"
 
 LONGSTRING static const char *slang_pp_directives_syn =

src/mesa/shader/slang/slang_typeinfo.c

@@ -28,12 +28,12 @@
  * \author Michal Krol
  */
 
-#include "imports.h"
+#include "main/imports.h"
+#include "shader/prog_instruction.h"
 #include "slang_typeinfo.h"
 #include "slang_compile.h"
 #include "slang_log.h"
 #include "slang_mem.h"
-#include "prog_instruction.h"
 
 
 /**

src/mesa/shader/slang/slang_vartable.c

@@ -1,11 +1,11 @@
 
-#include "imports.h"
+#include "main/imports.h"
+#include "shader/prog_instruction.h"
 #include "slang_compile.h"
 #include "slang_compile_variable.h"
 #include "slang_mem.h"
 #include "slang_vartable.h"
 #include "slang_ir.h"
-#include "prog_instruction.h"
 
 
 static int dbg = 0;

src/mesa/swrast/s_atifragshader.c

@@ -23,11 +23,10 @@
 #include "glheader.h"
 #include "colormac.h"
 #include "context.h"
-#include "atifragshader.h"
 #include "macros.h"
-#include "program.h"
+#include "shader/program.h"
-
+#include "shader/atifragshader.h"
-#include "s_atifragshader.h"
+#include "swrast/s_atifragshader.h"
 
 
 /**

src/mesa/swrast/s_context.c

@@ -31,9 +31,9 @@
 #include "context.h"
 #include "colormac.h"
 #include "mtypes.h"
-#include "prog_statevars.h"
 #include "teximage.h"
 #include "swrast.h"
+#include "shader/prog_statevars.h"
 #include "s_blend.h"
 #include "s_context.h"
 #include "s_lines.h"

src/mesa/swrast/s_context.h

@@ -43,10 +43,10 @@
 #ifndef S_CONTEXT_H
 #define S_CONTEXT_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
+#include "shader/prog_execute.h"
 #include "swrast.h"
 #include "s_span.h"
-#include "prog_execute.h"
 
 
 typedef void (*texture_sample_func)(GLcontext *ctx,

src/mesa/swrast/s_fragprog.c

@@ -22,11 +22,11 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "prog_instruction.h"
+#include "main/texstate.h"
-#include "texstate.h"
+#include "shader/prog_instruction.h"
 
 #include "s_fragprog.h"
 #include "s_span.h"

src/mesa/swrast/swrast.h

@@ -32,7 +32,7 @@
 #ifndef SWRAST_H
 #define SWRAST_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 /**
  * \struct SWvertex

src/mesa/tnl/t_context.c

@@ -26,12 +26,12 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
-#include "light.h"
+#include "main/light.h"
 
 #include "tnl.h"
 #include "t_context.h"

src/mesa/tnl/t_context.h

@@ -49,8 +49,8 @@
 #ifndef _T_CONTEXT_H
 #define _T_CONTEXT_H
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "math/m_matrix.h"
 #include "math/m_vector.h"

src/mesa/tnl/t_pipeline.c

@@ -25,11 +25,11 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "state.h"
+#include "main/state.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "t_context.h"
 #include "t_pipeline.h"

src/mesa/tnl/t_vb_program.c

@@ -35,16 +35,16 @@
 #include "context.h"
 #include "macros.h"
 #include "imports.h"
-#include "prog_instruction.h"
+#include "shader/prog_instruction.h"
-#include "prog_statevars.h"
+#include "shader/prog_statevars.h"
-#include "prog_execute.h"
+#include "shader/prog_execute.h"
+#include "swrast/s_context.h"
+#include "swrast/s_texfilter.h"
 
 #include "tnl.h"
 #include "t_context.h"
 #include "t_pipeline.h"
 
-#include "swrast/s_context.h"
-#include "swrast/s_texfilter.h"
 
 /**
  * XXX the texture sampling code in this module is a bit of a hack.

src/mesa/tnl/t_vp_build.c

@@ -33,11 +33,11 @@
 #include "glheader.h"
 #include "macros.h"
 #include "enums.h"
-#include "program.h"
+#include "shader/program.h"
-#include "prog_instruction.h"
+#include "shader/prog_instruction.h"
-#include "prog_parameter.h"
+#include "shader/prog_parameter.h"
-#include "prog_print.h"
+#include "shader/prog_print.h"
-#include "prog_statevars.h"
+#include "shader/prog_statevars.h"
 #include "t_context.h" /* NOTE: very light dependency on this */
 #include "t_vp_build.h"
 

src/mesa/tnl/tnl.h

@@ -29,7 +29,7 @@
 #ifndef _TNL_H
 #define _TNL_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
 

src/mesa/vbo/vbo.h

@@ -32,7 +32,7 @@
 #ifndef _VBO_H
 #define _VBO_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 struct _mesa_prim {
    GLuint mode:8;

src/mesa/vbo/vbo_context.c

@@ -25,11 +25,11 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "mtypes.h"
+#include "main/imports.h"
+#include "main/mtypes.h"
+#include "main/api_arrayelt.h"
 #include "vbo.h"
 #include "vbo_context.h"
-#include "imports.h"
-#include "api_arrayelt.h"
 
 /* Reach out and grab this to use as the default:
  */

src/mesa/vbo/vbo_exec.c

@@ -26,14 +26,14 @@
  */
 
 
-#include "api_arrayelt.h"
+#include "main/api_arrayelt.h"
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
-#include "dlist.h"
+#include "main/dlist.h"
-#include "vtxfmt.h"
+#include "main/vtxfmt.h"
 
 #include "vbo_context.h"
 

src/mesa/vbo/vbo_exec.h

@@ -34,7 +34,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __VBO_EXEC_H__
 #define __VBO_EXEC_H__
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "vbo.h"
 #include "vbo_attrib.h"
 

src/mesa/vbo/vbo_exec_api.c

@@ -30,16 +30,16 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  *   Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "vtxfmt.h"
+#include "main/vtxfmt.h"
-#include "dlist.h"
+#include "main/dlist.h"
-#include "state.h"
+#include "main/state.h"
-#include "light.h"
+#include "main/light.h"
-#include "api_arrayelt.h"
+#include "main/api_arrayelt.h"
-#include "api_noop.h"
+#include "main/api_noop.h"
-#include "dispatch.h"
+#include "glapi/dispatch.h"
 
 #include "vbo_context.h"
 

src/mesa/vbo/vbo_exec_array.c

@@ -25,12 +25,12 @@
  * 
  **************************************************************************/
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "state.h"
+#include "main/state.h"
-#include "api_validate.h"
+#include "main/api_validate.h"
-#include "api_noop.h"
+#include "main/api_noop.h"
-#include "dispatch.h"
+#include "glapi/dispatch.h"
 
 #include "vbo_context.h"
 

src/mesa/vbo/vbo_exec_draw.c

@@ -25,11 +25,11 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "enums.h"
+#include "main/enums.h"
-#include "state.h"
+#include "main/state.h"
-#include "macros.h"
+#include "main/macros.h"
 
 #include "vbo_context.h"
 

src/mesa/vbo/vbo_exec_eval.c

@@ -25,13 +25,13 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "api_eval.h"
+#include "main/api_eval.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "math/m_eval.h"
+#include "glapi/dispatch.h"
 #include "vbo_exec.h"
-#include "dispatch.h"
 
 
 static void clear_active_eval1( struct vbo_exec_context *exec, GLuint attr ) 

src/mesa/vbo/vbo_rebase.c

@@ -46,9 +46,9 @@
  * of zero.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "vbo.h"
 

src/mesa/vbo/vbo_save.c

@@ -26,10 +26,10 @@
  */
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
-#include "dlist.h"
+#include "main/dlist.h"
-#include "vtxfmt.h"
+#include "main/vtxfmt.h"
-#include "imports.h"
+#include "main/imports.h"
 
 #include "vbo_context.h"
 

src/mesa/vbo/vbo_save.h

@@ -34,7 +34,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef VBO_SAVE_H
 #define VBO_SAVE_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "vbo.h"
 #include "vbo_attrib.h"
 

src/mesa/vbo/vbo_save_api.c

@@ -67,15 +67,15 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "dlist.h"
+#include "main/dlist.h"
-#include "enums.h"
+#include "main/enums.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "api_validate.h"
+#include "main/api_validate.h"
-#include "api_arrayelt.h"
+#include "main/api_arrayelt.h"
-#include "vtxfmt.h"
+#include "main/vtxfmt.h"
-#include "dispatch.h"
+#include "glapi/dispatch.h"
 
 #include "vbo_context.h"
 

src/mesa/vbo/vbo_save_draw.c

@@ -26,13 +26,13 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "light.h"
+#include "main/light.h"
-#include "state.h"
+#include "main/state.h"
 
 #include "vbo_context.h"
 

src/mesa/vbo/vbo_save_loopback.c

@@ -28,17 +28,17 @@
 #include "swrast_setup/swrast_setup.h"
 #include "swrast/swrast.h"
 #include "tnl/tnl.h"
-#include "context.h"
+#include "main/context.h"
+#include "main/glheader.h"
+#include "main/enums.h"
+#include "main/imports.h"
+#include "main/macros.h"
+#include "main/mtypes.h"
+#include "glapi/dispatch.h"
+#include "glapi/glapi.h"
 
 #include "vbo_context.h"
 
-#include "glheader.h"
-#include "enums.h"
-#include "glapi.h"
-#include "imports.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "dispatch.h"
 
 
 typedef void (*attr_func)( GLcontext *ctx, GLint target, const GLfloat * );

src/mesa/vbo/vbo_split.c

@@ -47,9 +47,9 @@
  * limitations on drivers which want to use it as a fallback path.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "vbo_split.h"
 #include "vbo.h"

src/mesa/vbo/vbo_split_copy.c

@@ -29,11 +29,11 @@
 /* Split indexed primitives with per-vertex copying.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "enums.h"
+#include "main/enums.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "vbo_split.h"
 #include "vbo.h"

src/mesa/vbo/vbo_split_inplace.c

@@ -27,9 +27,9 @@
  */
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "enums.h"
+#include "main/enums.h"
 #include "vbo_split.h"