diff --git a/src/Gui/DAGView/DAGFilter.cpp b/src/Gui/DAGView/DAGFilter.cpp
index ae1ae2bd36..316182decb 100644
--- a/src/Gui/DAGView/DAGFilter.cpp
+++ b/src/Gui/DAGView/DAGFilter.cpp
@@ -21,15 +21,13 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
+#include <App/DocumentObject.h>
 #include <Base/Type.h>
-#include <Gui/ViewProviderDocumentObject.h>
-
 
 #include "DAGFilter.h"
 
+
 using namespace Gui;
 using namespace DAG;
 
diff --git a/src/Gui/DAGView/DAGModel.cpp b/src/Gui/DAGView/DAGModel.cpp
index b51750c339..57a1ca33aa 100644
--- a/src/Gui/DAGView/DAGModel.cpp
+++ b/src/Gui/DAGView/DAGModel.cpp
@@ -25,44 +25,35 @@
 #include <boost_bind_bind.hpp>
 #include <boost/graph/topological_sort.hpp>
 #include <boost_graph_reverse_graph.hpp>
-
-#include <QApplication>
-#include <QString>
-#include <QGraphicsTextItem>
-#include <QGraphicsEllipseItem>
-#include <QGraphicsPixmapItem>
-#include <QGraphicsRectItem>
-#include <QGraphicsSceneHoverEvent>
-#include <QGraphicsProxyWidget>
-#include <QPen>
+#include <memory>
 #include <QBrush>
 #include <QColor>
-#include <QPainter>
+#include <QGraphicsPixmapItem>
+#include <QGraphicsProxyWidget>
+#include <QGraphicsSceneContextMenuEvent>
+#include <QGraphicsSceneMouseEvent>
 #include <QKeyEvent>
 #include <QMenu>
+#include <QPainter>
+#include <QPen>
+#include <QString>
 #include <QTimer>
 #endif
 
-#include <QAbstractEventDispatcher>
-
-#include <deque>
-#include <memory>
-
-#include <unordered_set>
-
-#include <Base/TimeInfo.h>
 #include <Base/Console.h>
+#include <Base/TimeInfo.h>
 #include <App/Document.h>
 #include <Gui/Application.h>
-#include <Gui/Document.h>
-#include <Gui/ViewProviderDocumentObject.h>
-#include <Gui/Selection.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/MenuManager.h>
+#include <Gui/Document.h>
 #include <Gui/MainWindow.h>
+#include <Gui/MenuManager.h>
+#include <Gui/Selection.h>
+#include <Gui/ViewProviderDocumentObject.h>
 
 #include "DAGModel.h"
 
+
 using namespace Gui;
 using namespace DAG;
 namespace bp = boost::placeholders;
diff --git a/src/Gui/DAGView/DAGModel.h b/src/Gui/DAGView/DAGModel.h
index d362fa8497..3b71129a8a 100644
--- a/src/Gui/DAGView/DAGModel.h
+++ b/src/Gui/DAGView/DAGModel.h
@@ -28,13 +28,14 @@
 
 #include <boost_signals2.hpp>
 
-#include <QGraphicsScene>
 #include <QBrush>
+#include <QGraphicsScene>
 #include <QLineEdit>
 
-#include "DAGRectItem.h"
-#include "DAGModelGraph.h"
 #include "DAGFilter.h"
+#include "DAGModelGraph.h"
+#include "DAGRectItem.h"
+
 
 class QGraphicsSceneHoverEvent;
 class QGraphicsProxyWidget;
diff --git a/src/Gui/DAGView/DAGModelGraph.cpp b/src/Gui/DAGView/DAGModelGraph.cpp
index c74d3c332d..a491f7793a 100644
--- a/src/Gui/DAGView/DAGModelGraph.cpp
+++ b/src/Gui/DAGView/DAGModelGraph.cpp
@@ -21,11 +21,10 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include "DAGModelGraph.h"
 
