From abe41b1d2cf086b594509af850a052cea59b88ae Mon Sep 17 00:00:00 2001
From: Caio Oliveira <caio.oliveira@intel.com>
Date: Fri, 6 Dec 2024 14:25:29 -0800
Subject: [PATCH] intel/compiler: Use #pragma once instead of header guards

Acked-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32534>
---
 src/intel/compiler/brw_asm.h                      | 5 +----
 src/intel/compiler/brw_asm_internal.h             | 6 +-----
 src/intel/compiler/brw_cfg.h                      | 5 +----
 src/intel/compiler/brw_compiler.h                 | 5 +----
 src/intel/compiler/brw_disasm.h                   | 5 +----
 src/intel/compiler/brw_disasm_info.h              | 5 +----
 src/intel/compiler/brw_eu.h                       | 6 +-----
 src/intel/compiler/brw_eu_defines.h               | 5 +----
 src/intel/compiler/brw_fs.h                       | 5 +----
 src/intel/compiler/brw_fs_builder.h               | 5 +----
 src/intel/compiler/brw_fs_live_variables.h        | 5 +----
 src/intel/compiler/brw_inst.h                     | 5 +----
 src/intel/compiler/brw_ir.h                       | 5 +----
 src/intel/compiler/brw_ir_allocator.h             | 5 +----
 src/intel/compiler/brw_ir_analysis.h              | 5 +----
 src/intel/compiler/brw_ir_fs.h                    | 5 +----
 src/intel/compiler/brw_ir_performance.h           | 5 +----
 src/intel/compiler/brw_isa_info.h                 | 5 ++---
 src/intel/compiler/brw_kernel.h                   | 5 +----
 src/intel/compiler/brw_nir.h                      | 5 +----
 src/intel/compiler/brw_nir_rt.h                   | 5 +----
 src/intel/compiler/brw_nir_rt_builder.h           | 5 +----
 src/intel/compiler/brw_prim.h                     | 5 +----
 src/intel/compiler/brw_private.h                  | 5 +----
 src/intel/compiler/brw_reg.h                      | 5 +----
 src/intel/compiler/brw_reg_type.h                 | 5 +----
 src/intel/compiler/brw_rt.h                       | 5 +----
 src/intel/compiler/elk/elk_asm.h                  | 5 +----
 src/intel/compiler/elk/elk_cfg.h                  | 5 +----
 src/intel/compiler/elk/elk_clip.h                 | 5 +----
 src/intel/compiler/elk/elk_compiler.h             | 5 +----
 src/intel/compiler/elk/elk_dead_control_flow.h    | 5 +----
 src/intel/compiler/elk/elk_disasm.h               | 5 +----
 src/intel/compiler/elk/elk_disasm_info.h          | 5 +----
 src/intel/compiler/elk/elk_eu.h                   | 6 +-----
 src/intel/compiler/elk/elk_eu_defines.h           | 5 +----
 src/intel/compiler/elk/elk_eu_opcodes.h           | 6 +-----
 src/intel/compiler/elk/elk_fs.h                   | 5 +----
 src/intel/compiler/elk/elk_fs_builder.h           | 5 +----
 src/intel/compiler/elk/elk_fs_live_variables.h    | 5 +----
 src/intel/compiler/elk/elk_gfx6_gs_visitor.h      | 5 +----
 src/intel/compiler/elk/elk_inst.h                 | 5 +----
 src/intel/compiler/elk/elk_ir.h                   | 5 +----
 src/intel/compiler/elk/elk_ir_allocator.h         | 5 +----
 src/intel/compiler/elk/elk_ir_analysis.h          | 5 +----
 src/intel/compiler/elk/elk_ir_fs.h                | 5 +----
 src/intel/compiler/elk/elk_ir_performance.h       | 5 +----
 src/intel/compiler/elk/elk_ir_vec4.h              | 5 +----
 src/intel/compiler/elk/elk_isa_info.h             | 5 ++---
 src/intel/compiler/elk/elk_nir.h                  | 5 +----
 src/intel/compiler/elk/elk_nir_options.h          | 5 +----
 src/intel/compiler/elk/elk_nir_private.h          | 5 +----
 src/intel/compiler/elk/elk_prim.h                 | 5 +----
 src/intel/compiler/elk/elk_private.h              | 5 +----
 src/intel/compiler/elk/elk_reg.h                  | 5 +----
 src/intel/compiler/elk/elk_reg_type.h             | 5 +----
 src/intel/compiler/elk/elk_shader.h               | 5 +----
 src/intel/compiler/elk/elk_vec4.h                 | 5 +----
 src/intel/compiler/elk/elk_vec4_builder.h         | 5 +----
 src/intel/compiler/elk/elk_vec4_gs_visitor.h      | 5 +----
 src/intel/compiler/elk/elk_vec4_live_variables.h  | 5 +----
 src/intel/compiler/elk/elk_vec4_surface_builder.h | 5 +----
 src/intel/compiler/elk/elk_vec4_tcs.h             | 5 +----
 src/intel/compiler/elk/elk_vec4_tes.h             | 5 +----
 src/intel/compiler/elk/elk_vec4_vs.h              | 5 +----
 src/intel/compiler/intel_gfx_ver_enum.h           | 5 +----
 src/intel/compiler/intel_nir.h                    | 5 +----
 src/intel/compiler/intel_shader_enums.h           | 5 +----
 68 files changed, 70 insertions(+), 274 deletions(-)

diff --git a/src/intel/compiler/brw_asm.h b/src/intel/compiler/brw_asm.h
index 65c43fc8759..d159d09bc71 100644
--- a/src/intel/compiler/brw_asm.h
+++ b/src/intel/compiler/brw_asm.h
@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#ifndef BRW_ASM_H
-#define BRW_ASM_H
+#pragma once
 
 #include <stdio.h>
 #include <stdbool.h>
