diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4cffaae..025728e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,8 +136,6 @@ if (KDDockWidgets_XLib)
   add_definitions(-DKDDockWidgets_XLIB)
 endif()
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) # TODOm2 Replace with target_include_directories (PRIVATE)
-
 if(KDDockWidgets_QT6)
   set(Qt_VERSION_MAJOR 6)
   set(QT_MIN_VERSION "6.2.0")
diff --git a/examples/dockwidgets/MyMainWindow.cpp b/examples/dockwidgets/MyMainWindow.cpp
index b6187036..ae2ae8e4 100644
--- a/examples/dockwidgets/MyMainWindow.cpp
+++ b/examples/dockwidgets/MyMainWindow.cpp
@@ -14,8 +14,7 @@
 
 #include <kddockwidgets/Config.h>
 #include <kddockwidgets/LayoutSaver.h>
-
-#include "controllers/MainWindow.h"
+#include <kddockwidgets/controllers/MainWindow.h>
 
 #include <QMenu>
 #include <QMenuBar>
diff --git a/src/Config.cpp b/src/Config.cpp
index 78d448ed..b74856c1 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -23,7 +23,7 @@
 #include "private/DockRegistry_p.h"
 #include "private/Utils_p.h"
 #include "private/DragController_p.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 #include "controllers/Separator.h"
 
 #include <QDebug>
diff --git a/src/Config.h b/src/Config.h
index b313531d..fcd40944 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -19,8 +19,8 @@
 #ifndef KD_DOCKWIDGETS_CONFIG_H
 #define KD_DOCKWIDGETS_CONFIG_H
 
-#include "docks_export.h"
-#include "KDDockWidgets.h"
+#include "kddockwidgets/docks_export.h"
+#include "kddockwidgets/KDDockWidgets.h"
 
 #include <qglobal.h>
 
diff --git a/src/Controller.h b/src/Controller.h
index 34f33ad4..076e02ab 100644
--- a/src/Controller.h
+++ b/src/Controller.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include "docks_export.h"
+#include "kddockwidgets/docks_export.h"
 
 #include <QObject>
 
diff --git a/src/FocusScope.h b/src/FocusScope.h
index 72f5470e..b8d653a9 100644
--- a/src/FocusScope.h
+++ b/src/FocusScope.h
@@ -19,7 +19,7 @@
 #ifndef KD_DOCKWIDGETS_FOCUSSCOPE_H
 #define KD_DOCKWIDGETS_FOCUSSCOPE_H
 
