diff --git a/examples/basic/ExampleDockableWidget.cpp b/examples/basic/ExampleDockableWidget.cpp
index 665ebbb7..f9395260 100644
--- a/examples/basic/ExampleDockableWidget.cpp
+++ b/examples/basic/ExampleDockableWidget.cpp
@@ -20,7 +20,6 @@
 
 #include "ExampleDockableWidget.h"
 
-#include <QDebug>
 #include <QVBoxLayout>
 #include <QGroupBox>
 #include <QRadioButton>
diff --git a/examples/basic/main.cpp b/examples/basic/main.cpp
index c859c178..1f185b6d 100644
--- a/examples/basic/main.cpp
+++ b/examples/basic/main.cpp
@@ -23,7 +23,6 @@
 #include "DockWidget.h"
 #include "LayoutSaver.h"
 
-#include <QMouseEvent>
 #include <QTextEdit>
 #include <QMenu>
 #include <QAction>
diff --git a/src/DockWidget.cpp b/src/DockWidget.cpp
index ca39f8c6..baf501d0 100644
--- a/src/DockWidget.cpp
+++ b/src/DockWidget.cpp
@@ -31,13 +31,10 @@
 #include "DropArea_p.h"
 
 #include <QAction>
-#include <QDebug>
 #include <QEvent>
 #include <QVBoxLayout>
-#include <QTimer>
 #include <QSignalBlocker>
 #include <QCloseEvent>
-#include <QDataStream>
 
 using namespace KDDockWidgets;
 
diff --git a/src/DockWidget.h b/src/DockWidget.h
index 0a69294c..bf1683b4 100644
--- a/src/DockWidget.h
+++ b/src/DockWidget.h
@@ -27,7 +27,6 @@
 
 #include <QVector>
 #include <QWidget>
-#include <QPointer>
 
 class QAction;
 
diff --git a/src/DragController_p.h b/src/DragController_p.h
index 776186f4..dce2fa02 100644
--- a/src/DragController_p.h
+++ b/src/DragController_p.h
@@ -27,12 +27,10 @@
 
 #include <QStateMachine>
 #include <QPoint>