@@ -25,5 +24,3 @@ typedef enum {
 brw_assemble_result brw_assemble(
    void *mem_ctx, const struct intel_device_info *devinfo,
    FILE *f, const char *filename, brw_assemble_flags flags);
-
-#endif /* BRW_ASM_H */
diff --git a/src/intel/compiler/brw_asm_internal.h b/src/intel/compiler/brw_asm_internal.h
index 9ab324f02cc..8aa1c1fd083 100644
--- a/src/intel/compiler/brw_asm_internal.h
+++ b/src/intel/compiler/brw_asm_internal.h
@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#ifndef BRW_ASM_INTERNAL_H
-#define BRW_ASM_INTERNAL_H
+#pragma once
 
 /* Assembler internal state and definitions used by the brw_gram/brw_lex. */
 
@@ -102,6 +101,3 @@ struct target_label {
    char *name;
    int offset;
 };
-
-#endif /* BRW_ASM_H */
-
diff --git a/src/intel/compiler/brw_cfg.h b/src/intel/compiler/brw_cfg.h
index b1dd1e435de..1c7857c7325 100644
--- a/src/intel/compiler/brw_cfg.h
+++ b/src/intel/compiler/brw_cfg.h
@@ -25,8 +25,7 @@
  *
  */
 
-#ifndef BRW_CFG_H
-#define BRW_CFG_H
+#pragma once
 
 struct bblock_t;
 
@@ -535,5 +534,3 @@ namespace brw {
 }
 
 #endif
-
-#endif /* BRW_CFG_H */
diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h
index 257138256b6..5dfead077ce 100644
--- a/src/intel/compiler/brw_compiler.h
+++ b/src/intel/compiler/brw_compiler.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BRW_COMPILER_H
-#define BRW_COMPILER_H
+#pragma once
 
 #include <stdio.h>
 #include "c11/threads.h"
@@ -1561,5 +1560,3 @@ enum brw_topology_id
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
-
-#endif /* BRW_COMPILER_H */
diff --git a/src/intel/compiler/brw_disasm.h b/src/intel/compiler/brw_disasm.h
index ff3697fbbed..76f76bc4620 100644
--- a/src/intel/compiler/brw_disasm.h
+++ b/src/intel/compiler/brw_disasm.h
@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#ifndef BRW_DISASM_H
-#define BRW_DISASM_H
+#pragma once
 
 #include <stdio.h>
 #include <stdbool.h>
@@ -42,5 +41,3 @@ const char *brw_lsc_data_size_to_string(unsigned s);
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
-
-#endif /* BRW_DISASM_H */
diff --git a/src/intel/compiler/brw_disasm_info.h b/src/intel/compiler/brw_disasm_info.h
index 1010a44cc78..7cd5bd0b05b 100644
--- a/src/intel/compiler/brw_disasm_info.h
+++ b/src/intel/compiler/brw_disasm_info.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef _INTEL_ASM_ANNOTATION_H
-#define _INTEL_ASM_ANNOTATION_H
+#pragma once
 
 #include "compiler/glsl/list.h"
 
@@ -85,5 +84,3 @@ disasm_insert_error(struct disasm_info *disasm, int offset,
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
-
-#endif /* _INTEL_ASM_ANNOTATION_H */
diff --git a/src/intel/compiler/brw_eu.h b/src/intel/compiler/brw_eu.h
index a1672b0992a..c54b510bff0 100644
--- a/src/intel/compiler/brw_eu.h
+++ b/src/intel/compiler/brw_eu.h
@@ -29,9 +29,7 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-
-#ifndef BRW_EU_H
-#define BRW_EU_H
+#pragma once
 
 #include <stdbool.h>
 #include <stdio.h>
@@ -1607,5 +1605,3 @@ next_offset(const struct intel_device_info *devinfo, void *store, int offset)
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/intel/compiler/brw_eu_defines.h b/src/intel/compiler/brw_eu_defines.h
index 59211b747d3..4fde4dc5539 100644
--- a/src/intel/compiler/brw_eu_defines.h
+++ b/src/intel/compiler/brw_eu_defines.h
@@ -29,8 +29,7 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-#ifndef BRW_EU_DEFINES_H
-#define BRW_EU_DEFINES_H
+#pragma once
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -1852,5 +1851,3 @@ enum ENUM_PACKED lsc_vect_size {
 };
 
 #define LSC_ONE_ADDR_REG   1
-
-#endif /* BRW_EU_DEFINES_H */
diff --git a/src/intel/compiler/brw_fs.h b/src/intel/compiler/brw_fs.h
index b03e09ec366..0ce0ce9f139 100644
--- a/src/intel/compiler/brw_fs.h
+++ b/src/intel/compiler/brw_fs.h
@@ -25,8 +25,7 @@
  *
  */
 
-#ifndef BRW_FS_H
-#define BRW_FS_H
+#pragma once
 
 #include "brw_cfg.h"
 #include "brw_compiler.h"
@@ -681,5 +680,3 @@ bool brw_fs_workaround_nomask_control_flow(fs_visitor &s);
 /* Helpers. */
 unsigned brw_fs_get_lowered_simd_width(const fs_visitor *shader,
                                        const fs_inst *inst);
-
-#endif /* BRW_FS_H */
diff --git a/src/intel/compiler/brw_fs_builder.h b/src/intel/compiler/brw_fs_builder.h
index c4896f427af..e6b4c735071 100644
--- a/src/intel/compiler/brw_fs_builder.h
+++ b/src/intel/compiler/brw_fs_builder.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BRW_FS_BUILDER_H
-#define BRW_FS_BUILDER_H
+#pragma once
 
 #include "brw_ir_fs.h"
 #include "brw_eu.h"
@@ -897,5 +896,3 @@ offset(const brw_reg &reg, const brw::fs_builder &bld, unsigned delta)
 {
    return offset(reg, bld.dispatch_width(), delta);
 }
-
-#endif
diff --git a/src/intel/compiler/brw_fs_live_variables.h b/src/intel/compiler/brw_fs_live_variables.h
index 1d9d199fac0..60ecca43c96 100644
--- a/src/intel/compiler/brw_fs_live_variables.h
+++ b/src/intel/compiler/brw_fs_live_variables.h
@@ -25,8 +25,7 @@
  *
  */
 
-#ifndef BRW_FS_LIVE_VARIABLES_H
-#define BRW_FS_LIVE_VARIABLES_H
+#pragma once
 
 #include "brw_ir_analysis.h"
 #include "brw_ir_fs.h"
@@ -144,5 +143,3 @@ protected:
 };
 
 } /* namespace brw */
