diff --git a/examples/dockwidgets/MyTitleBar_CSS.h b/examples/dockwidgets/MyTitleBar_CSS.h
index e7448e69..45287d43 100644
--- a/examples/dockwidgets/MyTitleBar_CSS.h
+++ b/examples/dockwidgets/MyTitleBar_CSS.h
@@ -15,7 +15,7 @@
 #pragma once
 
 #include <kddockwidgets/views/TitleBar_qtwidgets.h>
-#include "controllers/TitleBar.h"
+#include "kddockwidgets/controllers/TitleBar.h"
 
 /**
  * @brief Shows how to implement a custom titlebar which uses "Qt StyleSheets".
diff --git a/examples/dockwidgets/main.cpp b/examples/dockwidgets/main.cpp
index ce254fcc..130c9aac 100644
--- a/examples/dockwidgets/main.cpp
+++ b/examples/dockwidgets/main.cpp
@@ -16,7 +16,7 @@
 #include <kddockwidgets/Config.h>
 #include <kddockwidgets/ViewFactory.h>
 
-#include "controllers/MainWindow.h"
+#include "kddockwidgets/controllers/MainWindow.h"
 
 #include <QStyleFactory>
 #include <QApplication>
diff --git a/examples/mdi_with_docking/main.cpp b/examples/mdi_with_docking/main.cpp
index b91c9a30..ea023c4a 100644
--- a/examples/mdi_with_docking/main.cpp
+++ b/examples/mdi_with_docking/main.cpp
@@ -16,7 +16,7 @@
 #include <qtwidgets/views/DockWidget_qtwidgets.h>
 #include <kddockwidgets/MDIArea.h>
 
-#include "controllers/MainWindow.h"
+#include "kddockwidgets/controllers/MainWindow.h"
 
 #include <QStyleFactory>
 #include <QApplication>
diff --git a/examples/minimal/main.cpp b/examples/minimal/main.cpp
index 09b942d3..b77af4d1 100644
--- a/examples/minimal/main.cpp
+++ b/examples/minimal/main.cpp
@@ -15,7 +15,7 @@
 #include <qtwidgets/views/MainWindow_qtwidgets.h>
 #include <qtwidgets/views/DockWidget_qtwidgets.h>
 
-#include "controllers/MainWindow.h"
+#include "kddockwidgets/controllers/MainWindow.h"
 
 #include <QStyleFactory>
 #include <QApplication>
diff --git a/src/private/DockRegistry.cpp b/src/private/DockRegistry.cpp
index 9b1e55c0..e7e4be4f 100644
--- a/src/private/DockRegistry.cpp
+++ b/src/private/DockRegistry.cpp
@@ -11,7 +11,7 @@
 
 #include "DockRegistry_p.h"
 #include "Config.h"
-#include "controllers/Layout.h"
+#include "kddockwidgets/controllers/Layout.h"
 #include "Logging_p.h"
 #include "Position_p.h"
 #include "Utils_p.h"
@@ -20,10 +20,10 @@
 #include "multisplitter/Item_p.h"
 
 #include "Platform.h"
-#include "controllers/FloatingWindow.h"
-#include "controllers/SideBar.h"
-#include "controllers/DockWidget.h"
-#include "controllers/DockWidget_p.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/SideBar.h"
+#include "kddockwidgets/controllers/DockWidget.h"
+#include "kddockwidgets/controllers/DockWidget_p.h"
 
 #include <QPointer>
 #include <QDebug>
diff --git a/src/private/DockRegistry_p.h b/src/private/DockRegistry_p.h
index c5505c9d..8ce657df 100644
--- a/src/private/DockRegistry_p.h
+++ b/src/private/DockRegistry_p.h
@@ -12,9 +12,9 @@
 #ifndef KD_DOCKREGISTRY_P_H
 #define KD_DOCKREGISTRY_P_H
 
-#include "controllers/DockWidget.h"
-#include "controllers/Frame.h"
-#include "controllers/MainWindow.h"
+#include "kddockwidgets/controllers/DockWidget.h"
+#include "kddockwidgets/controllers/Frame.h"
+#include "kddockwidgets/controllers/MainWindow.h"
 #include "Window.h"
 
 #include <QVector>
diff --git a/src/private/DragController.cpp b/src/private/DragController.cpp
index 6a1bc16c..84ac9365 100644
--- a/src/private/DragController.cpp
+++ b/src/private/DragController.cpp
@@ -20,12 +20,12 @@
 #include "Platform.h"
 #include "Window.h"
 
-#include "controllers/MDILayout.h"
-#include "controllers/DropArea.h"
-#include "controllers/TitleBar.h"
-#include "controllers/Frame.h"
-#include "controllers/FloatingWindow.h"
-#include "controllers/DockWidget_p.h"
+#include "kddockwidgets/controllers/MDILayout.h"
+#include "kddockwidgets/controllers/DropArea.h"
+#include "kddockwidgets/controllers/TitleBar.h"
+#include "kddockwidgets/controllers/Frame.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/DockWidget_p.h"
 
 #include <QMouseEvent>
 #include <QGuiApplication>
diff --git a/src/private/Draggable.cpp b/src/private/Draggable.cpp
index 1972fb65..f6a870e1 100644
--- a/src/private/Draggable.cpp
+++ b/src/private/Draggable.cpp
@@ -15,7 +15,7 @@
 #include "Utils_p.h"
 #include "Platform.h"
 
-#include "controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
 
 using namespace KDDockWidgets;
 
diff --git a/src/private/DropIndicatorOverlayInterface.cpp b/src/private/DropIndicatorOverlayInterface.cpp
index ee7c2152..61b785a5 100644
--- a/src/private/DropIndicatorOverlayInterface.cpp
+++ b/src/private/DropIndicatorOverlayInterface.cpp
@@ -11,13 +11,13 @@
 
 #include "DropIndicatorOverlay.h"
 
-#include "controllers/DropArea.h"
+#include "kddockwidgets/controllers/DropArea.h"
 #include "DockRegistry_p.h"
 #include "DragController_p.h"
 #include "Config.h"
 #include "Platform.h"
 
-#include "controllers/Frame.h"
+#include "kddockwidgets/controllers/Frame.h"
 
 using namespace KDDockWidgets;
 using namespace KDDockWidgets::Controllers;
diff --git a/src/private/Position.cpp b/src/private/Position.cpp
index 220ea3dd..b2755d20 100644
--- a/src/private/Position.cpp
+++ b/src/private/Position.cpp
@@ -19,8 +19,8 @@
 #include "DockRegistry_p.h"
 #include "LayoutSaver_p.h"
 #include "multisplitter/Item_p.h"
-#include "controllers/FloatingWindow.h"
-#include "controllers/Layout.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/Layout.h"
 
 #include <algorithm>
 
diff --git a/src/private/WidgetResizeHandler.cpp b/src/private/WidgetResizeHandler.cpp
index 85c089a7..3183b8c3 100644
--- a/src/private/WidgetResizeHandler.cpp
+++ b/src/private/WidgetResizeHandler.cpp
@@ -16,9 +16,9 @@
 #include "Utils_p.h"
 #include "DockRegistry_p.h"
 
-#include "controllers/MDILayout.h"
-#include "controllers/TitleBar.h"
-#include "controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/MDILayout.h"
+#include "kddockwidgets/controllers/TitleBar.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
 
 #include "Platform.h"
 
diff --git a/src/private/WidgetResizeHandler_p.h b/src/private/WidgetResizeHandler_p.h
index ac61ec18..ed6baf19 100644
--- a/src/private/WidgetResizeHandler_p.h
+++ b/src/private/WidgetResizeHandler_p.h
@@ -15,7 +15,7 @@
 #include "kddockwidgets/KDDockWidgets.h"
 #include "kddockwidgets/Qt5Qt6Compat_p.h"
 #include "kddockwidgets/docks_export.h"
-#include "controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
 #include "Window.h"
 
 #include <QPoint>
diff --git a/src/private/WindowBeingDragged.cpp b/src/private/WindowBeingDragged.cpp
index f76313dd..7aba717d 100644
--- a/src/private/WindowBeingDragged.cpp
+++ b/src/private/WindowBeingDragged.cpp
@@ -16,10 +16,10 @@
 #include "Utils_p.h"
 #include "Platform.h"
 
-#include "controllers/TitleBar.h"
-#include "controllers/Stack.h"
-#include "controllers/Frame.h"
-#include "controllers/Layout.h"
+#include "kddockwidgets/controllers/TitleBar.h"
+#include "kddockwidgets/controllers/Stack.h"
+#include "kddockwidgets/controllers/Frame.h"
+#include "kddockwidgets/controllers/Layout.h"
 
 #include <QPixmap>
 #include <QPainter>
diff --git a/src/private/WindowBeingDragged_p.h b/src/private/WindowBeingDragged_p.h
index bf5ca342..9d5dab22 100644
--- a/src/private/WindowBeingDragged_p.h
+++ b/src/private/WindowBeingDragged_p.h
@@ -13,7 +13,7 @@
 #define KD_WINDOWBEINGDRAGGED_P_H
 
 #include "kddockwidgets/docks_export.h"
-#include "controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
 #include "View.h"
 
 #include <QPointer>
diff --git a/src/private/multisplitter/Item.cpp b/src/private/multisplitter/Item.cpp
index 97ded79b..00e7b976 100644
--- a/src/private/multisplitter/Item.cpp
+++ b/src/private/multisplitter/Item.cpp
@@ -12,8 +12,8 @@
 #include "Item_p.h"
 #include "View.h"
 #include "Config.h"
-#include "controllers/Separator.h"
-#include "controllers/Frame.h"
+#include "kddockwidgets/controllers/Separator.h"
+#include "kddockwidgets/controllers/Frame.h"
 #include "ItemFreeContainer_p.h"
 #include "kdbindings/signal.h"
 #include "Window.h"
diff --git a/src/qtquick/QmlTypes.cpp b/src/qtquick/QmlTypes.cpp
index 3af2734c..0c0089c8 100644
--- a/src/qtquick/QmlTypes.cpp
+++ b/src/qtquick/QmlTypes.cpp
@@ -10,9 +10,9 @@
 */
 
 #include "QmlTypes.h"
