diff --git a/src/nouveau/headers/meson.build b/src/nouveau/headers/meson.build
index 0bf92a5b0de44..0fb4695da0096 100644
--- a/src/nouveau/headers/meson.build
+++ b/src/nouveau/headers/meson.build
@@ -1,4 +1,4 @@
-nvk_classes = [
+nv_push_classes = [
   'cl902d',
   'cl9039',
   'cl906f',
@@ -32,19 +32,19 @@ hwref_gens = [
   'turing/tu102',
 ]
 
-nvk_cl_header_depend_files = [
+nv_push_cl_header_depend_files = [
   files('class_parser.py')
 ]
 
 cl_generated = []
-foreach cl : nvk_classes
+foreach cl : nv_push_classes
   cl_generated += custom_target(
     cl + '.h',
     input : ['class_parser.py', 'nvidia/classes/'+cl+'.h'],
-    output : ['nvk_'+cl+'.h', 'nvk_'+cl+'.c'],
+    output : ['nv_push_'+cl+'.h', 'nv_push_'+cl+'.c'],
     command : [prog_python, '@INPUT0@', '--in-h', '@INPUT1@',
                '--out-h', '@OUTPUT0@', '--out-c', '@OUTPUT1@'],
-    depend_files: nvk_cl_header_depend_files,
+    depend_files: nv_push_cl_header_depend_files,
   )
 endforeach
 
@@ -76,14 +76,14 @@ if with_nouveau_vk
   rust = import('rust')
 
   cl_rs_generated = []
-  foreach cl : nvk_classes
+  foreach cl : nv_push_classes
     cl_rs_generated += custom_target(
       'nvh_classes_' + cl + '.rs',
       input : ['class_parser.py', 'nvidia/classes/'+cl+'.h'],
       output : ['nvh_classes_'+cl+'.rs'],
       command : [prog_python, '@INPUT0@', '--in-h', '@INPUT1@',
                  '--out-rs', '@OUTPUT0@'],
-      depend_files: nvk_cl_header_depend_files,
+      depend_files: nv_push_cl_header_depend_files,
     )
 
     fs = import('fs')
diff --git a/src/nouveau/headers/nv_push.c b/src/nouveau/headers/nv_push.c
index e41d6afe57575..009d1376e33aa 100644
--- a/src/nouveau/headers/nv_push.c
+++ b/src/nouveau/headers/nv_push.c
@@ -4,23 +4,23 @@
 
 #include <inttypes.h>
 
-#include "nvk_cl902d.h"
-#include "nvk_cl906f.h"
-#include "nvk_cl9097.h"
-#include "nvk_cl90b5.h"
-#include "nvk_cla097.h"
-#include "nvk_cla0b5.h"
-#include "nvk_cla0c0.h"
-#include "nvk_clb197.h"
-#include "nvk_clc0c0.h"
-#include "nvk_clc1b5.h"
-#include "nvk_clc397.h"
-#include "nvk_clc3c0.h"
-#include "nvk_clc597.h"
-#include "nvk_clc5c0.h"
-#include "nvk_clc697.h"
-#include "nvk_clc6c0.h"
-#include "nvk_clc7c0.h"
+#include "nv_push_cl902d.h"
+#include "nv_push_cl906f.h"
+#include "nv_push_cl9097.h"
+#include "nv_push_cl90b5.h"
+#include "nv_push_cla097.h"
+#include "nv_push_cla0b5.h"
+#include "nv_push_cla0c0.h"
+#include "nv_push_clb197.h"
+#include "nv_push_clc0c0.h"
+#include "nv_push_clc1b5.h"
+#include "nv_push_clc397.h"
+#include "nv_push_clc3c0.h"
+#include "nv_push_clc597.h"
+#include "nv_push_clc5c0.h"
+#include "nv_push_clc697.h"
+#include "nv_push_clc6c0.h"
+#include "nv_push_clc7c0.h"
 
 #ifndef NDEBUG
 void
diff --git a/src/nouveau/mme/mme_fermi_sim.c b/src/nouveau/mme/mme_fermi_sim.c
index 126143b7dad63..58e3d2e80217d 100644
--- a/src/nouveau/mme/mme_fermi_sim.c
+++ b/src/nouveau/mme/mme_fermi_sim.c
@@ -9,8 +9,8 @@
 #include "mme_fermi.h"
 #include "util/u_math.h"
 
-#include "nvk_cl9097.h"
-#include "nvk_cl902d.h"
+#include "nv_push_cl9097.h"
+#include "nv_push_cl902d.h"
 
 struct mme_fermi_sim {
    uint32_t param_count;
diff --git a/src/nouveau/mme/mme_tu104.c b/src/nouveau/mme/mme_tu104.c
index 28a1575b56f84..27ba4cc29625b 100644
--- a/src/nouveau/mme/mme_tu104.c
+++ b/src/nouveau/mme/mme_tu104.c
@@ -8,7 +8,7 @@
 
 #include <stdlib.h>
 
-#include "nvk_clc597.h"
+#include "nv_push_clc597.h"
 
 #define PRED_TO_STR(OP) [MME_TU104_PRED_##OP] = #OP
 const char *pred_to_str[] = {
diff --git a/src/nouveau/mme/mme_tu104_sim.c b/src/nouveau/mme/mme_tu104_sim.c
index b7356cef4d2bd..327a418a1b6f2 100644
--- a/src/nouveau/mme/mme_tu104_sim.c
+++ b/src/nouveau/mme/mme_tu104_sim.c
@@ -9,7 +9,7 @@
 #include "mme_tu104.h"
 #include "util/u_math.h"
 
-#include "nvk_clc597.h"
+#include "nv_push_clc597.h"
 
 struct mme_tu104_sim {
    uint32_t param_count;
diff --git a/src/nouveau/mme/tests/mme_builder_test.cpp b/src/nouveau/mme/tests/mme_builder_test.cpp
index 5cf5114989905..763a1893c494f 100644
--- a/src/nouveau/mme/tests/mme_builder_test.cpp
+++ b/src/nouveau/mme/tests/mme_builder_test.cpp
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "nvk_clc597.h"
+#include "nv_push_clc597.h"
 
 class mme_builder_test : public ::testing::Test {
 public:
diff --git a/src/nouveau/mme/tests/mme_fermi_sim_hw_test.cpp b/src/nouveau/mme/tests/mme_fermi_sim_hw_test.cpp
index f21fb0ae1a576..e5d42014c3fa2 100644
--- a/src/nouveau/mme/tests/mme_fermi_sim_hw_test.cpp
+++ b/src/nouveau/mme/tests/mme_fermi_sim_hw_test.cpp
@@ -6,7 +6,7 @@
 
 #include "mme_fermi_sim.h"
 /* for VOLTA_A */
-#include "nvk_clc397.h"
+#include "nv_push_clc397.h"
 
 class mme_fermi_sim_test : public ::testing::Test, public mme_hw_runner {
 public:
diff --git a/src/nouveau/mme/tests/mme_runner.cpp b/src/nouveau/mme/tests/mme_runner.cpp
index edd15ce608144..86ab96cce2123 100644
--- a/src/nouveau/mme/tests/mme_runner.cpp
+++ b/src/nouveau/mme/tests/mme_runner.cpp
@@ -11,7 +11,7 @@
 #include "mme_fermi_sim.h"
 #include "mme_tu104_sim.h"
 
-#include "nvk_clc597.h"
+#include "nv_push_clc597.h"
 
 #include "nouveau_bo.h"
 #include "nouveau_context.h"
diff --git a/src/nouveau/mme/tests/mme_runner.h b/src/nouveau/mme/tests/mme_runner.h
index 5c065047a0dac..3a7a8bcad93ca 100644
--- a/src/nouveau/mme/tests/mme_runner.h
+++ b/src/nouveau/mme/tests/mme_runner.h
@@ -12,7 +12,7 @@ struct nouveau_ws_contxt;
 struct nouveau_ws_device;
 
 #include "nv_push.h"
-#include "nvk_cl9097.h"
+#include "nv_push_cl9097.h"
 
 #define DATA_BO_SIZE 4096
 #define DATA_DWORDS 1024
diff --git a/src/nouveau/mme/tests/mme_tu104_sim_hw_test.cpp b/src/nouveau/mme/tests/mme_tu104_sim_hw_test.cpp
index 84b5ef6d27087..a978527d32960 100644
--- a/src/nouveau/mme/tests/mme_tu104_sim_hw_test.cpp
+++ b/src/nouveau/mme/tests/mme_tu104_sim_hw_test.cpp
@@ -5,7 +5,7 @@
 #include "mme_runner.h"
 #include "mme_tu104_sim.h"
 
-#include "nvk_clc597.h"
+#include "nv_push_clc597.h"
 
 class mme_tu104_sim_test : public ::testing::Test, public mme_hw_runner {
 public:
diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c b/src/nouveau/vulkan/nvk_cmd_buffer.c
index 60db6fd21d644..f4d59a09efb63 100644
--- a/src/nouveau/vulkan/nvk_cmd_buffer.c
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.c
@@ -22,11 +22,11 @@
 
 #include "nouveau/nouveau.h"
 
-#include "nvk_cl906f.h"
-#include "nvk_cl90b5.h"
-#include "nvk_cla097.h"
-#include "nvk_cla0c0.h"
-#include "nvk_clc597.h"
+#include "nv_push_cl906f.h"
+#include "nv_push_cl90b5.h"
+#include "nv_push_cla097.h"
+#include "nv_push_cla0c0.h"
+#include "nv_push_clc597.h"
 
 static void
 nvk_descriptor_state_fini(struct nvk_cmd_buffer *cmd,
diff --git a/src/nouveau/vulkan/nvk_cmd_clear.c b/src/nouveau/vulkan/nvk_cmd_clear.c
index a63e00299e7bc..185de4ebead79 100644
--- a/src/nouveau/vulkan/nvk_cmd_clear.c
+++ b/src/nouveau/vulkan/nvk_cmd_clear.c
@@ -13,7 +13,7 @@
 
 #include "vk_format.h"
 
-#include "nvk_cl9097.h"
+#include "nv_push_cl9097.h"
 #include "drf.h"
 
 void
diff --git a/src/nouveau/vulkan/nvk_cmd_copy.c b/src/nouveau/vulkan/nvk_cmd_copy.c
index 04dc90a93becd..463390ab67f27 100644
--- a/src/nouveau/vulkan/nvk_cmd_copy.c
+++ b/src/nouveau/vulkan/nvk_cmd_copy.c
@@ -18,9 +18,9 @@
 #include "nouveau_context.h"
 
 #include "nvtypes.h"
-#include "nvk_cl902d.h"
-#include "nvk_cl90b5.h"
-#include "nvk_clc1b5.h"
+#include "nv_push_cl902d.h"
+#include "nv_push_cl90b5.h"
+#include "nv_push_clc1b5.h"
 
 static inline uint16_t
 nvk_cmd_buffer_copy_cls(struct nvk_cmd_buffer *cmd)
diff --git a/src/nouveau/vulkan/nvk_cmd_dispatch.c b/src/nouveau/vulkan/nvk_cmd_dispatch.c
index 1614cc40694de..fd7325017fed7 100644
--- a/src/nouveau/vulkan/nvk_cmd_dispatch.c
+++ b/src/nouveau/vulkan/nvk_cmd_dispatch.c
@@ -17,14 +17,14 @@
 #include "cla1c0.h"
 #include "clc0c0.h"
 #include "clc5c0.h"
-#include "nvk_cl90c0.h"
-#include "nvk_cl9097.h"
-#include "nvk_cla0c0.h"
-#include "nvk_clb0c0.h"
-#include "nvk_clb1c0.h"
-#include "nvk_clc3c0.h"
-#include "nvk_clc597.h"
-#include "nvk_clc6c0.h"
+#include "nv_push_cl90c0.h"
+#include "nv_push_cl9097.h"
+#include "nv_push_cla0c0.h"
+#include "nv_push_clb0c0.h"
+#include "nv_push_clb1c0.h"
+#include "nv_push_clc3c0.h"
+#include "nv_push_clc597.h"
+#include "nv_push_clc6c0.h"
 
 VkResult
 nvk_push_dispatch_state_init(struct nvk_device *dev, struct nv_push *p)
diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c
index 2a5be82011ab7..5d74108349e92 100644
--- a/src/nouveau/vulkan/nvk_cmd_draw.c
+++ b/src/nouveau/vulkan/nvk_cmd_draw.c
@@ -20,15 +20,15 @@
 
 #include "nouveau_context.h"
 
-#include "nvk_cl902d.h"
-#include "nvk_cl9097.h"
-#include "nvk_cl90b5.h"
-#include "nvk_cl90c0.h"
-#include "nvk_cla097.h"
-#include "nvk_clb097.h"
-#include "nvk_clb197.h"
-#include "nvk_clc397.h"
-#include "nvk_clc597.h"
+#include "nv_push_cl902d.h"
+#include "nv_push_cl9097.h"
+#include "nv_push_cl90b5.h"
+#include "nv_push_cl90c0.h"
+#include "nv_push_cla097.h"
+#include "nv_push_clb097.h"
+#include "nv_push_clb197.h"
+#include "nv_push_clc397.h"
+#include "nv_push_clc597.h"
 #include "drf.h"
 
 static inline uint16_t
diff --git a/src/nouveau/vulkan/nvk_cmd_meta.c b/src/nouveau/vulkan/nvk_cmd_meta.c
index e038743125c1d..55504f2b848c8 100644
--- a/src/nouveau/vulkan/nvk_cmd_meta.c
+++ b/src/nouveau/vulkan/nvk_cmd_meta.c
@@ -9,8 +9,8 @@
 #include "nvk_image.h"
 #include "nvk_physical_device.h"
 
-#include "nvk_cl9097.h"
-#include "nvk_clb197.h"
+#include "nv_push_cl9097.h"
+#include "nv_push_clb197.h"
 
 static VkResult
 nvk_cmd_bind_map_buffer(struct vk_command_buffer *vk_cmd,
diff --git a/src/nouveau/vulkan/nvk_codegen.c b/src/nouveau/vulkan/nvk_codegen.c
index a1eae570c213f..45e9818250a68 100644
--- a/src/nouveau/vulkan/nvk_codegen.c
+++ b/src/nouveau/vulkan/nvk_codegen.c
@@ -14,7 +14,7 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_shader_tokens.h"
 
-#include "nvk_cl9097.h"
+#include "nv_push_cl9097.h"
 
 uint64_t
 nvk_cg_get_prog_debug(void)
diff --git a/src/nouveau/vulkan/nvk_device_memory.c b/src/nouveau/vulkan/nvk_device_memory.c
index 8bca7d6b7485c..1cfd4c1a99002 100644
--- a/src/nouveau/vulkan/nvk_device_memory.c
+++ b/src/nouveau/vulkan/nvk_device_memory.c
@@ -18,7 +18,7 @@
 #include <sys/mman.h>
 
 #include "nvtypes.h"
-#include "nvk_cl90b5.h"
+#include "nv_push_cl90b5.h"
 
 /* Supports opaque fd only */
 const VkExternalMemoryProperties nvk_opaque_fd_mem_props = {
diff --git a/src/nouveau/vulkan/nvk_event.c b/src/nouveau/vulkan/nvk_event.c
index 54b04120e2750..bf665ab6720e3 100644
--- a/src/nouveau/vulkan/nvk_event.c
+++ b/src/nouveau/vulkan/nvk_event.c
@@ -9,8 +9,8 @@
 #include "nvk_entrypoints.h"
 #include "nvk_mme.h"
 
-#include "nvk_cl906f.h"
-#include "nvk_cl9097.h"
+#include "nv_push_cl906f.h"
+#include "nv_push_cl9097.h"
 
 #define NVK_EVENT_MEM_SIZE sizeof(VkResult)
 
diff --git a/src/nouveau/vulkan/nvk_heap.c b/src/nouveau/vulkan/nvk_heap.c
index 28f042bf1450b..fc38a671db0ed 100644
--- a/src/nouveau/vulkan/nvk_heap.c
+++ b/src/nouveau/vulkan/nvk_heap.c
@@ -11,7 +11,7 @@
 #include "util/macros.h"
 
 #include "nv_push.h"
-#include "nvk_cl90b5.h"
+#include "nv_push_cl90b5.h"
 
 VkResult
 nvk_heap_init(struct nvk_device *dev, struct nvk_heap *heap,
diff --git a/src/nouveau/vulkan/nvk_query_pool.c b/src/nouveau/vulkan/nvk_query_pool.c
index cbecb298f4bed..a7a34ed91359f 100644
--- a/src/nouveau/vulkan/nvk_query_pool.c
+++ b/src/nouveau/vulkan/nvk_query_pool.c
@@ -24,10 +24,10 @@
 
 #include "util/os_time.h"
 
-#include "nvk_cl906f.h"
-#include "nvk_cl9097.h"
-#include "nvk_cla0c0.h"
-#include "nvk_clc597.h"
+#include "nv_push_cl906f.h"
+#include "nv_push_cl9097.h"
+#include "nv_push_cla0c0.h"
+#include "nv_push_clc597.h"
 
 struct nvk_query_report {
    uint64_t value;
diff --git a/src/nouveau/vulkan/nvk_queue.c b/src/nouveau/vulkan/nvk_queue.c
index 0c87c194461a0..d85af210ea0e2 100644
--- a/src/nouveau/vulkan/nvk_queue.c
+++ b/src/nouveau/vulkan/nvk_queue.c
@@ -13,13 +13,13 @@
 
 #include <xf86drm.h>
 
-#include "nvk_cl9039.h"
-#include "nvk_cl9097.h"
-#include "nvk_cl90b5.h"
-#include "nvk_cla0c0.h"
+#include "nv_push_cl9039.h"
+#include "nv_push_cl9097.h"
+#include "nv_push_cl90b5.h"
+#include "nv_push_cla0c0.h"
 #include "cla1c0.h"
-#include "nvk_clc3c0.h"
-#include "nvk_clc397.h"
+#include "nv_push_clc3c0.h"
+#include "nv_push_clc397.h"
 
 static void
 nvk_queue_state_init(struct nvk_queue_state *qs)
diff --git a/src/nouveau/vulkan/nvk_upload_queue.c b/src/nouveau/vulkan/nvk_upload_queue.c
index bb4d524af434c..b92e0815368d1 100644
--- a/src/nouveau/vulkan/nvk_upload_queue.c
+++ b/src/nouveau/vulkan/nvk_upload_queue.c
@@ -13,7 +13,7 @@
 #include "drm-uapi/nouveau_drm.h"
 
 #include "nv_push.h"
-#include "nvk_cl90b5.h"
+#include "nv_push_cl90b5.h"
 
 #define NVK_UPLOAD_BO_SIZE 64*1024
 
diff --git a/src/nouveau/vulkan/test_nvk_mme.c b/src/nouveau/vulkan/test_nvk_mme.c
index d8eea63cbd206..e67df0666129e 100644
--- a/src/nouveau/vulkan/test_nvk_mme.c
+++ b/src/nouveau/vulkan/test_nvk_mme.c
@@ -4,12 +4,12 @@
  */
 #include "nvk_mme.h"
 
-#include "nvk_cla097.h"
-#include "nvk_cla0c0.h"
-#include "nvk_clc397.h"
-#include "nvk_clc3c0.h"
-#include "nvk_clc597.h"
-#include "nvk_clc5c0.h"
+#include "nv_push_cla097.h"
+#include "nv_push_cla0c0.h"
+#include "nv_push_clc397.h"
+#include "nv_push_clc3c0.h"
+#include "nv_push_clc597.h"
+#include "nv_push_clc5c0.h"
 
 int main(int argc, char **argv)
 {