-
-#endif /* BRW_FS_LIVE_VARIABLES_H */
diff --git a/src/intel/compiler/brw_inst.h b/src/intel/compiler/brw_inst.h
index 8409f88257e..3a989342310 100644
--- a/src/intel/compiler/brw_inst.h
+++ b/src/intel/compiler/brw_inst.h
@@ -28,8 +28,7 @@
  * get and set various fields.  This is the actual hardware format.
  */
 
-#ifndef BRW_INST_H
-#define BRW_INST_H
+#pragma once
 
 #include <assert.h>
 #include <stdint.h>
@@ -1431,5 +1430,3 @@ brw_inst_opcode(const struct brw_isa_info *isa,
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/intel/compiler/brw_ir.h b/src/intel/compiler/brw_ir.h
index 98ff80b201b..1bd0af2867b 100644
--- a/src/intel/compiler/brw_ir.h
+++ b/src/intel/compiler/brw_ir.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BRW_IR_H
-#define BRW_IR_H
+#pragma once
 
 #include <assert.h>
 #include "brw_reg.h"
@@ -38,5 +37,3 @@
 #define MAX_VGRF_SIZE(devinfo) ((devinfo)->ver >= 20 ? 40 : 20)
 
 struct bblock_t;
-
-#endif
diff --git a/src/intel/compiler/brw_ir_allocator.h b/src/intel/compiler/brw_ir_allocator.h
index 4722ae4a4a5..818642fb07e 100644
--- a/src/intel/compiler/brw_ir_allocator.h
+++ b/src/intel/compiler/brw_ir_allocator.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BRW_IR_ALLOCATOR_H
-#define BRW_IR_ALLOCATOR_H
+#pragma once
 
 #include "util/compiler.h"
 #include "util/glheader.h"
@@ -88,5 +87,3 @@ namespace brw {
       unsigned capacity;
    };
 }
