diff --git a/src/gallium/README.portability b/src/gallium/README.portability
index 9fbec4c5f5c..2984ffa6ed0 100644
--- a/src/gallium/README.portability
+++ b/src/gallium/README.portability
@@ -11,7 +11,7 @@ headers in general, should strictly follow these guidelines to ensure
 
 = Compiler Support =
 
-* Include the p_compiler.h.
+* Include the util/compiler.h.
 
 * Cast explicitly when converting to integer types of smaller sizes.
 
diff --git a/src/gallium/auxiliary/cso_cache/cso_hash.h b/src/gallium/auxiliary/cso_cache/cso_hash.h
index b5722edf8e9..a1579e78944 100644
--- a/src/gallium/auxiliary/cso_cache/cso_hash.h
+++ b/src/gallium/auxiliary/cso_cache/cso_hash.h
@@ -44,7 +44,7 @@
 #ifndef CSO_HASH_H
 #define CSO_HASH_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/gallium/auxiliary/draw/draw_pipe.h b/src/gallium/auxiliary/draw/draw_pipe.h
index 2afb37772d3..6e298560a12 100644
--- a/src/gallium/auxiliary/draw/draw_pipe.h
+++ b/src/gallium/auxiliary/draw/draw_pipe.h
@@ -33,7 +33,7 @@
 #ifndef DRAW_PIPE_H
 #define DRAW_PIPE_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "draw_private.h"       /* for sizeof(vertex_header) */
 #include "draw_context.h"
 
diff --git a/src/gallium/auxiliary/draw/draw_pt.h b/src/gallium/auxiliary/draw/draw_pt.h
index 705a77f36a2..57fb8ad4396 100644
--- a/src/gallium/auxiliary/draw/draw_pt.h
+++ b/src/gallium/auxiliary/draw/draw_pt.h
@@ -33,7 +33,7 @@
 #ifndef DRAW_PT_H
 #define DRAW_PT_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct draw_pt_middle_end;
 struct draw_context;
diff --git a/src/gallium/auxiliary/draw/draw_vbuf.h b/src/gallium/auxiliary/draw/draw_vbuf.h
index be8a5f40347..55bbfe741bc 100644
--- a/src/gallium/auxiliary/draw/draw_vbuf.h
+++ b/src/gallium/auxiliary/draw/draw_vbuf.h
@@ -37,7 +37,7 @@
 #define DRAW_VBUF_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 
 
diff --git a/src/gallium/auxiliary/draw/draw_vertex.h b/src/gallium/auxiliary/draw/draw_vertex.h
index d52a142e6ca..06a6310a426 100644
--- a/src/gallium/auxiliary/draw/draw_vertex.h
+++ b/src/gallium/auxiliary/draw/draw_vertex.h
@@ -39,7 +39,7 @@
 #define DRAW_VERTEX_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "util/u_debug.h"
 #include "util/u_memory.h"
diff --git a/src/gallium/auxiliary/driver_trace/tr_context.h b/src/gallium/auxiliary/driver_trace/tr_context.h
index f687fa2939d..14b2b8a9d42 100644
--- a/src/gallium/auxiliary/driver_trace/tr_context.h
+++ b/src/gallium/auxiliary/driver_trace/tr_context.h
@@ -29,7 +29,7 @@
 #define TR_CONTEXT_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/hash_table.h"
 #include "pipe/p_context.h"
diff --git a/src/gallium/auxiliary/driver_trace/tr_dump.c b/src/gallium/auxiliary/driver_trace/tr_dump.c
index ae46ebc7f31..3c7f045a6d4 100644
--- a/src/gallium/auxiliary/driver_trace/tr_dump.c
+++ b/src/gallium/auxiliary/driver_trace/tr_dump.c
@@ -48,7 +48,7 @@
 # include <io.h>
 #endif
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_thread.h"
 #include "util/os_time.h"
 #include "util/simple_mtx.h"
diff --git a/src/gallium/auxiliary/driver_trace/tr_dump.h b/src/gallium/auxiliary/driver_trace/tr_dump.h
index 300d820d251..3486ad8ad33 100644
--- a/src/gallium/auxiliary/driver_trace/tr_dump.h
+++ b/src/gallium/auxiliary/driver_trace/tr_dump.h
@@ -34,7 +34,7 @@
 #define TR_DUMP_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 
 struct pipe_resource;
diff --git a/src/gallium/auxiliary/driver_trace/tr_dump_defines.h b/src/gallium/auxiliary/driver_trace/tr_dump_defines.h
index c523da25a38..ca3d3b9f885 100644
--- a/src/gallium/auxiliary/driver_trace/tr_dump_defines.h
+++ b/src/gallium/auxiliary/driver_trace/tr_dump_defines.h
@@ -28,7 +28,7 @@
 #ifndef TR_DUMP_DEFINES_H_
 #define TR_DUMP_DEFINES_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_format.h"
 #include "util/u_dump.h"
 #include "tr_dump.h"
diff --git a/src/gallium/auxiliary/driver_trace/tr_dump_state.c b/src/gallium/auxiliary/driver_trace/tr_dump_state.c
index 5dd02c40320..8561f71cba4 100644
--- a/src/gallium/auxiliary/driver_trace/tr_dump_state.c
+++ b/src/gallium/auxiliary/driver_trace/tr_dump_state.c
@@ -26,7 +26,7 @@
  **************************************************************************/
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_memory.h"
 #include "util/format/u_format.h"
 #include "tgsi/tgsi_dump.h"
diff --git a/src/gallium/auxiliary/driver_trace/tr_public.h b/src/gallium/auxiliary/driver_trace/tr_public.h
index 648ead18746..2abfa0f6414 100644
--- a/src/gallium/auxiliary/driver_trace/tr_public.h
+++ b/src/gallium/auxiliary/driver_trace/tr_public.h
@@ -28,7 +28,7 @@
 #ifndef TR_PUBLIC_H
 #define TR_PUBLIC_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/gallium/auxiliary/driver_trace/tr_texture.h b/src/gallium/auxiliary/driver_trace/tr_texture.h
index b9caf968d16..58e5e5d0140 100644
--- a/src/gallium/auxiliary/driver_trace/tr_texture.h
+++ b/src/gallium/auxiliary/driver_trace/tr_texture.h
@@ -29,7 +29,7 @@
 #define TR_TEXTURE_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 
 #include "tr_screen.h"
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit.h b/src/gallium/auxiliary/gallivm/lp_bld_arit.h
index df101830b02..b335916027f 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_arit.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_arit.h
@@ -38,7 +38,7 @@
 
 
 #include "gallivm/lp_bld.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 
 struct lp_type;
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_const.h b/src/gallium/auxiliary/gallivm/lp_bld_const.h
index fe3d906484c..ebd6d942258 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_const.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_const.h
@@ -37,7 +37,7 @@
 #define LP_BLD_CONST_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "gallivm/lp_bld.h"
 #include "gallivm/lp_bld_init.h"
 
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_coro.h b/src/gallium/auxiliary/gallivm/lp_bld_coro.h
index e3cf415230e..2fbaecc3152 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_coro.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_coro.h
@@ -27,7 +27,7 @@
 #define LP_BLD_CORO_H
 
 #include <stdbool.h>
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "gallivm/lp_bld.h"
 #include "gallivm/lp_bld_intr.h"
 
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.h b/src/gallium/auxiliary/gallivm/lp_bld_debug.h
index 2680456add2..a8db59b9bc4 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.h
@@ -32,7 +32,7 @@
 
 #include "gallivm/lp_bld.h"
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_string.h"
 
 
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
index 4d18786c23f..cd2108f3a08 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
@@ -27,7 +27,7 @@
 
 
 #include "util/detect.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/macros.h"
 #include "util/u_cpu_detect.h"
 #include "util/u_debug.h"
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.h b/src/gallium/auxiliary/gallivm/lp_bld_init.h
index ffed2a9a1bc..0a5c85d4314 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_init.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.h
@@ -30,7 +30,7 @@
 #define LP_BLD_INIT_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_pointer.h" // for func_pointer
 #include "lp_bld.h"
 #include <llvm-c/ExecutionEngine.h>
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_jit_types.c b/src/gallium/auxiliary/gallivm/lp_bld_jit_types.c
index 64445149cde..1bd59c365d9 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_jit_types.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_jit_types.c
@@ -21,7 +21,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "gallivm/lp_bld.h"
 #include "gallivm/lp_bld_init.h"
 #include "gallivm/lp_bld_struct.h"
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_pack.h b/src/gallium/auxiliary/gallivm/lp_bld_pack.h
index 62c8e7a8750..deee1c4798e 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_pack.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_pack.h
@@ -37,7 +37,7 @@
 #define LP_BLD_PACK_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "gallivm/lp_bld.h"
 
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_printf.h b/src/gallium/auxiliary/gallivm/lp_bld_printf.h
index e0191264f11..1973ef6f291 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_printf.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_printf.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "lp_bld.h"
 #include "lp_bld_init.h"
 
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h
index 9a9fe5f46a3..e183cec2827 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h
@@ -43,7 +43,7 @@
 #include "gallivm/lp_bld_sample.h"
 #include "gallivm/lp_bld_ir_common.h"
 #include "lp_bld_type.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "tgsi/tgsi_exec.h"
 #include "tgsi/tgsi_scan.h"
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_type.h b/src/gallium/auxiliary/gallivm/lp_bld_type.h
index f828ff15b62..f9c48fde1b0 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_type.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_type.h
@@ -38,7 +38,7 @@
 
 
 #include "util/format/u_format.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "gallivm/lp_bld.h"
 
 #ifdef __cplusplus
diff --git a/src/gallium/auxiliary/hud/font.c b/src/gallium/auxiliary/hud/font.c
index b4430e20575..95512a2f8a8 100644
--- a/src/gallium/auxiliary/hud/font.c
+++ b/src/gallium/auxiliary/hud/font.c
@@ -52,7 +52,7 @@
 
 #include "hud/font.h"
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_state.h"
 #include "pipe/p_context.h"