-#include "controllers/DropArea.h"
-#include "controllers/DropIndicatorOverlay.h"
-#include "controllers/indicators/ClassicIndicators.h"
+#include "kddockwidgets/controllers/DropArea.h"
+#include "kddockwidgets/controllers/DropIndicatorOverlay.h"
+#include "kddockwidgets/controllers/indicators/ClassicIndicators.h"
 #include "DockWidgetInstantiator.h"
 #include "MainWindowInstantiator.h"
 #include "LayoutSaverInstantiator.h"
diff --git a/src/qtquick/TestHelpers_qtquick.cpp b/src/qtquick/TestHelpers_qtquick.cpp
index 2f39aa49..01cc7e1c 100644
--- a/src/qtquick/TestHelpers_qtquick.cpp
+++ b/src/qtquick/TestHelpers_qtquick.cpp
@@ -13,7 +13,7 @@
 #include "Platform_qtquick.h"
 #include "views/View_qtquick.h"
 #include "qtquick/views/MainWindow_qtquick.h"
-#include "controllers/MainWindow.h"
+#include "kddockwidgets/controllers/MainWindow.h"
 
 #include <QGuiApplication>
 #include <QQmlEngine>
diff --git a/src/qtquick/ViewFactory_qtquick.cpp b/src/qtquick/ViewFactory_qtquick.cpp
index c0942e18..2ce42c18 100644
--- a/src/qtquick/ViewFactory_qtquick.cpp
+++ b/src/qtquick/ViewFactory_qtquick.cpp
@@ -12,15 +12,15 @@
 #include "ViewFactory_qtquick.h"
 #include "Config.h"
 