-#include "docks_export.h"
+#include "kddockwidgets/docks_export.h"
 #include "View.h"
 
 namespace KDDockWidgets {
diff --git a/src/KDDockWidgets.cpp b/src/KDDockWidgets.cpp
index c53b4c90..5e030fb6 100644
--- a/src/KDDockWidgets.cpp
+++ b/src/KDDockWidgets.cpp
@@ -10,7 +10,7 @@
 */
 
 
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 
 #ifdef KDDW_FRONTEND_QTWIDGETS
 #include "qtwidgets/Platform_qtwidgets.h"
diff --git a/src/KDDockWidgets.h b/src/KDDockWidgets.h
index 95493356..bd265bfc 100644
--- a/src/KDDockWidgets.h
+++ b/src/KDDockWidgets.h
@@ -19,7 +19,7 @@
 #ifndef KD_KDDOCKWIDGETS_H
 #define KD_KDDOCKWIDGETS_H
 
-#include "docks_export.h"
+#include "kddockwidgets/docks_export.h"
 #include "Qt5Qt6Compat_p.h"
 
 #include <QObject>
diff --git a/src/LayoutSaver.cpp b/src/LayoutSaver.cpp
index 2abcb27f..f753d492 100644
--- a/src/LayoutSaver.cpp
+++ b/src/LayoutSaver.cpp
@@ -18,7 +18,7 @@
 
 #include "LayoutSaver.h"
 #include "Config.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 #include "nlohmann_qt_helpers.h"
 
 #include "private/multisplitter/Item_p.h"
diff --git a/src/LayoutSaver.h b/src/LayoutSaver.h
index 21ac5b88..1a910ef2 100644
--- a/src/LayoutSaver.h
+++ b/src/LayoutSaver.h
@@ -19,9 +19,9 @@
  * @author Sérgio Martins \<sergio.martins@kdab.com\>
  */
 
-#include "docks_export.h"
+#include "kddockwidgets/docks_export.h"
 
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 
 QT_BEGIN_NAMESPACE
 class QByteArray;
diff --git a/src/Platform.h b/src/Platform.h
index 986309c5..6f028f10 100644
--- a/src/Platform.h
+++ b/src/Platform.h
@@ -11,9 +11,9 @@
 
 #pragma once
 
-#include "docks_export.h"
+#include "kddockwidgets/docks_export.h"
 #include "ViewWrapper.h"
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 
 #include "kdbindings/signal.h"
 
diff --git a/src/View.h b/src/View.h
index 3e797d76..117748da 100644
--- a/src/View.h
+++ b/src/View.h
@@ -11,8 +11,8 @@
 
 #pragma once
 
-#include "docks_export.h"
-#include "KDDockWidgets.h"
+#include "kddockwidgets/docks_export.h"
+#include "kddockwidgets/KDDockWidgets.h"
 #include "Controller.h"
 
 #include <QSize> // TODOm4 Remove Qt headers, introduce Size and Rect structs
diff --git a/src/ViewFactory.cpp b/src/ViewFactory.cpp
index f99fc7b0..5b26c2e1 100644
--- a/src/ViewFactory.cpp
+++ b/src/ViewFactory.cpp
@@ -9,7 +9,7 @@
   Contact KDAB at <info@kdab.com> for commercial licensing options.
 */
 
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 
 using namespace KDDockWidgets;
 
diff --git a/src/ViewFactory.h b/src/ViewFactory.h
index e3b4a479..f4eafdaf 100644
--- a/src/ViewFactory.h
+++ b/src/ViewFactory.h
@@ -12,8 +12,8 @@
 #ifndef KDDOCKWIDGETS_ViewFactory_H
 #define KDDOCKWIDGETS_ViewFactory_H
 
-#include "docks_export.h"
-#include "KDDockWidgets.h"
+#include "kddockwidgets/docks_export.h"
+#include "kddockwidgets/KDDockWidgets.h"
 #include "View.h"
 #include "controllers/Stack.h"
 #include "controllers/TitleBar.h"
diff --git a/src/ViewGuard.h b/src/ViewGuard.h
index 4b9bd5d3..d839fa12 100644
--- a/src/ViewGuard.h
+++ b/src/ViewGuard.h
@@ -12,7 +12,7 @@
 #ifndef KDDW_VIEW_GUARD_H
 #define KDDW_VIEW_GUARD_H
 
-#include "docks_export.h"
+#include "kddockwidgets/docks_export.h"
 
 #include "kdbindings/signal.h"
 
diff --git a/src/ViewWrapper.h b/src/ViewWrapper.h
index 0f86c72a..8b604466 100644
--- a/src/ViewWrapper.h
+++ b/src/ViewWrapper.h
@@ -12,7 +12,7 @@
 #pragma once
 
 #include "View.h"
-#include "docks_export.h"
+#include "kddockwidgets/docks_export.h"
 
 namespace KDDockWidgets {
 
diff --git a/src/controllers/DockWidget.cpp b/src/controllers/DockWidget.cpp
index 25f73c64..20d66827 100644
--- a/src/controllers/DockWidget.cpp
+++ b/src/controllers/DockWidget.cpp
@@ -26,7 +26,7 @@
 #include "private/multisplitter/Item_p.h"
 
 #include "Config.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 
 #include <QEvent>
 #include <QCloseEvent>
diff --git a/src/controllers/DropArea.cpp b/src/controllers/DropArea.cpp
index 81cc1e2a..411a7fe2 100644
--- a/src/controllers/DropArea.cpp
+++ b/src/controllers/DropArea.cpp
@@ -11,7 +11,7 @@
 
 #include "DropArea.h"
 #include "Config.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 #include "private/DockRegistry_p.h"
 #include "private/Draggable_p.h"
 #include "private/Logging_p.h"
diff --git a/src/controllers/FloatingWindow.cpp b/src/controllers/FloatingWindow.cpp
index fb5083a6..af496427 100644
--- a/src/controllers/FloatingWindow.cpp
+++ b/src/controllers/FloatingWindow.cpp
@@ -20,7 +20,7 @@
 #include "private/WidgetResizeHandler_p.h"
 #include "private/DockRegistry_p.h"
 #include "Config.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 #include "private/DragController_p.h"
 #include "private/LayoutSaver_p.h"
 #include "DockWidget_p.h"
diff --git a/src/controllers/Frame.h b/src/controllers/Frame.h
index 8d2e5293..1e8dd4d5 100644
--- a/src/controllers/Frame.h
+++ b/src/controllers/Frame.h
@@ -11,8 +11,7 @@
 
 #pragma once
 
-#include "Controller.h"
-
+#include "kddockwidgets/Controller.h"
 #include "kddockwidgets/KDDockWidgets.h"
 #include "kddockwidgets/FocusScope.h"
 #include "DockWidget.h"
diff --git a/src/controllers/Layout.cpp b/src/controllers/Layout.cpp
index d33f7fa7..04ab2990 100644
--- a/src/controllers/Layout.cpp
+++ b/src/controllers/Layout.cpp
@@ -13,7 +13,7 @@
 #include "private/Position_p.h"
 #include "Config.h"
 #include "Platform.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 #include "private/Utils_p.h"
 
 #include "controllers/DockWidget_p.h"
diff --git a/src/controllers/Layout.h b/src/controllers/Layout.h
index e50b635a..eae19147 100644
--- a/src/controllers/Layout.h
+++ b/src/controllers/Layout.h
@@ -24,10 +24,11 @@
 
 #pragma once
 
-#include "View.h"
+#include "kddockwidgets/View.h"
 #include "kddockwidgets/docks_export.h"
 #include "kddockwidgets/KDDockWidgets.h"
 #include "kddockwidgets/LayoutSaver.h"
+
 #include "kdbindings/signal.h"
 
 #include <QList>
diff --git a/src/controllers/MDILayout.cpp b/src/controllers/MDILayout.cpp
index b60958a3..54378220 100644
--- a/src/controllers/MDILayout.cpp
+++ b/src/controllers/MDILayout.cpp
@@ -12,7 +12,7 @@
 #include "MDILayout.h"
 #include "private/multisplitter/ItemFreeContainer_p.h"
 #include "Config.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 #include "controllers/Frame.h"
 #include "controllers/DockWidget_p.h"
 
diff --git a/src/controllers/MDILayout.h b/src/controllers/MDILayout.h
index ea6b6359..1513e533 100644
--- a/src/controllers/MDILayout.h
+++ b/src/controllers/MDILayout.h
@@ -14,7 +14,7 @@
 #ifndef KDDOCKWIDGETS_MDI_LAYOUT_WIDGET_P_H
 #define KDDOCKWIDGETS_MDI_LAYOUT_WIDGET_P_H
 
-#include "controllers/Layout.h"
+#include "kddockwidgets/controllers/Layout.h"
 #include "kddockwidgets/KDDockWidgets.h"
 #include "kddockwidgets/docks_export.h"
 
diff --git a/src/controllers/MainWindow.cpp b/src/controllers/MainWindow.cpp
index 9ce9c48e..6b1ff63e 100644
--- a/src/controllers/MainWindow.cpp
+++ b/src/controllers/MainWindow.cpp
@@ -18,21 +18,21 @@
  */
 
 #include "MainWindow.h"
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 #include "private/DockRegistry_p.h"
 #include "controllers/MDILayout.h"
 #include "controllers/DropArea.h"
 #include "private/Utils_p.h"
 #include "private/Logging_p.h"
 #include "private/WidgetResizeHandler_p.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 #include "private/LayoutSaver_p.h"
 #include "private/multisplitter/Item_p.h"
 #include "Platform.h"
 #include "controllers/DockWidget_p.h"
 #include "controllers/Frame.h"
 #include "controllers/SideBar.h"
-#include "views/MainWindow.h"
+#include "kddockwidgets/views/MainWindow.h"
 
 
 using namespace KDDockWidgets;
diff --git a/src/controllers/MainWindow.h b/src/controllers/MainWindow.h
index 481b40ef..92aab653 100644
--- a/src/controllers/MainWindow.h
+++ b/src/controllers/MainWindow.h
@@ -20,10 +20,10 @@
 #ifndef KD_MAINWINDOW_BASE_H
 #define KD_MAINWINDOW_BASE_H
 
-#include "docks_export.h"
-#include "KDDockWidgets.h"
-#include "LayoutSaver.h"
-#include "Controller.h"
+#include "kddockwidgets/docks_export.h"
+#include "kddockwidgets/KDDockWidgets.h"
+#include "kddockwidgets/LayoutSaver.h"
+#include "kddockwidgets/Controller.h"
 
 #include <QVector>
 #include <QMargins>
diff --git a/src/controllers/Separator.cpp b/src/controllers/Separator.cpp
index c7523d67..c6a23da6 100644
--- a/src/controllers/Separator.cpp
+++ b/src/controllers/Separator.cpp
@@ -16,7 +16,7 @@
 #include "Config.h"
 #include "Platform.h"
 #include "Controller.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 
 #include <QGuiApplication>
 
diff --git a/src/controllers/Stack.h b/src/controllers/Stack.h
index f97d5181..fc63be81 100644
--- a/src/controllers/Stack.h
+++ b/src/controllers/Stack.h
@@ -13,8 +13,8 @@
 
 #include "../Controller.h"
 #include "../private/Draggable_p.h"
-#include "controllers/Frame.h"
-#include "controllers/TabBar.h"
+#include "Frame.h"
+#include "TabBar.h"
 
 #include <QPointer>
 
diff --git a/src/controllers/TabBar.cpp b/src/controllers/TabBar.cpp
index 365d3d62..3d395d5f 100644
--- a/src/controllers/TabBar.cpp
+++ b/src/controllers/TabBar.cpp
@@ -20,7 +20,7 @@
 #include "private/DragController_p.h"
 #include "private/Utils_p.h"
 #include "Config.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 
 using namespace KDDockWidgets;
 using namespace KDDockWidgets::Controllers;
diff --git a/src/controllers/TitleBar.cpp b/src/controllers/TitleBar.cpp
index afe372e0..c0017666 100644
--- a/src/controllers/TitleBar.cpp
+++ b/src/controllers/TitleBar.cpp
@@ -11,7 +11,7 @@
 
 #include "TitleBar.h"
 #include "Config.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 #include "View.h"
 #include "private/WindowBeingDragged_p.h"
 #include "private/Utils_p.h"
diff --git a/src/controllers/indicators/ClassicIndicators.cpp b/src/controllers/indicators/ClassicIndicators.cpp
index 3fbcfbaf..ab190ecd 100644
--- a/src/controllers/indicators/ClassicIndicators.cpp
+++ b/src/controllers/indicators/ClassicIndicators.cpp
@@ -11,7 +11,7 @@
 
 #include "ClassicIndicators.h"
 #include "Config.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 #include "views/ClassicIndicatorWindow.h"
 
 #include "controllers/DropArea.h"
diff --git a/src/fwd_headers/kddockwidgets/Action.h b/src/fwd_headers/kddockwidgets/Action.h
new file mode 100644
index 00000000..579314dc
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/Action.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../Action.h"
diff --git a/src/fwd_headers/kddockwidgets/Controller.h b/src/fwd_headers/kddockwidgets/Controller.h
new file mode 100644
index 00000000..affe90b8
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/Controller.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../Controller.h"
diff --git a/src/fwd_headers/kddockwidgets/Platform.h b/src/fwd_headers/kddockwidgets/Platform.h
new file mode 100644
index 00000000..ab5f02fb
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/Platform.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../Platform.h"
diff --git a/src/fwd_headers/kddockwidgets/Platform_qt.h b/src/fwd_headers/kddockwidgets/Platform_qt.h
new file mode 100644
index 00000000..e3c7ed85
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/Platform_qt.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../qtcommon/Platform_qt.h"
diff --git a/src/fwd_headers/kddockwidgets/View.h b/src/fwd_headers/kddockwidgets/View.h
new file mode 100644
index 00000000..e9582330
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/View.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../View.h"
diff --git a/src/fwd_headers/kddockwidgets/ViewWrapper.h b/src/fwd_headers/kddockwidgets/ViewWrapper.h
new file mode 100644
index 00000000..69523404
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/ViewWrapper.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../ViewWrapper.h"
diff --git a/src/fwd_headers/kddockwidgets/Window.h b/src/fwd_headers/kddockwidgets/Window.h
new file mode 100644
index 00000000..361d55a7
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/Window.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../Window.h"
diff --git a/src/fwd_headers/kddockwidgets/Window_qt.h b/src/fwd_headers/kddockwidgets/Window_qt.h
new file mode 100644
index 00000000..1fa0a33d
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/Window_qt.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../qtcommon/Window_qt.h"
diff --git a/src/fwd_headers/kddockwidgets/private/Utils_p.h b/src/fwd_headers/kddockwidgets/private/Utils_p.h
new file mode 100644
index 00000000..efc848a7
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/private/Utils_p.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../../private/Utils_p.h"
diff --git a/src/fwd_headers/kddockwidgets/views/ClassicIndicatorWindow.h b/src/fwd_headers/kddockwidgets/views/ClassicIndicatorWindow.h
new file mode 100644
index 00000000..2ebb7c7b
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/views/ClassicIndicatorWindow.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../../views/ClassicIndicatorWindow.h"
diff --git a/src/fwd_headers/kddockwidgets/views/DockWidget.h b/src/fwd_headers/kddockwidgets/views/DockWidget.h
new file mode 100644
index 00000000..a2d1e648
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/views/DockWidget.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../../views/DockWidget.h"
diff --git a/src/fwd_headers/kddockwidgets/views/Frame.h b/src/fwd_headers/kddockwidgets/views/Frame.h
new file mode 100644
index 00000000..d319dc88
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/views/Frame.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../../views/Frame.h"
diff --git a/src/fwd_headers/kddockwidgets/views/MainWindow.h b/src/fwd_headers/kddockwidgets/views/MainWindow.h
new file mode 100644
index 00000000..a0d14b47
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/views/MainWindow.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../../views/MainWindow.h"
diff --git a/src/fwd_headers/kddockwidgets/views/MainWindowMDI.h b/src/fwd_headers/kddockwidgets/views/MainWindowMDI.h
new file mode 100644
index 00000000..45182934
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/views/MainWindowMDI.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../../views/MainWindowMDI.h"
diff --git a/src/fwd_headers/kddockwidgets/views/SideBar.h b/src/fwd_headers/kddockwidgets/views/SideBar.h
new file mode 100644
index 00000000..4d7ac5aa
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/views/SideBar.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../../views/SideBar.h"
diff --git a/src/fwd_headers/kddockwidgets/views/Stack.h b/src/fwd_headers/kddockwidgets/views/Stack.h
new file mode 100644
index 00000000..f9a5334f
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/views/Stack.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../../views/Stack.h"
diff --git a/src/fwd_headers/kddockwidgets/views/TabBar.h b/src/fwd_headers/kddockwidgets/views/TabBar.h
new file mode 100644
index 00000000..217979cb
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/views/TabBar.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../../views/TabBar.h"
diff --git a/src/fwd_headers/kddockwidgets/views/TitleBar.h b/src/fwd_headers/kddockwidgets/views/TitleBar.h
new file mode 100644
index 00000000..40d5bfba
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/views/TitleBar.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sergio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../../views/TitleBar.h"
diff --git a/src/fwd_headers/qtquick/kddockwidgets/Window_qtquick.h b/src/fwd_headers/qtquick/kddockwidgets/Window_qtquick.h
new file mode 100644
index 00000000..69cd03d4
--- /dev/null
+++ b/src/fwd_headers/qtquick/kddockwidgets/Window_qtquick.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2019-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sérgio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../../qtquick/Window_qtquick.h"
diff --git a/src/fwd_headers/qtwidgets/kddockwidgets/Platform_qtwidgets.h b/src/fwd_headers/qtwidgets/kddockwidgets/Platform_qtwidgets.h
new file mode 100644
index 00000000..4689fd71
--- /dev/null
+++ b/src/fwd_headers/qtwidgets/kddockwidgets/Platform_qtwidgets.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2019-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sérgio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../../qtwidgets/Platform_qtwidgets.h"
diff --git a/src/fwd_headers/qtwidgets/kddockwidgets/Window_qtwidgets.h b/src/fwd_headers/qtwidgets/kddockwidgets/Window_qtwidgets.h
new file mode 100644
index 00000000..2189ab05
--- /dev/null
+++ b/src/fwd_headers/qtwidgets/kddockwidgets/Window_qtwidgets.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2019-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sérgio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#include "../../../qtwidgets/Window_qtwidgets.h"
diff --git a/src/layoutlinter_main.cpp b/src/layoutlinter_main.cpp
index a46a80e1..4c324f2d 100644
--- a/src/layoutlinter_main.cpp
+++ b/src/layoutlinter_main.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "Config.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 
 #include "controllers/MainWindow.h"
 #include "controllers/DockWidget.h"
diff --git a/src/private/DockRegistry_p.h b/src/private/DockRegistry_p.h
index 8ce657df..125e3606 100644
--- a/src/private/DockRegistry_p.h
+++ b/src/private/DockRegistry_p.h
@@ -15,7 +15,7 @@
 #include "kddockwidgets/controllers/DockWidget.h"
 #include "kddockwidgets/controllers/Frame.h"
 #include "kddockwidgets/controllers/MainWindow.h"
-#include "Window.h"
+#include "kddockwidgets/Window.h"
 
 #include <QVector>
 #include <QObject>
diff --git a/src/private/Utils_p.h b/src/private/Utils_p.h
index e046527f..69d79d06 100644
--- a/src/private/Utils_p.h
+++ b/src/private/Utils_p.h
@@ -13,7 +13,7 @@
 #define KD_UTILS_P_H
 
 #include "kddockwidgets/Config.h"
-#include "View.h"
+#include "kddockwidgets/View.h"
 
 #include <QScreen>
 #include <QWindow>
diff --git a/src/private/WindowBeingDragged.cpp b/src/private/WindowBeingDragged.cpp
index 7aba717d..40949bbe 100644
--- a/src/private/WindowBeingDragged.cpp
+++ b/src/private/WindowBeingDragged.cpp
@@ -9,7 +9,7 @@
   Contact KDAB at <info@kdab.com> for commercial licensing options.
 */
 
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 #include "WindowBeingDragged_p.h"
 #include "DragController_p.h"
 #include "Logging_p.h"
diff --git a/src/qtcommon/Platform_qt.cpp b/src/qtcommon/Platform_qt.cpp
index 86d5b23a..e2c9fb5e 100644
--- a/src/qtcommon/Platform_qt.cpp
+++ b/src/qtcommon/Platform_qt.cpp
@@ -10,8 +10,8 @@
 */
 
 #include "Platform_qt.h"
-#include "KDDockWidgets.h"
-#include "Window_qt.h"
+#include "kddockwidgets/KDDockWidgets.h"
+#include "kddockwidgets/Window_qt.h"
 
 #include <QWindow>
 #include <QDebug>
diff --git a/src/qtcommon/Platform_qt.h b/src/qtcommon/Platform_qt.h
index 759a9aa6..20ed2bef 100644
--- a/src/qtcommon/Platform_qt.h
+++ b/src/qtcommon/Platform_qt.h
@@ -11,9 +11,9 @@
 
 #pragma once
 
-#include "docks_export.h"
-#include "Platform.h"
-#include "Window_qt.h"
+#include "kddockwidgets/docks_export.h"
+#include "kddockwidgets/Platform.h"
+#include "kddockwidgets/Window_qt.h"
 
 namespace KDDockWidgets {
 
diff --git a/src/qtcommon/Window_qt.cpp b/src/qtcommon/Window_qt.cpp
index 2f68df91..0e7c7b02 100644
--- a/src/qtcommon/Window_qt.cpp
+++ b/src/qtcommon/Window_qt.cpp
@@ -10,7 +10,7 @@
 */
 
 
-#include "Window_qt.h"
+#include "kddockwidgets/Window_qt.h"
 
 #include <QWindow>
 #include <QScreen>
diff --git a/src/qtcommon/Window_qt.h b/src/qtcommon/Window_qt.h
index 7614038c..6aa95b96 100644
--- a/src/qtcommon/Window_qt.h
+++ b/src/qtcommon/Window_qt.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include "Window.h"
+#include "kddockwidgets/Window.h"
 
 #include <QPointer>
 
diff --git a/src/qtquick/MainWindowInstantiator.cpp b/src/qtquick/MainWindowInstantiator.cpp
index 230609ec..a35a5c26 100644
--- a/src/qtquick/MainWindowInstantiator.cpp
+++ b/src/qtquick/MainWindowInstantiator.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "MainWindowInstantiator.h"
-#include "qtquick/views/MainWindow_qtquick.h"
+#include "kddockwidgets/views/MainWindow_qtquick.h"
 #include "qtquick/views/MainWindowMDI_qtquick.h"
 
 #include "DockWidgetInstantiator.h"
diff --git a/src/qtquick/Platform_qtquick.cpp b/src/qtquick/Platform_qtquick.cpp
index 4edf9867..a47b19d8 100644
--- a/src/qtquick/Platform_qtquick.cpp
+++ b/src/qtquick/Platform_qtquick.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "Platform_qtquick.h"
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 #include "Config.h"
 #include "QmlTypes.h"
 
diff --git a/src/qtquick/Platform_qtquick.h b/src/qtquick/Platform_qtquick.h
index 5b3a88eb..5c11778b 100644
--- a/src/qtquick/Platform_qtquick.h
+++ b/src/qtquick/Platform_qtquick.h
@@ -11,8 +11,8 @@
 
 #pragma once
 
-#include "KDDockWidgets.h"
-#include "qtcommon/Platform_qt.h"
+#include "kddockwidgets/KDDockWidgets.h"
+#include "kddockwidgets/Platform_qt.h"
 #include "Helpers_p.h"
 
 class QQmlEngine;
diff --git a/src/qtquick/TestHelpers_qtquick.cpp b/src/qtquick/TestHelpers_qtquick.cpp
index 01cc7e1c..ca723dc2 100644
--- a/src/qtquick/TestHelpers_qtquick.cpp
+++ b/src/qtquick/TestHelpers_qtquick.cpp
@@ -9,10 +9,10 @@
   Contact KDAB at <info@kdab.com> for commercial licensing options.
 */
 
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 #include "Platform_qtquick.h"
 #include "views/View_qtquick.h"
-#include "qtquick/views/MainWindow_qtquick.h"
+#include "kddockwidgets/views/MainWindow_qtquick.h"
 #include "kddockwidgets/controllers/MainWindow.h"
 
 #include <QGuiApplication>
diff --git a/src/qtquick/ViewFactory_qtquick.cpp b/src/qtquick/ViewFactory_qtquick.cpp
index 2ce42c18..c219b9bf 100644
--- a/src/qtquick/ViewFactory_qtquick.cpp
+++ b/src/qtquick/ViewFactory_qtquick.cpp
@@ -33,7 +33,7 @@
 #include "qtquick/views/TabBar_qtquick.h"
 // #include "qtquick/views/SideBar_qtquick.h"
 #include "qtquick/views/Stack_qtquick.h"
-#include "qtquick/views/MainWindow_qtquick.h"
+#include "kddockwidgets/views/MainWindow_qtquick.h"
 #include "qtquick/views/MDILayout_qtquick.h"
 #include "qtquick/views/ClassicIndicatorsWindow_qtquick.h"
 
diff --git a/src/qtquick/ViewFactory_qtquick.h b/src/qtquick/ViewFactory_qtquick.h
index afb19e3e..7ac08a6a 100644
--- a/src/qtquick/ViewFactory_qtquick.h
+++ b/src/qtquick/ViewFactory_qtquick.h
@@ -12,7 +12,7 @@
 #ifndef KDDOCKWIDGETS_ViewFactory_QTQUICK_H
 #define KDDOCKWIDGETS_ViewFactory_QTQUICK_H
 
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 
 // clazy:excludeall=ctor-missing-parent-argument
 
diff --git a/src/qtquick/Window_qtquick.h b/src/qtquick/Window_qtquick.h
index a7868a06..1ce9ae6d 100644
--- a/src/qtquick/Window_qtquick.h
+++ b/src/qtquick/Window_qtquick.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include "qtcommon/Window_qt.h"
+#include "kddockwidgets/Window_qt.h"
 
 namespace KDDockWidgets {
 class DOCKS_EXPORT Window_qtquick : public Window_qt
diff --git a/src/qtquick/views/DockWidget_qtquick.cpp b/src/qtquick/views/DockWidget_qtquick.cpp
index 249be00a..e0ce9d11 100644
--- a/src/qtquick/views/DockWidget_qtquick.cpp
+++ b/src/qtquick/views/DockWidget_qtquick.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "DockWidget_qtquick.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 
 #include "kddockwidgets/controllers/TitleBar.h"
 #include "kddockwidgets/controllers/DockWidget.h"
diff --git a/src/qtquick/views/FloatingWindow_qtquick.cpp b/src/qtquick/views/FloatingWindow_qtquick.cpp
index 6d6d3772..6e199f89 100644
--- a/src/qtquick/views/FloatingWindow_qtquick.cpp
+++ b/src/qtquick/views/FloatingWindow_qtquick.cpp
@@ -25,7 +25,7 @@
 #include "private/WidgetResizeHandler_p.h"
 #include "qtquick/Platform_qtquick.h"
 #include "qtquick/Window_qtquick.h"
-#include "qtquick/views/MainWindow_qtquick.h"
+#include "kddockwidgets/views/MainWindow_qtquick.h"
 #include "qtquick/views/TitleBar_qtquick.h"
 #include "qtquick/views/DropArea_qtquick.h"
 
diff --git a/src/qtquick/views/Frame_qtquick.cpp b/src/qtquick/views/Frame_qtquick.cpp
index 66dc645c..b4550899 100644
--- a/src/qtquick/views/Frame_qtquick.cpp
+++ b/src/qtquick/views/Frame_qtquick.cpp
@@ -30,7 +30,7 @@
 #include "Stack_qtquick.h"
 
 #include "Config.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 #include "Stack_qtquick.h"
 #include "private/WidgetResizeHandler_p.h"
 
diff --git a/src/qtquick/views/MainWindowMDI_qtquick.h b/src/qtquick/views/MainWindowMDI_qtquick.h
index 6b30333b..b107c511 100644
--- a/src/qtquick/views/MainWindowMDI_qtquick.h
+++ b/src/qtquick/views/MainWindowMDI_qtquick.h
@@ -13,8 +13,8 @@
 #define KD_MAINWINDOW_MDI_QTQUICK_H
 #pragma once
 
-#include "views/MainWindowMDI.h"
-#include "qtquick/views/MainWindow_qtquick.h"
+#include "kddockwidgets/views/MainWindowMDI.h"
+#include "kddockwidgets/views/MainWindow_qtquick.h"
 
 namespace KDDockWidgets {
 
diff --git a/src/qtquick/views/MainWindow_qtquick.h b/src/qtquick/views/MainWindow_qtquick.h
index 82551fb4..ceda95f6 100644
--- a/src/qtquick/views/MainWindow_qtquick.h
+++ b/src/qtquick/views/MainWindow_qtquick.h
@@ -13,7 +13,7 @@
 #define KD_MAIN_WINDOW_QUICK_P_H
 
 #include "View_qtquick.h"
-#include "views/MainWindow.h"
+#include "kddockwidgets/views/MainWindow.h"
 
 namespace KDDockWidgets {
 
diff --git a/src/qtquick/views/Separator_qtquick.h b/src/qtquick/views/Separator_qtquick.h
index c94290e1..80706e9d 100644
--- a/src/qtquick/views/Separator_qtquick.h
+++ b/src/qtquick/views/Separator_qtquick.h
@@ -18,6 +18,10 @@
 
 #include <QQuickItem>
 
+namespace KDDockWidgets::Controllers {
+class Separator;
+}
+
 namespace KDDockWidgets::Views {
 
 class DOCKS_EXPORT Separator_qtquick : public View_qtquick
diff --git a/src/qtquick/views/Stack_qtquick.cpp b/src/qtquick/views/Stack_qtquick.cpp
index d76aee53..d6595a9b 100644
--- a/src/qtquick/views/Stack_qtquick.cpp
+++ b/src/qtquick/views/Stack_qtquick.cpp
@@ -11,7 +11,7 @@
 
 #include "Stack_qtquick.h"
 #include "Config.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 
 #include "kddockwidgets/controllers/Frame.h"
 #include "kddockwidgets/controllers/TabBar.h"
diff --git a/src/qtquick/views/ViewWrapper_qtquick.cpp b/src/qtquick/views/ViewWrapper_qtquick.cpp
index 8af601f7..ab57f83c 100644
--- a/src/qtquick/views/ViewWrapper_qtquick.cpp
+++ b/src/qtquick/views/ViewWrapper_qtquick.cpp
@@ -16,8 +16,9 @@
 #include "qtquick/views/DockWidget_qtquick.h"
 #include "qtquick/views/FloatingWindow_qtquick.h"
 #include "qtquick/views/Frame_qtquick.h"
-#include "qtquick/views/MainWindow_qtquick.h"
+#include "kddockwidgets/views/MainWindow_qtquick.h"
 #include "qtquick/views/Separator_qtquick.h"
+#include "private/multisplitter/Item_p.h"
 // #include "qtquick/views/SideBar_qtquick.h"
 #include "qtquick/views/Stack_qtquick.h"
 #include "qtquick/views/TabBar_qtquick.h"
diff --git a/src/qtquick/views/ViewWrapper_qtquick.h b/src/qtquick/views/ViewWrapper_qtquick.h
index 37f9653a..27569fc6 100644
--- a/src/qtquick/views/ViewWrapper_qtquick.h
+++ b/src/qtquick/views/ViewWrapper_qtquick.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include "ViewWrapper.h"
+#include "kddockwidgets/ViewWrapper.h"
 
 #include <QQuickItem>
 #include <QPointer>
diff --git a/src/qtquick/views/View_qtquick.cpp b/src/qtquick/views/View_qtquick.cpp
index e5ac2ea4..5f063f06 100644
--- a/src/qtquick/views/View_qtquick.cpp
+++ b/src/qtquick/views/View_qtquick.cpp
@@ -12,6 +12,7 @@
 #include "View_qtquick.h"
 #include "private/Utils_p.h"
 #include "ViewWrapper_qtquick.h"
+#include "private/multisplitter/Item_p.h"
 
 #include <qpa/qplatformwindow.h>
 #include <QGuiApplication>
diff --git a/src/qtquick/views/View_qtquick.h b/src/qtquick/views/View_qtquick.h
index bb8e89ad..0bece6a4 100644
--- a/src/qtquick/views/View_qtquick.h
+++ b/src/qtquick/views/View_qtquick.h
@@ -11,11 +11,10 @@
 
 #pragma once
 
-#include "Controller.h"
-#include "View.h"
+#include "kddockwidgets/Controller.h"
+#include "kddockwidgets/View.h"
 #include "ViewWrapper_qtquick.h"
-#include "private/multisplitter/Item_p.h"
-#include "qtquick/Window_qtquick.h"
+#include "kddockwidgets/Window_qtquick.h"
 
 #include <QDebug>
 #include <QEvent>
diff --git a/src/qtwidgets/MDIArea.cpp b/src/qtwidgets/MDIArea.cpp
index a2010703..a3e2ab1c 100644
--- a/src/qtwidgets/MDIArea.cpp
+++ b/src/qtwidgets/MDIArea.cpp
@@ -11,7 +11,7 @@
 
 #include "MDIArea.h"
 
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 #include "kddockwidgets/controllers/DockWidget.h"
 #include "kddockwidgets/controllers/MDILayout.h"
 #include "kddockwidgets/controllers/DropArea.h"
diff --git a/src/qtwidgets/MDIArea.h b/src/qtwidgets/MDIArea.h
index 9e66a08e..fa19ddfa 100644
--- a/src/qtwidgets/MDIArea.h
+++ b/src/qtwidgets/MDIArea.h
@@ -13,8 +13,8 @@
 #define KDDOCKWIDGETS_MDI_AREA_H
 
 #include "kddockwidgets/docks_export.h"
-#include "KDDockWidgets.h"
-#include "qtwidgets/views/View_qtwidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
+#include "kddockwidgets/views/View_qtwidgets.h"
 
 namespace KDDockWidgets {
 
diff --git a/src/qtwidgets/Platform_qtwidgets.cpp b/src/qtwidgets/Platform_qtwidgets.cpp
index 061b7463..81671a03 100644
--- a/src/qtwidgets/Platform_qtwidgets.cpp
+++ b/src/qtwidgets/Platform_qtwidgets.cpp
@@ -10,7 +10,7 @@
 */
 
 #include "Platform_qtwidgets.h"
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 
 #include "Window_qtwidgets.h"
 #include "DebugWindow.h"
diff --git a/src/qtwidgets/TestHelpers_qtwidgets.cpp b/src/qtwidgets/TestHelpers_qtwidgets.cpp
index 09282a80..4b3241b1 100644
--- a/src/qtwidgets/TestHelpers_qtwidgets.cpp
+++ b/src/qtwidgets/TestHelpers_qtwidgets.cpp
@@ -9,7 +9,7 @@
   Contact KDAB at <info@kdab.com> for commercial licensing options.
 */
 
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 #include "Platform_qtwidgets.h"
 #include "views/ViewWrapper_qtwidgets.h"
 #include "views/View_qtwidgets.h"
diff --git a/src/qtwidgets/ViewFactory_qtwidgets.h b/src/qtwidgets/ViewFactory_qtwidgets.h
index e388b1e6..ad8af605 100644
--- a/src/qtwidgets/ViewFactory_qtwidgets.h
+++ b/src/qtwidgets/ViewFactory_qtwidgets.h
@@ -12,7 +12,7 @@
 #ifndef KDDOCKWIDGETS_ViewFactory_QTWIDGETS_H
 #define KDDOCKWIDGETS_ViewFactory_QTWIDGETS_H
 
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 
 // clazy:excludeall=ctor-missing-parent-argument
 
diff --git a/src/qtwidgets/Window_qtwidgets.h b/src/qtwidgets/Window_qtwidgets.h
index b976219c..9e5c7576 100644
--- a/src/qtwidgets/Window_qtwidgets.h
+++ b/src/qtwidgets/Window_qtwidgets.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include "qtcommon/Window_qt.h"
+#include "kddockwidgets/Window_qt.h"
 
 namespace KDDockWidgets {
 class DOCKS_EXPORT Window_qtwidgets : public Window_qt
diff --git a/src/qtwidgets/views/MainWindowMDI_qtwidgets.h b/src/qtwidgets/views/MainWindowMDI_qtwidgets.h
index 3dbe339f..311c690f 100644
--- a/src/qtwidgets/views/MainWindowMDI_qtwidgets.h
+++ b/src/qtwidgets/views/MainWindowMDI_qtwidgets.h
@@ -20,8 +20,8 @@
 #define KD_MAINWINDOW_MDI_QTWIDGETS_H
 #pragma once
 
-#include "views/MainWindowMDI.h"
-#include "qtwidgets/views/MainWindow_qtwidgets.h"
+#include "kddockwidgets/views/MainWindowMDI.h"
+#include "kddockwidgets/views/MainWindow_qtwidgets.h"
 
 namespace KDDockWidgets {
 
diff --git a/src/qtwidgets/views/MainWindow_qtwidgets.cpp b/src/qtwidgets/views/MainWindow_qtwidgets.cpp
index 7fa2acb4..ecb00285 100644
--- a/src/qtwidgets/views/MainWindow_qtwidgets.cpp
+++ b/src/qtwidgets/views/MainWindow_qtwidgets.cpp
@@ -18,7 +18,7 @@
 
 #include "MainWindow_qtwidgets.h"
 #include "Config.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 
 #include "kddockwidgets/controllers/DropArea.h"
 #include "kddockwidgets/controllers/MainWindow.h"
diff --git a/src/qtwidgets/views/MainWindow_qtwidgets.h b/src/qtwidgets/views/MainWindow_qtwidgets.h
index 57253c34..dee9fe62 100644
--- a/src/qtwidgets/views/MainWindow_qtwidgets.h
+++ b/src/qtwidgets/views/MainWindow_qtwidgets.h
@@ -20,7 +20,7 @@
 #define KD_MAINWINDOW_H
 
 #include "View_qtwidgets.h"
-#include "views/MainWindow.h"
+#include "kddockwidgets/views/MainWindow.h"
 
 #include <QMainWindow>
 
diff --git a/src/qtwidgets/views/TitleBar_qtwidgets.h b/src/qtwidgets/views/TitleBar_qtwidgets.h
index d562c1bf..7db2c09e 100644
--- a/src/qtwidgets/views/TitleBar_qtwidgets.h
+++ b/src/qtwidgets/views/TitleBar_qtwidgets.h
@@ -12,7 +12,7 @@
 #pragma once
 
 #include "View_qtwidgets.h"
-#include "views/TitleBar.h"
+#include "kddockwidgets/views/TitleBar.h"
 
 #include <QToolButton>
 
diff --git a/src/qtwidgets/views/ViewWrapper_qtwidgets.h b/src/qtwidgets/views/ViewWrapper_qtwidgets.h
index e359265b..34535b8e 100644
--- a/src/qtwidgets/views/ViewWrapper_qtwidgets.h
+++ b/src/qtwidgets/views/ViewWrapper_qtwidgets.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include "ViewWrapper.h"
+#include "kddockwidgets/ViewWrapper.h"
 
 #include <QWidget>
 #include <QPointer>
diff --git a/src/qtwidgets/views/View_qtwidgets.h b/src/qtwidgets/views/View_qtwidgets.h
index d1f92613..1e0ee835 100644
--- a/src/qtwidgets/views/View_qtwidgets.h
+++ b/src/qtwidgets/views/View_qtwidgets.h
@@ -11,11 +11,11 @@
 
 #pragma once
 
-#include "private/Utils_p.h"
-#include "Controller.h"
-#include "View.h"
-#include "ViewWrapper_qtwidgets.h"
-#include "qtwidgets/Window_qtwidgets.h"
+#include "kddockwidgets/private/Utils_p.h"
+#include "kddockwidgets/Controller.h"
+#include "kddockwidgets/View.h"
+#include "kddockwidgets/Window_qtwidgets.h"
+#include "kddockwidgets/views/ViewWrapper_qtwidgets.h"
 
 #include <QDebug>
 #include <QEvent>
diff --git a/src/views/ClassicIndicatorWindow.h b/src/views/ClassicIndicatorWindow.h
index 20f2dc6a..885ccc59 100644
--- a/src/views/ClassicIndicatorWindow.h
+++ b/src/views/ClassicIndicatorWindow.h
@@ -12,7 +12,7 @@
 #pragma once
 
 #include "View.h"
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 
 namespace KDDockWidgets {
 
diff --git a/src/views/MainWindow.h b/src/views/MainWindow.h
index 9e038d84..26c3de05 100644
--- a/src/views/MainWindow.h
+++ b/src/views/MainWindow.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 
 class QMargins;
 class QRect;
diff --git a/src/views/MainWindowMDI.h b/src/views/MainWindowMDI.h
index e383f9dc..4c8af363 100644
--- a/src/views/MainWindowMDI.h
+++ b/src/views/MainWindowMDI.h
@@ -14,7 +14,7 @@
 #define KD_MAINWINDOW_MDI_INTERFACE_H
 #pragma once
 
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 
 namespace KDDockWidgets {
 
diff --git a/tests/controllers/tst_dockwidget.cpp b/tests/controllers/tst_dockwidget.cpp
index ea818634..beb2ef76 100644
--- a/tests/controllers/tst_dockwidget.cpp
+++ b/tests/controllers/tst_dockwidget.cpp
@@ -12,7 +12,7 @@
 #include "../main.h"
 #include "kddockwidgets/controllers/DockWidget.h"
 #include "Action.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 #include "Config.h"
 #include "Platform.h"
 
diff --git a/tests/controllers/tst_floatingwindow.cpp b/tests/controllers/tst_floatingwindow.cpp
index ab5fbc66..1024e991 100644
--- a/tests/controllers/tst_floatingwindow.cpp
+++ b/tests/controllers/tst_floatingwindow.cpp
@@ -13,7 +13,7 @@
 #include "kddockwidgets/controllers/FloatingWindow.h"
 #include "kddockwidgets/controllers/Frame.h"
 #include "kddockwidgets/controllers/DockWidget.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 #include "Config.h"
 
 TEST_CASE("FloatingWindow Ctor")
diff --git a/tests/fuzzer/Operations.h b/tests/fuzzer/Operations.h
index 053e450e..4ad517dc 100644
--- a/tests/fuzzer/Operations.h
+++ b/tests/fuzzer/Operations.h
@@ -15,7 +15,7 @@
 #ifndef KDDOCKWIDGETS_TESTING_OPERATIONS_H
 #define KDDOCKWIDGETS_TESTING_OPERATIONS_H
 
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 
 #include <QObject>
 #include <QVector>
diff --git a/tests/qtquick/tst_qtquick.cpp b/tests/qtquick/tst_qtquick.cpp
index c7274fa2..516fa02d 100644
--- a/tests/qtquick/tst_qtquick.cpp
+++ b/tests/qtquick/tst_qtquick.cpp
@@ -13,7 +13,7 @@
 /// @brief Here lives the tests that only apply to QtQuick
 
 #include "Platform.h"
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 
 #include "../utils.h"
 
diff --git a/tests/qtwidgets/tst_qtwidgets.cpp b/tests/qtwidgets/tst_qtwidgets.cpp
index 0c237250..507f70df 100644
--- a/tests/qtwidgets/tst_qtwidgets.cpp
+++ b/tests/qtwidgets/tst_qtwidgets.cpp
@@ -15,13 +15,13 @@
 /// QtWidgets specific.
 
 #include "Platform.h"
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 #include "../utils.h"
 #include "Config.h"
 #include "LayoutSaver.h"
 #include "LayoutSaver_p.h"
 #include "WindowBeingDragged_p.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 
 #include "multisplitter/Item_p.h"
 
diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp
index fa247533..f8b7c2fa 100644
--- a/tests/tst_docks.cpp
+++ b/tests/tst_docks.cpp
@@ -19,7 +19,7 @@
 #include "WindowBeingDragged_p.h"
 #include "Platform.h"
 #include "multisplitter/Item_p.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 #include "Action.h"
 #include "kddockwidgets/controllers/MDILayout.h"
 #include "kddockwidgets/controllers/DropArea.h"
diff --git a/tests/tst_multisplitter.cpp b/tests/tst_multisplitter.cpp
index 87374c87..5cdf8a1d 100644
--- a/tests/tst_multisplitter.cpp
+++ b/tests/tst_multisplitter.cpp
@@ -15,7 +15,7 @@
 
 #include "Platform.h"
 #include "Config.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 
 #include <QtTest/QtTest>
 
diff --git a/tests/utils.cpp b/tests/utils.cpp
index f27a4ae1..27efbd50 100644
--- a/tests/utils.cpp
+++ b/tests/utils.cpp
@@ -11,7 +11,7 @@
 
 #include "utils.h"
 #include "Config.h"
-#include "ViewFactory.h"
+#include "kddockwidgets/ViewFactory.h"
 #include "Platform.h"
 #include "ViewGuard.h"
 #include "kddockwidgets/controllers/DropArea.h"
diff --git a/tests/utils.h b/tests/utils.h
index 2c994dc6..865f5e09 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -16,7 +16,7 @@
 
 #include "Config.h"
 #include "DockRegistry_p.h"
-#include "KDDockWidgets.h"
+#include "kddockwidgets/KDDockWidgets.h"
 
 #include "kddockwidgets/controllers/DropIndicatorOverlay.h"
 #include "kddockwidgets/controllers/DropArea.h"