Move compiler.h and imports.h/c from src/mesa/main into src/util

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4324>

src/compiler/SConscript.glsl

@@ -71,7 +71,6 @@ if env['msvc']:
 
 # Copy these files to avoid generation object files into src/mesa/program
 env.Prepend(CPPPATH = ['#src/mesa/main'])
-env.Command('glsl/imports.c', '#src/mesa/main/imports.c', Copy('$TARGET', '$SOURCE'))
 env.Command('glsl/extensions_table.c', '#src/mesa/main/extensions_table.c', Copy('$TARGET', '$SOURCE'))
 # Copy these files to avoid generation object files into src/mesa/program
 env.Prepend(CPPPATH = ['#src/mesa/program'])
@@ -82,7 +81,6 @@ compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_FILES'])
 
 mesa_objs = env.StaticObject([
     'glsl/extensions_table.c',
-    'glsl/imports.c',
     'glsl/symbol_table.c',
     'glsl/dummy_errors.c',
 ])

src/compiler/glsl/gl_nir_lower_buffers.c

@@ -26,7 +26,7 @@
 #include "gl_nir.h"
 #include "ir_uniform.h"
 
-#include "main/compiler.h"
+#include "util/compiler.h"
 #include "main/mtypes.h"
 
 static nir_ssa_def *

src/compiler/glsl/gl_nir_lower_samplers_as_deref.c

@@ -61,7 +61,7 @@
 #include "gl_nir.h"
 #include "ir_uniform.h"
 
