diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
index adc7a428469..19735339bca 100644
--- a/src/compiler/Makefile.sources
+++ b/src/compiler/Makefile.sources
@@ -235,10 +235,10 @@ NIR_FILES = \
 	nir/nir_worklist.h
 
 SPIRV_FILES = \
-	nir/spirv/nir_spirv.h \
-	nir/spirv/spirv_to_nir.c \
-	nir/spirv/vtn_alu.c \
-	nir/spirv/vtn_cfg.c \
-	nir/spirv/vtn_glsl450.c \
-	nir/spirv/vtn_private.h \
-	nir/spirv/vtn_variables.c
+	spirv/nir_spirv.h \
+	spirv/spirv_to_nir.c \
+	spirv/vtn_alu.c \
+	spirv/vtn_cfg.c \
+	spirv/vtn_glsl450.c \
+	spirv/vtn_private.h \
+	spirv/vtn_variables.c
diff --git a/src/compiler/nir/spirv/GLSL.std.450.h b/src/compiler/spirv/GLSL.std.450.h
similarity index 100%
rename from src/compiler/nir/spirv/GLSL.std.450.h
rename to src/compiler/spirv/GLSL.std.450.h
diff --git a/src/compiler/nir/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h
similarity index 100%
rename from src/compiler/nir/spirv/nir_spirv.h
rename to src/compiler/spirv/nir_spirv.h
diff --git a/src/compiler/nir/spirv/spirv.h b/src/compiler/spirv/spirv.h
similarity index 100%
rename from src/compiler/nir/spirv/spirv.h
rename to src/compiler/spirv/spirv.h
diff --git a/src/compiler/nir/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
similarity index 100%
rename from src/compiler/nir/spirv/spirv_to_nir.c
rename to src/compiler/spirv/spirv_to_nir.c
diff --git a/src/compiler/nir/spirv/vtn_alu.c b/src/compiler/spirv/vtn_alu.c
similarity index 100%
rename from src/compiler/nir/spirv/vtn_alu.c
rename to src/compiler/spirv/vtn_alu.c
diff --git a/src/compiler/nir/spirv/vtn_cfg.c b/src/compiler/spirv/vtn_cfg.c
similarity index 100%
rename from src/compiler/nir/spirv/vtn_cfg.c
rename to src/compiler/spirv/vtn_cfg.c
diff --git a/src/compiler/nir/spirv/vtn_glsl450.c b/src/compiler/spirv/vtn_glsl450.c
similarity index 100%
rename from src/compiler/nir/spirv/vtn_glsl450.c
rename to src/compiler/spirv/vtn_glsl450.c
diff --git a/src/compiler/nir/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h
similarity index 100%
rename from src/compiler/nir/spirv/vtn_private.h
rename to src/compiler/spirv/vtn_private.h
diff --git a/src/compiler/nir/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
similarity index 100%
rename from src/compiler/nir/spirv/vtn_variables.c
rename to src/compiler/spirv/vtn_variables.c
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index 52748a0619a..90732dba961 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -31,7 +31,7 @@
 #include "anv_private.h"
 #include "brw_nir.h"
 #include "anv_nir.h"
-#include "nir/spirv/nir_spirv.h"
+#include "spirv/nir_spirv.h"
 
 /* Needed for SWIZZLE macros */
 #include "program/prog_instruction.h"