-
-#endif
diff --git a/src/intel/compiler/brw_ir_analysis.h b/src/intel/compiler/brw_ir_analysis.h
index 33b8f5178a6..edd9047f1f8 100644
--- a/src/intel/compiler/brw_ir_analysis.h
+++ b/src/intel/compiler/brw_ir_analysis.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BRW_IR_ANALYSIS_H
-#define BRW_IR_ANALYSIS_H
+#pragma once
 
 namespace brw {
    /**
@@ -188,5 +187,3 @@ private:
    const C *c;
    T *p;
 };
-
-#endif
diff --git a/src/intel/compiler/brw_ir_fs.h b/src/intel/compiler/brw_ir_fs.h
index 997927c9ae9..66c9d082841 100644
--- a/src/intel/compiler/brw_ir_fs.h
+++ b/src/intel/compiler/brw_ir_fs.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BRW_IR_FS_H
-#define BRW_IR_FS_H
+#pragma once
 
 #include "brw_ir.h"
 #include "brw_ir_allocator.h"
@@ -599,5 +598,3 @@ brw_fs_flag_mask(const brw_reg &r, unsigned sz)
       return 0;
    }
 }
-
-#endif
diff --git a/src/intel/compiler/brw_ir_performance.h b/src/intel/compiler/brw_ir_performance.h
index d3531e85ff6..2dbbcccec59 100644
--- a/src/intel/compiler/brw_ir_performance.h
+++ b/src/intel/compiler/brw_ir_performance.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BRW_IR_PERFORMANCE_H
-#define BRW_IR_PERFORMANCE_H
+#pragma once
 
 #include "brw_ir_analysis.h"
 
@@ -81,5 +80,3 @@ namespace brw {
       operator=(performance u);
    };
 }
-
-#endif
diff --git a/src/intel/compiler/brw_isa_info.h b/src/intel/compiler/brw_isa_info.h
index ae0ad3e2c2d..1219ea01f8b 100644
--- a/src/intel/compiler/brw_isa_info.h
+++ b/src/intel/compiler/brw_isa_info.h
@@ -20,8 +20,8 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef BRW_ISA_ENCODING_H
-#define BRW_ISA_ENCODING_H
+
+#pragma once
 
 #include "dev/intel_device_info.h"
 #include "brw_eu_defines.h"
@@ -83,4 +83,3 @@ is_3src(const struct brw_isa_info *isa, enum opcode opcode)
 #ifdef __cplusplus
 }
 #endif
-#endif
diff --git a/src/intel/compiler/brw_kernel.h b/src/intel/compiler/brw_kernel.h
index f251d5d16ad..2c2efd81a04 100644
--- a/src/intel/compiler/brw_kernel.h
+++ b/src/intel/compiler/brw_kernel.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BRW_KERNEL_H
-#define BRW_KERNEL_H
+#pragma once
 
 #include "brw_compiler.h"
 
@@ -74,5 +73,3 @@ brw_nir_from_spirv(void *mem_ctx, unsigned gfx_version,
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
-
-#endif /* BRW_KERNEL_H */
diff --git a/src/intel/compiler/brw_nir.h b/src/intel/compiler/brw_nir.h
index ba12fe7e25b..7c423f51bec 100644
--- a/src/intel/compiler/brw_nir.h
+++ b/src/intel/compiler/brw_nir.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BRW_NIR_H
-#define BRW_NIR_H
+#pragma once
 
 #include "brw_reg.h"
 #include "compiler/nir/nir.h"
@@ -295,5 +294,3 @@ bool brw_nir_uses_inline_data(nir_shader *shader);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* BRW_NIR_H */
diff --git a/src/intel/compiler/brw_nir_rt.h b/src/intel/compiler/brw_nir_rt.h
index 4215d348e0c..99e1097e654 100644
--- a/src/intel/compiler/brw_nir_rt.h
+++ b/src/intel/compiler/brw_nir_rt.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BRW_NIR_RT_H
-#define BRW_NIR_RT_H
+#pragma once
 
 #include "brw_nir.h"
 #include "brw_rt.h"
@@ -72,5 +71,3 @@ brw_nir_create_trivial_return_shader(const struct brw_compiler *compiler,
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* BRW_NIR_RT_H */
diff --git a/src/intel/compiler/brw_nir_rt_builder.h b/src/intel/compiler/brw_nir_rt_builder.h
index d0f71b13e27..f34ae062808 100644
--- a/src/intel/compiler/brw_nir_rt_builder.h
+++ b/src/intel/compiler/brw_nir_rt_builder.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BRW_NIR_RT_BUILDER_H
-#define BRW_NIR_RT_BUILDER_H
+#pragma once
 
 /* This file provides helpers to access memory based data structures that the
  * RT hardware reads/writes and their locations.
@@ -983,5 +982,3 @@ brw_nir_rt_acceleration_structure_to_root_node(nir_builder *b,
 
    return nir_if_phi(b, null_node_ptr, root_node_ptr);
 }
-
-#endif /* BRW_NIR_RT_BUILDER_H */
diff --git a/src/intel/compiler/brw_prim.h b/src/intel/compiler/brw_prim.h
index 28823089c1e..fc754b44fe3 100644
--- a/src/intel/compiler/brw_prim.h
+++ b/src/intel/compiler/brw_prim.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BRW_PRIM_H
-#define BRW_PRIM_H
+#pragma once
 
 #define _3DPRIM_POINTLIST         0x01
 #define _3DPRIM_LINELIST          0x02
@@ -46,5 +45,3 @@
 #define _3DPRIM_LINESTRIP_CONT_BF 0x14
 #define _3DPRIM_TRIFAN_NOSTIPPLE  0x16
 #define _3DPRIM_PATCHLIST(n) ({ assert(n > 0 && n <= 32); 0x20 + (n - 1); })
-
-#endif /* BRW_PRIM_H */
diff --git a/src/intel/compiler/brw_private.h b/src/intel/compiler/brw_private.h
index d573d06a656..3bc9030bb4d 100644
--- a/src/intel/compiler/brw_private.h
+++ b/src/intel/compiler/brw_private.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BRW_PRIVATE_H
-#define BRW_PRIVATE_H
+#pragma once
 
 #include "brw_compiler.h"
 
@@ -93,5 +92,3 @@ int brw_simd_select_for_workgroup_size(const struct intel_device_info *devinfo,
 bool brw_should_print_shader(const nir_shader *shader, uint64_t debug_flag);
 
 #endif // __cplusplus
-
-#endif // BRW_PRIVATE_H
diff --git a/src/intel/compiler/brw_reg.h b/src/intel/compiler/brw_reg.h
index 92d9c8ad102..448ad2556d2 100644
--- a/src/intel/compiler/brw_reg.h
+++ b/src/intel/compiler/brw_reg.h
@@ -39,8 +39,7 @@
  * the abstract brw_reg type into the actual hardware instruction encoding.
  */
 
-#ifndef BRW_REG_H
-#define BRW_REG_H
+#pragma once
 
 #include <stdbool.h>
 #include "util/compiler.h"
@@ -1511,5 +1510,3 @@ byte_stride(const brw_reg &reg)
 }
 
 #endif /* __cplusplus */
-
-#endif
diff --git a/src/intel/compiler/brw_reg_type.h b/src/intel/compiler/brw_reg_type.h
index a1b303e0103..97695724363 100644
--- a/src/intel/compiler/brw_reg_type.h
+++ b/src/intel/compiler/brw_reg_type.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BRW_REG_TYPE_H
-#define BRW_REG_TYPE_H
+#pragma once
 
 #include <stdbool.h>
 
@@ -194,5 +193,3 @@ brw_reg_type_to_letters(enum brw_reg_type type);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/intel/compiler/brw_rt.h b/src/intel/compiler/brw_rt.h
index 2cf1851ff59..f71273efb53 100644
--- a/src/intel/compiler/brw_rt.h
+++ b/src/intel/compiler/brw_rt.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BRW_RT_H
-#define BRW_RT_H
+#pragma once
 
 #include <stdint.h>
 
@@ -288,5 +287,3 @@ brw_rt_ray_queries_shadow_stacks_size(const struct intel_device_info *devinfo,
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* BRW_RT_H */
diff --git a/src/intel/compiler/elk/elk_asm.h b/src/intel/compiler/elk/elk_asm.h
index 00080c1aa2e..d9d39aa5a99 100644
--- a/src/intel/compiler/elk/elk_asm.h
+++ b/src/intel/compiler/elk/elk_asm.h
@@ -22,8 +22,7 @@
  *
  */
 
-#ifndef ELK_ASM_H
-#define ELK_ASM_H
+#pragma once
 
 #include <inttypes.h>
 #include <stdbool.h>
@@ -109,5 +108,3 @@ struct target_label {
    char *name;
    int offset;
 };
-
-#endif /* ELK_ASM_H */
diff --git a/src/intel/compiler/elk/elk_cfg.h b/src/intel/compiler/elk/elk_cfg.h
index d35bc08864a..6dd8c80ce90 100644
--- a/src/intel/compiler/elk/elk_cfg.h
+++ b/src/intel/compiler/elk/elk_cfg.h
@@ -25,8 +25,7 @@
  *
  */
 
-#ifndef ELK_CFG_H
-#define ELK_CFG_H
+#pragma once
 
 #include "elk_ir.h"
 #ifdef __cplusplus
@@ -533,5 +532,3 @@ namespace elk {
    };
 }
 #endif
-
-#endif /* ELK_CFG_H */
diff --git a/src/intel/compiler/elk/elk_clip.h b/src/intel/compiler/elk/elk_clip.h
index b065157a4b3..8c448a0e6cf 100644
--- a/src/intel/compiler/elk/elk_clip.h
+++ b/src/intel/compiler/elk/elk_clip.h
@@ -29,8 +29,7 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-#ifndef ELK_CLIP_H
-#define ELK_CLIP_H
+#pragma once
 
 #include "elk_compiler.h"
 #include "elk_eu.h"
@@ -159,5 +158,3 @@ void elk_clip_project_position(struct elk_clip_compile *c,
              struct elk_reg pos );
 void elk_clip_ff_sync(struct elk_clip_compile *c);
 void elk_clip_init_ff_sync(struct elk_clip_compile *c);
-
-#endif
diff --git a/src/intel/compiler/elk/elk_compiler.h b/src/intel/compiler/elk/elk_compiler.h
index ab7d8f66ca1..c52d3377ca6 100644
--- a/src/intel/compiler/elk/elk_compiler.h
+++ b/src/intel/compiler/elk/elk_compiler.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_COMPILER_H
-#define ELK_COMPILER_H
+#pragma once
 
 #include <stdio.h>
 #include "c11/threads.h"
@@ -1762,5 +1761,3 @@ elk_compute_first_urb_slot_required(uint64_t inputs_read,
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
-
-#endif /* ELK_COMPILER_H */
diff --git a/src/intel/compiler/elk/elk_dead_control_flow.h b/src/intel/compiler/elk/elk_dead_control_flow.h
index bd8956b9307..4d81d23b8d9 100644
--- a/src/intel/compiler/elk/elk_dead_control_flow.h
+++ b/src/intel/compiler/elk/elk_dead_control_flow.h
@@ -21,11 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_DEAD_CONTROL_FLOW_H
-#define ELK_DEAD_CONTROL_FLOW_H
+#pragma once
 
 #include "elk_shader.h"
 
 bool elk_dead_control_flow_eliminate(elk_backend_shader *s);
-
-#endif /* ELK_DEAD_CONTROL_FLOW_H */
diff --git a/src/intel/compiler/elk/elk_disasm.h b/src/intel/compiler/elk/elk_disasm.h
index c88461ed185..19ea613c63b 100644
--- a/src/intel/compiler/elk/elk_disasm.h
+++ b/src/intel/compiler/elk/elk_disasm.h
@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#ifndef ELK_DISASM_H
-#define ELK_DISASM_H
+#pragma once
 
 #include <stdio.h>
 #include <stdbool.h>
@@ -38,5 +37,3 @@ void elk_disassemble_with_errors(const struct elk_isa_info *isa,
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
-
-#endif /* ELK_DISASM_H */
diff --git a/src/intel/compiler/elk/elk_disasm_info.h b/src/intel/compiler/elk/elk_disasm_info.h
index b4739a0bd2c..44ad0e3b52b 100644
--- a/src/intel/compiler/elk/elk_disasm_info.h
+++ b/src/intel/compiler/elk/elk_disasm_info.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_DISASM_INFO_H
-#define ELK_DISASM_INFO_H
+#pragma once
 
 #include "compiler/glsl/list.h"
 
@@ -86,5 +85,3 @@ elk_disasm_insert_error(struct elk_disasm_info *disasm, unsigned offset,
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
-
-#endif /* ELK_DISASM_INFO_H */
diff --git a/src/intel/compiler/elk/elk_eu.h b/src/intel/compiler/elk/elk_eu.h
index e4aab13a66a..88b00d3d8ba 100644
--- a/src/intel/compiler/elk/elk_eu.h
+++ b/src/intel/compiler/elk/elk_eu.h
@@ -29,9 +29,7 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-
-#ifndef ELK_EU_H
-#define ELK_EU_H
+#pragma once
 
 #include <stdbool.h>
 #include <stdio.h>
@@ -1939,5 +1937,3 @@ next_offset(const struct intel_device_info *devinfo, void *store, int offset)
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/intel/compiler/elk/elk_eu_defines.h b/src/intel/compiler/elk/elk_eu_defines.h
index 30350e96ea8..2d69c533ea0 100644
--- a/src/intel/compiler/elk/elk_eu_defines.h
+++ b/src/intel/compiler/elk/elk_eu_defines.h
@@ -29,8 +29,7 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-#ifndef ELK_EU_DEFINES_H
-#define ELK_EU_DEFINES_H
+#pragma once
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -1257,5 +1256,3 @@ enum ENUM_PACKED lsc_vect_size {
 };
 
 #define LSC_ONE_ADDR_REG   1
-
-#endif /* ELK_EU_DEFINES_H */
diff --git a/src/intel/compiler/elk/elk_eu_opcodes.h b/src/intel/compiler/elk/elk_eu_opcodes.h
index fbdd5ebc3bd..e6731a207d3 100644
--- a/src/intel/compiler/elk/elk_eu_opcodes.h
+++ b/src/intel/compiler/elk/elk_eu_opcodes.h
@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#ifndef ELK_EU_OPCODES_H
-#define ELK_EU_OPCODES_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -607,6 +606,3 @@ enum elk_opcode {
 #ifdef __cplusplus
 }
 #endif
-
-#endif
-
diff --git a/src/intel/compiler/elk/elk_fs.h b/src/intel/compiler/elk/elk_fs.h
index e259a2da76d..c1c6f5ec47a 100644
--- a/src/intel/compiler/elk/elk_fs.h
+++ b/src/intel/compiler/elk/elk_fs.h
@@ -25,8 +25,7 @@
  *
  */
 
-#ifndef ELK_FS_H
-#define ELK_FS_H
+#pragma once
 
 #include "elk_shader.h"
 #include "elk_ir_fs.h"
@@ -588,5 +587,3 @@ int elk_get_subgroup_id_param_index(const intel_device_info *devinfo,
                                     const elk_stage_prog_data *prog_data);
 
 void nir_to_elk(elk_fs_visitor *s);
-
-#endif /* ELK_FS_H */
diff --git a/src/intel/compiler/elk/elk_fs_builder.h b/src/intel/compiler/elk/elk_fs_builder.h
index c9ffcd4f3a1..67a0f3406d2 100644
--- a/src/intel/compiler/elk/elk_fs_builder.h
+++ b/src/intel/compiler/elk/elk_fs_builder.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_FS_BUILDER_H
-#define ELK_FS_BUILDER_H
+#pragma once
 
 #include "elk_ir_fs.h"
 #include "elk_shader.h"
@@ -936,5 +935,3 @@ offset(const elk_fs_reg &reg, const elk::fs_builder &bld, unsigned delta)
 {
    return offset(reg, bld.dispatch_width(), delta);
 }
-
-#endif
diff --git a/src/intel/compiler/elk/elk_fs_live_variables.h b/src/intel/compiler/elk/elk_fs_live_variables.h
index cf28e104a9d..8ee6be49911 100644
--- a/src/intel/compiler/elk/elk_fs_live_variables.h
+++ b/src/intel/compiler/elk/elk_fs_live_variables.h
@@ -25,8 +25,7 @@
  *
  */
 
-#ifndef ELK_FS_LIVE_VARIABLES_H
-#define ELK_FS_LIVE_VARIABLES_H
+#pragma once
 
 #include "elk_ir_analysis.h"
 #include "elk_ir_fs.h"
@@ -146,5 +145,3 @@ protected:
 };
 
 } /* namespace elk */
-
-#endif /* ELK_FS_LIVE_VARIABLES_H */
diff --git a/src/intel/compiler/elk/elk_gfx6_gs_visitor.h b/src/intel/compiler/elk/elk_gfx6_gs_visitor.h
index 31d508f0e56..7ba76c9651b 100644
--- a/src/intel/compiler/elk/elk_gfx6_gs_visitor.h
+++ b/src/intel/compiler/elk/elk_gfx6_gs_visitor.h
@@ -22,8 +22,7 @@
  *
  */
 
-#ifndef ELK_GFX6_GS_VISITOR_H
-#define ELK_GFX6_GS_VISITOR_H
+#pragma once
 
 #include "elk_vec4.h"
 #include "elk_vec4_gs_visitor.h"
@@ -80,5 +79,3 @@ private:
 } /* namespace elk */
 
 #endif /* __cplusplus */
-
-#endif /* ELK_GFX6_GS_VISITOR_H */
diff --git a/src/intel/compiler/elk/elk_inst.h b/src/intel/compiler/elk/elk_inst.h
index 0ef9be348cd..1c516e8dfae 100644
--- a/src/intel/compiler/elk/elk_inst.h
+++ b/src/intel/compiler/elk/elk_inst.h
@@ -28,8 +28,7 @@
  * get and set various fields.  This is the actual hardware format.
  */
 
-#ifndef ELK_INST_H
-#define ELK_INST_H
+#pragma once
 
 #include <assert.h>
 #include <stdint.h>
@@ -1062,5 +1061,3 @@ elk_inst_opcode(const struct elk_isa_info *isa,
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/intel/compiler/elk/elk_ir.h b/src/intel/compiler/elk/elk_ir.h
index 32574217627..96bb4abdb3c 100644
--- a/src/intel/compiler/elk/elk_ir.h
+++ b/src/intel/compiler/elk/elk_ir.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_IR_H
-#define ELK_IR_H
+#pragma once
 
 #include <assert.h>
 #include "elk_reg.h"
@@ -193,5 +192,3 @@ struct elk_backend_instruction {
    /** The number of hardware registers used for a message header. */
    uint8_t header_size;
 };
-
-#endif
diff --git a/src/intel/compiler/elk/elk_ir_allocator.h b/src/intel/compiler/elk/elk_ir_allocator.h
index 7c8bb5e707d..6f0168ec7c3 100644
--- a/src/intel/compiler/elk/elk_ir_allocator.h
+++ b/src/intel/compiler/elk/elk_ir_allocator.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_IR_ALLOCATOR_H
-#define ELK_IR_ALLOCATOR_H
+#pragma once
 
 #include "util/compiler.h"
 #include "util/glheader.h"
@@ -92,5 +91,3 @@ namespace elk {
       unsigned capacity;
    };
 }
-
-#endif
diff --git a/src/intel/compiler/elk/elk_ir_analysis.h b/src/intel/compiler/elk/elk_ir_analysis.h
index 5295dd2e372..819653f2aed 100644
--- a/src/intel/compiler/elk/elk_ir_analysis.h
+++ b/src/intel/compiler/elk/elk_ir_analysis.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_IR_ANALYSIS_H
-#define ELK_IR_ANALYSIS_H
+#pragma once
 
 namespace elk {
    /**
@@ -191,5 +190,3 @@ private:
    const C *c;
    T *p;
 };
-
-#endif
diff --git a/src/intel/compiler/elk/elk_ir_fs.h b/src/intel/compiler/elk/elk_ir_fs.h
index 68d546455fb..dd71b9e4ea9 100644
--- a/src/intel/compiler/elk/elk_ir_fs.h
+++ b/src/intel/compiler/elk/elk_ir_fs.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_IR_FS_H
-#define ELK_IR_FS_H
+#pragma once
 
 #include "elk_shader.h"
 
@@ -725,5 +724,3 @@ is_coalescing_payload(const elk::simple_allocator &alloc, const elk_fs_inst *ins
 
 bool
 elk_has_bank_conflict(const struct elk_isa_info *isa, const elk_fs_inst *inst);
-
-#endif
diff --git a/src/intel/compiler/elk/elk_ir_performance.h b/src/intel/compiler/elk/elk_ir_performance.h
index c3147574d25..d46c5d665bd 100644
--- a/src/intel/compiler/elk/elk_ir_performance.h
+++ b/src/intel/compiler/elk/elk_ir_performance.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_IR_PERFORMANCE_H
-#define ELK_IR_PERFORMANCE_H
+#pragma once
 
 class elk_fs_visitor;
 
@@ -82,5 +81,3 @@ namespace elk {
       operator=(performance u);
    };
 }
-
-#endif
diff --git a/src/intel/compiler/elk/elk_ir_vec4.h b/src/intel/compiler/elk/elk_ir_vec4.h
index 74a2813930c..6673d30b9df 100644
--- a/src/intel/compiler/elk/elk_ir_vec4.h
+++ b/src/intel/compiler/elk/elk_ir_vec4.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_IR_VEC4_H
-#define ELK_IR_VEC4_H
+#pragma once
 
 #include "elk_shader.h"
 
@@ -471,5 +470,3 @@ get_exec_type_size(const vec4_instruction *inst)
 }
 
 } /* namespace elk */
-
-#endif
diff --git a/src/intel/compiler/elk/elk_isa_info.h b/src/intel/compiler/elk/elk_isa_info.h
index fe65faf817a..86040f55060 100644
--- a/src/intel/compiler/elk/elk_isa_info.h
+++ b/src/intel/compiler/elk/elk_isa_info.h
@@ -20,8 +20,8 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef ELK_ISA_ENCODING_H
-#define ELK_ISA_ENCODING_H
+
+#pragma once
 
 #include "dev/intel_device_info.h"
 #include "elk_eu_opcodes.h"
@@ -83,4 +83,3 @@ elk_is_3src(const struct elk_isa_info *isa, enum elk_opcode opcode)
 #ifdef __cplusplus
 }
 #endif
-#endif
diff --git a/src/intel/compiler/elk/elk_nir.h b/src/intel/compiler/elk/elk_nir.h
index 8575a07b8f8..550bf8a556b 100644
--- a/src/intel/compiler/elk/elk_nir.h
+++ b/src/intel/compiler/elk/elk_nir.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_NIR_H
-#define ELK_NIR_H
+#pragma once
 
 #include "compiler/nir/nir.h"
 #include "elk_compiler.h"
@@ -278,5 +277,3 @@ void elk_nir_adjust_payload(nir_shader *shader);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* ELK_NIR_H */
diff --git a/src/intel/compiler/elk/elk_nir_options.h b/src/intel/compiler/elk/elk_nir_options.h
index 99096498106..0e8f9bed902 100644
--- a/src/intel/compiler/elk/elk_nir_options.h
+++ b/src/intel/compiler/elk/elk_nir_options.h
@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#ifndef ELK_NIR_OPTIONS_H
-#define ELK_NIR_OPTIONS_H
+#pragma once
 
 #include "nir.h"
 
@@ -18,5 +17,3 @@ extern const struct nir_shader_compiler_options elk_vector_nir_options;
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* ELK_NIR_OPTIONS_H */
diff --git a/src/intel/compiler/elk/elk_nir_private.h b/src/intel/compiler/elk/elk_nir_private.h
index 12a54f42a3a..78948212099 100644
--- a/src/intel/compiler/elk/elk_nir_private.h
+++ b/src/intel/compiler/elk/elk_nir_private.h
@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#ifndef ELK_NIR_PRIVATE_H
-#define ELK_NIR_PRIVATE_H
+#pragma once
 
 #include "elk_reg.h"
 #include "nir.h"
@@ -21,5 +20,3 @@ enum elk_reg_type elk_type_for_nir_type(const struct intel_device_info *devinfo,
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/intel/compiler/elk/elk_prim.h b/src/intel/compiler/elk/elk_prim.h
index eec079ec9dc..fc754b44fe3 100644
--- a/src/intel/compiler/elk/elk_prim.h
+++ b/src/intel/compiler/elk/elk_prim.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_PRIM_H
-#define ELK_PRIM_H
+#pragma once
 
 #define _3DPRIM_POINTLIST         0x01
 #define _3DPRIM_LINELIST          0x02
@@ -46,5 +45,3 @@
 #define _3DPRIM_LINESTRIP_CONT_BF 0x14
 #define _3DPRIM_TRIFAN_NOSTIPPLE  0x16
 #define _3DPRIM_PATCHLIST(n) ({ assert(n > 0 && n <= 32); 0x20 + (n - 1); })
-
-#endif /* ELK_PRIM_H */
diff --git a/src/intel/compiler/elk/elk_private.h b/src/intel/compiler/elk/elk_private.h
index f83e57d2517..675779ee246 100644
--- a/src/intel/compiler/elk/elk_private.h
+++ b/src/intel/compiler/elk/elk_private.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_PRIVATE_H
-#define ELK_PRIVATE_H
+#pragma once
 
 #include "elk_compiler.h"
 
@@ -72,5 +71,3 @@ int elk_simd_select_for_workgroup_size(const struct intel_device_info *devinfo,
                                        const unsigned *sizes);
 
 bool elk_should_print_shader(const nir_shader *shader, uint64_t debug_flag);
-
-#endif // ELK_PRIVATE_H
diff --git a/src/intel/compiler/elk/elk_reg.h b/src/intel/compiler/elk/elk_reg.h
index f853e43ad8b..611ae613af2 100644
--- a/src/intel/compiler/elk/elk_reg.h
+++ b/src/intel/compiler/elk/elk_reg.h
@@ -39,8 +39,7 @@
  * the abstract elk_reg type into the actual hardware instruction encoding.
  */
 
-#ifndef ELK_REG_H
-#define ELK_REG_H
+#pragma once
 
 #include <stdbool.h>
 #include "util/compiler.h"
@@ -1360,5 +1359,3 @@ elk_type_is_float(enum elk_reg_type type)
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/intel/compiler/elk/elk_reg_type.h b/src/intel/compiler/elk/elk_reg_type.h
index fb1dd7848a1..433078a5e0e 100644
--- a/src/intel/compiler/elk/elk_reg_type.h
+++ b/src/intel/compiler/elk/elk_reg_type.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_REG_TYPE_H
-#define ELK_REG_TYPE_H
+#pragma once
 
 #include <stdbool.h>
 
@@ -197,5 +196,3 @@ elk_reg_type_to_letters(enum elk_reg_type type);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/intel/compiler/elk/elk_shader.h b/src/intel/compiler/elk/elk_shader.h
index ed229220136..180dcac92dc 100644
--- a/src/intel/compiler/elk/elk_shader.h
+++ b/src/intel/compiler/elk/elk_shader.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_SHADER_H
-#define ELK_SHADER_H
+#pragma once
 
 #include <stdint.h>
 #include "elk_cfg.h"
@@ -190,5 +189,3 @@ struct elk_gs_compile
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* ELK_SHADER_H */
diff --git a/src/intel/compiler/elk/elk_vec4.h b/src/intel/compiler/elk/elk_vec4.h
index b0589dfe244..9b5c2c5a9f5 100644
--- a/src/intel/compiler/elk/elk_vec4.h
+++ b/src/intel/compiler/elk/elk_vec4.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_VEC4_H
-#define ELK_VEC4_H
+#pragma once
 
 #include "elk_shader.h"
 
@@ -346,5 +345,3 @@ private:
 
 } /* namespace elk */
 #endif /* __cplusplus */
-
-#endif /* ELK_VEC4_H */
diff --git a/src/intel/compiler/elk/elk_vec4_builder.h b/src/intel/compiler/elk/elk_vec4_builder.h
index 9591f0a2731..0e01da6f08a 100644
--- a/src/intel/compiler/elk/elk_vec4_builder.h
+++ b/src/intel/compiler/elk/elk_vec4_builder.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_VEC4_BUILDER_H
-#define ELK_VEC4_BUILDER_H
+#pragma once
 
 #include "elk_ir_vec4.h"
 #include "elk_ir_allocator.h"
@@ -642,5 +641,3 @@ namespace elk {
       } annotation;
    };
 }
