diff --git a/src/Mod/TechDraw/Gui/Rez.h b/src/Mod/TechDraw/Gui/Rez.h
index ec91c3fb4d..a981f01222 100644
--- a/src/Mod/TechDraw/Gui/Rez.h
+++ b/src/Mod/TechDraw/Gui/Rez.h
@@ -26,8 +26,9 @@
 #include <QPointF>
 #include <QRectF>
 #include <QSize>
-#include <Base/Vector3D.h>
 #include <Base/Tools2D.h>
+#include <Base/Vector3D.h>
+
 
 namespace TechDrawGui
 {
diff --git a/src/Mod/TechDraw/Gui/SymbolChooser.h b/src/Mod/TechDraw/Gui/SymbolChooser.h
index 49ffd118b2..4a77f12208 100644
--- a/src/Mod/TechDraw/Gui/SymbolChooser.h
+++ b/src/Mod/TechDraw/Gui/SymbolChooser.h
@@ -22,12 +22,12 @@
 #ifndef TECHDRAWGUI_SYMBOLCHOOSER_H
 #define TECHDRAWGUI_SYMBOLCHOOSER_H
 
-#include <QPushButton>
 #include <QDialog>
 #include <QListWidget>
 
 #include <Mod/TechDraw/Gui/ui_SymbolChooser.h>
 
+
 namespace TechDrawGui {
 
 class TechDrawGuiExport SymbolChooser : public QDialog
diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.h b/src/Mod/TechDraw/Gui/TaskActiveView.h
index 550d842d70..fc3066af10 100644
--- a/src/Mod/TechDraw/Gui/TaskActiveView.h
+++ b/src/Mod/TechDraw/Gui/TaskActiveView.h
@@ -25,18 +25,12 @@
 
 #include <QPushButton>
 
-#include <App/DocumentObject.h>
-#include <Base/Vector3D.h>
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/TechDraw/Gui/ui_TaskActiveView.h>
 
-class Ui_TaskActiveView;
 
-namespace App {
-class DocumentObject;
-}
+class Ui_TaskActiveView;
 
 namespace TechDraw
 {
diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.h b/src/Mod/TechDraw/Gui/TaskBalloon.h
index 4f74d5c626..a723d267bc 100644
--- a/src/Mod/TechDraw/Gui/TaskBalloon.h
+++ b/src/Mod/TechDraw/Gui/TaskBalloon.h
@@ -24,12 +24,13 @@
 #ifndef GUI_TASKVIEW_TASKBALLOON_H
 #define GUI_TASKVIEW_TASKBALLOON_H
 
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
+#include <Gui/TaskView/TaskView.h>
 
 #include "QGIViewBalloon.h"
 #include "ViewProviderBalloon.h"
 
+
 namespace TechDrawGui
 {
 
diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.h b/src/Mod/TechDraw/Gui/TaskCenterLine.h
index 8f63a12c7f..6542ee74ca 100644
--- a/src/Mod/TechDraw/Gui/TaskCenterLine.h
+++ b/src/Mod/TechDraw/Gui/TaskCenterLine.h
@@ -23,14 +23,10 @@
 #ifndef TECHDRAWGUI_TASKCENTERLINE_H
 #define TECHDRAWGUI_TASKCENTERLINE_H
 
-#include <App/DocumentObject.h>
-#include <Base/Vector3D.h>
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/TechDraw/Gui/ui_TaskCenterLine.h>
 
-/*#include "QGTracker.h"*/
 
 //TODO: make this a proper enum
 #define TRACKERPICK 0
@@ -42,10 +38,6 @@
 
 class Ui_TaskCenterLine;
 
-namespace App {
-class DocumentObject;
-}
-
 namespace TechDraw
 {
 class DrawPage;
diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.h b/src/Mod/TechDraw/Gui/TaskCosVertex.h
index 42d2da85d0..563f765684 100644
--- a/src/Mod/TechDraw/Gui/TaskCosVertex.h
+++ b/src/Mod/TechDraw/Gui/TaskCosVertex.h
@@ -23,15 +23,13 @@
 #ifndef TECHDRAWGUI_TASKCOSVERTEX_H
 #define TECHDRAWGUI_TASKCOSVERTEX_H
 
-#include <App/DocumentObject.h>
-#include <Base/Vector3D.h>
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/TechDraw/Gui/ui_TaskCosVertex.h>
 
 #include "QGTracker.h"
 
+
 //TODO: make this a proper enum
 #define TRACKERPICK 0
 #define TRACKEREDIT 1
@@ -40,10 +38,6 @@
 
 class Ui_TaskCosVertex;
 
-namespace App {
-class DocumentObject;
-}
-
 namespace TechDraw
 {
 class DrawPage;
diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.h b/src/Mod/TechDraw/Gui/TaskCosmeticLine.h
index 76dd6d6d18..5240210524 100644
--- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.h
+++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.h
@@ -23,21 +23,14 @@
 #ifndef TECHDRAWGUI_TASKCOSMETICLINE_H
 #define TECHDRAWGUI_TASKCOSMETICLINE_H
 
-#include <App/DocumentObject.h>
 #include <Base/Vector3D.h>
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/TechDraw/App/Cosmetic.h>
-
 #include <Mod/TechDraw/Gui/ui_TaskCosmeticLine.h>
 
 class Ui_TaskCosmeticLine;
 
-namespace App {
-class DocumentObject;
-}
-
 namespace TechDraw
 {
 class DrawPage;
diff --git a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h
index eec40b09a3..e9d8dd8c01 100644
--- a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h
+++ b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.h
@@ -24,11 +24,9 @@
 #define TECHDRAWGUI_TASKCUSTOMIZEFORMAT_H
 
 #include <App/DocumentObject.h>
-#include <Base/Vector3D.h>
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
+#include <Gui/TaskView/TaskView.h>
 
-#include <Mod/TechDraw/App/Cosmetic.h>
 
 namespace App {
 class DocumentObject;
diff --git a/src/Mod/TechDraw/Gui/TaskDetail.h b/src/Mod/TechDraw/Gui/TaskDetail.h
index 310ab8e021..6a9e35246d 100644
--- a/src/Mod/TechDraw/Gui/TaskDetail.h
+++ b/src/Mod/TechDraw/Gui/TaskDetail.h
@@ -23,13 +23,12 @@
 #ifndef TECHDRAWGUI_TASKDETAIL_H
 #define TECHDRAWGUI_TASKDETAIL_H
 
-#include <App/DocumentObject.h>
 #include <Base/Vector3D.h>
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/TechDraw/Gui/ui_TaskDetail.h>
 
+
 //TODO: make this a proper enum
 #define TRACKERPICK 0
 #define TRACKEREDIT 1
@@ -38,10 +37,6 @@
 
 class Ui_TaskDetail;
 
-namespace App {
-class DocumentObject;
-}
-
 namespace TechDraw
 {
 class DrawPage;
diff --git a/src/Mod/TechDraw/Gui/TaskDimension.h b/src/Mod/TechDraw/Gui/TaskDimension.h
index 1c74283cdd..de69a0105c 100644
--- a/src/Mod/TechDraw/Gui/TaskDimension.h
+++ b/src/Mod/TechDraw/Gui/TaskDimension.h
@@ -23,12 +23,13 @@
 #ifndef GUI_TASKVIEW_TASKDIMENSION_H
 #define GUI_TASKVIEW_TASKDIMENSION_H
 
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
+#include <Gui/TaskView/TaskView.h>
 
 #include "QGIViewDimension.h"
 #include "ViewProviderDimension.h"
 
+
 namespace TechDrawGui
 {
 
diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.h b/src/Mod/TechDraw/Gui/TaskGeomHatch.h
index de19c84137..a332941ac2 100644
--- a/src/Mod/TechDraw/Gui/TaskGeomHatch.h
+++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.h
@@ -23,13 +23,10 @@
 #ifndef GUI_TASKVIEW_TASKGEOMHATCH_H
 #define GUI_TASKVIEW_TASKGEOMHATCH_H
 
-#include <App/Material.h>
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-
-#include <Mod/TechDraw/Gui/ui_TaskGeomHatch.h>
-
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/TechDraw/App/DrawGeomHatch.h>
+#include <Mod/TechDraw/Gui/ui_TaskGeomHatch.h>
 
 
 class Ui_TaskGeomHatch;
diff --git a/src/Mod/TechDraw/Gui/TaskHatch.h b/src/Mod/TechDraw/Gui/TaskHatch.h
index 562797aa8c..97e64d7184 100644
--- a/src/Mod/TechDraw/Gui/TaskHatch.h
+++ b/src/Mod/TechDraw/Gui/TaskHatch.h
@@ -24,10 +24,8 @@
 #ifndef GUI_TASKVIEW_TASKHATCH_H
 #define GUI_TASKVIEW_TASKHATCH_H
 
-#include <App/Material.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-
 #include <Mod/TechDraw/App/DrawHatch.h>
 #include <Mod/TechDraw/Gui/ui_TaskHatch.h>
 
diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.h b/src/Mod/TechDraw/Gui/TaskLeaderLine.h
index e063167905..b1e9d45bc6 100644
--- a/src/Mod/TechDraw/Gui/TaskLeaderLine.h
+++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.h
@@ -23,15 +23,14 @@
 #ifndef TECHDRAWGUI_TASKTEXTLEADER_H
 #define TECHDRAWGUI_TASKTEXTLEADER_H
 
-#include <App/DocumentObject.h>
 #include <Base/Vector3D.h>
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/TechDraw/Gui/ui_TaskLeaderLine.h>
 
 #include "QGTracker.h"
 
+
 //TODO: make this a proper enum
 #define TRACKERPICK 0
 #define TRACKEREDIT 1
@@ -42,10 +41,6 @@
 
 class Ui_TaskLeaderLine;
 
-namespace App {
-class DocumentObject;
-}
-
 namespace TechDraw
 {
 class DrawPage;
diff --git a/src/Mod/TechDraw/Gui/TaskLineDecor.h b/src/Mod/TechDraw/Gui/TaskLineDecor.h
index d64b8fe3ac..eb873a4b09 100644
--- a/src/Mod/TechDraw/Gui/TaskLineDecor.h
+++ b/src/Mod/TechDraw/Gui/TaskLineDecor.h
@@ -23,14 +23,12 @@
 #ifndef GUI_TASKVIEW_TASKLINEDECOR_H
 #define GUI_TASKVIEW_TASKLINEDECOR_H
 
-#include <App/Material.h>
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-#include <Gui/FileDialog.h>
-
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/TechDraw/Gui/ui_TaskLineDecor.h>
 #include <Mod/TechDraw/Gui/ui_TaskRestoreLines.h>   //????
 
+
 class Ui_TaskLineDecor;
 
 namespace App
diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.h b/src/Mod/TechDraw/Gui/TaskLinkDim.h
index a05b71e4a2..fc2baf0b5c 100644
--- a/src/Mod/TechDraw/Gui/TaskLinkDim.h
+++ b/src/Mod/TechDraw/Gui/TaskLinkDim.h
@@ -23,12 +23,10 @@
 #ifndef GUI_TASKVIEW_TASKLINKDIM_H
 #define GUI_TASKVIEW_TASKLINKDIM_H
 
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-
-#include <Mod/TechDraw/Gui/ui_TaskLinkDim.h>
-
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/TechDraw/App/DrawViewDimension.h>
+#include <Mod/TechDraw/Gui/ui_TaskLinkDim.h>
 
 
 namespace Gui {
diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.h b/src/Mod/TechDraw/Gui/TaskProjGroup.h
index 19f1c88fb6..b9fc46766f 100644
--- a/src/Mod/TechDraw/Gui/TaskProjGroup.h
+++ b/src/Mod/TechDraw/Gui/TaskProjGroup.h
@@ -26,17 +26,13 @@
 
 #include <QString>
 
-#include <Base/BoundBox.h>
 #include <Base/Vector3D.h>
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-
-#include "MDIViewPage.h"
-
+#include <Gui/TaskView/TaskView.h>
+#include <Mod/TechDraw/App/DrawProjGroup.h>
 #include <Mod/TechDraw/Gui/ui_TaskProjGroup.h>
 
-#include <Mod/TechDraw/App/DrawProjGroup.h>
-#include <Mod/TechDraw/App/DrawProjGroupItem.h>
+#include "MDIViewPage.h"
 
 
 class Ui_TaskProjGroup;
diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.h b/src/Mod/TechDraw/Gui/TaskRichAnno.h
index f450be630b..5aa1b44c28 100644
--- a/src/Mod/TechDraw/Gui/TaskRichAnno.h
+++ b/src/Mod/TechDraw/Gui/TaskRichAnno.h
@@ -23,21 +23,16 @@
 #ifndef TECHDRAWGUI_TASKRICHANNO_H
 #define TECHDRAWGUI_TASKRICHANNO_H
 
-#include <App/DocumentObject.h>
 #include <Base/Vector3D.h>
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/TechDraw/Gui/ui_TaskRichAnno.h>
 
+
 class MRichTextEdit;
 
 class Ui_TaskRichAnno;
 
-namespace App {
-class DocumentObject;
-}
-
 namespace TechDraw
 {
 class DrawPage;
diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.h b/src/Mod/TechDraw/Gui/TaskSectionView.h
index 5cb7184dbe..3d30b5fdf2 100644
--- a/src/Mod/TechDraw/Gui/TaskSectionView.h
+++ b/src/Mod/TechDraw/Gui/TaskSectionView.h
@@ -23,11 +23,9 @@
 #ifndef GUI_TASKVIEW_TASKSECTIONVIEW_H
 #define GUI_TASKVIEW_TASKSECTIONVIEW_H
 
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/TechDraw/Gui/ui_TaskSectionView.h>
-
 #include <Mod/TechDraw/App/DrawViewPart.h>
 #include <Mod/TechDraw/App/DrawViewSection.h>
 
diff --git a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h
index a29789a850..12da8b9a66 100644
--- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h
+++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.h
@@ -23,13 +23,11 @@
 #ifndef TECHDRAWGUI_TASKSELECTLINEATTRIBUTES_H
 #define TECHDRAWGUI_TASKSELECTLINEATTRIBUTES_H
 
-#include <App/DocumentObject.h>
-#include <Base/Vector3D.h>
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/TechDraw/App/Cosmetic.h>
 
+
 class dimAttributes {
     double cascadeSpacing;
     double lineStretch;
@@ -46,10 +44,6 @@ class dimAttributes {
 
 extern dimAttributes activeDimAttributes; // container holding dimension attributes
 
-namespace App {
-class DocumentObject;
-}
-
 namespace TechDraw
 {
 class DrawPage;
diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h
index 9ba9de62d0..37c3596aba 100644
--- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h
+++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.h
@@ -26,12 +26,11 @@
 #include <QPushButton>
 
 #include <App/DocumentObject.h>
-#include <Base/Vector3D.h>
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/TechDraw/Gui/ui_TaskWeldingSymbol.h>
 
+
 class Ui_TaskWeldingSymbol;
 
 namespace App {
diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp
index 8c71b5dc6d..bf777f9964 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp
@@ -36,6 +36,7 @@
 #include <Gui/Selection.h>
 
 #include <Mod/TechDraw/App/DrawLeaderLine.h>
+#include <Mod/TechDraw/App/DrawProjGroupItem.h>
 #include <Mod/TechDraw/App/DrawViewDetail.h>
 #include <Mod/TechDraw/App/DrawViewSection.h>