diff --git a/examples/qtquick/main.cpp b/examples/qtquick/main.cpp
index a337c8a6..8c996618 100644
--- a/examples/qtquick/main.cpp
+++ b/examples/qtquick/main.cpp
@@ -10,9 +10,9 @@
 */
 
 
-#include "private/DockRegistry_p.h"
-#include "private/quick/DockWidgetQuick.h"
-#include "Config.h"
+#include <kddockwidgets/Config.h>
+#include <kddockwidgets/DockWidgetQuick.h>
+#include <kddockwidgets/private/DockRegistry_p.h>
 
 #include <QQuickView>
 #include <QGuiApplication>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cbe7a1a0..1f8716e1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -86,7 +86,7 @@ set(DOCKS_INSTALLABLE_PRIVATE_WIDGET_INCLUDES
 
 if(${PROJECT_NAME}_QTQUICK)
   set(DOCKSLIBS_SRCS ${DOCKSLIBS_SRCS}
-      private/quick/DockWidgetQuick.cpp
+      DockWidgetQuick.cpp
       private/quick/QWidgetAdapter_quick.cpp
       private/quick/FloatingWindowQuick.cpp
       private/quick/TitleBarQuick.cpp
diff --git a/src/private/quick/DockWidgetQuick.cpp b/src/DockWidgetQuick.cpp
similarity index 100%
rename from src/private/quick/DockWidgetQuick.cpp
rename to src/DockWidgetQuick.cpp
diff --git a/src/private/quick/DockWidgetQuick.h b/src/DockWidgetQuick.h
similarity index 100%
rename from src/private/quick/DockWidgetQuick.h
rename to src/DockWidgetQuick.h
diff --git a/src/FrameworkWidgetFactory.cpp b/src/FrameworkWidgetFactory.cpp
index 4b31ca8b..489d7457 100644
--- a/src/FrameworkWidgetFactory.cpp
+++ b/src/FrameworkWidgetFactory.cpp
@@ -33,8 +33,8 @@
 # include <QRubberBand>
 # include <QToolButton>
 #else
+# include "DockWidgetQuick.h"
 # include "quick/FrameQuick_p.h"
-# include "quick/DockWidgetQuick.h"
 # include "quick/TitleBarQuick_p.h"
 # include "quick/FloatingWindowQuick_p.h"
 # include "multisplitter/Separator_quick.h"
diff --git a/src/fwd_headers/kddockwidgets/private/DragRegistry_p.h b/src/fwd_headers/kddockwidgets/DockWidgetQuick.h
similarity index 87%
rename from src/fwd_headers/kddockwidgets/private/DragRegistry_p.h
rename to src/fwd_headers/kddockwidgets/DockWidgetQuick.h
index ecc394f3..d2cdf9bd 100644
--- a/src/fwd_headers/kddockwidgets/private/DragRegistry_p.h
+++ b/src/fwd_headers/kddockwidgets/DockWidgetQuick.h
@@ -9,4 +9,4 @@
   Contact KDAB at <info@kdab.com> for commercial licensing options.
 */
 
-#include "../../../private/DragRegistry_p.h"
+#include "../../DockWidgetQuick.h"
diff --git a/src/fwd_headers/kddockwidgets/private/DockRegistry_p.h b/src/fwd_headers/kddockwidgets/private/DockRegistry_p.h
new file mode 100644
index 00000000..0004b03e
--- /dev/null
+++ b/src/fwd_headers/kddockwidgets/private/DockRegistry_p.h
@@ -0,0 +1,12 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2020 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/DockRegistry_p.h"
diff --git a/src/private/DockRegistry_p.h b/src/private/DockRegistry_p.h
index e74c2ba6..51d1c143 100644
--- a/src/private/DockRegistry_p.h
+++ b/src/private/DockRegistry_p.h
@@ -12,8 +12,8 @@
 #ifndef KD_DOCKREGISTRY_P_H
 #define KD_DOCKREGISTRY_P_H
 
-#include "DockWidgetBase.h"
-#include "MainWindowBase.h"
+#include "../DockWidgetBase.h"
+#include "../MainWindowBase.h"
 #include "FloatingWindow_p.h"
 
 #include <QVector>
diff --git a/src/private/FloatingWindow_p.h b/src/private/FloatingWindow_p.h
index 3fde757a..02b94bde 100644
--- a/src/private/FloatingWindow_p.h
+++ b/src/private/FloatingWindow_p.h
@@ -12,11 +12,11 @@
 #ifndef KD_FLOATING_WINDOW_P_H
 #define KD_FLOATING_WINDOW_P_H
 
-#include "docks_export.h"
+#include "../docks_export.h"
+#include "../QWidgetAdapter.h"
+#include "../LayoutSaver_p.h"
 #include "Frame_p.h"
 #include "Draggable_p.h"
-#include "QWidgetAdapter.h"
-#include "LayoutSaver_p.h"
 
 QT_BEGIN_NAMESPACE
 class QAbstractNativeEventFilter;
diff --git a/src/private/quick/QWidgetAdapter_quick_p.h b/src/private/quick/QWidgetAdapter_quick_p.h
index f5d2c236..c4a1e2be 100644
--- a/src/private/quick/QWidgetAdapter_quick_p.h
+++ b/src/private/quick/QWidgetAdapter_quick_p.h
@@ -21,7 +21,7 @@
 #ifndef KDDOCKWIDGETS_QWIDGETADAPTERQUICK_P_H
 #define KDDOCKWIDGETS_QWIDGETADAPTERQUICK_P_H
 
-#include "docks_export.h"
+#include "../../docks_export.h"
 #include "Item_p.h"
 
 #include <QQuickItem>
diff --git a/tests/tst_common.cpp b/tests/tst_common.cpp
index 74ef216d..cf906c75 100644
--- a/tests/tst_common.cpp
+++ b/tests/tst_common.cpp
@@ -29,7 +29,7 @@
 #include <QApplication>
 
 #ifdef KDDOCKWIDGETS_QTQUICK
-# include "quick/DockWidgetQuick.h"
+# include "DockWidgetQuick.h"
 # include "quick/MainWindowQuick_p.h"
 
 # include <QQmlEngine>
diff --git a/tests/utils.cpp b/tests/utils.cpp
index 9ce76622..7c15a8f8 100644
--- a/tests/utils.cpp
+++ b/tests/utils.cpp
@@ -23,7 +23,7 @@
 #include <QtTest/QtTest>
 
 #ifdef KDDOCKWIDGETS_QTQUICK
-# include "private/quick/DockWidgetQuick.h"
+# include "DockWidgetQuick.h"
 # include "private/quick/MainWindowQuick_p.h"
 # include <QQuickView>
 #else