diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4e780e5d..2908df45 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -124,6 +124,10 @@ set(DOCKSLIBS_SRCS
     qtwidgets/views/Stack_qtwidgets.h
     qtwidgets/views/SideBar_qtwidgets.cpp
     qtwidgets/views/SideBar_qtwidgets.h
+    qtwidgets/DebugWindow.cpp
+    qtwidgets/DebugWindow_p.h
+    qtwidgets/ObjectViewer.cpp
+    qtwidgets/ObjectViewer_p.h
 )
 
 # add_library(kddockwidgets_backend STATIC ${KDDW_BACKEND_SRCS})
@@ -225,10 +229,7 @@ if(${PROJECT_NAME}_QTQUICK)
 
 else()
   set(DOCKSLIBS_SRCS ${DOCKSLIBS_SRCS}
-      private/DebugWindow.cpp
-      private/DebugWindow_p.h
-      private/ObjectViewer.cpp
-      private/ObjectViewer_p.h
+
       # MainWindow.cpp
       # MainWindow.h
       # DockWidget.h
diff --git a/src/private/DockRegistry.cpp b/src/private/DockRegistry.cpp
index bb4fa4f3..09117881 100644
--- a/src/private/DockRegistry.cpp
+++ b/src/private/DockRegistry.cpp
@@ -34,7 +34,7 @@
 #include <QWindow>
 
 #ifdef KDDOCKWIDGETS_QTWIDGETS
-#include "DebugWindow_p.h"
+#include "qtwidgets/DebugWindow_p.h"
 #else
 #include "quick/QmlTypes.h"
 #endif
diff --git a/src/private/DebugWindow.cpp b/src/qtwidgets/DebugWindow.cpp
similarity index 99%
rename from src/private/DebugWindow.cpp
rename to src/qtwidgets/DebugWindow.cpp
index 06244857..69a0bb10 100644
--- a/src/private/DebugWindow.cpp
+++ b/src/qtwidgets/DebugWindow.cpp
@@ -17,9 +17,9 @@
  */
 
 #include "DebugWindow_p.h"
-#include "DockRegistry_p.h"
+#include "private/DockRegistry_p.h"
+#include "private/LayoutWidget_p.h"
 #include "LayoutSaver.h"
-#include "LayoutWidget_p.h"
 #include "ObjectViewer_p.h"
 #include "Qt5Qt6Compat_p.h"
 
diff --git a/src/private/DebugWindow_p.h b/src/qtwidgets/DebugWindow_p.h
similarity index 100%
rename from src/private/DebugWindow_p.h
rename to src/qtwidgets/DebugWindow_p.h
diff --git a/src/private/ObjectViewer.cpp b/src/qtwidgets/ObjectViewer.cpp
similarity index 100%
rename from src/private/ObjectViewer.cpp
rename to src/qtwidgets/ObjectViewer.cpp
diff --git a/src/private/ObjectViewer_p.h b/src/qtwidgets/ObjectViewer_p.h
similarity index 100%
rename from src/private/ObjectViewer_p.h
rename to src/qtwidgets/ObjectViewer_p.h