diff --git a/src/gallium/auxiliary/hud/font.h b/src/gallium/auxiliary/hud/font.h
index 01cdeba9b61..daae101bbf9 100644
--- a/src/gallium/auxiliary/hud/font.h
+++ b/src/gallium/auxiliary/hud/font.h
@@ -28,7 +28,7 @@
 #ifndef FONT_H
 #define FONT_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct pipe_resource;
 struct pipe_context;
diff --git a/src/gallium/auxiliary/indices/u_indices.h b/src/gallium/auxiliary/indices/u_indices.h
index 870840325c4..eb38286a074 100644
--- a/src/gallium/auxiliary/indices/u_indices.h
+++ b/src/gallium/auxiliary/indices/u_indices.h
@@ -25,7 +25,7 @@
 #ifndef U_INDICES_H
 #define U_INDICES_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 
 /* First/last provoking vertex */
diff --git a/src/gallium/auxiliary/indices/u_indices_priv.h b/src/gallium/auxiliary/indices/u_indices_priv.h
index 2ad2d71a62d..e3730b69ccb 100644
--- a/src/gallium/auxiliary/indices/u_indices_priv.h
+++ b/src/gallium/auxiliary/indices/u_indices_priv.h
@@ -25,7 +25,7 @@
 #ifndef U_INDICES_PRIV_H
 #define U_INDICES_PRIV_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "u_indices.h"
 
 #define IN_UINT8      0
diff --git a/src/gallium/auxiliary/indices/u_unfilled_gen.py b/src/gallium/auxiliary/indices/u_unfilled_gen.py
index d6eddaf44fd..95cd7a50bbd 100644
--- a/src/gallium/auxiliary/indices/u_unfilled_gen.py
+++ b/src/gallium/auxiliary/indices/u_unfilled_gen.py
@@ -67,7 +67,7 @@ def prolog(f: 'T.TextIO'):
 
 #include "indices/u_indices.h"
 #include "indices/u_indices_priv.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "pipe/p_defines.h"
 #include "util/u_memory.h"
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.h b/src/gallium/auxiliary/pipe-loader/pipe_loader.h
index b799fabf281..eb3c691c702 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader.h
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.h
@@ -33,7 +33,7 @@
 #ifndef PIPE_LOADER_H
 #define PIPE_LOADER_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "frontend/drm_driver.h"
 #include "util/xmlconfig.h"
 
diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer.h b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
index 15aa4958e8e..495584604e6 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
@@ -44,7 +44,7 @@
 #define PB_BUFFER_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_inlines.h"
 #include "pipe/p_defines.h"
diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
index 7926d3fffd6..8e8c861a300 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
@@ -42,7 +42,7 @@
 #endif
 #include <inttypes.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "util/u_debug.h"
 #include "util/u_thread.h"
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c
index 2b8f4b23629..040f1c5b52f 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c
@@ -34,7 +34,7 @@
  */
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_thread.h"
 #include "util/u_memory.h"
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c
index f111bdac601..61b80f5a96c 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c
@@ -33,7 +33,7 @@
  */
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_thread.h"
 #include "util/u_math.h"
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
index f078ff0b10b..9f38de53e85 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
@@ -36,7 +36,7 @@
  * @author Jose Fonseca <jfonseca@vmware.com>
  */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_thread.h"
 #include "pipe/p_defines.h"
diff --git a/src/gallium/auxiliary/pipebuffer/pb_validate.c b/src/gallium/auxiliary/pipebuffer/pb_validate.c
index 5adc3315d45..64663f68490 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_validate.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_validate.c
@@ -33,7 +33,7 @@
  */
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "util/u_memory.h"
 #include "util/u_debug.h"
diff --git a/src/gallium/auxiliary/pipebuffer/pb_validate.h b/src/gallium/auxiliary/pipebuffer/pb_validate.h
index bdaee4fe660..bdc5f937867 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_validate.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_validate.h
@@ -36,7 +36,7 @@
 #define PB_VALIDATE_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 
 #ifdef __cplusplus
diff --git a/src/gallium/auxiliary/postprocess/pp_init.c b/src/gallium/auxiliary/postprocess/pp_init.c
index aecc58c5399..09ad74c145e 100644
--- a/src/gallium/auxiliary/postprocess/pp_init.c
+++ b/src/gallium/auxiliary/postprocess/pp_init.c
@@ -25,7 +25,7 @@
  *
  **************************************************************************/
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "postprocess/filters.h"
 #include "postprocess/pp_private.h"
diff --git a/src/gallium/auxiliary/postprocess/pp_mlaa.c b/src/gallium/auxiliary/postprocess/pp_mlaa.c
index 4650e6ec0f5..8b13efe9dbb 100644
--- a/src/gallium/auxiliary/postprocess/pp_mlaa.c
+++ b/src/gallium/auxiliary/postprocess/pp_mlaa.c
@@ -38,7 +38,7 @@
  * policies, either expressed or implied, of the copyright holders.
  */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "postprocess/postprocess.h"
 #include "postprocess/pp_mlaa.h"
diff --git a/src/gallium/auxiliary/rtasm/rtasm_execmem.c b/src/gallium/auxiliary/rtasm/rtasm_execmem.c
index ff6705d455a..90db1fe5b38 100644
--- a/src/gallium/auxiliary/rtasm/rtasm_execmem.c
+++ b/src/gallium/auxiliary/rtasm/rtasm_execmem.c
@@ -31,7 +31,7 @@
  */
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/simple_mtx.h"
 #include "util/u_debug.h"
 #include "util/u_thread.h"
diff --git a/src/gallium/auxiliary/rtasm/rtasm_execmem.h b/src/gallium/auxiliary/rtasm/rtasm_execmem.h
index c2cded5e5a6..43c5b90a2aa 100644
--- a/src/gallium/auxiliary/rtasm/rtasm_execmem.h
+++ b/src/gallium/auxiliary/rtasm/rtasm_execmem.h
@@ -32,7 +32,7 @@
 #ifndef _RTASM_EXECMEM_H_
 #define _RTASM_EXECMEM_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 
 extern void *
diff --git a/src/gallium/auxiliary/rtasm/rtasm_x86sse.c b/src/gallium/auxiliary/rtasm/rtasm_x86sse.c
index 4429a01369b..8f27a03c202 100644
--- a/src/gallium/auxiliary/rtasm/rtasm_x86sse.c
+++ b/src/gallium/auxiliary/rtasm/rtasm_x86sse.c
@@ -27,7 +27,7 @@
 
 #if DETECT_ARCH_X86 || DETECT_ARCH_X86_64
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_pointer.h"
 
diff --git a/src/gallium/auxiliary/rtasm/rtasm_x86sse.h b/src/gallium/auxiliary/rtasm/rtasm_x86sse.h
index ecf855e4922..d09397fc6f7 100644
--- a/src/gallium/auxiliary/rtasm/rtasm_x86sse.h
+++ b/src/gallium/auxiliary/rtasm/rtasm_x86sse.h
@@ -25,7 +25,7 @@
 #ifndef _RTASM_X86SSE_H_
 #define _RTASM_X86SSE_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/detect.h"
 
 #if DETECT_ARCH_X86 || DETECT_ARCH_X86_64
diff --git a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
index cce7faa341d..f2cfeb38827 100644
--- a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
@@ -2,7 +2,7 @@
 #ifndef INLINE_DEBUG_HELPER_H
 #define INLINE_DEBUG_HELPER_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_tests.h"
 
diff --git a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
index 494dece4d27..ddb67b3a25a 100644
--- a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
@@ -2,7 +2,7 @@
 #ifndef INLINE_SW_HELPER_H
 #define INLINE_SW_HELPER_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_screen.h"
 #include "util/u_debug.h"
 #include "frontend/sw_winsys.h"
diff --git a/src/gallium/auxiliary/target-helpers/sw_helper.h b/src/gallium/auxiliary/target-helpers/sw_helper.h
index db616aa47f0..65fadc481ab 100644
--- a/src/gallium/auxiliary/target-helpers/sw_helper.h
+++ b/src/gallium/auxiliary/target-helpers/sw_helper.h
@@ -2,7 +2,7 @@
 #ifndef SW_HELPER_H
 #define SW_HELPER_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "target-helpers/sw_helper_public.h"
 #include "frontend/sw_winsys.h"
diff --git a/src/gallium/auxiliary/tgsi/tgsi_dump.h b/src/gallium/auxiliary/tgsi/tgsi_dump.h
index ffec5e1136a..f5bc8e78922 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_dump.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_dump.h
@@ -28,7 +28,7 @@
 #ifndef TGSI_DUMP_H
 #define TGSI_DUMP_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_shader_tokens.h"
 
diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c b/src/gallium/auxiliary/tgsi/tgsi_exec.c
index dfdcfd35af2..a9a74041a7a 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_exec.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c
@@ -51,7 +51,7 @@
  *   Brian Paul
  */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "pipe/p_shader_tokens.h"
 #include "tgsi/tgsi_dump.h"
diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.h b/src/gallium/auxiliary/tgsi/tgsi_exec.h
index ea6969b8a6a..48bfdd73de3 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_exec.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.h
@@ -29,7 +29,7 @@
 #ifndef TGSI_EXEC_H
 #define TGSI_EXEC_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "pipe/p_shader_tokens.h"
 
diff --git a/src/gallium/auxiliary/tgsi/tgsi_from_mesa.c b/src/gallium/auxiliary/tgsi/tgsi_from_mesa.c
index 4716aaad17a..5128cd16c3b 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_from_mesa.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_from_mesa.c
@@ -23,7 +23,7 @@
 
 #include "tgsi/tgsi_from_mesa.h"
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "util/compiler.h"
 
diff --git a/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h b/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h
index c3595b93c5f..8d07a4ddaf7 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_shader_tokens.h"
 
diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.h b/src/gallium/auxiliary/tgsi/tgsi_info.h
index 140d5bf1f50..34e7af534b7 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_info.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_info.h
@@ -29,7 +29,7 @@
 #define TGSI_INFO_H
 
 #include "compiler/shader_enums.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_shader_tokens.h"
 #include "util/format/u_format.h"
 