-#include "controllers/indicators/ClassicIndicators.h"
-#include "controllers/indicators/NullIndicators.h"
-#include "controllers/indicators/SegmentedIndicators.h"
+#include "kddockwidgets/controllers/indicators/ClassicIndicators.h"
+#include "kddockwidgets/controllers/indicators/NullIndicators.h"
+#include "kddockwidgets/controllers/indicators/SegmentedIndicators.h"
 #include "private/Utils_p.h"
 
-#include "controllers/MainWindow.h"
-#include "controllers/TabBar.h"
-#include "controllers/Stack.h"
-#include "controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/MainWindow.h"
+#include "kddockwidgets/controllers/TabBar.h"
+#include "kddockwidgets/controllers/Stack.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
 
 #include "qtquick/views/FloatingWindow_qtquick.h"
 #include "qtquick/views/DockWidget_qtquick.h"
diff --git a/src/qtquick/views/ClassicIndicatorsWindow_qtquick.cpp b/src/qtquick/views/ClassicIndicatorsWindow_qtquick.cpp
index d0a7a9cd..d9611ae1 100644
--- a/src/qtquick/views/ClassicIndicatorsWindow_qtquick.cpp
+++ b/src/qtquick/views/ClassicIndicatorsWindow_qtquick.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "ClassicIndicatorsWindow_qtquick.h"
-#include "controllers/indicators/ClassicIndicators.h"
+#include "kddockwidgets/controllers/indicators/ClassicIndicators.h"
 #include "private/Utils_p.h"
 
 #include <QQmlContext>
diff --git a/src/qtquick/views/DockWidget_qtquick.cpp b/src/qtquick/views/DockWidget_qtquick.cpp
index 4fb42e24..249be00a 100644
--- a/src/qtquick/views/DockWidget_qtquick.cpp
+++ b/src/qtquick/views/DockWidget_qtquick.cpp
@@ -12,10 +12,10 @@
 #include "DockWidget_qtquick.h"
 #include "ViewFactory.h"
 
-#include "controllers/TitleBar.h"
-#include "controllers/DockWidget.h"
-#include "controllers/DockWidget_p.h"
-#include "controllers/Frame.h"
+#include "kddockwidgets/controllers/TitleBar.h"
+#include "kddockwidgets/controllers/DockWidget.h"
+#include "kddockwidgets/controllers/DockWidget_p.h"
+#include "kddockwidgets/controllers/Frame.h"
 #include "qtquick/Platform_qtquick.h"
 #include "qtquick/views/TitleBar_qtquick.h"
 #include "qtquick/views/Frame_qtquick.h"
diff --git a/src/qtquick/views/DockWidget_qtquick.h b/src/qtquick/views/DockWidget_qtquick.h
index 6bf3bc4e..1d2ef59f 100644
--- a/src/qtquick/views/DockWidget_qtquick.h
+++ b/src/qtquick/views/DockWidget_qtquick.h
@@ -19,7 +19,7 @@
 #ifndef KD_DOCKWIDGET_QUICK_H
 #define KD_DOCKWIDGET_QUICK_H
 
-#include "controllers/DockWidget.h"
+#include "kddockwidgets/controllers/DockWidget.h"
 #include "View_qtquick.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qtquick/views/DropArea_qtquick.cpp b/src/qtquick/views/DropArea_qtquick.cpp
index 3e8b06b2..ef361d13 100644
--- a/src/qtquick/views/DropArea_qtquick.cpp
+++ b/src/qtquick/views/DropArea_qtquick.cpp
@@ -11,7 +11,7 @@
 
 #include "DropArea_qtquick.h"
 #include "private/Utils_p.h"
-#include "controllers/DropArea.h"
+#include "kddockwidgets/controllers/DropArea.h"
 
 using namespace KDDockWidgets;
 using namespace KDDockWidgets::Views;
diff --git a/src/qtquick/views/FloatingWindow_qtquick.cpp b/src/qtquick/views/FloatingWindow_qtquick.cpp
index 5746f190..6d6d3772 100644
--- a/src/qtquick/views/FloatingWindow_qtquick.cpp
+++ b/src/qtquick/views/FloatingWindow_qtquick.cpp
@@ -18,9 +18,9 @@
 #include "private/Logging_p.h"
 #include "private/Utils_p.h"
 
-#include "controllers/DropArea.h"
-#include "controllers/FloatingWindow.h"
-#include "controllers/MainWindow.h"
+#include "kddockwidgets/controllers/DropArea.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/MainWindow.h"
 
 #include "private/WidgetResizeHandler_p.h"
 #include "qtquick/Platform_qtquick.h"
diff --git a/src/qtquick/views/Frame_qtquick.cpp b/src/qtquick/views/Frame_qtquick.cpp
index 09dcd748..66dc645c 100644
--- a/src/qtquick/views/Frame_qtquick.cpp
+++ b/src/qtquick/views/Frame_qtquick.cpp
@@ -19,9 +19,9 @@
 #include "Frame_qtquick.h"
 #include "views/Frame.h"
 
-#include "controllers/Frame.h"
-#include "controllers/DockWidget.h"
-#include "controllers/DockWidget_p.h"
+#include "kddockwidgets/controllers/Frame.h"
+#include "kddockwidgets/controllers/DockWidget.h"
+#include "kddockwidgets/controllers/DockWidget_p.h"
 
 #include "qtquick/ViewFactory_qtquick.h"
 #include "qtquick/Platform_qtquick.h"
diff --git a/src/qtquick/views/MDILayout_qtquick.cpp b/src/qtquick/views/MDILayout_qtquick.cpp
index 7f5a57c9..a6c4d899 100644
--- a/src/qtquick/views/MDILayout_qtquick.cpp
+++ b/src/qtquick/views/MDILayout_qtquick.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "MDILayout_qtquick.h"
-#include "controllers/MDILayout.h"
+#include "kddockwidgets/controllers/MDILayout.h"
 
 using namespace KDDockWidgets;
 using namespace KDDockWidgets::Views;
