diff --git a/src/intel/compiler/brw_analysis.cpp b/src/intel/compiler/brw_analysis.cpp
index 4837fb03a59..a244e9f14a8 100644
--- a/src/intel/compiler/brw_analysis.cpp
+++ b/src/intel/compiler/brw_analysis.cpp
@@ -7,8 +7,6 @@
 #include "brw_cfg.h"
 #include "brw_fs.h"
 
-using namespace brw;
-
 /* Calculates the immediate dominator of each block, according to "A Simple,
  * Fast Dominance Algorithm" by Keith D. Cooper, Timothy J. Harvey, and Ken
  * Kennedy.
diff --git a/src/intel/compiler/brw_cfg.cpp b/src/intel/compiler/brw_cfg.cpp
index 2c17168d664..b96bfb074cd 100644
--- a/src/intel/compiler/brw_cfg.cpp
+++ b/src/intel/compiler/brw_cfg.cpp
@@ -35,8 +35,6 @@
  * blocks with successor/predecessor edges connecting them.
  */
 
-using namespace brw;
-
 static bblock_t *
 pop_stack(exec_list *list)
 {
diff --git a/src/intel/compiler/brw_compile_cs.cpp b/src/intel/compiler/brw_compile_cs.cpp
index 5c4fe6da8cc..cef17d3cb4e 100644
--- a/src/intel/compiler/brw_compile_cs.cpp
+++ b/src/intel/compiler/brw_compile_cs.cpp
@@ -17,8 +17,6 @@
 
 #include <memory>
 
-using namespace brw;
-
 static void
 fill_push_const_block_info(struct brw_push_const_block *block, unsigned dwords)
 {
diff --git a/src/intel/compiler/brw_compile_fs.cpp b/src/intel/compiler/brw_compile_fs.cpp
index b03f190b01a..a58c165e196 100644
--- a/src/intel/compiler/brw_compile_fs.cpp
+++ b/src/intel/compiler/brw_compile_fs.cpp
@@ -18,8 +18,6 @@
 
 #include <memory>
 
-using namespace brw;
-
 static brw_inst *
 brw_emit_single_fb_write(fs_visitor &s, const brw_builder &bld,
                          brw_reg color0, brw_reg color1,
diff --git a/src/intel/compiler/brw_compile_gs.cpp b/src/intel/compiler/brw_compile_gs.cpp
index 648adb8d293..01c1ab81d59 100644
--- a/src/intel/compiler/brw_compile_gs.cpp
+++ b/src/intel/compiler/brw_compile_gs.cpp
@@ -12,8 +12,6 @@
 #include "brw_private.h"
 #include "dev/intel_debug.h"
 
-using namespace brw;
-
 static const GLuint gl_prim_to_hw_prim[MESA_PRIM_TRIANGLE_STRIP_ADJACENCY+1] = {
    [MESA_PRIM_POINTS] =_3DPRIM_POINTLIST,
    [MESA_PRIM_LINES] = _3DPRIM_LINELIST,
diff --git a/src/intel/compiler/brw_compile_mesh.cpp b/src/intel/compiler/brw_compile_mesh.cpp
index e1c7500bf2c..789f489e039 100644
--- a/src/intel/compiler/brw_compile_mesh.cpp
+++ b/src/intel/compiler/brw_compile_mesh.cpp
@@ -34,8 +34,6 @@
 
 #include <memory>
 
-using namespace brw;
-
 static inline int
 type_size_scalar_dwords(const struct glsl_type *type, bool bindless)
 {
diff --git a/src/intel/compiler/brw_compile_tcs.cpp b/src/intel/compiler/brw_compile_tcs.cpp
index 0b1836664f9..01592d1c3e4 100644
--- a/src/intel/compiler/brw_compile_tcs.cpp
+++ b/src/intel/compiler/brw_compile_tcs.cpp
@@ -12,8 +12,6 @@
 #include "brw_private.h"
 #include "dev/intel_debug.h"
 
-using namespace brw;
-
 /**
  * Return the number of patches to accumulate before a MULTI_PATCH mode thread is
  * launched.  In cases with a large number of input control points and a large
diff --git a/src/intel/compiler/brw_compile_vs.cpp b/src/intel/compiler/brw_compile_vs.cpp
index daf419e6eb6..5175b11f28d 100644
--- a/src/intel/compiler/brw_compile_vs.cpp
+++ b/src/intel/compiler/brw_compile_vs.cpp
@@ -10,8 +10,6 @@
 #include "brw_private.h"
 #include "dev/intel_debug.h"
 
-using namespace brw;
-
 static void
 brw_assign_vs_urb_setup(fs_visitor &s)
 {
diff --git a/src/intel/compiler/brw_from_nir.cpp b/src/intel/compiler/brw_from_nir.cpp
index 6017d326cb0..c7dfeeadf1d 100644
--- a/src/intel/compiler/brw_from_nir.cpp
+++ b/src/intel/compiler/brw_from_nir.cpp
@@ -34,8 +34,6 @@
 
 #include <vector>
 
-using namespace brw;
-
 struct brw_bind_info {
    bool valid;
    bool bindless;
diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index fc7b8ca1707..8f255e2087e 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -44,8 +44,6 @@
 #include "compiler/nir/nir_builder.h"
 #include "util/u_math.h"
 
-using namespace brw;
-
 void
 fs_visitor::vfail(const char *format, va_list va)
 {
diff --git a/src/intel/compiler/brw_fs_thread_payload.cpp b/src/intel/compiler/brw_fs_thread_payload.cpp
index d5a15f1d5b6..1c1b0e08158 100644
--- a/src/intel/compiler/brw_fs_thread_payload.cpp
+++ b/src/intel/compiler/brw_fs_thread_payload.cpp
@@ -24,8 +24,6 @@
 #include "brw_fs.h"
 #include "brw_builder.h"
 
-using namespace brw;
-
 vs_thread_payload::vs_thread_payload(const fs_visitor &v)
 {
    unsigned r = 0;
diff --git a/src/intel/compiler/brw_fs_visitor.cpp b/src/intel/compiler/brw_fs_visitor.cpp
index 7b5ccebc041..a8d60d91889 100644
--- a/src/intel/compiler/brw_fs_visitor.cpp
+++ b/src/intel/compiler/brw_fs_visitor.cpp
@@ -34,8 +34,6 @@
 #include "compiler/glsl_types.h"
 #include "dev/intel_device_info.h"
 
-using namespace brw;
-
 void
 fs_visitor::emit_urb_writes(const brw_reg &gs_vertex_count)
 {
diff --git a/src/intel/compiler/brw_lower.cpp b/src/intel/compiler/brw_lower.cpp
index 055d90d65b9..c7ab9c26c62 100644
--- a/src/intel/compiler/brw_lower.cpp
+++ b/src/intel/compiler/brw_lower.cpp
@@ -6,8 +6,6 @@
 #include "brw_fs.h"
 #include "brw_builder.h"
 
-using namespace brw;
-
 /**
  * Align16 3-source instructions cannot have scalar stride w/64-bit types.
  *
diff --git a/src/intel/compiler/brw_lower_dpas.cpp b/src/intel/compiler/brw_lower_dpas.cpp
index e55f1cfc9c1..76d1480f52f 100644
--- a/src/intel/compiler/brw_lower_dpas.cpp
+++ b/src/intel/compiler/brw_lower_dpas.cpp
@@ -6,8 +6,6 @@
 #include "brw_fs.h"
 #include "brw_builder.h"
 
-using namespace brw;
-
 static void
 f16_using_mac(const brw_builder &bld, brw_inst *inst)
 {
diff --git a/src/intel/compiler/brw_lower_integer_multiplication.cpp b/src/intel/compiler/brw_lower_integer_multiplication.cpp
index b5444695b21..48c110d76df 100644
--- a/src/intel/compiler/brw_lower_integer_multiplication.cpp
+++ b/src/intel/compiler/brw_lower_integer_multiplication.cpp
@@ -6,8 +6,6 @@
 #include "brw_fs.h"
 #include "brw_builder.h"
 
-using namespace brw;
-
 /**
  * Factor an unsigned 32-bit integer.
  *
diff --git a/src/intel/compiler/brw_lower_logical_sends.cpp b/src/intel/compiler/brw_lower_logical_sends.cpp
index 484d2e30e49..a4a5dca7612 100644
--- a/src/intel/compiler/brw_lower_logical_sends.cpp
+++ b/src/intel/compiler/brw_lower_logical_sends.cpp
@@ -29,8 +29,6 @@
 #include "brw_fs.h"
 #include "brw_builder.h"
 
-using namespace brw;
-
 static void
 lower_urb_read_logical_send(const brw_builder &bld, brw_inst *inst)
 {
diff --git a/src/intel/compiler/brw_lower_pack.cpp b/src/intel/compiler/brw_lower_pack.cpp
index 981110f6326..651b8a08cb3 100644
--- a/src/intel/compiler/brw_lower_pack.cpp
+++ b/src/intel/compiler/brw_lower_pack.cpp
@@ -26,8 +26,6 @@
 #include "brw_cfg.h"
 #include "brw_builder.h"
 
-using namespace brw;
-
 bool
 brw_lower_pack(fs_visitor &s)
 {
diff --git a/src/intel/compiler/brw_lower_regioning.cpp b/src/intel/compiler/brw_lower_regioning.cpp
index 5c95a0e16dd..f5f96a62ef9 100644
--- a/src/intel/compiler/brw_lower_regioning.cpp
+++ b/src/intel/compiler/brw_lower_regioning.cpp
@@ -25,8 +25,6 @@
 #include "brw_cfg.h"
 #include "brw_builder.h"
 
-using namespace brw;
-
 namespace {
    /* From the SKL PRM Vol 2a, "Move":
     *
diff --git a/src/intel/compiler/brw_lower_scoreboard.cpp b/src/intel/compiler/brw_lower_scoreboard.cpp
index 6852fe1e7c9..269bee14525 100644
--- a/src/intel/compiler/brw_lower_scoreboard.cpp
+++ b/src/intel/compiler/brw_lower_scoreboard.cpp
@@ -58,8 +58,6 @@
 #include "brw_builder.h"
 #include "brw_cfg.h"
 
-using namespace brw;
-
 namespace {
    /**
     * In-order instruction accounting.
diff --git a/src/intel/compiler/brw_lower_simd_width.cpp b/src/intel/compiler/brw_lower_simd_width.cpp
index 62e2b450aee..3327444900f 100644
--- a/src/intel/compiler/brw_lower_simd_width.cpp
+++ b/src/intel/compiler/brw_lower_simd_width.cpp
@@ -6,8 +6,6 @@
 #include "brw_fs.h"
 #include "brw_builder.h"
 
-using namespace brw;
-
 static bool
 is_mixed_float_with_fp32_dst(const brw_inst *inst)
 {
diff --git a/src/intel/compiler/brw_lower_subgroup_ops.cpp b/src/intel/compiler/brw_lower_subgroup_ops.cpp
index 188c7cf30bc..9a480a17089 100644
--- a/src/intel/compiler/brw_lower_subgroup_ops.cpp
+++ b/src/intel/compiler/brw_lower_subgroup_ops.cpp
@@ -9,8 +9,6 @@
 #include "brw_fs.h"
 #include "brw_builder.h"
 
-using namespace brw;
-
 struct brw_reduction_info {
    brw_reg             identity;
    enum opcode         op;
diff --git a/src/intel/compiler/brw_opt.cpp b/src/intel/compiler/brw_opt.cpp
index af0eae6ba21..0a872f59177 100644
--- a/src/intel/compiler/brw_opt.cpp
+++ b/src/intel/compiler/brw_opt.cpp
@@ -9,8 +9,6 @@
 
 #include "dev/intel_debug.h"
 
-using namespace brw;
-
 void
 brw_optimize(fs_visitor &s)
 {
diff --git a/src/intel/compiler/brw_opt_address_reg_load.cpp b/src/intel/compiler/brw_opt_address_reg_load.cpp
index d4e7c6cf6fa..0cd9752c226 100644
--- a/src/intel/compiler/brw_opt_address_reg_load.cpp
+++ b/src/intel/compiler/brw_opt_address_reg_load.cpp
@@ -20,8 +20,6 @@
  *    add(1)   a0.4:UD, vgrf63+0.0<0>:UD, 192u
  */
 
-using namespace brw;
-
 static bool
 opt_address_reg_load_local(fs_visitor &s, bblock_t *block, const brw_def_analysis &defs)
 {
diff --git a/src/intel/compiler/brw_opt_algebraic.cpp b/src/intel/compiler/brw_opt_algebraic.cpp
index a37e49c2ddc..762704a8896 100644
--- a/src/intel/compiler/brw_opt_algebraic.cpp
+++ b/src/intel/compiler/brw_opt_algebraic.cpp
@@ -7,8 +7,6 @@
 #include "brw_builder.h"
 #include "util/half_float.h"
 
-using namespace brw;
-
 static uint64_t
 src_as_uint(const brw_reg &src)
 {
diff --git a/src/intel/compiler/brw_opt_cmod_propagation.cpp b/src/intel/compiler/brw_opt_cmod_propagation.cpp
index d70bfe5334c..5d2dac70705 100644
--- a/src/intel/compiler/brw_opt_cmod_propagation.cpp
+++ b/src/intel/compiler/brw_opt_cmod_propagation.cpp
@@ -48,8 +48,6 @@
  * exists and therefore remove the instruction.
  */
 
-using namespace brw;
-
 static bool
 cmod_propagate_cmp_to_add(const intel_device_info *devinfo, bblock_t *block,
                           brw_inst *inst)
diff --git a/src/intel/compiler/brw_opt_combine_constants.cpp b/src/intel/compiler/brw_opt_combine_constants.cpp
index 9f51540166e..6888e332932 100644
--- a/src/intel/compiler/brw_opt_combine_constants.cpp
+++ b/src/intel/compiler/brw_opt_combine_constants.cpp
@@ -33,8 +33,6 @@
 #include "brw_cfg.h"
 #include "util/half_float.h"
 
-using namespace brw;
-
 static const bool debug = false;
 
 enum PACKED interpreted_type {
diff --git a/src/intel/compiler/brw_opt_copy_propagation.cpp b/src/intel/compiler/brw_opt_copy_propagation.cpp
index 56a4e369c51..97a7349068d 100644
--- a/src/intel/compiler/brw_opt_copy_propagation.cpp
+++ b/src/intel/compiler/brw_opt_copy_propagation.cpp
@@ -40,8 +40,6 @@
 #include "brw_cfg.h"
 #include "brw_eu.h"
 
-using namespace brw;
-
 namespace { /* avoid conflict with opt_copy_propagation_elements */
 struct acp_entry {
    struct rb_node by_dst;
diff --git a/src/intel/compiler/brw_opt_cse.cpp b/src/intel/compiler/brw_opt_cse.cpp
index b950a36192e..1259ebf3c0c 100644
--- a/src/intel/compiler/brw_opt_cse.cpp
+++ b/src/intel/compiler/brw_opt_cse.cpp
@@ -33,8 +33,6 @@
  * Support for SSA-based global Common Subexpression Elimination (CSE).
  */
 
-using namespace brw;
-
 struct remap_entry {
    brw_inst *inst;
    bblock_t *block;
diff --git a/src/intel/compiler/brw_opt_dead_code_eliminate.cpp b/src/intel/compiler/brw_opt_dead_code_eliminate.cpp
index 2fc812f110f..e95dc7309a9 100644
--- a/src/intel/compiler/brw_opt_dead_code_eliminate.cpp
+++ b/src/intel/compiler/brw_opt_dead_code_eliminate.cpp
@@ -34,8 +34,6 @@
  * yet in the tail end of this block.
  */
 
-using namespace brw;
-
 /**
  * Is it safe to eliminate the instruction?
  */
diff --git a/src/intel/compiler/brw_opt_register_coalesce.cpp b/src/intel/compiler/brw_opt_register_coalesce.cpp
index 7d8c983051b..4416906390f 100644
--- a/src/intel/compiler/brw_opt_register_coalesce.cpp
+++ b/src/intel/compiler/brw_opt_register_coalesce.cpp
@@ -44,8 +44,6 @@
 #include "brw_fs.h"
 #include "brw_cfg.h"
 
-using namespace brw;
-
 static bool
 is_nop_mov(const brw_inst *inst)
 {
diff --git a/src/intel/compiler/brw_opt_saturate_propagation.cpp b/src/intel/compiler/brw_opt_saturate_propagation.cpp
index d3706292c4b..91dc27839ee 100644
--- a/src/intel/compiler/brw_opt_saturate_propagation.cpp
+++ b/src/intel/compiler/brw_opt_saturate_propagation.cpp
@@ -25,8 +25,6 @@
 #include "brw_fs.h"
 #include "brw_cfg.h"
 
-using namespace brw;
-
 /** @file
  *
  * Implements a pass that propagates the SAT modifier from a MOV.SAT into the
diff --git a/src/intel/compiler/brw_opt_txf_combiner.cpp b/src/intel/compiler/brw_opt_txf_combiner.cpp
index ef64a1309cd..e596177a9e1 100644
--- a/src/intel/compiler/brw_opt_txf_combiner.cpp
+++ b/src/intel/compiler/brw_opt_txf_combiner.cpp
@@ -7,8 +7,6 @@
 #include "brw_fs.h"
 #include "brw_builder.h"
 
-using namespace brw;
-
 static unsigned
 dest_comps_for_txf(const fs_visitor &s, const brw_inst *txf)
 {
diff --git a/src/intel/compiler/brw_opt_virtual_grfs.cpp b/src/intel/compiler/brw_opt_virtual_grfs.cpp
index 475e31a5536..616c35fc269 100644
--- a/src/intel/compiler/brw_opt_virtual_grfs.cpp
+++ b/src/intel/compiler/brw_opt_virtual_grfs.cpp
@@ -6,8 +6,6 @@
 #include "brw_fs.h"
 #include "brw_builder.h"
 
-using namespace brw;
-
 /**
  * Split large virtual GRFs into separate components if we can.
  *
diff --git a/src/intel/compiler/brw_print.cpp b/src/intel/compiler/brw_print.cpp
index 37848943eee..e12f6194556 100644
--- a/src/intel/compiler/brw_print.cpp
+++ b/src/intel/compiler/brw_print.cpp
@@ -10,8 +10,6 @@
 #include "dev/intel_debug.h"
 #include "util/half_float.h"
 
-using namespace brw;
-
 void
 brw_print_instructions(const fs_visitor &s, FILE *file)
 {
diff --git a/src/intel/compiler/brw_reg_allocate.cpp b/src/intel/compiler/brw_reg_allocate.cpp
index a0f3f65dca4..b311abb8a79 100644
--- a/src/intel/compiler/brw_reg_allocate.cpp
+++ b/src/intel/compiler/brw_reg_allocate.cpp
@@ -32,8 +32,6 @@
 #include "util/set.h"
 #include "util/register_allocate.h"
 
-using namespace brw;
-
 static void
 assign_reg(const struct intel_device_info *devinfo,
            unsigned *reg_hw_locations, brw_reg *reg)
diff --git a/src/intel/compiler/brw_schedule_instructions.cpp b/src/intel/compiler/brw_schedule_instructions.cpp
index 4fefd61779a..f7f192c58dd 100644
--- a/src/intel/compiler/brw_schedule_instructions.cpp
+++ b/src/intel/compiler/brw_schedule_instructions.cpp
@@ -31,8 +31,6 @@
 #include "brw_cfg.h"
 #include <new>
 
-using namespace brw;
-
 /** @file
  *
  * List scheduling of FS instructions.
diff --git a/src/intel/compiler/brw_workaround.cpp b/src/intel/compiler/brw_workaround.cpp
index 4d32a983b64..a07468c0471 100644
--- a/src/intel/compiler/brw_workaround.cpp
+++ b/src/intel/compiler/brw_workaround.cpp
@@ -6,8 +6,6 @@
 #include "brw_fs.h"
 #include "brw_builder.h"
 
-using namespace brw;
-
 /* Wa_14015360517
  *
  * The first instruction of any kernel should have non-zero emask.
diff --git a/src/intel/compiler/test_lower_scoreboard.cpp b/src/intel/compiler/test_lower_scoreboard.cpp
index a7c7cc0db50..25175f935ac 100644
--- a/src/intel/compiler/test_lower_scoreboard.cpp
+++ b/src/intel/compiler/test_lower_scoreboard.cpp
@@ -26,8 +26,6 @@
 #include "brw_builder.h"
 #include "brw_cfg.h"
 
-using namespace brw;
-
 class scoreboard_test : public ::testing::Test {
 protected:
    scoreboard_test();
diff --git a/src/intel/compiler/test_opt_cmod_propagation.cpp b/src/intel/compiler/test_opt_cmod_propagation.cpp
index f02b430d506..858167e1748 100644
--- a/src/intel/compiler/test_opt_cmod_propagation.cpp
+++ b/src/intel/compiler/test_opt_cmod_propagation.cpp
@@ -26,8 +26,6 @@
 #include "brw_builder.h"
 #include "brw_cfg.h"
 
-using namespace brw;
-
 class cmod_propagation_test : public ::testing::Test {
 protected:
    cmod_propagation_test();
diff --git a/src/intel/compiler/test_opt_combine_constants.cpp b/src/intel/compiler/test_opt_combine_constants.cpp
index fc6b63b3009..09df01f9cdd 100644
--- a/src/intel/compiler/test_opt_combine_constants.cpp
+++ b/src/intel/compiler/test_opt_combine_constants.cpp
@@ -8,8 +8,6 @@
 #include "brw_builder.h"
 #include "brw_cfg.h"
 
-using namespace brw;
-
 struct FSCombineConstantsTest : public ::testing::Test {
    FSCombineConstantsTest() {
       mem_ctx = ralloc_context(NULL);
diff --git a/src/intel/compiler/test_opt_copy_propagation.cpp b/src/intel/compiler/test_opt_copy_propagation.cpp
index 2e9e6d4357a..2477cf73b02 100644
--- a/src/intel/compiler/test_opt_copy_propagation.cpp
+++ b/src/intel/compiler/test_opt_copy_propagation.cpp
@@ -26,8 +26,6 @@
 #include "brw_builder.h"
 #include "brw_cfg.h"
 
-using namespace brw;
-
 class copy_propagation_test : public ::testing::Test {
 protected:
    copy_propagation_test();
diff --git a/src/intel/compiler/test_opt_cse.cpp b/src/intel/compiler/test_opt_cse.cpp
index 9e47eabd3d0..686529c38db 100644
--- a/src/intel/compiler/test_opt_cse.cpp
+++ b/src/intel/compiler/test_opt_cse.cpp
@@ -8,8 +8,6 @@
 #include "brw_builder.h"
 #include "brw_cfg.h"
 
-using namespace brw;
-
 class cse_test : public ::testing::Test {
 protected:
    cse_test();
diff --git a/src/intel/compiler/test_opt_saturate_propagation.cpp b/src/intel/compiler/test_opt_saturate_propagation.cpp
index 7bac9f020db..4f9f5388699 100644
--- a/src/intel/compiler/test_opt_saturate_propagation.cpp
+++ b/src/intel/compiler/test_opt_saturate_propagation.cpp
@@ -26,8 +26,6 @@
 #include "brw_builder.h"
 #include "brw_cfg.h"
 
-using namespace brw;
-
 class saturate_propagation_test : public ::testing::Test {
 protected:
    saturate_propagation_test();