diff --git a/src/gallium/auxiliary/tgsi/tgsi_parse.h b/src/gallium/auxiliary/tgsi/tgsi_parse.h
index f11dbbd5eef..92d268d4b31 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_parse.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_parse.h
@@ -28,7 +28,7 @@
 #ifndef TGSI_PARSE_H
 #define TGSI_PARSE_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_shader_tokens.h"
 
 #if defined __cplusplus
diff --git a/src/gallium/auxiliary/tgsi/tgsi_sanity.h b/src/gallium/auxiliary/tgsi/tgsi_sanity.h
index 3b99351d427..25fbd20aef4 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_sanity.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_sanity.h
@@ -28,7 +28,7 @@
 #ifndef TGSI_SANITY_H
 #define TGSI_SANITY_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #if defined __cplusplus
 extern "C" {
diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.h b/src/gallium/auxiliary/tgsi/tgsi_scan.h
index 3ee63490fd1..05dbefe17cf 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.h
@@ -29,7 +29,7 @@
 #define TGSI_SCAN_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "pipe/p_shader_tokens.h"
 
diff --git a/src/gallium/auxiliary/tgsi/tgsi_strings.c b/src/gallium/auxiliary/tgsi/tgsi_strings.c
index 2403a4da5df..1e21c558f65 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_strings.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_strings.c
@@ -27,7 +27,7 @@
  **************************************************************************/
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_memory.h"
 #include "tgsi_strings.h"
 
diff --git a/src/gallium/auxiliary/tgsi/tgsi_text.h b/src/gallium/auxiliary/tgsi/tgsi_text.h
index f103692231e..3b8de2c1dad 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_text.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_text.h
@@ -28,7 +28,7 @@
 #ifndef TGSI_TEXT_H
 #define TGSI_TEXT_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #if defined __cplusplus
 extern "C" {
diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.h b/src/gallium/auxiliary/tgsi/tgsi_ureg.h
index befb486bd88..76efe956fcd 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_ureg.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.h
@@ -30,7 +30,7 @@
 
 #include "pipe/p_defines.h"
 #include "util/format/u_formats.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_shader_tokens.h"
 #include "util/u_debug.h"
 
diff --git a/src/gallium/auxiliary/translate/translate.h b/src/gallium/auxiliary/translate/translate.h
index 93907f9034a..9ee59932e10 100644
--- a/src/gallium/auxiliary/translate/translate.h
+++ b/src/gallium/auxiliary/translate/translate.h
@@ -40,7 +40,7 @@
 #define _TRANSLATE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 
diff --git a/src/gallium/auxiliary/translate/translate_sse.c b/src/gallium/auxiliary/translate/translate_sse.c
index 39bb84e543f..7c597bf07a5 100644
--- a/src/gallium/auxiliary/translate/translate_sse.c
+++ b/src/gallium/auxiliary/translate/translate_sse.c
@@ -27,7 +27,7 @@
 
 
 #include "util/detect.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_memory.h"
 #include "util/u_cpu_detect.h"
 #include "util/u_math.h"
diff --git a/src/gallium/auxiliary/util/u_bitmask.c b/src/gallium/auxiliary/util/u_bitmask.c
index 14e6a25c696..f7185b49a1a 100644
--- a/src/gallium/auxiliary/util/u_bitmask.c
+++ b/src/gallium/auxiliary/util/u_bitmask.c
@@ -33,7 +33,7 @@
  */
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 
 #include "util/u_memory.h"
diff --git a/src/gallium/auxiliary/util/u_bitmask.h b/src/gallium/auxiliary/util/u_bitmask.h
index 7dad2322363..845826fc958 100644
--- a/src/gallium/auxiliary/util/u_bitmask.h
+++ b/src/gallium/auxiliary/util/u_bitmask.h
@@ -36,7 +36,7 @@
 #define U_HANDLE_BITMASK_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 
 #ifdef __cplusplus
diff --git a/src/gallium/auxiliary/util/u_cache.c b/src/gallium/auxiliary/util/u_cache.c
index 5d4a70daabb..c5f35fedc61 100644
--- a/src/gallium/auxiliary/util/u_cache.c
+++ b/src/gallium/auxiliary/util/u_cache.c
@@ -36,7 +36,7 @@
  */
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 
 #include "util/u_math.h"
diff --git a/src/gallium/auxiliary/util/u_cache.h b/src/gallium/auxiliary/util/u_cache.h
index be3631b7254..736530e6453 100644
--- a/src/gallium/auxiliary/util/u_cache.h
+++ b/src/gallium/auxiliary/util/u_cache.h
@@ -36,7 +36,7 @@
 #define U_CACHE_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 
 #ifdef __cplusplus
diff --git a/src/gallium/auxiliary/util/u_debug_flush.c b/src/gallium/auxiliary/util/u_debug_flush.c
index 95aebbb7d4c..45cfdae876d 100644
--- a/src/gallium/auxiliary/util/u_debug_flush.c
+++ b/src/gallium/auxiliary/util/u_debug_flush.c
@@ -38,7 +38,7 @@
  */
 
 #ifdef DEBUG
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/simple_mtx.h"
 #include "util/u_debug_stack.h"
 #include "util/u_debug.h"
diff --git a/src/gallium/auxiliary/util/u_debug_image.h b/src/gallium/auxiliary/util/u_debug_image.h
index 03a5e5ddd48..25a69b3e654 100644
--- a/src/gallium/auxiliary/util/u_debug_image.h
+++ b/src/gallium/auxiliary/util/u_debug_image.h
@@ -28,7 +28,7 @@
 #define U_DEBUG_IMAGE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 
 
diff --git a/src/gallium/auxiliary/util/u_draw.h b/src/gallium/auxiliary/util/u_draw.h
index b5a623e0c72..7214ea91067 100644
--- a/src/gallium/auxiliary/util/u_draw.h
+++ b/src/gallium/auxiliary/util/u_draw.h
@@ -29,7 +29,7 @@
 #define U_DRAW_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 
diff --git a/src/gallium/auxiliary/util/u_draw_quad.h b/src/gallium/auxiliary/util/u_draw_quad.h
index e5b676a5a23..e9eb74254a4 100644
--- a/src/gallium/auxiliary/util/u_draw_quad.h
+++ b/src/gallium/auxiliary/util/u_draw_quad.h
@@ -29,7 +29,7 @@
 #define U_DRAWQUAD_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_context.h"
 
 #include "util/u_draw.h"
diff --git a/src/gallium/auxiliary/util/u_dump.h b/src/gallium/auxiliary/util/u_dump.h
index 910cbbb96ea..ae019f0dc5b 100644
--- a/src/gallium/auxiliary/util/u_dump.h
+++ b/src/gallium/auxiliary/util/u_dump.h
@@ -36,7 +36,7 @@
 #define U_DEBUG_DUMP_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 
 #include <stdio.h>
diff --git a/src/gallium/auxiliary/util/u_dump_state.c b/src/gallium/auxiliary/util/u_dump_state.c
index 353b94221e0..c46a2b2eb4d 100644
--- a/src/gallium/auxiliary/util/u_dump_state.c
+++ b/src/gallium/auxiliary/util/u_dump_state.c
@@ -26,7 +26,7 @@
  **************************************************************************/
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_memory.h"
 #include "util/u_string.h"
 #include "util/format/u_format.h"
diff --git a/src/gallium/auxiliary/util/u_framebuffer.h b/src/gallium/auxiliary/util/u_framebuffer.h
index a07e5d32220..73f71c8f54b 100644
--- a/src/gallium/auxiliary/util/u_framebuffer.h
+++ b/src/gallium/auxiliary/util/u_framebuffer.h
@@ -29,7 +29,7 @@
 #define U_FRAMEBUFFER_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 
 
diff --git a/src/gallium/auxiliary/util/u_handle_table.c b/src/gallium/auxiliary/util/u_handle_table.c
index c6eeeef0f3a..0436f46490b 100644
--- a/src/gallium/auxiliary/util/u_handle_table.c
+++ b/src/gallium/auxiliary/util/u_handle_table.c
@@ -33,7 +33,7 @@
  */
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 
 #include "util/u_memory.h"
diff --git a/src/gallium/auxiliary/util/u_pack_color.h b/src/gallium/auxiliary/util/u_pack_color.h
index 1b0a6a2f2dd..7aea01d40c0 100644
--- a/src/gallium/auxiliary/util/u_pack_color.h
+++ b/src/gallium/auxiliary/util/u_pack_color.h
@@ -35,7 +35,7 @@
 #define U_PACK_COLOR_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "util/format/u_format.h"
 #include "util/u_math.h"
diff --git a/src/gallium/auxiliary/util/u_pstipple.h b/src/gallium/auxiliary/util/u_pstipple.h
index 9f71942e8e0..9234fafdd69 100644
--- a/src/gallium/auxiliary/util/u_pstipple.h
+++ b/src/gallium/auxiliary/util/u_pstipple.h
@@ -29,7 +29,7 @@
 #ifndef U_PSTIPPLE_H
 #define U_PSTIPPLE_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/gallium/auxiliary/util/u_rect.h b/src/gallium/auxiliary/util/u_rect.h
index df6ddbcf8a7..bce396b95a0 100644
--- a/src/gallium/auxiliary/util/u_rect.h
+++ b/src/gallium/auxiliary/util/u_rect.h
@@ -29,7 +29,7 @@
 #ifndef U_RECT_H
 #define U_RECT_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_math.h"
 
 #ifdef __cplusplus
diff --git a/src/gallium/auxiliary/util/u_simple_shaders.h b/src/gallium/auxiliary/util/u_simple_shaders.h
index daecca01737..f7fac851319 100644
--- a/src/gallium/auxiliary/util/u_simple_shaders.h
+++ b/src/gallium/auxiliary/util/u_simple_shaders.h
@@ -30,7 +30,7 @@
 #define U_SIMPLE_SHADERS_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_shader_tokens.h"
 
 
diff --git a/src/gallium/auxiliary/util/u_split_prim.h b/src/gallium/auxiliary/util/u_split_prim.h
index fe048ccc4d0..09545cd4a39 100644
--- a/src/gallium/auxiliary/util/u_split_prim.h
+++ b/src/gallium/auxiliary/util/u_split_prim.h
@@ -4,7 +4,7 @@
 #define U_SPLIT_PRIM_H
 
 #include "pipe/p_defines.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "util/u_debug.h"
 
diff --git a/src/gallium/auxiliary/util/u_sse.h b/src/gallium/auxiliary/util/u_sse.h
index 5d445475ddc..5d1eecc3801 100644
--- a/src/gallium/auxiliary/util/u_sse.h
+++ b/src/gallium/auxiliary/util/u_sse.h
@@ -38,7 +38,7 @@
 #define U_SSE_H_
 
 #include "util/detect.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 
 #if DETECT_ARCH_SSE
diff --git a/src/gallium/auxiliary/util/u_surface.h b/src/gallium/auxiliary/util/u_surface.h
index e5340057747..c635239e846 100644
--- a/src/gallium/auxiliary/util/u_surface.h
+++ b/src/gallium/auxiliary/util/u_surface.h
@@ -29,7 +29,7 @@
 #define U_SURFACE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 
 #include "util/u_pack_color.h"
diff --git a/src/gallium/auxiliary/util/u_tests.h b/src/gallium/auxiliary/util/u_tests.h
index 5ac5d8371df..c26f0732d72 100644
--- a/src/gallium/auxiliary/util/u_tests.h
+++ b/src/gallium/auxiliary/util/u_tests.h
@@ -28,7 +28,7 @@
 #ifndef U_TESTS_H
 #define U_TESTS_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/gallium/auxiliary/util/u_texture.h b/src/gallium/auxiliary/util/u_texture.h
index c1e91137e64..98a0890e2c6 100644
--- a/src/gallium/auxiliary/util/u_texture.h
+++ b/src/gallium/auxiliary/util/u_texture.h
@@ -27,7 +27,7 @@
 #ifndef U_TEXTURE_H
 #define U_TEXTURE_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/gallium/auxiliary/util/u_tile.h b/src/gallium/auxiliary/util/u_tile.h
index e9f0ab03b8f..119373a629d 100644
--- a/src/gallium/auxiliary/util/u_tile.h
+++ b/src/gallium/auxiliary/util/u_tile.h
@@ -28,7 +28,7 @@
 #ifndef P_TILE_H
 #define P_TILE_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 
diff --git a/src/gallium/auxiliary/util/u_upload_mgr.h b/src/gallium/auxiliary/util/u_upload_mgr.h
index edfa0ce5fb1..3ea1822ea6e 100644
--- a/src/gallium/auxiliary/util/u_upload_mgr.h
+++ b/src/gallium/auxiliary/util/u_upload_mgr.h
@@ -32,7 +32,7 @@
 #ifndef U_UPLOAD_MGR_H
 #define U_UPLOAD_MGR_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 
 struct pipe_context;
diff --git a/src/gallium/auxiliary/util/u_video.h b/src/gallium/auxiliary/util/u_video.h
index ae3f024db15..116af07e375 100644
--- a/src/gallium/auxiliary/util/u_video.h
+++ b/src/gallium/auxiliary/util/u_video.h
@@ -32,7 +32,7 @@
 #include "pipe/p_video_enums.h"
 
 /* u_reduce_video_profile() needs these */
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_math.h"
 
diff --git a/src/gallium/auxiliary/vl/vl_compositor_gfx.c b/src/gallium/auxiliary/vl/vl_compositor_gfx.c
index eb33f7b0ca8..b7080c344d9 100644
--- a/src/gallium/auxiliary/vl/vl_compositor_gfx.c
+++ b/src/gallium/auxiliary/vl/vl_compositor_gfx.c
@@ -27,7 +27,7 @@
 
 #include <assert.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_context.h"
 
 #include "util/u_memory.h"
diff --git a/src/gallium/auxiliary/vl/vl_csc.h b/src/gallium/auxiliary/vl/vl_csc.h
index 8623e1b3be5..b640b4e8fde 100644
--- a/src/gallium/auxiliary/vl/vl_csc.h
+++ b/src/gallium/auxiliary/vl/vl_csc.h
@@ -28,7 +28,7 @@
 #ifndef vl_csc_h
 #define vl_csc_h
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 typedef float vl_csc_matrix[3][4];
 
diff --git a/src/gallium/auxiliary/vl/vl_zscan.h b/src/gallium/auxiliary/vl/vl_zscan.h
index 978503d589f..135e7c3bafd 100644
--- a/src/gallium/auxiliary/vl/vl_zscan.h
+++ b/src/gallium/auxiliary/vl/vl_zscan.h
@@ -28,7 +28,7 @@
 #ifndef vl_zscan_h
 #define vl_zscan_h
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 
 #ifdef __cplusplus
diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler.h b/src/gallium/drivers/etnaviv/etnaviv_compiler.h
index 08a3852c5d7..f86a08c87a2 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_compiler.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_compiler.h
@@ -30,7 +30,7 @@
 #include "etnaviv_context.h"
 #include "etnaviv_internal.h"
 #include "etnaviv_shader.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_shader_tokens.h"
 #include "compiler/shader_enums.h"
 #include "util/disk_cache.h"
diff --git a/src/gallium/drivers/i915/i915_query.c b/src/gallium/drivers/i915/i915_query.c
index 8d4402b6820..4e53d0d1552 100644
--- a/src/gallium/drivers/i915/i915_query.c
+++ b/src/gallium/drivers/i915/i915_query.c
@@ -27,7 +27,7 @@
 
 /* Fake occlusion queries which return 0, it's better than crashing */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "util/u_memory.h"
 
diff --git a/src/gallium/drivers/i915/i915_state_inlines.h b/src/gallium/drivers/i915/i915_state_inlines.h
index 8d7885ec6d3..9c1415e1e8d 100644
--- a/src/gallium/drivers/i915/i915_state_inlines.h
+++ b/src/gallium/drivers/i915/i915_state_inlines.h
@@ -28,7 +28,7 @@
 #ifndef I915_STATE_INLINES_H
 #define I915_STATE_INLINES_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "util/u_debug.h"
 #include "i915_reg.h"
diff --git a/src/gallium/drivers/i915/i915_winsys.h b/src/gallium/drivers/i915/i915_winsys.h
index 7d99ce98804..aaa0154b300 100644
--- a/src/gallium/drivers/i915/i915_winsys.h
+++ b/src/gallium/drivers/i915/i915_winsys.h
@@ -26,7 +26,7 @@
 #ifndef I915_WINSYS_H
 #define I915_WINSYS_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct i915_winsys;
 struct i915_winsys_buffer;
diff --git a/src/gallium/drivers/llvmpipe/lp_bld_alpha.h b/src/gallium/drivers/llvmpipe/lp_bld_alpha.h
index ca483ad4b1b..cf2d85b6ed6 100644
--- a/src/gallium/drivers/llvmpipe/lp_bld_alpha.h
+++ b/src/gallium/drivers/llvmpipe/lp_bld_alpha.h
@@ -34,7 +34,7 @@
 #ifndef LP_BLD_ALPHA_H
 #define LP_BLD_ALPHA_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "gallivm/lp_bld.h"
 
diff --git a/src/gallium/drivers/llvmpipe/lp_bld_depth.h b/src/gallium/drivers/llvmpipe/lp_bld_depth.h
index 6cb8d69b225..a38dbd07d0e 100644
--- a/src/gallium/drivers/llvmpipe/lp_bld_depth.h
+++ b/src/gallium/drivers/llvmpipe/lp_bld_depth.h
@@ -36,7 +36,7 @@
 #define LP_BLD_DEPTH_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 
 #include "gallivm/lp_bld.h"
diff --git a/src/gallium/drivers/llvmpipe/lp_cs_tpool.h b/src/gallium/drivers/llvmpipe/lp_cs_tpool.h
index 22c0d10e7d4..3d7ac028aab 100644
--- a/src/gallium/drivers/llvmpipe/lp_cs_tpool.h
+++ b/src/gallium/drivers/llvmpipe/lp_cs_tpool.h
@@ -34,7 +34,7 @@
 #ifndef LP_CS_QUEUE
 #define LP_CS_QUEUE
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "util/u_thread.h"
 #include "util/list.h"
diff --git a/src/gallium/drivers/llvmpipe/lp_debug.h b/src/gallium/drivers/llvmpipe/lp_debug.h
index 56cb706b9b0..2212a8232b9 100644
--- a/src/gallium/drivers/llvmpipe/lp_debug.h
+++ b/src/gallium/drivers/llvmpipe/lp_debug.h
@@ -29,7 +29,7 @@
 #ifndef LP_DEBUG_H
 #define LP_DEBUG_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 
 #define DEBUG_PIPE      0x1
diff --git a/src/gallium/drivers/llvmpipe/lp_flush.h b/src/gallium/drivers/llvmpipe/lp_flush.h
index 4d1c2df6819..4aad8619995 100644
--- a/src/gallium/drivers/llvmpipe/lp_flush.h
+++ b/src/gallium/drivers/llvmpipe/lp_flush.h
@@ -28,7 +28,7 @@
 #ifndef LP_FLUSH_H
 #define LP_FLUSH_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct pipe_context;
 struct pipe_fence_handle;
diff --git a/src/gallium/drivers/llvmpipe/lp_memory.h b/src/gallium/drivers/llvmpipe/lp_memory.h
index aee3c39ef76..00f5bea3f37 100644
--- a/src/gallium/drivers/llvmpipe/lp_memory.h
+++ b/src/gallium/drivers/llvmpipe/lp_memory.h
@@ -29,7 +29,7 @@
 #define LP_MEMORY_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "lp_limits.h"
 #include "gallivm/lp_bld_type.h"
diff --git a/src/gallium/drivers/llvmpipe/lp_perf.h b/src/gallium/drivers/llvmpipe/lp_perf.h
index 61e3fa8ddbc..61019218a0c 100644
--- a/src/gallium/drivers/llvmpipe/lp_perf.h
+++ b/src/gallium/drivers/llvmpipe/lp_perf.h
@@ -33,7 +33,7 @@
 #ifndef LP_PERF_H
 #define LP_PERF_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 /**
  * Various counters
diff --git a/src/gallium/drivers/llvmpipe/lp_rast.h b/src/gallium/drivers/llvmpipe/lp_rast.h
index 13ae6ab87b1..12f7082b6a2 100644
--- a/src/gallium/drivers/llvmpipe/lp_rast.h
+++ b/src/gallium/drivers/llvmpipe/lp_rast.h
@@ -37,7 +37,7 @@
 #ifndef LP_RAST_H
 #define LP_RAST_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_pack_color.h"
 #include "util/u_rect.h"
 #include "lp_jit.h"
diff --git a/src/gallium/drivers/llvmpipe/lp_scene_queue.h b/src/gallium/drivers/llvmpipe/lp_scene_queue.h
index 1ce71c778c2..23e047eb8c6 100644
--- a/src/gallium/drivers/llvmpipe/lp_scene_queue.h
+++ b/src/gallium/drivers/llvmpipe/lp_scene_queue.h
@@ -29,7 +29,7 @@
 #ifndef LP_SCENE_QUEUE
 #define LP_SCENE_QUEUE
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct lp_scene_queue;
 struct lp_scene;
diff --git a/src/gallium/drivers/llvmpipe/lp_setup.h b/src/gallium/drivers/llvmpipe/lp_setup.h
index 8d330045921..28ae673f6f7 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup.h
+++ b/src/gallium/drivers/llvmpipe/lp_setup.h
@@ -27,7 +27,7 @@
 #ifndef LP_SETUP_H
 #define LP_SETUP_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "lp_jit.h"
 
 struct draw_context;
diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.h b/src/gallium/drivers/llvmpipe/lp_state_fs.h
index 05febde318f..023b7e83b36 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.h
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.h
@@ -31,7 +31,7 @@
 
 
 #include "util/list.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "gallivm/lp_bld_sample.h" /* for struct lp_sampler_static_state */
 #include "gallivm/lp_bld_jit_sample.h"
diff --git a/src/gallium/drivers/nouveau/nv30/nvfx_shader.h b/src/gallium/drivers/nouveau/nv30/nvfx_shader.h
index 907ca17b0aa..e6e7051e921 100644
--- a/src/gallium/drivers/nouveau/nv30/nvfx_shader.h
+++ b/src/gallium/drivers/nouveau/nv30/nvfx_shader.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #define NVFX_SWZ_IDENTITY ((3 << 6) | (2 << 4) | (1 << 2) | (0 << 0))
 
diff --git a/src/gallium/drivers/panfrost/pan_context.h b/src/gallium/drivers/panfrost/pan_context.h
index 844088c4846..32be6d7f6d1 100644
--- a/src/gallium/drivers/panfrost/pan_context.h
+++ b/src/gallium/drivers/panfrost/pan_context.h
@@ -35,11 +35,11 @@
 #include "pan_resource.h"
 #include "pan_texture.h"
 
-#include "pipe/p_compiler.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_state.h"
+#include "util/compiler.h"
 #include "util/detect.h"
 #include "util/format/u_formats.h"
 #include "util/hash_table.h"
diff --git a/src/gallium/drivers/r300/r300_chipset.h b/src/gallium/drivers/r300/r300_chipset.h
index 3d16c678989..4663203a1a9 100644
--- a/src/gallium/drivers/r300/r300_chipset.h
+++ b/src/gallium/drivers/r300/r300_chipset.h
@@ -23,7 +23,7 @@
 #ifndef R300_CHIPSET_H
 #define R300_CHIPSET_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 /* these are sizes in dwords */
 #define R300_HIZ_LIMIT 10240
diff --git a/src/gallium/drivers/r300/r300_screen_buffer.h b/src/gallium/drivers/r300/r300_screen_buffer.h
index da37d34cea2..87069504a8c 100644
--- a/src/gallium/drivers/r300/r300_screen_buffer.h
+++ b/src/gallium/drivers/r300/r300_screen_buffer.h
@@ -27,7 +27,7 @@
 #define R300_SCREEN_BUFFER_H
 
 #include <stdio.h>
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "util/u_transfer.h"
 
diff --git a/src/gallium/drivers/r300/r300_texture.h b/src/gallium/drivers/r300/r300_texture.h
index f18794b71a7..5859ee090a9 100644
--- a/src/gallium/drivers/r300/r300_texture.h
+++ b/src/gallium/drivers/r300/r300_texture.h
@@ -23,7 +23,7 @@
 #ifndef R300_TEXTURE_H
 #define R300_TEXTURE_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "pipe/p_screen.h"
 
diff --git a/src/gallium/drivers/r300/r300_tgsi_to_rc.h b/src/gallium/drivers/r300/r300_tgsi_to_rc.h
index 4dc3ddca738..049cb1e0b51 100644
--- a/src/gallium/drivers/r300/r300_tgsi_to_rc.h
+++ b/src/gallium/drivers/r300/r300_tgsi_to_rc.h
@@ -23,7 +23,7 @@
 #ifndef R300_TGSI_TO_RC_H
 #define R300_TGSI_TO_RC_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct radeon_compiler;
 
diff --git a/src/gallium/drivers/softpipe/sp_flush.h b/src/gallium/drivers/softpipe/sp_flush.h
index 0919eda7c19..752f25e0b2c 100644
--- a/src/gallium/drivers/softpipe/sp_flush.h
+++ b/src/gallium/drivers/softpipe/sp_flush.h
@@ -28,7 +28,7 @@
 #ifndef SP_FLUSH_H
 #define SP_FLUSH_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct pipe_context;
 struct pipe_fence_handle;
diff --git a/src/gallium/drivers/softpipe/sp_tex_tile_cache.h b/src/gallium/drivers/softpipe/sp_tex_tile_cache.h
index 2e4635f3811..a6bb2eb5a6d 100644
--- a/src/gallium/drivers/softpipe/sp_tex_tile_cache.h
+++ b/src/gallium/drivers/softpipe/sp_tex_tile_cache.h
@@ -29,7 +29,7 @@
 #define SP_TEX_TILE_CACHE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "sp_limits.h"
 
 
diff --git a/src/gallium/drivers/softpipe/sp_tile_cache.h b/src/gallium/drivers/softpipe/sp_tile_cache.h
index 0d6d93d6c71..dbb46d32d83 100644
--- a/src/gallium/drivers/softpipe/sp_tile_cache.h
+++ b/src/gallium/drivers/softpipe/sp_tile_cache.h
@@ -29,7 +29,7 @@
 #define SP_TILE_CACHE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "sp_texture.h"
 
 
diff --git a/src/gallium/drivers/svga/include/svga_types.h b/src/gallium/drivers/svga/include/svga_types.h
index 611e8de87be..1782d98957a 100644
--- a/src/gallium/drivers/svga/include/svga_types.h
+++ b/src/gallium/drivers/svga/include/svga_types.h
@@ -26,7 +26,7 @@
 #ifndef _SVGA_TYPES_H_
 #define _SVGA_TYPES_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #ifndef __HAIKU__
 typedef int64_t int64;
diff --git a/src/gallium/drivers/svga/svga_debug.h b/src/gallium/drivers/svga/svga_debug.h
index 8b43279a9ac..7ce69de5d34 100644
--- a/src/gallium/drivers/svga/svga_debug.h
+++ b/src/gallium/drivers/svga/svga_debug.h
@@ -26,7 +26,7 @@
 #ifndef SVGA_DEBUG_H
 #define SVGA_DEBUG_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 
 #define DEBUG_DMA          0x1
diff --git a/src/gallium/drivers/svga/svga_draw.c b/src/gallium/drivers/svga/svga_draw.c
index 91ac04f705c..00c8a8cf38d 100644
--- a/src/gallium/drivers/svga/svga_draw.c
+++ b/src/gallium/drivers/svga/svga_draw.c
@@ -23,7 +23,7 @@
  *
  **********************************************************/
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_inlines.h"
 #include "pipe/p_defines.h"
 #include "util/u_helpers.h"
diff --git a/src/gallium/drivers/svga/svga_draw.h b/src/gallium/drivers/svga/svga_draw.h
index 345539a30ac..a97a295edc1 100644
--- a/src/gallium/drivers/svga/svga_draw.h
+++ b/src/gallium/drivers/svga/svga_draw.h
@@ -26,7 +26,7 @@
 #ifndef SVGA_DRAW_H
 #define SVGA_DRAW_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "svga_hw_reg.h"
 
diff --git a/src/gallium/drivers/svga/svga_draw_private.h b/src/gallium/drivers/svga/svga_draw_private.h
index 329f5394e39..71940489b38 100644
--- a/src/gallium/drivers/svga/svga_draw_private.h
+++ b/src/gallium/drivers/svga/svga_draw_private.h
@@ -26,7 +26,7 @@
 #ifndef SVGA_DRAW_H_
 #define SVGA_DRAW_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "indices/u_indices.h"
 #include "util/u_prim.h"
diff --git a/src/gallium/drivers/svga/svga_hw_reg.h b/src/gallium/drivers/svga/svga_hw_reg.h
index 91e50e4ee1d..b3653efd13e 100644
--- a/src/gallium/drivers/svga/svga_hw_reg.h
+++ b/src/gallium/drivers/svga/svga_hw_reg.h
@@ -26,7 +26,7 @@
 #ifndef SVGA_HW_REG_H
 #define SVGA_HW_REG_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "svga_types.h"
 
diff --git a/src/gallium/drivers/svga/svga_resource_buffer.h b/src/gallium/drivers/svga/svga_resource_buffer.h
index 8eee8940321..ddde5860e30 100644
--- a/src/gallium/drivers/svga/svga_resource_buffer.h
+++ b/src/gallium/drivers/svga/svga_resource_buffer.h
@@ -27,7 +27,7 @@
 #define SVGA_BUFFER_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "util/u_transfer.h"
 
diff --git a/src/gallium/drivers/svga/svga_resource_texture.h b/src/gallium/drivers/svga/svga_resource_texture.h
index bad5c18bb59..118b5c43d05 100644
--- a/src/gallium/drivers/svga/svga_resource_texture.h
+++ b/src/gallium/drivers/svga/svga_resource_texture.h
@@ -27,7 +27,7 @@
 #define SVGA_TEXTURE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"
 #include "util/u_memory.h"
diff --git a/src/gallium/drivers/svga/svga_sampler_view.h b/src/gallium/drivers/svga/svga_sampler_view.h
index 8adae9aa2ef..d2ddde07786 100644
--- a/src/gallium/drivers/svga/svga_sampler_view.h
+++ b/src/gallium/drivers/svga/svga_sampler_view.h
@@ -27,7 +27,7 @@
 #define SVGA_SAMPLER_VIEW_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"
 #include "svga_screen_cache.h"
diff --git a/src/gallium/drivers/svga/svga_state.h b/src/gallium/drivers/svga/svga_state.h
index 4fc4519d6a1..6a871f7add3 100644
--- a/src/gallium/drivers/svga/svga_state.h
+++ b/src/gallium/drivers/svga/svga_state.h
@@ -27,7 +27,7 @@
 #define SVGA_STATE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 
 struct svga_context;
diff --git a/src/gallium/drivers/svga/svga_surface.h b/src/gallium/drivers/svga/svga_surface.h
index e97a392ac23..b2745f44dfe 100644
--- a/src/gallium/drivers/svga/svga_surface.h
+++ b/src/gallium/drivers/svga/svga_surface.h
@@ -27,7 +27,7 @@
 #define SVGA_SURFACE_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"
 #include "svga_screen_cache.h"
diff --git a/src/gallium/drivers/svga/svga_swtnl.h b/src/gallium/drivers/svga/svga_swtnl.h
index 0258993944c..baa627c18b0 100644
--- a/src/gallium/drivers/svga/svga_swtnl.h
+++ b/src/gallium/drivers/svga/svga_swtnl.h
@@ -26,7 +26,7 @@
 #ifndef SVGA_SWTNL_H
 #define SVGA_SWTNL_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct svga_context;
 struct pipe_context;
diff --git a/src/gallium/drivers/svga/svga_tgsi.c b/src/gallium/drivers/svga/svga_tgsi.c
index b6a1adce83d..3a4a1acf3ea 100644
--- a/src/gallium/drivers/svga/svga_tgsi.c
+++ b/src/gallium/drivers/svga/svga_tgsi.c
@@ -24,7 +24,7 @@
  **********************************************************/
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_shader_tokens.h"
 #include "pipe/p_defines.h"
 #include "tgsi/tgsi_dump.h"
diff --git a/src/gallium/drivers/svga/svga_tgsi.h b/src/gallium/drivers/svga/svga_tgsi.h
index 451912303cc..8009b29a570 100644
--- a/src/gallium/drivers/svga/svga_tgsi.h
+++ b/src/gallium/drivers/svga/svga_tgsi.h
@@ -26,7 +26,7 @@
 #ifndef SVGA_TGSI_H
 #define SVGA_TGSI_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "svga3d_reg.h"
 
 
diff --git a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
index 5cb65d37a04..171e8fc62fa 100644
--- a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
+++ b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c
@@ -32,7 +32,7 @@
  * \author Brian Paul
  */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_shader_tokens.h"
 #include "pipe/p_defines.h"
 #include "tgsi/tgsi_dump.h"
diff --git a/src/gallium/drivers/svga/svga_winsys.h b/src/gallium/drivers/svga/svga_winsys.h
index 630cb20030f..4c4ae8f8861 100644
--- a/src/gallium/drivers/svga/svga_winsys.h
+++ b/src/gallium/drivers/svga/svga_winsys.h
@@ -40,7 +40,7 @@
 #include "svga_reg.h"
 #include "svga3d_reg.h"
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 
 #include "svga_mksstats.h"
diff --git a/src/gallium/drivers/svga/svgadump/svga_dump.h b/src/gallium/drivers/svga/svgadump/svga_dump.h
index ca0154361cc..f6f971c259b 100644
--- a/src/gallium/drivers/svga/svgadump/svga_dump.h
+++ b/src/gallium/drivers/svga/svgadump/svga_dump.h
@@ -26,7 +26,7 @@
 #ifndef SVGA_DUMP_H_
 #define SVGA_DUMP_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 void            
 svga_dump_command(uint32_t cmd_id, const void *data, uint32_t size);
diff --git a/src/gallium/drivers/svga/svgadump/svga_shader.h b/src/gallium/drivers/svga/svgadump/svga_shader.h
index 0a2e3d5f345..41a40d4d3fd 100644
--- a/src/gallium/drivers/svga/svgadump/svga_shader.h
+++ b/src/gallium/drivers/svga/svgadump/svga_shader.h
@@ -33,7 +33,7 @@
 #ifndef ST_SHADER_SVGA_H
 #define ST_SHADER_SVGA_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct sh_op
 {
diff --git a/src/gallium/frontends/dri/dri_context.h b/src/gallium/frontends/dri/dri_context.h
index 60bf8646701..e008ed34912 100644
--- a/src/gallium/frontends/dri/dri_context.h
+++ b/src/gallium/frontends/dri/dri_context.h
@@ -33,7 +33,7 @@
 #define DRI_CONTEXT_H
 
 #include "dri_util.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "hud/hud_context.h"
 
 struct pipe_context;
diff --git a/src/gallium/frontends/dri/dri_drawable.h b/src/gallium/frontends/dri/dri_drawable.h
index dc7e5e32467..eaa7c35fda0 100644
--- a/src/gallium/frontends/dri/dri_drawable.h
+++ b/src/gallium/frontends/dri/dri_drawable.h
@@ -28,7 +28,7 @@
 #ifndef DRI_DRAWABLE_H
 #define DRI_DRAWABLE_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "frontend/api.h"
 #include "dri_util.h"
diff --git a/src/gallium/frontends/dri/dri_screen.h b/src/gallium/frontends/dri/dri_screen.h
index 24ddbf49163..b35d623c926 100644
--- a/src/gallium/frontends/dri/dri_screen.h
+++ b/src/gallium/frontends/dri/dri_screen.h
@@ -34,7 +34,7 @@
 
 #include "dri_util.h"
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 #include "frontend/api.h"
diff --git a/src/gallium/frontends/glx/xlib/glx_api.c b/src/gallium/frontends/glx/xlib/glx_api.c
index dd10b52302b..28022c87832 100644
--- a/src/gallium/frontends/glx/xlib/glx_api.c
+++ b/src/gallium/frontends/glx/xlib/glx_api.c
@@ -41,7 +41,7 @@
 #include "xm_api.h"
 #include "main/errors.h"
 #include "main/config.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 
diff --git a/src/gallium/frontends/glx/xlib/glx_getproc.c b/src/gallium/frontends/glx/xlib/glx_getproc.c
index 5fe0fe23417..bfc52f032c7 100644
--- a/src/gallium/frontends/glx/xlib/glx_getproc.c
+++ b/src/gallium/frontends/glx/xlib/glx_getproc.c
@@ -32,7 +32,7 @@
 #define GLX_GLXEXT_PROTOTYPES
 
 #include <string.h>
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "GL/glx.h"
 #include "glapi/glapi.h"
 
diff --git a/src/gallium/frontends/glx/xlib/xm_st.h b/src/gallium/frontends/glx/xlib/xm_st.h
index d6817f5ff5d..1150fe890c2 100644
--- a/src/gallium/frontends/glx/xlib/xm_st.h
+++ b/src/gallium/frontends/glx/xlib/xm_st.h
@@ -28,7 +28,7 @@
 #ifndef _XM_ST_H_
 #define _XM_ST_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "frontend/api.h"
 
 #include "xm_api.h"
diff --git a/src/gallium/frontends/hgl/hgl_context.h b/src/gallium/frontends/hgl/hgl_context.h
index 03e567af2de..f5d44ede9c1 100644
--- a/src/gallium/frontends/hgl/hgl_context.h
+++ b/src/gallium/frontends/hgl/hgl_context.h
@@ -10,7 +10,7 @@
 
 #include "util/u_thread.h"
 #include "util/format/u_formats.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_screen.h"
 #include "postprocess/filters.h"
 
diff --git a/src/gallium/frontends/nine/guid.h b/src/gallium/frontends/nine/guid.h
index ed616986215..be1b34ac859 100644
--- a/src/gallium/frontends/nine/guid.h
+++ b/src/gallium/frontends/nine/guid.h
@@ -23,7 +23,7 @@
 #ifndef _NINE_GUID_H_
 #define _NINE_GUID_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "d3d9types.h"
 
diff --git a/src/gallium/frontends/nine/iunknown.h b/src/gallium/frontends/nine/iunknown.h
index 98e63e87830..cdf27fa9551 100644
--- a/src/gallium/frontends/nine/iunknown.h
+++ b/src/gallium/frontends/nine/iunknown.h
@@ -23,7 +23,7 @@
 #ifndef _NINE_IUNKNOWN_H_
 #define _NINE_IUNKNOWN_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "util/u_atomic.h"
 #include "util/u_memory.h"
diff --git a/src/gallium/frontends/nine/nine_debug.h b/src/gallium/frontends/nine/nine_debug.h
index 6f7652ef469..a4b0363f996 100644
--- a/src/gallium/frontends/nine/nine_debug.h
+++ b/src/gallium/frontends/nine/nine_debug.h
@@ -24,7 +24,7 @@
 #define _NINE_DEBUG_H_
 
 #include "util/u_debug.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 void
 _nine_debug_printf( unsigned long flag,
diff --git a/src/gallium/frontends/nine/nine_flags.h b/src/gallium/frontends/nine/nine_flags.h
index 3b81a09cee4..cf689c7a199 100644
--- a/src/gallium/frontends/nine/nine_flags.h
+++ b/src/gallium/frontends/nine/nine_flags.h
@@ -3,7 +3,7 @@
 #ifndef _NINE_FLAGS_H_
 #define _NINE_FLAGS_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 /* Incoming 32 bits calls are 4-byte aligned.
  * We need to realign them to be able to use
@@ -11,4 +11,4 @@
  */
 #define NINE_WINAPI WINAPI UTIL_ALIGN_STACK
 
-#endif /* _NINE_FLAGS_H_ */
\ No newline at end of file
+#endif /* _NINE_FLAGS_H_ */
diff --git a/src/gallium/frontends/nine/nine_queue.h b/src/gallium/frontends/nine/nine_queue.h
index 52f6cbdfa87..8d298d8d73b 100644
--- a/src/gallium/frontends/nine/nine_queue.h
+++ b/src/gallium/frontends/nine/nine_queue.h
@@ -23,7 +23,7 @@
 #ifndef _NINE_QUEUE_H_
 #define _NINE_QUEUE_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct nine_queue_pool;
 
diff --git a/src/gallium/frontends/nine/nine_quirk.h b/src/gallium/frontends/nine/nine_quirk.h
index f1587fe4a4b..977d8f9895c 100644
--- a/src/gallium/frontends/nine/nine_quirk.h
+++ b/src/gallium/frontends/nine/nine_quirk.h
@@ -23,7 +23,7 @@
 #ifndef _NINE_QUIRK_H_
 #define _NINE_QUIRK_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 bool
 _nine_get_quirk( unsigned quirk );
diff --git a/src/gallium/frontends/vdpau/device.c b/src/gallium/frontends/vdpau/device.c
index baffa5df534..a8681d2b872 100644
--- a/src/gallium/frontends/vdpau/device.c
+++ b/src/gallium/frontends/vdpau/device.c
@@ -25,7 +25,7 @@
  *
  **************************************************************************/
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "util/u_memory.h"
 #include "util/u_debug.h"
diff --git a/src/gallium/frontends/vdpau/vdpau_private.h b/src/gallium/frontends/vdpau/vdpau_private.h
index 5bbb63b2cc6..22538ee214f 100644
--- a/src/gallium/frontends/vdpau/vdpau_private.h
+++ b/src/gallium/frontends/vdpau/vdpau_private.h
@@ -33,7 +33,7 @@
 #include <vdpau/vdpau.h>
 #include <vdpau/vdpau_x11.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_video_codec.h"
 
 #include "frontend/vdpau_interop.h"
diff --git a/src/gallium/frontends/wgl/stw_context.c b/src/gallium/frontends/wgl/stw_context.c
index 48ee6baf175..946dbc430c9 100644
--- a/src/gallium/frontends/wgl/stw_context.c
+++ b/src/gallium/frontends/wgl/stw_context.c
@@ -34,7 +34,7 @@
 #include <GL/gl.h>
 #include <GL/wglext.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 #include "util/compiler.h"
diff --git a/src/gallium/frontends/wgl/stw_device.h b/src/gallium/frontends/wgl/stw_device.h
index 385f9c32eb3..7f70aedf65b 100644
--- a/src/gallium/frontends/wgl/stw_device.h
+++ b/src/gallium/frontends/wgl/stw_device.h
@@ -29,7 +29,7 @@
 #define STW_DEVICE_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "frontend/api.h"
 #include "util/u_handle_table.h"
 #include "util/u_dynarray.h"
diff --git a/src/gallium/frontends/wgl/stw_ext_pixelformat.c b/src/gallium/frontends/wgl/stw_ext_pixelformat.c
index fb8facb1289..e4c6953ad9b 100644
--- a/src/gallium/frontends/wgl/stw_ext_pixelformat.c
+++ b/src/gallium/frontends/wgl/stw_ext_pixelformat.c
@@ -41,7 +41,7 @@
 #include <GL/gl.h>
 #include <GL/wglext.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_format.h"
 #include "util/u_memory.h"
 #include "stw_device.h"
diff --git a/src/gallium/frontends/wgl/stw_pixelformat.h b/src/gallium/frontends/wgl/stw_pixelformat.h
index a53a6b61074..e76b608b8ec 100644
--- a/src/gallium/frontends/wgl/stw_pixelformat.h
+++ b/src/gallium/frontends/wgl/stw_pixelformat.h
@@ -34,7 +34,7 @@
 #define PFD_SUPPORT_COMPOSITION 0x00008000
 #endif
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "frontend/api.h"
 
diff --git a/src/gallium/frontends/wgl/stw_tls.c b/src/gallium/frontends/wgl/stw_tls.c
index e1d00dff04d..3bded9d2b70 100644
--- a/src/gallium/frontends/wgl/stw_tls.c
+++ b/src/gallium/frontends/wgl/stw_tls.c
@@ -28,7 +28,7 @@
 #include <windows.h>
 #include <tlhelp32.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "stw_tls.h"
 
diff --git a/src/gallium/frontends/wgl/stw_winsys.h b/src/gallium/frontends/wgl/stw_winsys.h
index 1e84675be6a..ebf2a3a2f76 100644
--- a/src/gallium/frontends/wgl/stw_winsys.h
+++ b/src/gallium/frontends/wgl/stw_winsys.h
@@ -30,7 +30,7 @@
 
 #include <windows.h> /* for HDC */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "frontend/api.h"
 
 struct pipe_screen;
diff --git a/src/gallium/include/frontend/drisw_api.h b/src/gallium/include/frontend/drisw_api.h
index 4b5d36c1797..037f4b65113 100644
--- a/src/gallium/include/frontend/drisw_api.h
+++ b/src/gallium/include/frontend/drisw_api.h
@@ -1,7 +1,7 @@
 #ifndef _DRISW_API_H_
 #define _DRISW_API_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "sw_winsys.h"
 
 struct pipe_screen;
diff --git a/src/gallium/include/frontend/drm_driver.h b/src/gallium/include/frontend/drm_driver.h
index f1824128e3a..50f47b72970 100644
--- a/src/gallium/include/frontend/drm_driver.h
+++ b/src/gallium/include/frontend/drm_driver.h
@@ -2,7 +2,7 @@
 #ifndef _DRM_DRIVER_H_
 #define _DRM_DRIVER_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "winsys_handle.h"
 
diff --git a/src/gallium/include/frontend/sw_driver.h b/src/gallium/include/frontend/sw_driver.h
index 6223ff9f0ef..161e05e9419 100644
--- a/src/gallium/include/frontend/sw_driver.h
+++ b/src/gallium/include/frontend/sw_driver.h
@@ -2,7 +2,7 @@
 #ifndef _SW_DRIVER_H_
 #define _SW_DRIVER_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct pipe_screen;
 struct sw_winsys;
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
deleted file mode 100644
index 41a1d269bdd..00000000000
--- a/src/gallium/include/pipe/p_compiler.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2007-2008 VMware, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- **************************************************************************/
-
-#ifndef P_COMPILER_H
-#define P_COMPILER_H
-
-
-#include "util/compiler.h"
-
-#endif /* P_COMPILER_H */
diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
index d6a88554b11..590a00bda4b 100644
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -28,7 +28,7 @@
 #ifndef PIPE_CONTEXT_H
 #define PIPE_CONTEXT_H
 
-#include "p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "p_video_enums.h"
 #include "p_defines.h"
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index c3222f986c5..a96b04072b1 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -28,7 +28,7 @@
 #ifndef PIPE_DEFINES_H
 #define PIPE_DEFINES_H
 
-#include "p_compiler.h"
+#include "util/compiler.h"
 
 #include "compiler/shader_enums.h"
 #include "util/os_time.h"
diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h
index 77bf6ab68d4..0c3c096bc36 100644
--- a/src/gallium/include/pipe/p_screen.h
+++ b/src/gallium/include/pipe/p_screen.h
@@ -38,7 +38,7 @@
 #define P_SCREEN_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_video_enums.h"
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 8d412f522c7..1c3f77f6588 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -46,7 +46,7 @@
 
 #include "util/u_memory.h"
 
-#include "p_compiler.h"
+#include "util/compiler.h"
 #include "p_defines.h"
 #include "util/format/u_formats.h"
 
diff --git a/src/gallium/targets/libgl-xlib/xlib.c b/src/gallium/targets/libgl-xlib/xlib.c
index 4515b7682d4..fa1c4d25824 100644
--- a/src/gallium/targets/libgl-xlib/xlib.c
+++ b/src/gallium/targets/libgl-xlib/xlib.c
@@ -30,7 +30,7 @@
  * Authors:
  *   Keith Whitwell
  */
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "sw/xlib/xlib_sw_winsys.h"
 
diff --git a/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c b/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c
index e5302400d60..5315fd7a954 100644
--- a/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c
+++ b/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c
@@ -42,7 +42,7 @@
 #endif
 #include <inttypes.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "util/u_debug.h"
 #include "util/u_thread.h"
diff --git a/src/gallium/winsys/svga/drm/vmw_buffer.h b/src/gallium/winsys/svga/drm/vmw_buffer.h
index 4068ace37cb..deebb0efd6c 100644
--- a/src/gallium/winsys/svga/drm/vmw_buffer.h
+++ b/src/gallium/winsys/svga/drm/vmw_buffer.h
@@ -28,7 +28,7 @@
 #define VMW_BUFFER_H_
 
 #include <assert.h>
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipebuffer/pb_bufmgr.h"
 #include "util/u_debug_flush.h"
 
diff --git a/src/gallium/winsys/svga/drm/vmw_context.h b/src/gallium/winsys/svga/drm/vmw_context.h
index 87d54e5b8ea..347e05d8c3f 100644
--- a/src/gallium/winsys/svga/drm/vmw_context.h
+++ b/src/gallium/winsys/svga/drm/vmw_context.h
@@ -32,7 +32,7 @@
 #define VMW_CONTEXT_H_
 
 #include <stdio.h>
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct svga_winsys_screen;
 struct svga_winsys_context;
diff --git a/src/gallium/winsys/svga/drm/vmw_fence.h b/src/gallium/winsys/svga/drm/vmw_fence.h
index aab558f6b3d..7c6b57ac905 100644
--- a/src/gallium/winsys/svga/drm/vmw_fence.h
+++ b/src/gallium/winsys/svga/drm/vmw_fence.h
@@ -28,7 +28,7 @@
 #define VMW_FENCE_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipebuffer/pb_buffer_fenced.h"
 
 struct pipe_fence_handle;
diff --git a/src/gallium/winsys/svga/drm/vmw_screen.c b/src/gallium/winsys/svga/drm/vmw_screen.c
index e585659da4a..7db2872e499 100644
--- a/src/gallium/winsys/svga/drm/vmw_screen.c
+++ b/src/gallium/winsys/svga/drm/vmw_screen.c
@@ -32,7 +32,7 @@
 
 #include "util/os_file.h"
 #include "util/u_memory.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_hash_table.h"
 #ifdef MAJOR_IN_MKDEV
 #include <sys/mkdev.h>
diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h
index 4b7561ff64a..d6d02dab64f 100644
--- a/src/gallium/winsys/svga/drm/vmw_screen.h
+++ b/src/gallium/winsys/svga/drm/vmw_screen.h
@@ -35,7 +35,7 @@
 #define VMW_SCREEN_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_state.h"
 
 #include "svga_winsys.h"
diff --git a/src/gallium/winsys/svga/drm/vmw_screen_dri.c b/src/gallium/winsys/svga/drm/vmw_screen_dri.c
index 73f7651a468..dfcc15b64e8 100644
--- a/src/gallium/winsys/svga/drm/vmw_screen_dri.c
+++ b/src/gallium/winsys/svga/drm/vmw_screen_dri.c
@@ -24,7 +24,7 @@
  **********************************************************/
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_inlines.h"
 #include "util/u_memory.h"
 #include "util/format/u_format.h"
diff --git a/src/gallium/winsys/svga/drm/vmw_shader.h b/src/gallium/winsys/svga/drm/vmw_shader.h
index a62a814471d..d851be4ea8a 100644
--- a/src/gallium/winsys/svga/drm/vmw_shader.h
+++ b/src/gallium/winsys/svga/drm/vmw_shader.h
@@ -34,7 +34,7 @@
 #ifndef VMW_SHADER_H_
 #define VMW_SHADER_H_
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_atomic.h"
 #include "util/u_inlines.h"
 
diff --git a/src/gallium/winsys/svga/drm/vmw_surface.h b/src/gallium/winsys/svga/drm/vmw_surface.h
index d7acce7dc6a..1e6e31c4315 100644
--- a/src/gallium/winsys/svga/drm/vmw_surface.h
+++ b/src/gallium/winsys/svga/drm/vmw_surface.h
@@ -35,7 +35,7 @@
 #define VMW_SURFACE_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_atomic.h"
 #include "util/u_inlines.h"
 #include "util/u_thread.h"
diff --git a/src/gallium/winsys/sw/dri/dri_sw_winsys.c b/src/gallium/winsys/sw/dri/dri_sw_winsys.c
index 35a267fbd85..464caac7177 100644
--- a/src/gallium/winsys/sw/dri/dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/dri/dri_sw_winsys.c
@@ -37,7 +37,7 @@
 #endif
 #endif
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"
diff --git a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h
index c882b1d8d35..1fc1d9bcdec 100644
--- a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h
+++ b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h
@@ -3,7 +3,7 @@
 
 #include <windows.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "frontend/sw_winsys.h"
 
 void gdi_sw_display( struct sw_winsys *winsys,
diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.cpp b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.cpp
index f0f772d4525..2bc1b972fb1 100644
--- a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.cpp
+++ b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.cpp
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "util/format/u_formats.h"
 #include "util/u_inlines.h"
diff --git a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
index 5761c0e1049..206ec9090e7 100644
--- a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
@@ -42,7 +42,7 @@
 #include <fcntl.h>
 #include <xf86drm.h>
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"
diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
index 29cfb3a9ca6..02282856743 100644
--- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
+++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
@@ -24,7 +24,7 @@
 #define VIRGL_DRM_WINSYS_H
 
 #include <stdint.h>
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
 #include "util/list.h"
diff --git a/src/mesa/state_tracker/st_cb_flush.h b/src/mesa/state_tracker/st_cb_flush.h
index daee0408c76..72029cc7a1e 100644
--- a/src/mesa/state_tracker/st_cb_flush.h
+++ b/src/mesa/state_tracker/st_cb_flush.h
@@ -30,7 +30,7 @@
 #define ST_CB_FLUSH_H
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 struct dd_function_table;
 struct pipe_fence_handle;
diff --git a/src/mesa/state_tracker/st_debug.h b/src/mesa/state_tracker/st_debug.h
index 35a194ef9eb..0d86379adc5 100644
--- a/src/mesa/state_tracker/st_debug.h
+++ b/src/mesa/state_tracker/st_debug.h
@@ -29,7 +29,7 @@
 #ifndef ST_DEBUG_H
 #define ST_DEBUG_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 
 struct st_context;
diff --git a/src/mesa/state_tracker/st_manager.h b/src/mesa/state_tracker/st_manager.h
index 7c2c4b66512..4a617edb36c 100644
--- a/src/mesa/state_tracker/st_manager.h
+++ b/src/mesa/state_tracker/st_manager.h
@@ -31,7 +31,7 @@
 #include "main/menums.h"
 #include "main/fbobject.h"
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 
 struct st_context;
diff --git a/src/mesa/state_tracker/st_sampler_view.h b/src/mesa/state_tracker/st_sampler_view.h
index c7c9f60c311..74b6c09faf1 100644
--- a/src/mesa/state_tracker/st_sampler_view.h
+++ b/src/mesa/state_tracker/st_sampler_view.h
@@ -27,7 +27,7 @@
 #ifndef ST_SAMPLER_VIEW_H
 #define ST_SAMPLER_VIEW_H
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 #include "util/u_sampler.h"
diff --git a/src/util/format/u_format_bptc.h b/src/util/format/u_format_bptc.h
index 5dda6366b1a..4a98107c0df 100644
--- a/src/util/format/u_format_bptc.h
+++ b/src/util/format/u_format_bptc.h
@@ -30,7 +30,7 @@
 #define U_FORMAT_BPTC_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "c99_compat.h"
 
diff --git a/src/util/format/u_format_etc.c b/src/util/format/u_format_etc.c
index 2b5d97f32fa..878c4760b47 100644
--- a/src/util/format/u_format_etc.c
+++ b/src/util/format/u_format_etc.c
@@ -1,4 +1,4 @@
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_debug.h"
 #include "util/u_math.h"
 #include "util/format/u_format_etc.h"
diff --git a/src/util/format/u_format_fxt1.h b/src/util/format/u_format_fxt1.h
index a9a8feb3d88..71a44ad587c 100644
--- a/src/util/format/u_format_fxt1.h
+++ b/src/util/format/u_format_fxt1.h
@@ -30,7 +30,7 @@
 #define U_FORMAT_FXT1_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "c99_compat.h"
 
diff --git a/src/util/format/u_format_other.h b/src/util/format/u_format_other.h
index 21095be3921..2a325fb65ef 100644
--- a/src/util/format/u_format_other.h
+++ b/src/util/format/u_format_other.h
@@ -30,7 +30,7 @@
 #define U_FORMAT_OTHER_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "c99_compat.h"
 
diff --git a/src/util/format/u_format_pack.py b/src/util/format/u_format_pack.py
index b68669f464b..72f66ef107f 100644
--- a/src/util/format/u_format_pack.py
+++ b/src/util/format/u_format_pack.py
@@ -692,7 +692,7 @@ def is_format_hand_written(format):
 
 def generate(formats):
     print()
-    print('#include "pipe/p_compiler.h"')
+    print('#include "util/compiler.h"')
     print('#include "util/u_math.h"')
     print('#include "util/half_float.h"')
     print('#include "u_format.h"')
diff --git a/src/util/format/u_format_s3tc.h b/src/util/format/u_format_s3tc.h
index 61b039cc74d..3acaa3de851 100644
--- a/src/util/format/u_format_s3tc.h
+++ b/src/util/format/u_format_s3tc.h
@@ -30,7 +30,7 @@
 #define U_FORMAT_S3TC_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "c99_compat.h"
 
diff --git a/src/util/format/u_format_tests.h b/src/util/format/u_format_tests.h
index 5ef3eed4216..9b349cc333e 100644
--- a/src/util/format/u_format_tests.h
+++ b/src/util/format/u_format_tests.h
@@ -30,7 +30,7 @@
 #define U_FORMAT_TESTS_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/format/u_formats.h"
 
 
diff --git a/src/util/format/u_format_yuv.h b/src/util/format/u_format_yuv.h
index afa4a3a61e9..d73527dd2ae 100644
--- a/src/util/format/u_format_yuv.h
+++ b/src/util/format/u_format_yuv.h
@@ -45,7 +45,7 @@
 #define U_FORMAT_YUV_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_math.h"
 
 #include "c99_compat.h"
diff --git a/src/util/format/u_format_zs.h b/src/util/format/u_format_zs.h
index 107cce8e2ea..00bc0a79a91 100644
--- a/src/util/format/u_format_zs.h
+++ b/src/util/format/u_format_zs.h
@@ -30,7 +30,7 @@
 #define U_FORMAT_ZS_H_
 
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "c99_compat.h"
 
diff --git a/src/util/u_cpu_detect.c b/src/util/u_cpu_detect.c
index ebb97a220de..ee38d3ff907 100644
--- a/src/util/u_cpu_detect.c
+++ b/src/util/u_cpu_detect.c
@@ -33,7 +33,7 @@
  */
 
 #include "util/detect.h"
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 
 #include "util/u_debug.h"
 #include "u_cpu_detect.h"
diff --git a/src/util/u_debug_symbol.c b/src/util/u_debug_symbol.c
index 0a714a07d7a..5f8da4216b8 100644
--- a/src/util/u_debug_symbol.c
+++ b/src/util/u_debug_symbol.c
@@ -32,7 +32,7 @@
  * @author Jose Fonseca <jfonseca@vmware.com>
  */
 
-#include "pipe/p_compiler.h"
+#include "util/compiler.h"
 #include "util/u_thread.h"
 #include "util/simple_mtx.h"
 #include "util/u_string.h"