diff --git a/src/qtquick/views/MainWindowMDI_qtquick.cpp b/src/qtquick/views/MainWindowMDI_qtquick.cpp
index cef953e5..eba2df90 100644
--- a/src/qtquick/views/MainWindowMDI_qtquick.cpp
+++ b/src/qtquick/views/MainWindowMDI_qtquick.cpp
@@ -10,8 +10,8 @@
 */
 
 #include "MainWindowMDI_qtquick.h"
-#include "controllers/MDILayout.h"
-#include "controllers/MainWindow.h"
+#include "kddockwidgets/controllers/MDILayout.h"
+#include "kddockwidgets/controllers/MainWindow.h"
 #include "MainWindow_qtquick.h"
 
 using namespace KDDockWidgets;
diff --git a/src/qtquick/views/MainWindow_qtquick.cpp b/src/qtquick/views/MainWindow_qtquick.cpp
index df256dff..185cf2fd 100644
--- a/src/qtquick/views/MainWindow_qtquick.cpp
+++ b/src/qtquick/views/MainWindow_qtquick.cpp
@@ -10,8 +10,8 @@
 */
 
 #include "MainWindow_qtquick.h"
-#include "controllers/Layout.h"
-#include "controllers/MainWindow.h"
+#include "kddockwidgets/controllers/Layout.h"
+#include "kddockwidgets/controllers/MainWindow.h"
 
 #include <QDebug>
 
diff --git a/src/qtquick/views/Separator_qtquick.cpp b/src/qtquick/views/Separator_qtquick.cpp
index ce123272..134e1eb0 100644
--- a/src/qtquick/views/Separator_qtquick.cpp
+++ b/src/qtquick/views/Separator_qtquick.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "Separator_qtquick.h"
-#include "controllers/Separator.h"
+#include "kddockwidgets/controllers/Separator.h"
 #include "private/Logging_p.h"
 #include "private/multisplitter/Item_p.h"
 // #include "Rubberband_quick.h"
diff --git a/src/qtquick/views/SideBar_qtquick.cpp b/src/qtquick/views/SideBar_qtquick.cpp
index f87d8d46..be4bbcc5 100644
--- a/src/qtquick/views/SideBar_qtquick.cpp
+++ b/src/qtquick/views/SideBar_qtquick.cpp
@@ -11,9 +11,9 @@
 
 #include "SideBar_qtquick.h"
 
-#include "controllers/DockWidget.h"
-#include "controllers/SideBar.h"
-#include "controllers/MainWindow.h"
+#include "kddockwidgets/controllers/DockWidget.h"
+#include "kddockwidgets/controllers/SideBar.h"
+#include "kddockwidgets/controllers/MainWindow.h"
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
diff --git a/src/qtquick/views/Stack_qtquick.cpp b/src/qtquick/views/Stack_qtquick.cpp
index 96581442..d76aee53 100644
--- a/src/qtquick/views/Stack_qtquick.cpp
+++ b/src/qtquick/views/Stack_qtquick.cpp
@@ -13,8 +13,8 @@
 #include "Config.h"
 #include "ViewFactory.h"
 
-#include "controllers/Frame.h"
-#include "controllers/TabBar.h"
+#include "kddockwidgets/controllers/Frame.h"
+#include "kddockwidgets/controllers/TabBar.h"
 
 #include <QDebug>
 #include <QScopedValueRollback>
diff --git a/src/qtquick/views/TabBar_qtquick.cpp b/src/qtquick/views/TabBar_qtquick.cpp
index 958efc16..13917e0a 100644
--- a/src/qtquick/views/TabBar_qtquick.cpp
+++ b/src/qtquick/views/TabBar_qtquick.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "TabBar_qtquick.h"
-#include "controllers/TabBar.h"
+#include "kddockwidgets/controllers/TabBar.h"
 
 #include <QMetaObject>
 #include <QMouseEvent>
diff --git a/src/qtquick/views/TitleBar_qtquick.cpp b/src/qtquick/views/TitleBar_qtquick.cpp
index c853759a..0a67796c 100644
--- a/src/qtquick/views/TitleBar_qtquick.cpp
+++ b/src/qtquick/views/TitleBar_qtquick.cpp
@@ -13,9 +13,9 @@
 
 #include "private/DragController_p.h"
 
-#include "controllers/Frame.h"
-#include "controllers/FloatingWindow.h"
-#include "controllers/TitleBar.h"
+#include "kddockwidgets/controllers/Frame.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/TitleBar.h"
 
 #include "private/Logging_p.h"
 #include "private/WindowBeingDragged_p.h"
diff --git a/src/qtquick/views/ViewWrapper_qtquick.cpp b/src/qtquick/views/ViewWrapper_qtquick.cpp
index a4fc75fb..8af601f7 100644
--- a/src/qtquick/views/ViewWrapper_qtquick.cpp
+++ b/src/qtquick/views/ViewWrapper_qtquick.cpp
@@ -25,8 +25,8 @@
 #include "qtquick/views/MDILayout_qtquick.h"
 #include "qtquick/views/DropArea_qtquick.h"
 
-#include "controllers/DropArea.h"
-#include "controllers/MDILayout.h"
+#include "kddockwidgets/controllers/DropArea.h"
+#include "kddockwidgets/controllers/MDILayout.h"
 // #include "MDIArea.h"
 
 #include <QDebug>
diff --git a/src/qtwidgets/DebugWindow.cpp b/src/qtwidgets/DebugWindow.cpp
index dc6bdd58..0f3939e3 100644
--- a/src/qtwidgets/DebugWindow.cpp
+++ b/src/qtwidgets/DebugWindow.cpp
@@ -21,8 +21,8 @@
 #include "LayoutSaver.h"
 #include "Qt5Qt6Compat_p.h"
 
