diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c b/src/nouveau/vulkan/nvk_cmd_buffer.c
index ccd3fb6abec..8ca9901f8d5 100644
--- a/src/nouveau/vulkan/nvk_cmd_buffer.c
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.c
@@ -19,8 +19,6 @@
 #include "vk_pipeline_layout.h"
 #include "vk_synchronization.h"
 
-#include "nouveau_context.h"
-
 #include "nv_push_cl906f.h"
 #include "nv_push_cl90b5.h"
 #include "nv_push_cla097.h"
diff --git a/src/nouveau/vulkan/nvk_cmd_copy.c b/src/nouveau/vulkan/nvk_cmd_copy.c
index 5223d844ed1..74c66a6718e 100644
--- a/src/nouveau/vulkan/nvk_cmd_copy.c
+++ b/src/nouveau/vulkan/nvk_cmd_copy.c
@@ -15,9 +15,6 @@
 
 #include "vk_format.h"
 
-#include "nouveau_bo.h"
-#include "nouveau_context.h"
-
 #include "nvtypes.h"
 #include "nv_push_cl902d.h"
 #include "nv_push_cl90b5.h"
diff --git a/src/nouveau/vulkan/nvk_cmd_dispatch.c b/src/nouveau/vulkan/nvk_cmd_dispatch.c
index e133512db2d..ec7c267d77f 100644
--- a/src/nouveau/vulkan/nvk_cmd_dispatch.c
+++ b/src/nouveau/vulkan/nvk_cmd_dispatch.c
@@ -11,8 +11,6 @@
 #include "nvk_physical_device.h"
 #include "nvk_shader.h"
 
-#include "nouveau_context.h"
-
 #include "cla0b5.h"
 #include "cla1c0.h"
 #include "clc0c0.h"
diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c
index 75782d6bd56..7d3137c15e1 100644
--- a/src/nouveau/vulkan/nvk_cmd_draw.c
+++ b/src/nouveau/vulkan/nvk_cmd_draw.c
@@ -18,8 +18,6 @@
 #include "vk_render_pass.h"
 #include "vk_standard_sample_locations.h"
 
-#include "nouveau_context.h"
-
 #include "nv_push_cl902d.h"
 #include "nv_push_cl9097.h"
 #include "nv_push_cl90b5.h"
diff --git a/src/nouveau/vulkan/nvk_device.c b/src/nouveau/vulkan/nvk_device.c
index 45b7918d881..d1b28956f36 100644
--- a/src/nouveau/vulkan/nvk_device.c
+++ b/src/nouveau/vulkan/nvk_device.c
@@ -10,16 +10,10 @@
 #include "nvk_physical_device.h"
 #include "nvk_shader.h"
 #include "nvkmd/nvkmd.h"
-#include "nvkmd/nouveau/nvkmd_nouveau.h"
 
 #include "vk_pipeline_cache.h"
 #include "vulkan/wsi/wsi_common.h"
 
-#include "nouveau_context.h"
-
-#include <fcntl.h>
-#include <xf86drm.h>
-
 #include "cl9097.h"
 #include "clb097.h"
 #include "clc397.h"
@@ -158,8 +152,6 @@ nvk_CreateDevice(VkPhysicalDevice physicalDevice,
    if (result != VK_SUCCESS)
       goto fail_init;
 
-   dev->ws_dev = nvkmd_nouveau_dev(dev->nvkmd)->ws_dev;
-
    vk_device_set_drm_fd(&dev->vk, nvkmd_dev_get_drm_fd(dev->nvkmd));
    dev->vk.command_buffer_ops = &nvk_cmd_buffer_ops;
 
diff --git a/src/nouveau/vulkan/nvk_device.h b/src/nouveau/vulkan/nvk_device.h
index 7ee20d8b468..9679a150e0a 100644
--- a/src/nouveau/vulkan/nvk_device.h
+++ b/src/nouveau/vulkan/nvk_device.h
@@ -37,9 +37,6 @@ struct nvk_device {
 
    struct nvkmd_dev *nvkmd;
 
-   /* Leave this for now so we have less refactoring */
-   struct nouveau_ws_device *ws_dev;
-
    struct nvk_upload_queue upload;
 
    struct nvk_descriptor_table images;
diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c
index cae8c918426..87aced70f1a 100644
--- a/src/nouveau/vulkan/nvk_physical_device.c
+++ b/src/nouveau/vulkan/nvk_physical_device.c
@@ -23,10 +23,7 @@
 #include "vk_shader_module.h"
 #include "vulkan/wsi/wsi_common.h"
 
-#include <fcntl.h>
-#include <sys/stat.h>
 #include <sys/sysmacros.h>
-#include <xf86drm.h>
 
 #include "cl90c0.h"
 #include "cl91c0.h"
@@ -1099,7 +1096,7 @@ nvk_get_vram_heap_available(struct nvk_physical_device *pdev)
 
 VkResult
 nvk_create_drm_physical_device(struct vk_instance *_instance,
-                               drmDevicePtr drm_device,
+                               struct _drmDevice *drm_device,
                                struct vk_physical_device **pdev_out)
 {
    struct nvk_instance *instance = (struct nvk_instance *)_instance;
diff --git a/src/nouveau/vulkan/nvk_sampler.c b/src/nouveau/vulkan/nvk_sampler.c
index bb5703f15f4..fd359ab83f7 100644
--- a/src/nouveau/vulkan/nvk_sampler.c
+++ b/src/nouveau/vulkan/nvk_sampler.c
@@ -11,8 +11,6 @@
 #include "vk_format.h"
 #include "vk_sampler.h"
 
-#include "nouveau_context.h"
-
 #include "util/bitpack_helpers.h"
 #include "util/format/format_utils.h"
 #include "util/format_srgb.h"
diff --git a/src/nouveau/vulkan/nvk_shader.h b/src/nouveau/vulkan/nvk_shader.h
index 9be1544bda7..2e11c5790f5 100644
--- a/src/nouveau/vulkan/nvk_shader.h
+++ b/src/nouveau/vulkan/nvk_shader.h
@@ -12,7 +12,6 @@
 
 #include "nak.h"
 #include "nir.h"
-#include "nouveau_bo.h"
 
 #include "vk_shader.h"