-#include <QPointer>
 #include <memory>
 
 namespace KDDockWidgets {
 
-class Frame;
 class StateBase;
 class DropArea;
 class Draggable;
diff --git a/src/Draggable_p.h b/src/Draggable_p.h
index 68e09c8c..e7187e15 100644
--- a/src/Draggable_p.h
+++ b/src/Draggable_p.h
@@ -23,14 +23,12 @@
 
 #include <QWidget>
 #include <QVector>
-#include <QPointer>
 
 #include <memory>
 
 namespace KDDockWidgets {
 
 class FloatingWindow;
-class Frame;
 class WidgetResizeHandler;
 struct WindowBeingDragged;
 
diff --git a/src/DropArea_p.h b/src/DropArea_p.h
index 2a577f08..7c03a82b 100644
--- a/src/DropArea_p.h
+++ b/src/DropArea_p.h
@@ -27,9 +27,7 @@
 #include "DropIndicatorOverlayInterface_p.h"
 
 #include <QWidget>
-#include <QLoggingCategory>
 
-class QVBoxLayout;
 
 
 namespace KDDockWidgets {
diff --git a/src/DropIndicatorOverlayInterface.cpp b/src/DropIndicatorOverlayInterface.cpp
index 901e07de..eaa132f2 100644
--- a/src/DropIndicatorOverlayInterface.cpp
+++ b/src/DropIndicatorOverlayInterface.cpp
@@ -22,7 +22,6 @@
 
 #include "Frame_p.h"
 #include "DropArea_p.h"
-#include <QDebug>
 
 using namespace KDDockWidgets;
 
diff --git a/src/FloatingWindow.cpp b/src/FloatingWindow.cpp
index 0fc2a867..b612330a 100644
--- a/src/FloatingWindow.cpp
+++ b/src/FloatingWindow.cpp
@@ -30,7 +30,6 @@
 #include "WidgetResizeHandler_p.h"
 #include "DockRegistry_p.h"
 
-#include <QDebug>
 #include <QVBoxLayout>
 #include <QApplication>
 #include <QCloseEvent>
diff --git a/src/Frame_p.h b/src/Frame_p.h
index 2ba5f7e9..2270bab5 100644
--- a/src/Frame_p.h
+++ b/src/Frame_p.h
@@ -27,14 +27,13 @@
 
 #include <QWidget>
 #include <QVector>
+#include <QDebug>
 
 namespace KDDockWidgets {
 
 class TitleBar;
 class TabWidget;
 class DropArea;
-class DragController;
-class FloatingWindow;
 class DockWidget;
 
 /**
diff --git a/src/LayoutSaver.cpp b/src/LayoutSaver.cpp
index cf27b5aa..cf9f3d7f 100644
--- a/src/LayoutSaver.cpp
+++ b/src/LayoutSaver.cpp
@@ -31,7 +31,6 @@
 #include <QDebug>
 #include <QSettings>
 #include <QApplication>
-#include <QObject>
 
 #include <memory>
 
diff --git a/src/LayoutSaver.h b/src/LayoutSaver.h
index 1c0cfcaf..0f181d7d 100644
--- a/src/LayoutSaver.h
+++ b/src/LayoutSaver.h
@@ -23,11 +23,9 @@
 
 #include "docks_export.h"
 
-class QSettings;
 class QByteArray;
 
 namespace KDDockWidgets {
-class DockRegistry;
 
 class DOCKS_EXPORT LayoutSaver
 {
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 2819a1ac..679e0a25 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -25,7 +25,6 @@
 #include "DockRegistry_p.h"
 #include "multisplitter/MultiSplitter_p.h"
 
-#include <QPainter>
 #include <QApplication>
 
 using namespace KDDockWidgets;
diff --git a/src/TabWidget_p.h b/src/TabWidget_p.h
index c5dbfebd..d3bad354 100644
--- a/src/TabWidget_p.h
+++ b/src/TabWidget_p.h
@@ -33,7 +33,6 @@
 
 namespace KDDockWidgets {
 
-class FloatingWindow;
 class DockWidget;
 class TabWidget;
 
diff --git a/src/TitleBar.cpp b/src/TitleBar.cpp
index 6040dfc0..ea7b57e0 100644
--- a/src/TitleBar.cpp
+++ b/src/TitleBar.cpp
@@ -26,8 +26,6 @@
 #include "WindowBeingDragged_p.h"
 
 #include <QPainter>
-#include <QMouseEvent>
-#include <QApplication>
 #include <QToolButton>
 #include <QHBoxLayout>
 #include <QStyle>
diff --git a/src/indicators/ClassicIndicators.cpp b/src/indicators/ClassicIndicators.cpp
index 5e95ac7c..4afe3401 100644
--- a/src/indicators/ClassicIndicators.cpp
+++ b/src/indicators/ClassicIndicators.cpp
@@ -26,7 +26,6 @@
 
 #include <QPainter>
 #include <QRubberBand>
-#include <QTimer>
 
 #define INDICATOR_WIDTH 40
 #define OUTTER_INDICATOR_MARGIN 10
diff --git a/src/multisplitter/AnchorGroup_p.h b/src/multisplitter/AnchorGroup_p.h
index 1ea80302..500ea14a 100644
--- a/src/multisplitter/AnchorGroup_p.h
+++ b/src/multisplitter/AnchorGroup_p.h
@@ -24,7 +24,6 @@
 #include "KDDockWidgets.h"
 #include "Anchor_p.h"
 
-#include <QWidget>
 
 namespace KDDockWidgets {
 
diff --git a/src/multisplitter/Anchor_p.h b/src/multisplitter/Anchor_p.h
index 3b761c3d..cfb98219 100644
--- a/src/multisplitter/Anchor_p.h
+++ b/src/multisplitter/Anchor_p.h
@@ -24,7 +24,6 @@
 #include "docks_export.h"
 
 #include <QWidget>
-#include <QLoggingCategory>
 #include <QPointer>
 
 namespace KDDockWidgets {
diff --git a/src/multisplitter/Item_p.h b/src/multisplitter/Item_p.h
index 1f3b84e9..a2afc0f8 100644
--- a/src/multisplitter/Item_p.h
+++ b/src/multisplitter/Item_p.h
@@ -26,7 +26,6 @@
 
 #include <QRect>
 #include <QObject>
-#include <QPointer>
 
 /**
  * Represents an item that you put into a multi-splitter.