-#include "controllers/FloatingWindow.h"
-#include "controllers/Layout.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/Layout.h"
 
 #include "qtwidgets/views/MainWindow_qtwidgets.h"
 
diff --git a/src/qtwidgets/MDIArea.cpp b/src/qtwidgets/MDIArea.cpp
index 506fe01a..a2010703 100644
--- a/src/qtwidgets/MDIArea.cpp
+++ b/src/qtwidgets/MDIArea.cpp
@@ -12,9 +12,9 @@
 #include "MDIArea.h"
 
 #include "ViewFactory.h"
-#include "controllers/DockWidget.h"
-#include "controllers/MDILayout.h"
-#include "controllers/DropArea.h"
+#include "kddockwidgets/controllers/DockWidget.h"
+#include "kddockwidgets/controllers/MDILayout.h"
+#include "kddockwidgets/controllers/DropArea.h"
 
 #include "qtwidgets/views/View_qtwidgets.h"
 
diff --git a/src/qtwidgets/TestHelpers_qtwidgets.cpp b/src/qtwidgets/TestHelpers_qtwidgets.cpp
index 8bb39f07..09282a80 100644
--- a/src/qtwidgets/TestHelpers_qtwidgets.cpp
+++ b/src/qtwidgets/TestHelpers_qtwidgets.cpp
@@ -13,7 +13,7 @@
 #include "Platform_qtwidgets.h"
 #include "views/ViewWrapper_qtwidgets.h"
 #include "views/View_qtwidgets.h"
-#include "controllers/MainWindow.h"
+#include "kddockwidgets/controllers/MainWindow.h"
 #include "qtwidgets/views/MainWindow_qtwidgets.h"
 
 #include <QStyleFactory>
diff --git a/src/qtwidgets/ViewFactory_qtwidgets.cpp b/src/qtwidgets/ViewFactory_qtwidgets.cpp
index daa9fbdb..85b1cffb 100644
--- a/src/qtwidgets/ViewFactory_qtwidgets.cpp
+++ b/src/qtwidgets/ViewFactory_qtwidgets.cpp
@@ -14,13 +14,13 @@
 
 #include "private/Utils_p.h"
 
-#include "controllers/TabBar.h"
-#include "controllers/Stack.h"
-#include "controllers/FloatingWindow.h"
-#include "controllers/indicators/ClassicIndicators.h"
-#include "controllers/indicators/NullIndicators.h"
-#include "controllers/indicators/SegmentedIndicators.h"
-#include "controllers/MainWindow.h"
+#include "kddockwidgets/controllers/TabBar.h"
+#include "kddockwidgets/controllers/Stack.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/indicators/ClassicIndicators.h"
+#include "kddockwidgets/controllers/indicators/NullIndicators.h"
+#include "kddockwidgets/controllers/indicators/SegmentedIndicators.h"
+#include "kddockwidgets/controllers/MainWindow.h"
 
 #include "qtwidgets/views/ClassicIndicatorsOverlay_qtwidgets.h"
 #include "qtwidgets/views/ClassicIndicatorsWindow_qtwidgets.h"
diff --git a/src/qtwidgets/views/ClassicIndicatorsOverlay_qtwidgets.cpp b/src/qtwidgets/views/ClassicIndicatorsOverlay_qtwidgets.cpp
index 1e8746eb..79eb1b8f 100644
--- a/src/qtwidgets/views/ClassicIndicatorsOverlay_qtwidgets.cpp
+++ b/src/qtwidgets/views/ClassicIndicatorsOverlay_qtwidgets.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "ClassicIndicatorsOverlay_qtwidgets.h"
-#include "controllers/indicators/ClassicIndicators.h"
+#include "kddockwidgets/controllers/indicators/ClassicIndicators.h"
 
 using namespace KDDockWidgets;
 using namespace KDDockWidgets::Views;
diff --git a/src/qtwidgets/views/ClassicIndicatorsWindow_qtwidgets.cpp b/src/qtwidgets/views/ClassicIndicatorsWindow_qtwidgets.cpp
index 64903ba0..59dfaafa 100644
--- a/src/qtwidgets/views/ClassicIndicatorsWindow_qtwidgets.cpp
+++ b/src/qtwidgets/views/ClassicIndicatorsWindow_qtwidgets.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "ClassicIndicatorsWindow_qtwidgets.h"
-#include "controllers/indicators/ClassicIndicators.h"
+#include "kddockwidgets/controllers/indicators/ClassicIndicators.h"
 #include "private/Utils_p.h"
 
 using namespace KDDockWidgets;
diff --git a/src/qtwidgets/views/DockWidget_qtwidgets.h b/src/qtwidgets/views/DockWidget_qtwidgets.h
index 62997607..c7848307 100644
--- a/src/qtwidgets/views/DockWidget_qtwidgets.h
+++ b/src/qtwidgets/views/DockWidget_qtwidgets.h
@@ -20,7 +20,7 @@
 #define KD_DOCKWIDGET_WIDGETS_H
 #pragma once
 
-#include "controllers/DockWidget.h"
+#include "kddockwidgets/controllers/DockWidget.h"
 #include "View_qtwidgets.h"
 
 // clazy:excludeall=ctor-missing-parent-argument
diff --git a/src/qtwidgets/views/DropArea_qtwidgets.cpp b/src/qtwidgets/views/DropArea_qtwidgets.cpp
index 12a7a77c..62132a07 100644
--- a/src/qtwidgets/views/DropArea_qtwidgets.cpp
+++ b/src/qtwidgets/views/DropArea_qtwidgets.cpp
@@ -11,7 +11,7 @@
 
 #include "DropArea_qtwidgets.h"
 #include "private/Utils_p.h"
-#include "controllers/DropArea.h"
+#include "kddockwidgets/controllers/DropArea.h"
 
 using namespace KDDockWidgets;
 using namespace KDDockWidgets::Views;