-
-#endif
diff --git a/src/intel/compiler/elk/elk_vec4_gs_visitor.h b/src/intel/compiler/elk/elk_vec4_gs_visitor.h
index 0ddb29f0199..a1c30a5939b 100644
--- a/src/intel/compiler/elk/elk_vec4_gs_visitor.h
+++ b/src/intel/compiler/elk/elk_vec4_gs_visitor.h
@@ -27,8 +27,7 @@
  * Geometry-shader-specific code derived from the vec4_visitor class.
  */
 
-#ifndef ELK_VEC4_GS_VISITOR_H
-#define ELK_VEC4_GS_VISITOR_H
+#pragma once
 
 #include "elk_vec4.h"
 
@@ -71,5 +70,3 @@ protected:
 
 } /* namespace elk */
 #endif /* __cplusplus */
-
-#endif /* ELK_VEC4_GS_VISITOR_H */
diff --git a/src/intel/compiler/elk/elk_vec4_live_variables.h b/src/intel/compiler/elk/elk_vec4_live_variables.h
index e0832dda956..d0a3e038056 100644
--- a/src/intel/compiler/elk/elk_vec4_live_variables.h
+++ b/src/intel/compiler/elk/elk_vec4_live_variables.h
@@ -25,8 +25,7 @@
  *
  */
 
