diff --git a/sources/diagramcommands.cpp b/sources/diagramcommands.cpp
index 0125d9c9a..4665d312b 100644
--- a/sources/diagramcommands.cpp
+++ b/sources/diagramcommands.cpp
@@ -18,17 +18,11 @@
 #include "diagramcommands.h"
 
 #include "diagram.h"
-#include "qetgraphicsitem/conductor.h"
 #include "qetgraphicsitem/conductortextitem.h"
-#include "qetgraphicsitem/diagramimageitem.h"
-#include "qetgraphicsitem/diagramtextitem.h"
 #include "qetgraphicsitem/element.h"
 #include "qetgraphicsitem/elementtextitemgroup.h"
-#include "qetgraphicsitem/independenttextitem.h"
 #include "qgimanager.h"
 
-#include <QPropertyAnimation>
-
 /**
 	@brief PasteDiagramCommand::PasteDiagramCommand
 	Constructor
diff --git a/sources/diagramcommands.h b/sources/diagramcommands.h
index 08bd9e9d3..94baea5ff 100644
--- a/sources/diagramcommands.h
+++ b/sources/diagramcommands.h
@@ -18,20 +18,12 @@
 #ifndef DIAGRAM_COMMANDS_H
 #define DIAGRAM_COMMANDS_H
 
-#include "borderproperties.h"
 #include "qetgraphicsitem/conductor.h"
-#include "diagramcontent.h"
-#include "qet.h"
-#include "qetgraphicsitem/qetshapeitem.h"
 #include "conductorprofile.h"
-#include "diagram.h"
+#include "borderproperties.h"
 #include "undocommand/deleteqgraphicsitemcommand.h"
 
 class DiagramTextItem;
-class Element;
-class IndependentTextItem;
-class DiagramImageItem;
-class QetGraphicsItem;
 
 /**
 	@brief The PasteDiagramCommand class
diff --git a/sources/diagramview.cpp b/sources/diagramview.cpp
index 45ea8ad96..53736c754 100644
--- a/sources/diagramview.cpp
+++ b/sources/diagramview.cpp
@@ -33,6 +33,7 @@
 #include "undocommand/changetitleblockcommand.h"
 #include "utils/conductorcreator.h"
 #include "undocommand/addgraphicsobjectcommand.h"
+#include "diagram.h"
 
 #include <QDropEvent>
 
diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp
index bf0546e66..fb37f25ac 100644
--- a/sources/qetdiagrameditor.cpp
+++ b/sources/qetdiagrameditor.cpp
@@ -41,6 +41,7 @@
 #include "undocommand/addelementtextcommand.h"
 #include "undocommand/rotateselectioncommand.h"
 #include "undocommand/rotatetextscommand.h"
+#include "diagram.h"
 
 #ifdef BUILD_WITHOUT_KF5
 #else
diff --git a/sources/qetgraphicsitem/conductor.cpp b/sources/qetgraphicsitem/conductor.cpp
index 4a62f3294..3aca313c3 100644
--- a/sources/qetgraphicsitem/conductor.cpp
+++ b/sources/qetgraphicsitem/conductor.cpp
@@ -29,6 +29,7 @@
 #include "../ui/conductorpropertiesdialog.h"
 #include "conductortextitem.h"
 #include "element.h"
+#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h"
 
 #include <QMultiHash>
 #include <QtDebug>