diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build
index 58fd5d10b75..b953ea006ed 100644
--- a/src/gallium/drivers/panfrost/meson.build
+++ b/src/gallium/drivers/panfrost/meson.build
@@ -21,6 +21,8 @@
 
 files_panfrost = files(
   'pan_afbc_cso.c',
+  'pan_bo.c',
+  'pan_device.c',
   'pan_disk_cache.c',
   'pan_fence.c',
   'pan_helpers.c',
diff --git a/src/panfrost/lib/pan_bo.c b/src/gallium/drivers/panfrost/pan_bo.c
similarity index 99%
rename from src/panfrost/lib/pan_bo.c
rename to src/gallium/drivers/panfrost/pan_bo.c
index ab26b2b5ddc..ac340124a4f 100644
--- a/src/panfrost/lib/pan_bo.c
+++ b/src/gallium/drivers/panfrost/pan_bo.c
@@ -83,7 +83,7 @@ panfrost_bo_alloc(struct panfrost_device *dev, size_t size, uint32_t flags,
    assert(kmod_bo);
 
    bo = pan_lookup_bo(dev, kmod_bo->handle);
-   assert(!memcmp(bo, &((struct panfrost_bo){}), sizeof(*bo)));
+   assert(!memcmp(bo, &((struct panfrost_bo){0}), sizeof(*bo)));
    bo->kmod_bo = kmod_bo;
 
    struct pan_kmod_vm_op vm_op = {
diff --git a/src/panfrost/lib/pan_bo.h b/src/gallium/drivers/panfrost/pan_bo.h
similarity index 100%
rename from src/panfrost/lib/pan_bo.h
rename to src/gallium/drivers/panfrost/pan_bo.h
diff --git a/src/panfrost/lib/pan_device.c b/src/gallium/drivers/panfrost/pan_device.c
similarity index 100%
rename from src/panfrost/lib/pan_device.c
rename to src/gallium/drivers/panfrost/pan_device.c
diff --git a/src/panfrost/lib/pan_device.h b/src/gallium/drivers/panfrost/pan_device.h
similarity index 100%
rename from src/panfrost/lib/pan_device.h
rename to src/gallium/drivers/panfrost/pan_device.h
diff --git a/src/panfrost/lib/meson.build b/src/panfrost/lib/meson.build
index e15cfed41f3..272da453cf9 100644
--- a/src/panfrost/lib/meson.build
+++ b/src/panfrost/lib/meson.build
@@ -73,10 +73,8 @@ libpanfrost_lib_files = files(
 
   'pan_afbc.c',
   'pan_attributes.c',
-  'pan_bo.c',
   'pan_blend.c',
   'pan_clear.c',
-  'pan_device.c',
   'pan_earlyzs.c',
   'pan_samples.c',
   'pan_tiler.c',