-#ifndef ELK_VEC4_LIVE_VARIABLES_H
-#define ELK_VEC4_LIVE_VARIABLES_H
+#pragma once
 
 #include "elk_ir_vec4.h"
 #include "elk_ir_analysis.h"
@@ -141,5 +140,3 @@ var_from_reg(const simple_allocator &alloc, const dst_reg &reg,
 }
 
 } /* namespace elk */
-
-#endif /* ELK_VEC4_LIVE_VARIABLES_H */
diff --git a/src/intel/compiler/elk/elk_vec4_surface_builder.h b/src/intel/compiler/elk/elk_vec4_surface_builder.h
index cf507d5fca0..1c0d83a6da6 100644
--- a/src/intel/compiler/elk/elk_vec4_surface_builder.h
+++ b/src/intel/compiler/elk/elk_vec4_surface_builder.h
@@ -22,8 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_VEC4_SURFACE_BUILDER_H
-#define ELK_VEC4_SURFACE_BUILDER_H
+#pragma once
 
 #include "elk_vec4_builder.h"
 
@@ -49,5 +48,3 @@ namespace elk {
                           elk_predicate pred = ELK_PREDICATE_NONE);
    }
 }
-
-#endif
diff --git a/src/intel/compiler/elk/elk_vec4_tcs.h b/src/intel/compiler/elk/elk_vec4_tcs.h
index a005d40d991..f327353634f 100644
--- a/src/intel/compiler/elk/elk_vec4_tcs.h
+++ b/src/intel/compiler/elk/elk_vec4_tcs.h
@@ -27,8 +27,7 @@
  * The vec4-mode tessellation control shader compiler backend.
  */
 