diff --git a/src/qtwidgets/views/FloatingWindow_qtwidgets.cpp b/src/qtwidgets/views/FloatingWindow_qtwidgets.cpp
index 51c5dd35..503bb36f 100644
--- a/src/qtwidgets/views/FloatingWindow_qtwidgets.cpp
+++ b/src/qtwidgets/views/FloatingWindow_qtwidgets.cpp
@@ -10,13 +10,13 @@
 */
 
 #include "FloatingWindow_qtwidgets.h"
-#include "controllers/FloatingWindow.h"
-#include "controllers/Frame.h"
-#include "controllers/TitleBar.h"
-#include "controllers/MainWindow.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/Frame.h"
+#include "kddockwidgets/controllers/TitleBar.h"
+#include "kddockwidgets/controllers/MainWindow.h"
 
 #include "private/DockRegistry_p.h"
-#include "controllers/DropArea.h"
+#include "kddockwidgets/controllers/DropArea.h"
 #include "private/Logging_p.h"
 #include "private/Utils_p.h"
 #include "private/DragController_p.h"
diff --git a/src/qtwidgets/views/Frame_qtwidgets.cpp b/src/qtwidgets/views/Frame_qtwidgets.cpp
index 67446a84..fdc0aa96 100644
--- a/src/qtwidgets/views/Frame_qtwidgets.cpp
+++ b/src/qtwidgets/views/Frame_qtwidgets.cpp
@@ -14,11 +14,11 @@
 #include "qtwidgets/views/View_qtwidgets.h"
 #include "qtwidgets/views/DockWidget_qtwidgets.h"
 
-#include "controllers/Layout.h"
-#include "controllers/Frame.h"
-#include "controllers/Stack.h"
-#include "controllers/TabBar.h"
-#include "controllers/TitleBar.h"
+#include "kddockwidgets/controllers/Layout.h"
+#include "kddockwidgets/controllers/Frame.h"
+#include "kddockwidgets/controllers/Stack.h"
+#include "kddockwidgets/controllers/TabBar.h"
+#include "kddockwidgets/controllers/TitleBar.h"
 
 #include <QPainter>
 #include <QTabBar>
diff --git a/src/qtwidgets/views/MDILayout_qtwidgets.cpp b/src/qtwidgets/views/MDILayout_qtwidgets.cpp
index 1a506eb5..a19862ef 100644
--- a/src/qtwidgets/views/MDILayout_qtwidgets.cpp
+++ b/src/qtwidgets/views/MDILayout_qtwidgets.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "MDILayout_qtwidgets.h"
-#include "controllers/MDILayout.h"
+#include "kddockwidgets/controllers/MDILayout.h"
 
 using namespace KDDockWidgets;
 using namespace KDDockWidgets::Views;
diff --git a/src/qtwidgets/views/MainWindowMDI_qtwidgets.cpp b/src/qtwidgets/views/MainWindowMDI_qtwidgets.cpp
index e533d1be..a3a1012a 100644
--- a/src/qtwidgets/views/MainWindowMDI_qtwidgets.cpp
+++ b/src/qtwidgets/views/MainWindowMDI_qtwidgets.cpp
@@ -10,8 +10,8 @@
 */
 
 #include "MainWindowMDI_qtwidgets.h"
-#include "controllers/MDILayout.h"
-#include "controllers/MainWindow.h"
+#include "kddockwidgets/controllers/MDILayout.h"
+#include "kddockwidgets/controllers/MainWindow.h"
 
 using namespace KDDockWidgets;
 using namespace KDDockWidgets::Views;
diff --git a/src/qtwidgets/views/MainWindow_qtwidgets.cpp b/src/qtwidgets/views/MainWindow_qtwidgets.cpp
index 0f0e6efa..7fa2acb4 100644
--- a/src/qtwidgets/views/MainWindow_qtwidgets.cpp
+++ b/src/qtwidgets/views/MainWindow_qtwidgets.cpp
@@ -20,10 +20,10 @@
 #include "Config.h"
 #include "ViewFactory.h"
 
-#include "controllers/DropArea.h"
-#include "controllers/MainWindow.h"
-#include "controllers/Frame.h"
-#include "controllers/SideBar.h"
+#include "kddockwidgets/controllers/DropArea.h"
+#include "kddockwidgets/controllers/MainWindow.h"
+#include "kddockwidgets/controllers/Frame.h"
+#include "kddockwidgets/controllers/SideBar.h"
 
 #include "private/DockRegistry_p.h"
 #include "private/Logging_p.h"
diff --git a/src/qtwidgets/views/SegmentedIndicatorsOverlay_qtwidgets.cpp b/src/qtwidgets/views/SegmentedIndicatorsOverlay_qtwidgets.cpp
index b3c65cc6..acecb0fc 100644
--- a/src/qtwidgets/views/SegmentedIndicatorsOverlay_qtwidgets.cpp
+++ b/src/qtwidgets/views/SegmentedIndicatorsOverlay_qtwidgets.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "SegmentedIndicatorsOverlay_qtwidgets.h"
-#include "controllers/indicators/SegmentedIndicators.h"
+#include "kddockwidgets/controllers/indicators/SegmentedIndicators.h"
 
 #include <QPainter>
 
diff --git a/src/qtwidgets/views/Separator_qtwidgets.cpp b/src/qtwidgets/views/Separator_qtwidgets.cpp
index 21da2369..013d61f2 100644
--- a/src/qtwidgets/views/Separator_qtwidgets.cpp
+++ b/src/qtwidgets/views/Separator_qtwidgets.cpp
@@ -14,7 +14,7 @@
 
 #include "Config.h"
 #include "private/Logging_p.h"
-#include "controllers/Separator.h"
+#include "kddockwidgets/controllers/Separator.h"
 
 #include <QMouseEvent>
 #include <QPainter>
