mesa: Prefix main includes with dir to avoid conflicts.

Some of the headers in src/mesa/main have pretty common names which
easily conflict with third-party code, e.g. config.h

src/mesa/SConscript

@@ -10,7 +10,6 @@ if env['platform'] != 'winddk':
 	
 	env.Append(CPPPATH = [
 		'#/src/mesa',
-		'#/src/mesa/main',
 	])
 	
 	if gcc:

src/mesa/glapi/glapi.c

@@ -50,7 +50,7 @@
 
 
 
-#include "glheader.h"
+#include "main/glheader.h"
 #include "glapi.h"
 #include "glapioffsets.h"
 #include "glapitable.h"

src/mesa/glapi/glapi_getproc.c

@@ -32,7 +32,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "glheader.h"
+#include "main/glheader.h"
 #include "glapi.h"
 #include "glapioffsets.h"
 #include "glapitable.h"

src/mesa/glapi/glthread.c

@@ -29,7 +29,7 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
 #include "glthread.h"
 
 

src/mesa/math/m_debug_clip.c

@@ -25,10 +25,10 @@
  *    Gareth Hughes
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 
 #include "m_matrix.h"
 #include "m_xform.h"

src/mesa/math/m_debug_norm.c

@@ -26,10 +26,10 @@
  *    Gareth Hughes
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 
 #include "m_matrix.h"
 #include "m_xform.h"

src/mesa/math/m_debug_xform.c

@@ -26,10 +26,10 @@
  * Updated for P6 architecture by Gareth Hughes.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 
 #include "m_matrix.h"
 #include "m_xform.h"

src/mesa/math/m_matrix.c

@@ -34,10 +34,10 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 
 #include "m_matrix.h"
 

src/mesa/math/m_translate.c

@@ -28,9 +28,9 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "mtypes.h"		/* GLchan hack */
+#include "main/mtypes.h"		/* GLchan hack */
-#include "colormac.h"
+#include "main/colormac.h"
 
 #include "m_translate.h"
 

src/mesa/math/m_vector.c

@@ -28,10 +28,10 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 
 #include "m_vector.h"
 

src/mesa/math/m_xform.h

@@ -27,8 +27,8 @@
 #define _M_XFORM_H
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "config.h"
+#include "main/config.h"
 #include "math/m_vector.h"
 #include "math/m_matrix.h"
 

src/mesa/shader/arbprogparse.c

@@ -38,9 +38,9 @@
 #include "programopt.h"
 #include "prog_parameter.h"
 #include "prog_statevars.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "prog_instruction.h"
 
 

src/mesa/shader/arbprogparse.h

