diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 3bdfe88b35a..200238b4e40 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -48,9 +48,7 @@
 #include "util/u_printf.h"
 #include "nir_defines.h"
 #include "nir_shader_compiler_options.h"
-#define XXH_INLINE_ALL
 #include <stdio.h>
-#include "util/xxhash.h"
 
 #ifndef NDEBUG
 #include "util/u_debug.h"
diff --git a/src/compiler/nir/nir_instr_set.c b/src/compiler/nir/nir_instr_set.c
index 19158261f45..8e8f7dde5f2 100644
--- a/src/compiler/nir/nir_instr_set.c
+++ b/src/compiler/nir/nir_instr_set.c
@@ -26,6 +26,9 @@
 #include "nir_vla.h"
 #include "nir.h"
 
+#define XXH_INLINE_ALL
+#include "util/xxhash.h"
+
 /* This function determines if uses of an instruction can safely be rewritten
  * to use another identical instruction instead. Note that this function must
  * be kept in sync with hash_instr() and nir_instrs_equal() -- only
diff --git a/src/compiler/nir/nir_lower_locals_to_regs.c b/src/compiler/nir/nir_lower_locals_to_regs.c
index 280ae6cd981..d69e65773f5 100644
--- a/src/compiler/nir/nir_lower_locals_to_regs.c
+++ b/src/compiler/nir/nir_lower_locals_to_regs.c
@@ -26,6 +26,9 @@
 #include "nir_builder_opcodes.h"
 #include "nir_intrinsics_indices.h"
 
+#define XXH_INLINE_ALL
+#include "util/xxhash.h"
+
 struct locals_to_regs_state {
    nir_builder builder;
 
diff --git a/src/compiler/nir/nir_opt_load_store_vectorize.c b/src/compiler/nir/nir_opt_load_store_vectorize.c
index b357fbe994b..3b8d09cb544 100644
--- a/src/compiler/nir/nir_opt_load_store_vectorize.c
+++ b/src/compiler/nir/nir_opt_load_store_vectorize.c
@@ -50,6 +50,9 @@
 
 #include <stdlib.h>
 
+#define XXH_INLINE_ALL
+#include "util/xxhash.h"
+
 struct intrinsic_info {
    nir_variable_mode mode; /* 0 if the mode is obtained from the deref. */
    nir_intrinsic_op op;
diff --git a/src/compiler/nir/nir_opt_vectorize.c b/src/compiler/nir/nir_opt_vectorize.c
index e03cd194bfd..e40858b8f07 100644
--- a/src/compiler/nir/nir_opt_vectorize.c
+++ b/src/compiler/nir/nir_opt_vectorize.c
@@ -37,6 +37,9 @@
 #include "nir_builder.h"
 #include "nir_vla.h"
 
+#define XXH_INLINE_ALL
+#include "util/xxhash.h"
+
 #define HASH(hash, data) XXH32(&data, sizeof(data), hash)
 
 static uint32_t
diff --git a/src/freedreno/vulkan/tu_autotune.cc b/src/freedreno/vulkan/tu_autotune.cc
index 15952c130a5..41e9a95bcd2 100644
--- a/src/freedreno/vulkan/tu_autotune.cc
+++ b/src/freedreno/vulkan/tu_autotune.cc
@@ -11,6 +11,9 @@
 #include "tu_image.h"
 #include "tu_pass.h"
 
+#define XXH_INLINE_ALL
+#include "util/xxhash.h"
+
 /* How does it work?
  *
  * - For each renderpass we calculate the number of samples passed
diff --git a/src/freedreno/vulkan/tu_pass.cc b/src/freedreno/vulkan/tu_pass.cc
index dce4edc7964..a238217b63f 100644
--- a/src/freedreno/vulkan/tu_pass.cc
+++ b/src/freedreno/vulkan/tu_pass.cc
@@ -16,6 +16,9 @@
 #include "tu_device.h"
 #include "tu_image.h"
 
+#define XXH_INLINE_ALL
+#include "util/xxhash.h"
+
 static void
 tu_render_pass_add_subpass_dep(struct tu_render_pass *pass,
                                const VkSubpassDependency2 *dep)
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc b/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc
index db15c589962..e3c32bf4696 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc
@@ -22,6 +22,9 @@
 #include "fd6_screen.h"
 #include "fd6_texture.h"
 
+#define XXH_INLINE_ALL
+#include "util/xxhash.h"
+
 static void fd6_texture_state_destroy(struct fd6_texture_state *state);
 
 static void