-#include "main/compiler.h"
+#include "util/compiler.h"
 #include "main/mtypes.h"
 
 struct lower_samplers_as_deref_state {

src/compiler/glsl/glsl_to_nir.cpp

@@ -37,7 +37,7 @@
 #include "compiler/nir/nir_builtin_builder.h"
 #include "compiler/nir/nir_deref.h"
 #include "main/errors.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/mtypes.h"
 #include "main/shaderobj.h"
 #include "util/u_math.h"

src/compiler/glsl/ir_clone.cpp

@@ -22,7 +22,7 @@
  */
 
 #include <string.h>
-#include "main/compiler.h"
+#include "util/compiler.h"
 #include "ir.h"
 #include "compiler/glsl_types.h"
 #include "util/hash_table.h"

src/compiler/glsl/linker.cpp

@@ -86,7 +86,7 @@
 #include "util/u_string.h"
 #include "util/u_math.h"
 
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/shaderobj.h"
 #include "main/enums.h"
 #include "main/mtypes.h"

src/compiler/glsl/tests/builtin_variable_test.cpp

@@ -22,7 +22,7 @@
  */
 #include <gtest/gtest.h>
 #include "standalone_scaffolding.h"
-#include "main/compiler.h"
+#include "util/compiler.h"
 #include "main/mtypes.h"
 #include "main/macros.h"
 #include "ir.h"

src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp

@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #include <gtest/gtest.h>
-#include "main/compiler.h"
+#include "util/compiler.h"
 #include "main/mtypes.h"
 #include "main/macros.h"
 #include "util/ralloc.h"

src/compiler/glsl/tests/general_ir_test.cpp

@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #include <gtest/gtest.h>
-#include "main/compiler.h"
+#include "util/compiler.h"
 #include "main/mtypes.h"
 #include "main/macros.h"
 #include "ir.h"

src/compiler/glsl/tests/invalidate_locations_test.cpp

@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #include <gtest/gtest.h>
-#include "main/compiler.h"
+#include "util/compiler.h"
 #include "main/mtypes.h"
 #include "main/macros.h"
 #include "util/ralloc.h"

src/compiler/glsl/tests/lower_int64_test.cpp

@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #include <gtest/gtest.h>
-#include "main/compiler.h"
+#include "util/compiler.h"
 #include "main/mtypes.h"
 #include "main/macros.h"
 #include "ir.h"

src/compiler/glsl/tests/sampler_types_test.cpp

@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #include <gtest/gtest.h>
-#include "main/compiler.h"
+#include "util/compiler.h"
 #include "main/mtypes.h"
 #include "main/macros.h"
 #include "ir.h"

src/compiler/glsl/tests/set_uniform_initializer_tests.cpp

@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #include <gtest/gtest.h>
-#include "main/compiler.h"
+#include "util/compiler.h"
 #include "main/mtypes.h"
 #include "main/macros.h"
 #include "util/ralloc.h"

src/compiler/glsl/tests/varyings_test.cpp

@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #include <gtest/gtest.h>
-#include "main/compiler.h"
+#include "util/compiler.h"
 #include "main/mtypes.h"
 #include "main/macros.h"
 #include "util/ralloc.h"

src/compiler/nir/nir_opt_copy_propagate.c

@@ -26,7 +26,7 @@
  */
 
 #include "nir.h"
-#include <main/imports.h>
+#include <util/imports.h>
 
 /**
  * SSA-based copy propagation

src/gallium/state_trackers/glx/xlib/glx_api.c

@@ -39,7 +39,7 @@
 #include <GL/glxproto.h>
 
 #include "xm_api.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/errors.h"
 #include "util/u_math.h"
 

src/gallium/state_trackers/glx/xlib/xm_api.c

@@ -70,7 +70,7 @@
 #include "hud/hud_context.h"
 
 #include "main/errors.h"
-#include "main/imports.h"
+#include "util/imports.h"
 
 #include "xm_public.h"
 #include <GL/glx.h>

src/intel/compiler/brw_reg.h

@@ -43,7 +43,7 @@
 #define BRW_REG_H
 
 #include <stdbool.h>
-#include "main/compiler.h"
+#include "util/compiler.h"
 #include "main/macros.h"
 #include "program/prog_instruction.h"
 #include "brw_eu_defines.h"

src/mapi/glapi/gen/gl_enums.py

@@ -52,7 +52,7 @@ class PrintGlEnums(gl_XML.gl_print_base):
     def printRealHeader(self):
         print('#include "main/glheader.h"')
         print('#include "main/enums.h"')
-        print('#include "main/imports.h"')
+        print('#include "util/imports.h"')
         print('#include "main/mtypes.h"')
         print('')
         print('typedef struct PACKED {')

src/mapi/glapi/gen/gl_genexec.py

@@ -89,7 +89,7 @@ header = """/**
 #include "main/genmipmap.h"
 #include "main/hint.h"
 #include "main/histogram.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/light.h"
 #include "main/lines.h"
 #include "main/matrix.h"

src/mapi/glapi/gen/gl_table.py

@@ -100,6 +100,8 @@ class PrintRemapTable(gl_XML.gl_print_base):
  * can SET_FuncName, are used to get and set the dispatch pointer for the
  * named function in the specified dispatch table.
  */
+
+#include "main/glheader.h"
 """)
         return
 

src/mesa/Android.libmesa_glsl_utils.mk

@@ -43,7 +43,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_SRC_FILES := \
 	main/extensions_table.c \
-	main/imports.c \
 	program/symbol_table.c \
 	program/dummy_errors.c
 

src/mesa/Makefile.sources

@@ -43,7 +43,6 @@ MAIN_FILES = \
 	main/colortab.h \
 	main/compute.c \
 	main/compute.h \
-	main/compiler.h \
 	main/condrender.c \
 	main/condrender.h \
 	main/config.h \
@@ -138,8 +137,6 @@ MAIN_FILES = \
 	main/histogram.h \
 	main/image.c \
 	main/image.h \
-	main/imports.c \
-	main/imports.h \
 	main/light.c \
 	main/light.h \
 	main/lines.c \

src/mesa/drivers/common/driverfuncs.c

@@ -24,7 +24,7 @@
 
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/accum.h"
 #include "main/arrayobj.h"
 #include "main/context.h"

src/mesa/drivers/common/meta.c

@@ -33,7 +33,7 @@
 
 #include "main/glheader.h"
 #include "main/mtypes.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/arbprogram.h"
 #include "main/arrayobj.h"
 #include "main/blend.h"

src/mesa/drivers/common/meta_blit.c

@@ -24,7 +24,7 @@
 
 #include "main/glheader.h"
 #include "main/mtypes.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/arbprogram.h"
 #include "main/arrayobj.h"
 #include "main/blend.h"

src/mesa/drivers/dri/i915/i830_context.c

@@ -28,7 +28,7 @@
 #include "i830_context.h"
 #include "main/api_exec.h"
 #include "main/extensions.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/version.h"
 #include "main/vtxfmt.h"
 #include "tnl/tnl.h"

src/mesa/drivers/dri/i915/i915_context.c

@@ -29,7 +29,7 @@
 #include "main/api_exec.h"
 #include "main/framebuffer.h"
 #include "main/extensions.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "main/version.h"
 #include "main/vtxfmt.h"

src/mesa/drivers/dri/i915/i915_debug_fp.c

@@ -29,7 +29,8 @@
 
 #include "i915_reg.h"
 #include "i915_debug.h"
-#include "main/imports.h"
+#include "util/imports.h"
+#include "main/glheader.h"
 
 static const char *opcodes[0x20] = {
    "NOP",

src/mesa/drivers/dri/i915/i915_vtbl.c

@@ -29,7 +29,7 @@
 
 #include "main/glheader.h"
 #include "main/mtypes.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "main/renderbuffer.h"
 #include "main/framebuffer.h"

src/mesa/drivers/dri/i915/intel_buffer_objects.c

@@ -26,7 +26,7 @@
  **************************************************************************/
 
 
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/mtypes.h"
 #include "main/macros.h"
 #include "main/bufferobj.h"

src/mesa/drivers/dri/i915/intel_context.c

@@ -31,7 +31,7 @@
 #include "main/extensions.h"
 #include "main/fbobject.h"
 #include "main/framebuffer.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/points.h"
 #include "main/renderbuffer.h"
 

src/mesa/drivers/dri/i915/intel_fbo.c

@@ -27,7 +27,7 @@
 
 
 #include "main/enums.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "main/mtypes.h"
 #include "main/fbobject.h"

src/mesa/drivers/dri/i915/intel_render.c

@@ -33,7 +33,7 @@
 #include "main/glheader.h"
 #include "main/context.h"
 #include "main/macros.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/mtypes.h"
 #include "main/enums.h"
 

src/mesa/drivers/dri/i915/intel_syncobj.c

@@ -38,7 +38,7 @@
  * performance bottleneck, though.
  */
 
-#include "main/imports.h"
+#include "util/imports.h"
 
 #include "intel_context.h"
 #include "intel_batchbuffer.h"

src/mesa/drivers/dri/i965/brw_conditional_render.c

@@ -30,7 +30,7 @@
  * (GL_NV_conditional_render, GL_ARB_conditional_render_inverted) on Gen7+.
  */
 
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/condrender.h"
 
 #include "brw_context.h"

src/mesa/drivers/dri/i965/brw_context.c

@@ -37,7 +37,7 @@
 #include "main/fbobject.h"
 #include "main/extensions.h"
 #include "main/glthread.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "main/points.h"
 #include "main/version.h"

src/mesa/drivers/dri/i965/brw_object_purgeable.c

@@ -27,7 +27,7 @@
  * The driver implementation of the GL_APPLE_object_purgeable extension.
  */
 
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/mtypes.h"
 #include "main/macros.h"
 #include "main/bufferobj.h"

src/mesa/drivers/dri/i965/brw_primitive_restart.c

@@ -25,7 +25,7 @@
  *
  */
 
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/bufferobj.h"
 #include "main/varray.h"
 #include "vbo/vbo.h"

src/mesa/drivers/dri/i965/brw_program.c

@@ -30,7 +30,7 @@
   */
 
 #include <pthread.h>
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/glspirv.h"
 #include "program/prog_parameter.h"
 #include "program/prog_print.h"

src/mesa/drivers/dri/i965/brw_program_cache.c

@@ -44,7 +44,7 @@
  * big we throw out all of the cache data and let it get regenerated.
  */
 
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/streaming-load-memcpy.h"
 #include "x86/common_x86_asm.h"
 #include "intel_batchbuffer.h"

src/mesa/drivers/dri/i965/brw_queryobj.c

@@ -35,7 +35,7 @@
  * appropriately synced with the stage of the pipeline for our extensions'
  * needs.
  */
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/queryobj.h"
 
 #include "brw_context.h"

src/mesa/drivers/dri/i965/brw_sync.c

@@ -40,7 +40,7 @@
 
 #include <libsync.h> /* Requires Android or libdrm-2.4.72 */
 
-#include "main/imports.h"
+#include "util/imports.h"
 
 #include "brw_context.h"
 #include "intel_batchbuffer.h"

src/mesa/drivers/dri/i965/brw_vs.c

@@ -30,7 +30,7 @@
   */
 
 
-#include "main/compiler.h"
+#include "util/compiler.h"
 #include "main/context.h"
 #include "brw_context.h"
 #include "brw_vs.h"

src/mesa/drivers/dri/i965/gen6_queryobj.c

@@ -31,7 +31,7 @@
  * GL_EXT_transform_feedback, and friends) on platforms that support
  * hardware contexts (Gen6+).
  */
-#include "main/imports.h"
+#include "util/imports.h"
 
 #include "brw_context.h"
 #include "brw_defines.h"

src/mesa/drivers/dri/i965/hsw_queryobj.c

@@ -26,7 +26,7 @@
  *
  * Support for query buffer objects (GL_ARB_query_buffer_object) on Haswell+.
  */
-#include "main/imports.h"
+#include "util/imports.h"
 
 #include "brw_context.h"
 #include "brw_defines.h"

src/mesa/drivers/dri/i965/intel_buffer_objects.c

@@ -29,7 +29,7 @@
  * This provides core GL buffer object functionality.
  */
 
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/mtypes.h"
 #include "main/macros.h"
 #include "main/streaming-load-memcpy.h"

src/mesa/drivers/dri/i965/intel_fbo.c

@@ -24,7 +24,7 @@
  */
 
 #include "main/enums.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "main/mtypes.h"
 #include "main/fbobject.h"

src/mesa/drivers/dri/i965/intel_upload.c

@@ -28,7 +28,7 @@
  * Batched upload via BOs.
  */
 
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "brw_bufmgr.h"
 #include "brw_context.h"

src/mesa/drivers/dri/nouveau/nouveau_driver.h

@@ -27,7 +27,7 @@
 #ifndef __NOUVEAU_DRIVER_H__
 #define __NOUVEAU_DRIVER_H__
 
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/mtypes.h"
 #include "main/macros.h"
 #include "main/formats.h"

src/mesa/drivers/dri/r200/r200_cmdbuf.c

@@ -32,7 +32,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "main/context.h"
 #include "util/simple_list.h"

src/mesa/drivers/dri/r200/r200_context.c

@@ -37,7 +37,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/api_arrayelt.h"
 #include "main/api_exec.h"
 #include "main/context.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/extensions.h"
 #include "main/version.h"
 #include "main/vtxfmt.h"

src/mesa/drivers/dri/r200/r200_ioctl.c

@@ -36,7 +36,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <errno.h>
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "main/context.h"
 #include "swrast/swrast.h"

src/mesa/drivers/dri/r200/r200_maos_arrays.c

@@ -34,7 +34,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "main/glheader.h"
 #include "main/mtypes.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "main/state.h"
 

src/mesa/drivers/dri/r200/r200_sanity.c

@@ -35,7 +35,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <errno.h> 
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 
 #include "r200_context.h"
 #include "r200_sanity.h"

src/mesa/drivers/dri/r200/r200_state.c

@@ -34,7 +34,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/enums.h"
 #include "main/light.h"
 #include "main/framebuffer.h"

src/mesa/drivers/dri/r200/r200_state_init.c

@@ -33,7 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "main/errors.h"
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/enums.h"
 #include "main/api_arrayelt.h"
 #include "main/state.h"

src/mesa/drivers/dri/r200/r200_swtcl.c

@@ -36,7 +36,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/mtypes.h"
 #include "main/enums.h"
 #include "main/image.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "main/state.h"
 

src/mesa/drivers/dri/r200/r200_tcl.c

@@ -33,7 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/mtypes.h"
 #include "main/enums.h"
 #include "main/light.h"

src/mesa/drivers/dri/r200/r200_tex.c

@@ -32,7 +32,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/context.h"
 #include "main/enums.h"
 #include "main/image.h"

src/mesa/drivers/dri/r200/r200_texstate.c

@@ -33,7 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/context.h"
 #include "main/macros.h"
 #include "main/state.h"

src/mesa/drivers/dri/radeon/radeon_buffer_objects.c

@@ -25,7 +25,7 @@
  *
  */
 
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/mtypes.h"
 #include "main/bufferobj.h"
 

src/mesa/drivers/dri/radeon/radeon_common.c

@@ -43,7 +43,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <errno.h>
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/context.h"
 #include "main/enums.h"
 #include "main/fbobject.h"

src/mesa/drivers/dri/radeon/radeon_context.c

@@ -40,7 +40,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/api_exec.h"
 #include "main/context.h"
 #include "util/simple_list.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/extensions.h"
 #include "main/version.h"
 #include "main/vtxfmt.h"

src/mesa/drivers/dri/radeon/radeon_fbo.c

@@ -26,7 +26,7 @@
  **************************************************************************/
 
 
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "main/mtypes.h"
 #include "main/enums.h"

src/mesa/drivers/dri/radeon/radeon_fog.c

@@ -34,7 +34,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "c99_math.h"
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/context.h"
 #include "main/mtypes.h"
 #include "main/enums.h"

src/mesa/drivers/dri/radeon/radeon_ioctl.c

@@ -42,7 +42,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "swrast/swrast.h"
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "util/simple_list.h"
 
 #include "radeon_context.h"

src/mesa/drivers/dri/radeon/radeon_maos_arrays.c

@@ -33,7 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/mtypes.h"
 #include "main/macros.h"
 

src/mesa/drivers/dri/radeon/radeon_maos_verts.c

@@ -33,7 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/mtypes.h"
 #include "main/state.h"
 

src/mesa/drivers/dri/radeon/radeon_queryobj.c

@@ -28,7 +28,7 @@
 #include "radeon_queryobj.h"
 #include "radeon_debug.h"
 
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/queryobj.h"
 
 #include <inttypes.h>

src/mesa/drivers/dri/radeon/radeon_queryobj.h

@@ -25,7 +25,7 @@
  *
  */
 
-#include "main/imports.h"
+#include "util/imports.h"
 #include "util/simple_list.h"
 #include "radeon_common_context.h"
 

src/mesa/drivers/dri/radeon/radeon_screen.c

@@ -37,7 +37,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <errno.h>
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/mtypes.h"
 #include "main/framebuffer.h"
 #include "main/renderbuffer.h"

src/mesa/drivers/dri/radeon/radeon_state.c

@@ -33,7 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/enums.h"
 #include "main/light.h"
 #include "main/context.h"

src/mesa/drivers/dri/radeon/radeon_state_init.c

@@ -29,7 +29,7 @@
 
 #include "main/errors.h"
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/api_arrayelt.h"
 
 #include "swrast/swrast.h"

src/mesa/drivers/dri/radeon/radeon_swtcl.c

@@ -35,7 +35,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/glheader.h"
 #include "main/mtypes.h"
 #include "main/enums.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "main/state.h"
 

src/mesa/drivers/dri/radeon/radeon_tcl.c

@@ -33,7 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/mtypes.h"
 #include "main/light.h"
 #include "main/enums.h"

src/mesa/drivers/dri/radeon/radeon_tex.c

@@ -32,7 +32,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/context.h"
 #include "main/enums.h"
 #include "main/image.h"

src/mesa/drivers/dri/radeon/radeon_texstate.c

@@ -34,7 +34,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/context.h"
 #include "main/macros.h"
 #include "main/teximage.h"

src/mesa/drivers/dri/radeon/radeon_texture.c

@@ -30,7 +30,7 @@
  */
 
 #include "main/glheader.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/context.h"
 #include "main/enums.h"
 #include "main/mipmap.h"

src/mesa/drivers/dri/swrast/swrast.c

@@ -39,7 +39,7 @@
 #include "main/fbobject.h"
 #include "main/formats.h"
 #include "main/framebuffer.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/renderbuffer.h"
 #include "main/version.h"
 #include "main/vtxfmt.h"

src/mesa/drivers/osmesa/osmesa.c

@@ -41,7 +41,7 @@
 #include "main/extensions.h"
 #include "main/formats.h"
 #include "main/framebuffer.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "main/mipmap.h"
 #include "main/mtypes.h"

src/mesa/drivers/x11/fakeglx.c

@@ -47,7 +47,7 @@
 #include "main/context.h"
 #include "main/config.h"
 #include "main/macros.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/mtypes.h"
 #include "main/version.h"
 #include "xfonts.h"

src/mesa/drivers/x11/xfonts.c

@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include "glxheader.h"
 #include "main/context.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "xfonts.h"
 
 

src/mesa/drivers/x11/xm_api.c

@@ -69,7 +69,7 @@
 #include "main/context.h"
 #include "main/extensions.h"
 #include "main/framebuffer.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "main/renderbuffer.h"
 #include "main/teximage.h"

src/mesa/drivers/x11/xm_buffer.c

@@ -32,7 +32,7 @@
 #include "glxheader.h"
 #include "xmesaP.h"
 #include "main/errors.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/formats.h"
 #include "main/framebuffer.h"
 #include "main/renderbuffer.h"

src/mesa/drivers/x11/xm_dd.c

@@ -37,7 +37,7 @@
 #include "main/macros.h"
 #include "main/mipmap.h"
 #include "main/image.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/mtypes.h"
 #include "main/pbo.h"
 #include "main/texformat.h"

src/mesa/drivers/x11/xm_tri.c

@@ -32,7 +32,7 @@
 
 #include <stdio.h>
 #include "c99_math.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/mtypes.h"
 #include "glxheader.h"
 #include "xmesaP.h"

src/mesa/main/accum.c

@@ -29,7 +29,7 @@
 #include "format_unpack.h"
 #include "format_pack.h"
 #include "framebuffer.h"
-#include "imports.h"
+#include "util/imports.h"
 #include "macros.h"
 #include "state.h"
 #include "mtypes.h"

src/mesa/main/api_arrayelt.c

@@ -39,7 +39,7 @@
 #include "api_arrayelt.h"
 #include "bufferobj.h"
 #include "context.h"
-#include "imports.h"
+#include "util/imports.h"
 #include "macros.h"
 #include "mtypes.h"
 #include "main/dispatch.h"

src/mesa/main/arbprogram.c

@@ -32,7 +32,7 @@
 #include "main/glheader.h"
 #include "main/context.h"
 #include "main/hash.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "main/mtypes.h"
 #include "main/arbprogram.h"

src/mesa/main/arrayobj.c

@@ -43,7 +43,7 @@
 #include "glheader.h"
 #include "hash.h"
 #include "image.h"
-#include "imports.h"
+#include "util/imports.h"
 #include "context.h"
 #include "bufferobj.h"
 #include "arrayobj.h"

src/mesa/main/atifragshader.c

@@ -24,7 +24,7 @@
 #include "main/glheader.h"
 #include "main/context.h"
 #include "main/hash.h"
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "main/enums.h"
 #include "main/mtypes.h"

src/mesa/main/attrib.c

@@ -24,7 +24,7 @@
  */
 
 #include "glheader.h"
-#include "imports.h"
+#include "util/imports.h"
 #include "accum.h"
 #include "arrayobj.h"
 #include "attrib.h"

src/mesa/main/bufferobj.c

@@ -36,7 +36,7 @@
 #include "glheader.h"
 #include "enums.h"
 #include "hash.h"
-#include "imports.h"
+#include "util/imports.h"
 #include "context.h"
 #include "bufferobj.h"
 #include "externalobjects.h"

src/mesa/main/context.c

@@ -77,7 +77,7 @@
 
 
 #include "glheader.h"
-#include "imports.h"
+#include "util/imports.h"
 #include "accum.h"
 #include "api_exec.h"
 #include "api_loopback.h"

src/mesa/main/context.h

@@ -50,7 +50,7 @@
 
 
 #include "errors.h"
-#include "imports.h"
+#include "util/imports.h"
 #include "extensions.h"
 #include "mtypes.h"
 #include "vbo/vbo.h"

src/mesa/main/cpuinfo.c

@@ -23,7 +23,7 @@
  */
 
 
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/cpuinfo.h"
 
 

src/mesa/main/debug.c

@@ -30,7 +30,7 @@
 #include "enums.h"
 #include "formats.h"
 #include "hash.h"
-#include "imports.h"
+#include "util/imports.h"
 #include "macros.h"
 #include "debug.h"
 #include "get.h"

src/mesa/main/debug_output.c

@@ -28,7 +28,7 @@
 #include "context.h"
 #include "debug_output.h"
 #include "enums.h"
-#include "imports.h"
+#include "util/imports.h"
 #include "hash.h"
 #include "mtypes.h"
 #include "version.h"

src/mesa/main/depth.c

@@ -24,7 +24,7 @@
 
 
 #include "glheader.h"
-#include "imports.h"
+#include "util/imports.h"
 #include "context.h"
 #include "depth.h"
 #include "enums.h"