diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12-private.h b/subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12-private.h
index a4e3445017..bbfb5e779a 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12-private.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12-private.h
@@ -25,6 +25,7 @@
 #include <gst/d3d12/gstd3d12format-private.h>
 #include <gst/d3d12/gstd3d12converter-private.h>
 #include <gst/d3d12/gstd3d12cmdqueue-private.h>
+#include <gst/d3d12/gstd3d12mipgen-private.h>
 #include <gst/d3d12/gstd3d12compat.h>
 
 /*
diff --git a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12mipgen.h b/subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12mipgen-private.h
similarity index 94%
rename from subprojects/gst-plugins-bad/sys/d3d12/gstd3d12mipgen.h
rename to subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12mipgen-private.h
index 9206457761..ceed7308cd 100644
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12mipgen.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12mipgen-private.h
@@ -20,15 +20,19 @@
 #pragma once
 
 #include <gst/gst.h>
-#include <gst/d3d12/gstd3d12.h>
+#include <gst/d3d12/gstd3d12_fwd.h>
 
 G_BEGIN_DECLS
 
 #define GST_TYPE_D3D12_MIP_GEN (gst_d3d12_mip_gen_get_type())
+
+GST_D3D12_API
 G_DECLARE_FINAL_TYPE (GstD3D12MipGen, gst_d3d12_mip_gen, GST, D3D12_MIP_GEN, GstObject);
 
+GST_D3D12_API
 GstD3D12MipGen * gst_d3d12_mip_gen_new (GstD3D12Device * device);
 
+GST_D3D12_API
 gboolean         gst_d3d12_mip_gen_execute (GstD3D12MipGen * gen,
                                             ID3D12Resource * resource,
                                             GstD3D12FenceData * fence_data,
diff --git a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12mipgen.cpp b/subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12mipgen.cpp
similarity index 99%
rename from subprojects/gst-plugins-bad/sys/d3d12/gstd3d12mipgen.cpp
rename to subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12mipgen.cpp
index c985b9047a..853805cf33 100644
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12mipgen.cpp
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12mipgen.cpp
@@ -45,7 +45,6 @@
 #include "config.h"
 #endif
 
-#include "gstd3d12mipgen.h"
 #include <gst/d3d12/gstd3d12-private.h>
 #include <gst/d3dshader/gstd3dshader.h>
 #include <directx/d3dx12.h>
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/d3d12/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/d3d12/meson.build
index 4bb3887ab6..4f1b93a316 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/d3d12/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/d3d12/meson.build
@@ -13,6 +13,7 @@ d3d12_sources = [
   'gstd3d12format.cpp',
   'gstd3d12frame.cpp',
   'gstd3d12memory.cpp',
+  'gstd3d12mipgen.cpp',
   'gstd3d12utils.cpp',
 ]
 
diff --git a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12mipmapping.cpp b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12mipmapping.cpp
index 64f149cfa1..2bcfce50d7 100644
--- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12mipmapping.cpp
+++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12mipmapping.cpp
@@ -33,7 +33,6 @@
 #endif
 
 #include "gstd3d12mipmapping.h"
-#include "gstd3d12mipgen.h"
 #include "gstd3d12pluginutils.h"
 #include <directx/d3dx12.h>
 #include <mutex>
diff --git a/subprojects/gst-plugins-bad/sys/d3d12/meson.build b/subprojects/gst-plugins-bad/sys/d3d12/meson.build
index 53dfc6af86..949c353aad 100644
--- a/subprojects/gst-plugins-bad/sys/d3d12/meson.build
+++ b/subprojects/gst-plugins-bad/sys/d3d12/meson.build
@@ -20,7 +20,6 @@ d3d12_sources = [
   'gstd3d12ipcsink.cpp',
   'gstd3d12ipcsrc.cpp',
   'gstd3d12mpeg2dec.cpp',
-  'gstd3d12mipgen.cpp',
   'gstd3d12mipmapping.cpp',
   'gstd3d12overlaycompositor.cpp',
   'gstd3d12pluginutils.cpp',