diff --git a/src/qtwidgets/views/SideBar_qtwidgets.cpp b/src/qtwidgets/views/SideBar_qtwidgets.cpp
index 95567596..abde57e7 100644
--- a/src/qtwidgets/views/SideBar_qtwidgets.cpp
+++ b/src/qtwidgets/views/SideBar_qtwidgets.cpp
@@ -11,9 +11,9 @@
 
 #include "SideBar_qtwidgets.h"
 
-#include "controllers/DockWidget.h"
-#include "controllers/SideBar.h"
-#include "controllers/MainWindow.h"
+#include "kddockwidgets/controllers/DockWidget.h"
+#include "kddockwidgets/controllers/SideBar.h"
+#include "kddockwidgets/controllers/MainWindow.h"
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
diff --git a/src/qtwidgets/views/Stack_qtwidgets.cpp b/src/qtwidgets/views/Stack_qtwidgets.cpp
index 0cd3e782..6fbfface 100644
--- a/src/qtwidgets/views/Stack_qtwidgets.cpp
+++ b/src/qtwidgets/views/Stack_qtwidgets.cpp
@@ -11,8 +11,8 @@
 
 #include "Stack_qtwidgets.h"
 #include "Controller.h"
-#include "controllers/Stack.h"
-#include "controllers/TitleBar.h"
+#include "kddockwidgets/controllers/Stack.h"
+#include "kddockwidgets/controllers/TitleBar.h"
 #include "qtwidgets/ViewFactory_qtwidgets.h"
 #include "qtwidgets/views/DockWidget_qtwidgets.h"
 #include "private/DockRegistry_p.h"
diff --git a/src/qtwidgets/views/TabBar_qtwidgets.cpp b/src/qtwidgets/views/TabBar_qtwidgets.cpp
index 4f6ee508..1c235a61 100644
--- a/src/qtwidgets/views/TabBar_qtwidgets.cpp
+++ b/src/qtwidgets/views/TabBar_qtwidgets.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "TabBar_qtwidgets.h"
-#include "controllers/TabBar.h"
+#include "kddockwidgets/controllers/TabBar.h"
 #include "private/Utils_p.h"
 #include "private/Logging_p.h"
 #include "Config.h"
diff --git a/src/qtwidgets/views/TitleBar_qtwidgets.cpp b/src/qtwidgets/views/TitleBar_qtwidgets.cpp
index 5a35dbe2..3bdd77f1 100644
--- a/src/qtwidgets/views/TitleBar_qtwidgets.cpp
+++ b/src/qtwidgets/views/TitleBar_qtwidgets.cpp
@@ -11,8 +11,8 @@
 
 #include "TitleBar_qtwidgets.h"
 
-#include "controllers/TitleBar.h"
-#include "controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/TitleBar.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
 
 #include "private/Utils_p.h"
 #include "private/Logging_p.h"
diff --git a/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp b/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp
index a464e6c1..f5b40629 100644
--- a/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp
+++ b/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp
@@ -25,9 +25,9 @@
 #include "qtwidgets/Window_qtwidgets.h"
 #include "qtwidgets/MDIArea.h"
 
-#include "controllers/MDILayout.h"
-#include "controllers/DropArea.h"
-#include "controllers/SideBar.h"
+#include "kddockwidgets/controllers/MDILayout.h"
+#include "kddockwidgets/controllers/DropArea.h"
+#include "kddockwidgets/controllers/SideBar.h"
 
 #include <QWindow>
 #include <QDebug>
diff --git a/tests/controllers/tst_dockwidget.cpp b/tests/controllers/tst_dockwidget.cpp
index 862b33d5..ea818634 100644
--- a/tests/controllers/tst_dockwidget.cpp
+++ b/tests/controllers/tst_dockwidget.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "../main.h"
-#include "controllers/DockWidget.h"
+#include "kddockwidgets/controllers/DockWidget.h"
 #include "Action.h"
 #include "ViewFactory.h"
 #include "Config.h"
diff --git a/tests/controllers/tst_floatingwindow.cpp b/tests/controllers/tst_floatingwindow.cpp
index ef354255..ab5fbc66 100644
--- a/tests/controllers/tst_floatingwindow.cpp
+++ b/tests/controllers/tst_floatingwindow.cpp
@@ -10,9 +10,9 @@
 */
 
 #include "../main.h"
-#include "controllers/FloatingWindow.h"
-#include "controllers/Frame.h"
-#include "controllers/DockWidget.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/Frame.h"
+#include "kddockwidgets/controllers/DockWidget.h"
 #include "ViewFactory.h"
 #include "Config.h"
 