-#ifndef ELK_VEC4_TCS_H
-#define ELK_VEC4_TCS_H
+#pragma once
 
 #include "elk_compiler.h"
 #include "elk_eu.h"
@@ -79,5 +78,3 @@ protected:
 
 } /* namespace elk */
 #endif /* __cplusplus */
-
-#endif /* ELK_VEC4_TCS_H */
diff --git a/src/intel/compiler/elk/elk_vec4_tes.h b/src/intel/compiler/elk/elk_vec4_tes.h
index 48dc75ded13..3ee385cb219 100644
--- a/src/intel/compiler/elk/elk_vec4_tes.h
+++ b/src/intel/compiler/elk/elk_vec4_tes.h
@@ -27,8 +27,7 @@
  * The vec4 mode tessellation evaluation shader compiler backend.
  */
 
-#ifndef ELK_VEC4_TES_H
-#define ELK_VEC4_TES_H
+#pragma once
 
 #include "elk_vec4.h"
 
@@ -61,5 +60,3 @@ private:
 
 } /* namespace elk */
 #endif /* __cplusplus */
-
-#endif /* ELK_VEC4_TES_H */
diff --git a/src/intel/compiler/elk/elk_vec4_vs.h b/src/intel/compiler/elk/elk_vec4_vs.h
index f50ab9dabae..6dfc8fb9c9f 100644
--- a/src/intel/compiler/elk/elk_vec4_vs.h
+++ b/src/intel/compiler/elk/elk_vec4_vs.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef ELK_VEC4_VS_VISITOR_H
-#define ELK_VEC4_VS_VISITOR_H
+#pragma once
 
 #include "elk_vec4.h"
 