+
 using namespace Gui;
 using namespace DAG;
 
diff --git a/src/Gui/DAGView/DAGModelGraph.h b/src/Gui/DAGView/DAGModelGraph.h
index ca5c264155..e6174652e2 100644
--- a/src/Gui/DAGView/DAGModelGraph.h
+++ b/src/Gui/DAGView/DAGModelGraph.h
@@ -23,15 +23,15 @@
 #ifndef DAGMODELGRAPH_H
 #define DAGMODELGRAPH_H
 
-#include <memory>
 #include <bitset>
+#include <memory>
 
 #include <boost_graph_adjacency_list.hpp>
-#include <boost/graph/iteration_macros.hpp>
 #include <boost_graph_reverse_graph.hpp>
-#include <boost/graph/topological_sort.hpp>
-#include <boost/graph/graphviz.hpp>
 #include <boost/graph/breadth_first_search.hpp>
+#include <boost/graph/graphviz.hpp>
+#include <boost/graph/iteration_macros.hpp>
+#include <boost/graph/topological_sort.hpp>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/member.hpp>
 #include <boost/multi_index/ordered_index.hpp>
@@ -39,6 +39,7 @@
 
 #include "DAGRectItem.h"
 
+
 namespace App{class DocumentObject;}
 
 namespace Gui
diff --git a/src/Gui/DAGView/DAGRectItem.cpp b/src/Gui/DAGView/DAGRectItem.cpp
index 1f024ab064..b65462ff2b 100644
--- a/src/Gui/DAGView/DAGRectItem.cpp
+++ b/src/Gui/DAGView/DAGRectItem.cpp
@@ -22,14 +22,15 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QPainter>
 #include <QApplication>
+#include <QPainter>
 #endif
 
 #include <QStyleOptionViewItem>
 
 #include "DAGRectItem.h"
 
+
 using namespace Gui;
 using namespace DAG;
 
diff --git a/src/Gui/DAGView/DAGRectItem.h b/src/Gui/DAGView/DAGRectItem.h
index 4d70c11b02..df9078b810 100644
--- a/src/Gui/DAGView/DAGRectItem.h
+++ b/src/Gui/DAGView/DAGRectItem.h
@@ -23,8 +23,9 @@
 #ifndef DAGRECTITEM_H
 #define DAGRECTITEM_H
 
-#include <QGraphicsRectItem>
 #include <QBrush>
+#include <QGraphicsRectItem>
+
 
 namespace Gui
 {
diff --git a/src/Gui/DAGView/DAGView.cpp b/src/Gui/DAGView/DAGView.cpp
index a69eec18a7..b8859dfac9 100644
--- a/src/Gui/DAGView/DAGView.cpp
+++ b/src/Gui/DAGView/DAGView.cpp
@@ -25,20 +25,15 @@
 #include <boost_bind_bind.hpp>
 #include <QAbstractEventDispatcher>
 #include <QVBoxLayout>
+#include <memory>
 #endif
 
-#include <memory>
-
-#include <sstream>
-
-#include <Base/Console.h>
-
-#include <App/Document.h>
-#include <Gui/Document.h>
 #include <Gui/Application.h>
+#include <Gui/Document.h>
 
-#include "DAGModel.h"
 #include "DAGView.h"
+#include "DAGModel.h"
+
 
 using namespace Gui;
 using namespace DAG;
diff --git a/src/Gui/DAGView/DAGView.h b/src/Gui/DAGView/DAGView.h
index 7a82dbe415..b622be22b6 100644
--- a/src/Gui/DAGView/DAGView.h
+++ b/src/Gui/DAGView/DAGView.h
@@ -24,7 +24,6 @@
 #define DAGVIEW_H
 
 #include <memory>
-
 #include <QGraphicsView>
 #include <boost_signals2.hpp>
 
@@ -34,6 +33,7 @@
 
 #include "DAGModel.h"
 
+
 namespace Gui
 {
   namespace DAG