diff --git a/tests/controllers/tst_frame.cpp b/tests/controllers/tst_frame.cpp
index 3ff6b17f..ed7f6a31 100644
--- a/tests/controllers/tst_frame.cpp
+++ b/tests/controllers/tst_frame.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "../main.h"
-#include "controllers/Frame.h"
+#include "kddockwidgets/controllers/Frame.h"
 
 TEST_CASE("Frame ctor")
 {
diff --git a/tests/controllers/tst_separator.cpp b/tests/controllers/tst_separator.cpp
index b1301b02..00961699 100644
--- a/tests/controllers/tst_separator.cpp
+++ b/tests/controllers/tst_separator.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "../main.h"
-#include "controllers/Separator.h"
+#include "kddockwidgets/controllers/Separator.h"
 
 TEST_CASE("Separator Ctor")
 {
diff --git a/tests/controllers/tst_stack.cpp b/tests/controllers/tst_stack.cpp
index ac00d47a..cc7ab237 100644
--- a/tests/controllers/tst_stack.cpp
+++ b/tests/controllers/tst_stack.cpp
@@ -10,8 +10,8 @@
 */
 
 #include "../main.h"
-#include "controllers/Frame.h"
-#include "controllers/Stack.h"
+#include "kddockwidgets/controllers/Frame.h"
+#include "kddockwidgets/controllers/Stack.h"
 
 TEST_CASE("Stack ctor")
 {
diff --git a/tests/controllers/tst_tabbar.cpp b/tests/controllers/tst_tabbar.cpp
index 9f504210..5d0bfb9e 100644
--- a/tests/controllers/tst_tabbar.cpp
+++ b/tests/controllers/tst_tabbar.cpp
@@ -10,9 +10,9 @@
 */
 
 #include "../main.h"
-#include "controllers/Frame.h"
-#include "controllers/Stack.h"
-#include "controllers/TabBar.h"
+#include "kddockwidgets/controllers/Frame.h"
+#include "kddockwidgets/controllers/Stack.h"
+#include "kddockwidgets/controllers/TabBar.h"
 
 TEST_CASE("TabBar ctor")
 {
diff --git a/tests/controllers/tst_titlebar.cpp b/tests/controllers/tst_titlebar.cpp
index 0f002140..cdb44771 100644
--- a/tests/controllers/tst_titlebar.cpp
+++ b/tests/controllers/tst_titlebar.cpp
@@ -10,8 +10,8 @@
 */
 
 #include "../main.h"
-#include "controllers/TitleBar.h"
-#include "controllers/Frame.h"
+#include "kddockwidgets/controllers/TitleBar.h"
+#include "kddockwidgets/controllers/Frame.h"
 
 TEST_CASE("TitleBar Ctor")
 {
diff --git a/tests/fuzzer/Fuzzer.cpp b/tests/fuzzer/Fuzzer.cpp
index 5da2e4c9..f3f0b82c 100644
--- a/tests/fuzzer/Fuzzer.cpp
+++ b/tests/fuzzer/Fuzzer.cpp
@@ -16,7 +16,7 @@
 #include "DockRegistry_p.h"
 #include "DockWidget.h"
 #include "MainWindow.h"
-#include "controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
 
 #include <QJsonDocument>
 
diff --git a/tests/qtwidgets/tst_qtwidgets.cpp b/tests/qtwidgets/tst_qtwidgets.cpp
index 939fa860..0c237250 100644
--- a/tests/qtwidgets/tst_qtwidgets.cpp
+++ b/tests/qtwidgets/tst_qtwidgets.cpp
@@ -25,11 +25,11 @@
 
 #include "multisplitter/Item_p.h"
 
-#include "controllers/DropArea.h"
-#include "controllers/Separator.h"
-#include "controllers/Frame.h"
-#include "controllers/DockWidget.h"
-#include "controllers/MainWindow.h"
+#include "kddockwidgets/controllers/DropArea.h"
+#include "kddockwidgets/controllers/Separator.h"
+#include "kddockwidgets/controllers/Frame.h"
+#include "kddockwidgets/controllers/DockWidget.h"
+#include "kddockwidgets/controllers/MainWindow.h"
 
 #include "qtwidgets/MDIArea.h"
 #include "qtwidgets/views/MainWindow_qtwidgets.h"
diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp
index 2f40f0ba..fa247533 100644
--- a/tests/tst_docks.cpp
+++ b/tests/tst_docks.cpp
@@ -21,14 +21,14 @@
 #include "multisplitter/Item_p.h"
 #include "ViewFactory.h"
 #include "Action.h"
-#include "controllers/MDILayout.h"
-#include "controllers/DropArea.h"
-#include "controllers/DockWidget.h"
-#include "controllers/DockWidget_p.h"
-#include "controllers/Separator.h"
-#include "controllers/TabBar.h"
-#include "controllers/Stack.h"
-#include "controllers/SideBar.h"
+#include "kddockwidgets/controllers/MDILayout.h"
+#include "kddockwidgets/controllers/DropArea.h"
+#include "kddockwidgets/controllers/DockWidget.h"
+#include "kddockwidgets/controllers/DockWidget_p.h"
+#include "kddockwidgets/controllers/Separator.h"
+#include "kddockwidgets/controllers/TabBar.h"
+#include "kddockwidgets/controllers/Stack.h"
+#include "kddockwidgets/controllers/SideBar.h"
 
 #ifdef Q_OS_WIN
 #include <windows.h>
diff --git a/tests/tst_multisplitter.cpp b/tests/tst_multisplitter.cpp
index 8e7d9bca..87374c87 100644
--- a/tests/tst_multisplitter.cpp
+++ b/tests/tst_multisplitter.cpp
@@ -11,7 +11,7 @@
 
 #include "private/multisplitter/Item_p.h"
 #include "View.h"
-#include "controllers/Separator.h"
+#include "kddockwidgets/controllers/Separator.h"
 
 #include "Platform.h"
 #include "Config.h"
diff --git a/tests/utils.cpp b/tests/utils.cpp
index 8c298cca..f27a4ae1 100644
--- a/tests/utils.cpp
+++ b/tests/utils.cpp
@@ -14,7 +14,7 @@
 #include "ViewFactory.h"
 #include "Platform.h"
 #include "ViewGuard.h"
-#include "controllers/DropArea.h"
+#include "kddockwidgets/controllers/DropArea.h"
 
 #include <QCloseEvent>
 #include <QDebug>
diff --git a/tests/utils.h b/tests/utils.h
index 66909c90..2c994dc6 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -18,13 +18,13 @@
 #include "DockRegistry_p.h"
 #include "KDDockWidgets.h"
 
-#include "controllers/DropIndicatorOverlay.h"
-#include "controllers/DropArea.h"
-#include "controllers/TitleBar.h"
-#include "controllers/Stack.h"
-#include "controllers/FloatingWindow.h"
-#include "controllers/DockWidget.h"
-#include "controllers/DockWidget_p.h"
+#include "kddockwidgets/controllers/DropIndicatorOverlay.h"
+#include "kddockwidgets/controllers/DropArea.h"
+#include "kddockwidgets/controllers/TitleBar.h"
+#include "kddockwidgets/controllers/Stack.h"
+#include "kddockwidgets/controllers/FloatingWindow.h"
+#include "kddockwidgets/controllers/DockWidget.h"
+#include "kddockwidgets/controllers/DockWidget_p.h"
 
 #include "Utils_p.h"