@@ -54,5 +53,3 @@ private:
 };
 
 } /* namespace elk */
-
-#endif /* ELK_VEC4_VS_VISITOR_H */
diff --git a/src/intel/compiler/intel_gfx_ver_enum.h b/src/intel/compiler/intel_gfx_ver_enum.h
index ee373bb55a7..3f869150357 100644
--- a/src/intel/compiler/intel_gfx_ver_enum.h
+++ b/src/intel/compiler/intel_gfx_ver_enum.h
@@ -21,8 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef INTEL_GFX_VER_ENUM_H
-#define INTEL_GFX_VER_ENUM_H
+#pragma once
 
 #include "util/macros.h"
 #include "dev/intel_device_info.h"
@@ -70,5 +69,3 @@ gfx_ver_from_devinfo(const struct intel_device_info *devinfo)
       unreachable("not reached");
    }
 }
-
-#endif
diff --git a/src/intel/compiler/intel_nir.h b/src/intel/compiler/intel_nir.h
index 2a7e36b479b..fcb7262eedd 100644
--- a/src/intel/compiler/intel_nir.h
+++ b/src/intel/compiler/intel_nir.h
@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#ifndef INTEL_NIR_H
-#define INTEL_NIR_H
+#pragma once
 
 #include "nir.h"
 
@@ -45,5 +44,3 @@ bool intel_nir_lower_printf(nir_shader *nir);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* INTEL_NIR_H */
diff --git a/src/intel/compiler/intel_shader_enums.h b/src/intel/compiler/intel_shader_enums.h
index f60fcd5fd44..60e6b607803 100644
--- a/src/intel/compiler/intel_shader_enums.h
+++ b/src/intel/compiler/intel_shader_enums.h
@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#ifndef INTEL_SHADER_ENUMS_H
-#define INTEL_SHADER_ENUMS_H
+#pragma once
 
 #include <stdint.h>
 
@@ -343,5 +342,3 @@ intel_fs_is_coarse(enum intel_sometimes shader_coarse_pixel_dispatch,
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
-
-#endif /* INTEL_SHADER_ENUMS_H */