@@ -26,7 +26,7 @@
 #ifndef ARBPROGPARSE_H
 #define ARBPROGPARSE_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 extern void
 _mesa_parse_arb_vertex_program(GLcontext *ctx, GLenum target,

src/mesa/shader/arbprogram.c

@@ -29,14 +29,14 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
 #include "arbprogram.h"
 #include "arbprogparse.h"
-#include "context.h"
+#include "main/context.h"
-#include "hash.h"
+#include "main/hash.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "program.h"
 
 

src/mesa/shader/atifragshader.c

@@ -21,13 +21,13 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "hash.h"
+#include "main/hash.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 "atifragshader.h"
 
 #define MESA_DEBUG_ATI_FS 0

src/mesa/shader/grammar/grammar_mesa.h

@@ -26,7 +26,7 @@
 #define GRAMMAR_MESA_H
 
 
-#include "imports.h"
+#include "main/imports.h"
 /* NOTE: include Mesa 3-D specific headers here */
 
 

src/mesa/shader/nvfragparse.c

@@ -37,10 +37,10 @@
  * including any use thereof or modifications thereto.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "prog_parameter.h"
 #include "prog_instruction.h"
 #include "nvfragparse.h"

src/mesa/shader/nvprogram.c

@@ -37,11 +37,11 @@
  * including any use thereof or modifications thereto.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "hash.h"
+#include "main/hash.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "prog_parameter.h"
 #include "prog_instruction.h"
 #include "nvfragparse.h"

src/mesa/shader/nvvertparse.c

@@ -37,10 +37,10 @@
  * including any use thereof or modifications thereto.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "nvprogram.h"
 #include "nvvertparse.h"
 #include "prog_instruction.h"

src/mesa/shader/prog_debug.c

@@ -23,9 +23,9 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "nvfragparse.h"
 #include "nvvertparse.h"
 #include "program.h"

src/mesa/shader/prog_execute.c

@@ -35,9 +35,9 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
 #include "program.h"
 #include "prog_execute.h"
 #include "prog_instruction.h"

src/mesa/shader/prog_instruction.c

@@ -23,9 +23,9 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "prog_instruction.h"
 
 

src/mesa/shader/prog_parameter.c

@@ -29,9 +29,9 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "prog_instruction.h"
 #include "prog_parameter.h"
 #include "prog_statevars.h"

src/mesa/shader/prog_parameter.h

@@ -31,7 +31,7 @@
 #ifndef PROG_PARAMETER_H
 #define PROG_PARAMETER_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "prog_statevars.h"
 
 

src/mesa/shader/prog_print.c

@@ -28,9 +28,9 @@
  * \author Brian Paul
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "imports.h"
+#include "main/imports.h"
 #include "prog_instruction.h"
 #include "prog_parameter.h"
 #include "prog_print.h"

src/mesa/shader/prog_statevars.c

@@ -29,12 +29,12 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "hash.h"
+#include "main/hash.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "prog_statevars.h"
 #include "prog_parameter.h"
 

src/mesa/shader/prog_statevars.h

@@ -25,7 +25,7 @@
 #ifndef PROG_STATEVARS_H
 #define PROG_STATEVARS_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
 /**

src/mesa/shader/program.c

@@ -29,9 +29,9 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "hash.h"
+#include "main/hash.h"
 #include "program.h"
 #include "prog_cache.h"
 #include "prog_parameter.h"

src/mesa/shader/program.h

@@ -40,7 +40,7 @@
 #ifndef PROGRAM_H
 #define PROGRAM_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
 extern struct gl_program _mesa_DummyProgram;

src/mesa/shader/programopt.c

@@ -31,8 +31,8 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
 #include "prog_parameter.h"
 #include "prog_statevars.h"
 #include "program.h"

src/mesa/shader/shader_api.c

@@ -35,10 +35,10 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.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 "prog_parameter.h"
 #include "prog_print.h"

src/mesa/shader/shader_api.h

@@ -27,8 +27,8 @@
 #define SHADER_API_H
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
 /**

src/mesa/shader/slang/slang_codegen.h

@@ -27,7 +27,7 @@
 #define SLANG_CODEGEN_H
 
 
-#include "imports.h"
+#include "main/imports.h"
 #include "slang_compile.h"
 
 

src/mesa/shader/slang/slang_compile.h

@@ -25,8 +25,8 @@
 #if !defined SLANG_COMPILE_H
 #define SLANG_COMPILE_H
 
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "slang_typeinfo.h"
 #include "slang_compile_variable.h"
 #include "slang_compile_struct.h"

src/mesa/shader/slang/slang_compile_function.c

@@ -28,7 +28,7 @@
  * \author Michal Krol
  */
 
-#include "imports.h"
+#include "main/imports.h"
 #include "slang_compile.h"
 #include "slang_mem.h"
 

src/mesa/shader/slang/slang_compile_operation.c

@@ -28,7 +28,7 @@
  * \author Michal Krol
  */
 
-#include "imports.h"
+#include "main/imports.h"
 #include "slang_compile.h"
 #include "slang_mem.h"
 

src/mesa/shader/slang/slang_compile_struct.c

@@ -28,7 +28,7 @@
  * \author Michal Krol
  */
 
-#include "imports.h"
+#include "main/imports.h"
 #include "slang_mem.h"
 #include "slang_compile.h"
 

src/mesa/shader/slang/slang_compile_variable.c

@@ -28,7 +28,7 @@
  * \author Michal Krol
  */
 
-#include "imports.h"
+#include "main/imports.h"
 #include "slang_compile.h"
 #include "slang_mem.h"
 

src/mesa/shader/slang/slang_emit.h

@@ -26,10 +26,10 @@
 #define SLANG_EMIT_H
 
 
-#include "imports.h"
+#include "main/imports.h"
 #include "slang_compile.h"
 #include "slang_ir.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
 extern void

src/mesa/shader/slang/slang_ir.c

@@ -23,8 +23,8 @@
  */
 
 
-#include "imports.h"
+#include "main/imports.h"
-#include "context.h"
+#include "main/context.h"
 #include "slang_ir.h"
 #include "slang_mem.h"
 #include "shader/prog_print.h"

src/mesa/shader/slang/slang_ir.h

@@ -33,10 +33,10 @@
 #define SLANG_IR_H
 
 
-#include "imports.h"
+#include "main/imports.h"
 #include "slang_compile.h"
 #include "slang_label.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
 /**

src/mesa/shader/slang/slang_library_noise.c

@@ -49,7 +49,7 @@
  */
 
 
-#include "imports.h"
+#include "main/imports.h"
 #include "slang_library_noise.h"
 
 #define FASTFLOOR(x) ( ((x)>0) ? ((int)x) : (((int)x)-1) )

src/mesa/shader/slang/slang_log.c

@@ -22,7 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "imports.h"
+#include "main/imports.h"
 #include "slang_log.h"
 #include "slang_utility.h"
 

src/mesa/shader/slang/slang_mem.c

@@ -32,8 +32,8 @@
  * \author Brian Paul
  */
 
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "slang_mem.h"
 
 

src/mesa/shader/slang/slang_mem.h

@@ -27,7 +27,7 @@
 #define SLANG_MEM_H
 
 
-#include "imports.h"
+#include "main/imports.h"
 
 
 typedef struct slang_mempool_ slang_mempool;

src/mesa/shader/slang/slang_preprocess.c

@@ -28,7 +28,7 @@
  * \author Michal Krol
  */
 
-#include "imports.h"
+#include "main/imports.h"
 #include "shader/grammar/grammar_mesa.h"
 #include "slang_preprocess.h"
 

src/mesa/shader/slang/slang_print.c

@@ -4,7 +4,7 @@
  */
 
 
-#include "imports.h"
+#include "main/imports.h"
 #include "slang_compile.h"
 #include "slang_print.h"
 

src/mesa/shader/slang/slang_simplify.c

@@ -28,9 +28,9 @@
  * \author Michal Krol
  */
 
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "get.h"
+#include "main/get.h"
 #include "slang_compile.h"
 #include "slang_codegen.h"
 #include "slang_simplify.h"

src/mesa/shader/slang/slang_storage.c

@@ -28,7 +28,7 @@
  * \author Michal Krol
  */
 
-#include "imports.h"
+#include "main/imports.h"
 #include "slang_storage.h"
 #include "slang_mem.h"
 

src/mesa/shader/slang/slang_typeinfo.h

@@ -25,8 +25,8 @@
 #ifndef SLANG_TYPEINFO_H
 #define SLANG_TYPEINFO_H 1
 
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "slang_log.h"
 #include "slang_utility.h"
 #include "slang_vartable.h"

src/mesa/shader/slang/slang_utility.c

@@ -28,7 +28,7 @@
  * \author Michal Krol
  */
 
-#include "imports.h"
+#include "main/imports.h"
 #include "slang_utility.h"
 #include "slang_mem.h"
 

src/mesa/sources

@@ -342,7 +342,6 @@ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 INCLUDE_DIRS = \
 	-I$(TOP)/include \
 	-I$(TOP)/src/mesa \
-	-I$(TOP)/src/mesa/main \
 	-I$(TOP)/src/gallium/include \
 	-I$(TOP)/src/gallium/drivers \
 	-I$(TOP)/src/gallium/auxiliary

src/mesa/sparc/sparc.c

@@ -31,7 +31,7 @@
 
 #ifdef USE_SPARC_ASM
 
-#include "context.h"
+#include "main/context.h"
 #include "math/m_xform.h"
 #include "tnl/t_context.h"
 

src/mesa/state_tracker/st_atom.c

@@ -26,8 +26,8 @@
  **************************************************************************/
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
 
 #include "pipe/p_defines.h"
 #include "st_context.h"

src/mesa/state_tracker/st_atom_viewport.c

@@ -26,8 +26,8 @@
  **************************************************************************/
 
 
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
 #include "st_context.h"
 #include "st_atom.h"
 #include "pipe/p_context.h"

src/mesa/state_tracker/st_mesa_to_tgsi.h

@@ -29,7 +29,7 @@
 #ifndef ST_MESA_TO_TGSI_H
 #define ST_MESA_TO_TGSI_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
 #if defined __cplusplus

src/mesa/state_tracker/st_texture.c

@@ -28,7 +28,7 @@
 #include "st_context.h"
 #include "st_format.h"
 #include "st_texture.h"
-#include "enums.h"
+#include "main/enums.h"
 
 #undef Elements  /* fix re-defined macro warning */
 

src/mesa/swrast/s_aaline.c

@@ -23,14 +23,14 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "swrast/s_aaline.h"
 #include "swrast/s_context.h"
 #include "swrast/s_span.h"
 #include "swrast/swrast.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
 #define SUB_PIXEL 4

src/mesa/swrast/s_aaline.h

@@ -28,7 +28,7 @@
 #define S_AALINE_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_aatriangle.c

@@ -28,12 +28,12 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 #include "s_aatriangle.h"
 #include "s_context.h"
 #include "s_span.h"

src/mesa/swrast/s_aatriangle.h

@@ -28,7 +28,7 @@
 #define S_AATRIANGLE_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_accum.c

@@ -23,10 +23,10 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 #include "fbobject.h"
 
 #include "s_accum.h"

src/mesa/swrast/s_accum.h

@@ -27,7 +27,7 @@
 #define S_ACCUM_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
 extern void

src/mesa/swrast/s_alpha.c

@@ -27,10 +27,10 @@
  * \brief Functions to apply alpha test.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "macros.h"
+#include "main/macros.h"
 
 #include "s_alpha.h"
 #include "s_context.h"

src/mesa/swrast/s_alpha.h

@@ -28,7 +28,7 @@
 #define S_ALPHA_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "s_context.h"
 
 

src/mesa/swrast/s_atifragshader.c

@@ -20,10 +20,10 @@
  * 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 "macros.h"
+#include "main/macros.h"
 #include "shader/program.h"
 #include "shader/atifragshader.h"
 #include "swrast/s_atifragshader.h"

src/mesa/swrast/s_bitmap.c

@@ -28,10 +28,10 @@
  * \author Brian Paul
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
 #include "bufferobj.h"
 #include "image.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "pixel.h"
 
 #include "s_context.h"

src/mesa/swrast/s_blend.c

@@ -35,10 +35,10 @@
 
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "macros.h"
+#include "main/macros.h"
 
 #include "s_blend.h"
 #include "s_context.h"

src/mesa/swrast/s_blend.h

@@ -27,7 +27,7 @@
 #define S_BLEND_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "s_context.h"
 
 

src/mesa/swrast/s_blit.c

@@ -23,8 +23,8 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "s_context.h"
 
 

src/mesa/swrast/s_buffers.c

@@ -24,11 +24,11 @@
 
 /** XXX This file should be named s_clear.c */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "s_accum.h"
 #include "s_context.h"

src/mesa/swrast/s_context.c

@@ -26,11 +26,11 @@
  *    Brian Paul
  */
 
-#include "imports.h"
+#include "main/imports.h"
 #include "bufferobj.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "teximage.h"
 #include "swrast.h"
 #include "shader/prog_statevars.h"

src/mesa/swrast/s_copypix.c

@@ -23,14 +23,14 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
 #include "convolve.h"
 #include "histogram.h"
 #include "image.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 #include "pixel.h"
 
 #include "s_context.h"

src/mesa/swrast/s_depth.c

@@ -23,10 +23,10 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 #include "fbobject.h"
 
 #include "s_depth.h"

src/mesa/swrast/s_depth.h

@@ -27,7 +27,7 @@
 #define S_DEPTH_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "s_context.h"
 
 

src/mesa/swrast/s_drawpix.c

@@ -23,13 +23,13 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
 #include "bufferobj.h"
-#include "context.h"
+#include "main/context.h"
 #include "convolve.h"
 #include "image.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 #include "pixel.h"
 #include "state.h"
 

src/mesa/swrast/s_drawpix.h

@@ -28,7 +28,7 @@
 #define S_DRAWPIXELS_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "swrast.h"
 
 /* XXX kill this header? */

src/mesa/swrast/s_feedback.c

@@ -22,12 +22,12 @@
  * 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 "enums.h"
+#include "main/enums.h"
 #include "feedback.h"
-#include "macros.h"
+#include "main/macros.h"
 
 #include "s_context.h"
 #include "s_feedback.h"

src/mesa/swrast/s_feedback.h

@@ -28,7 +28,7 @@
 #define S_FEEDBACK_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_fog.c

@@ -23,10 +23,10 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
 
 #include "s_context.h"
 #include "s_fog.h"

src/mesa/swrast/s_fog.h

@@ -28,7 +28,7 @@
 #define S_FOG_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_lines.c

@@ -23,10 +23,10 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "s_aaline.h"
 #include "s_context.h"
 #include "s_depth.h"

src/mesa/swrast/s_lines.h

@@ -27,7 +27,7 @@
 #ifndef S_LINES_H
 #define S_LINES_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 void
 _swrast_choose_line( GLcontext *ctx );

src/mesa/swrast/s_logic.c

@@ -23,10 +23,10 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
 
 #include "s_context.h"
 #include "s_logic.h"

src/mesa/swrast/s_logic.h

@@ -27,7 +27,7 @@
 #define S_LOGIC_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_masking.c

@@ -28,8 +28,8 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "macros.h"
+#include "main/macros.h"
 
 #include "s_context.h"
 #include "s_masking.h"

src/mesa/swrast/s_masking.h

@@ -27,7 +27,7 @@
 #define S_MASKING_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_points.c

@@ -23,10 +23,10 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "texstate.h"
 #include "s_context.h"
 #include "s_feedback.h"

src/mesa/swrast/s_points.h

@@ -27,7 +27,7 @@
 #ifndef S_POINTS_H
 #define S_POINTS_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 extern void
 _swrast_choose_point( GLcontext *ctx );

src/mesa/swrast/s_readpix.c

@@ -23,15 +23,15 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
 #include "bufferobj.h"
-#include "colormac.h"
+#include "main/colormac.h"
 #include "convolve.h"
-#include "context.h"
+#include "main/context.h"
 #include "feedback.h"
 #include "image.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 #include "pixel.h"
 #include "state.h"
 

src/mesa/swrast/s_span.c

@@ -30,11 +30,11 @@
  * \author Brian Paul
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 #include "image.h"
 
 #include "s_atifragshader.h"

src/mesa/swrast/s_span.h

@@ -27,7 +27,7 @@
 #define S_SPAN_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_spantemp.h

@@ -43,7 +43,7 @@
  * ignored otherwise.
  */
 
-#include "macros.h"
+#include "main/macros.h"
 
 
 #ifdef CI_MODE

src/mesa/swrast/s_stencil.c

@@ -23,9 +23,9 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "imports.h"
+#include "main/imports.h"
 
 #include "s_context.h"
 #include "s_depth.h"

src/mesa/swrast/s_stencil.h

@@ -27,7 +27,7 @@
 #define S_STENCIL_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_texcombine.c

@@ -23,11 +23,11 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "image.h"
 
 #include "s_context.h"

src/mesa/swrast/s_texcombine.h

@@ -27,7 +27,7 @@
 #define S_TEXCOMBINE_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "swrast.h"
 
 extern void

src/mesa/swrast/s_texfilter.c

@@ -23,10 +23,10 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "imports.h"
+#include "main/imports.h"
 #include "texformat.h"
 
 #include "s_context.h"

src/mesa/swrast/s_texfilter.h

@@ -27,7 +27,7 @@
 #define S_TEXFILTER_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_texstore.c

@@ -36,13 +36,13 @@
 
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
 #include "convolve.h"
 #include "image.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "mipmap.h"
 #include "texformat.h"
 #include "teximage.h"