diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0f54e531..d70b01fb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,12 +57,12 @@ set(DOCKS_INSTALLABLE_INCLUDES
     KDDockWidgets.h
     QWidgetAdapter.h
     LayoutSaver.h
+    Frame_p.h
     )
 
 set(DOCKS_INSTALLABLE_PRIVATE_WIDGET_INCLUDES
     widgets/QWidgetAdapter_widgets_p.h)
 
-
 if (OPTION_QTQUICK)
     set(DOCKSLIBS_SRCS ${DOCKSLIBS_SRCS}
         quick/QWidgetAdapter_quick.cpp
diff --git a/src/Frame_p.h b/src/Frame_p.h
index 1eb92439..542555f4 100644
--- a/src/Frame_p.h
+++ b/src/Frame_p.h
@@ -29,12 +29,12 @@
 #define KD_FRAME_P_H
 
 #include "docks_export.h"
-#include "multisplitter/Item_p.h"
 #include "QWidgetAdapter.h"
 
 #include <QWidget>
 #include <QVector>
 #include <QDebug>
+#include <QPointer>
 
 namespace KDDockWidgets {
 
diff --git a/src/FrameworkWidgetFactory.cpp b/src/FrameworkWidgetFactory.cpp
index deb97e6c..2ff2e900 100644
--- a/src/FrameworkWidgetFactory.cpp
+++ b/src/FrameworkWidgetFactory.cpp
@@ -19,10 +19,14 @@
 */
 
 #include "FrameworkWidgetFactory.h"
-#include "QWidgetAdapter.h"
+#include "Frame_p.h"
+#include "TitleBar_p.h"
+#include "TabWidget_p.h"
+#include "multisplitter/Separator_p.h"
+#include "FloatingWindow_p.h"
 
 #ifdef KDDOCKWIDGETS_QTWIDGETS
-#include "indicators/ClassicIndicators_p.h"
+# include "indicators/ClassicIndicators_p.h"
 # include "widgets/FrameWidget_p.h"
 # include "widgets/TitleBarWidget_p.h"
 # include "widgets/TabBarWidget_p.h"
diff --git a/src/FrameworkWidgetFactory.h b/src/FrameworkWidgetFactory.h
index 4de4b908..8f81ec3e 100644
--- a/src/FrameworkWidgetFactory.h
+++ b/src/FrameworkWidgetFactory.h
@@ -22,15 +22,20 @@
 #define KDDOCKWIDGETS_FRAMEWORKWIDGETFACTORY_H
 
 #include "docks_export.h"
+#include "QWidgetAdapter.h"
 #include "Frame_p.h"
-#include "TitleBar_p.h"
-#include "TabWidget_p.h"
-#include "multisplitter/Separator_p.h"
-#include "FloatingWindow_p.h"
 
 namespace KDDockWidgets {
 
 class DropIndicatorOverlayInterface;
+class Separator;
+class FloatingWindow;
+class TabWidget;
+class TitleBar;
+class Frame;
+class DropArea;
+class Anchor;
+class TabBar;
 
 class DOCKS_EXPORT FrameworkWidgetFactory {
 public:
diff --git a/src/multisplitter/Separator_p.h b/src/multisplitter/Separator_p.h
index 8f1bb916..a158bd43 100644
--- a/src/multisplitter/Separator_p.h
+++ b/src/multisplitter/Separator_p.h
@@ -38,7 +38,7 @@ public:
     bool isStatic() const;
     int position() const;
 
-    const Anchor *anchor() const { return m_anchor; }
+    const QPointer<Anchor> anchor() const { return m_anchor; }
     virtual void move(int p) = 0;
 
 protected: