From e29d1d03326035ffa32cffb9b2f8d2f67bf19d5a Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 9 Oct 2022 03:34:53 +0200
Subject: [PATCH] [TD] Gui, A*-C*: remove unused includes

- also sort includes
- also an addition to precompiled header
- TaskCenterLine: remove unused code that interferes with used code with the same name
---
 src/Mod/TechDraw/Gui/AppTechDrawGui.cpp       | 47 +++++------
 src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp     | 20 +----
 src/Mod/TechDraw/Gui/Command.cpp              | 53 +++----------
 src/Mod/TechDraw/Gui/CommandAnnotate.cpp      | 51 +++++-------
 src/Mod/TechDraw/Gui/CommandCreateDims.cpp    | 34 ++------
 src/Mod/TechDraw/Gui/CommandDecorate.cpp      | 32 ++------
 src/Mod/TechDraw/Gui/CommandExtensionDims.cpp |  6 +-
 src/Mod/TechDraw/Gui/CommandExtensionPack.cpp | 77 ++++++++-----------
 src/Mod/TechDraw/Gui/CommandStack.cpp         | 13 ++--
 src/Mod/TechDraw/Gui/PreCompiled.h            |  3 +-
 src/Mod/TechDraw/Gui/TaskCenterLine.h         |  8 --
 11 files changed, 110 insertions(+), 234 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp
index e6241f5a0f..c1237a5992 100644
--- a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp
+++ b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp
@@ -20,53 +20,48 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QFontDatabase>
 #endif
 
 #include <Base/Console.h>
-#include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
 #include <Base/Tools.h>
-
 #include <Gui/Application.h>
 #include <Gui/Language/Translator.h>
 #include <Gui/WidgetFactory.h>
 
-#include "Workbench.h"
-#include "MDIViewPage.h"
-
-#include "DlgPrefsTechDrawGeneralImp.h"
-#include "DlgPrefsTechDrawScaleImp.h"
-#include "DlgPrefsTechDrawAnnotationImp.h"
-#include "DlgPrefsTechDrawDimensionsImp.h"
-#include "DlgPrefsTechDrawColorsImp.h"
 #include "DlgPrefsTechDrawAdvancedImp.h"
+#include "DlgPrefsTechDrawAnnotationImp.h"
+#include "DlgPrefsTechDrawColorsImp.h"
+#include "DlgPrefsTechDrawDimensionsImp.h"
+#include "DlgPrefsTechDrawGeneralImp.h"
 #include "DlgPrefsTechDrawHLRImp.h"
-#include "ViewProviderPage.h"
-#include "ViewProviderDrawingView.h"
-#include "ViewProviderDimension.h"
+#include "DlgPrefsTechDrawScaleImp.h"
+#include "MDIViewPage.h"
+#include "ViewProviderAnnotation.h"
 #include "ViewProviderBalloon.h"
+#include "ViewProviderCosmeticExtension.h"
+#include "ViewProviderDimension.h"
+#include "ViewProviderDrawingView.h"
+#include "ViewProviderGeomHatch.h"
+#include "ViewProviderHatch.h"
+#include "ViewProviderImage.h"
+#include "ViewProviderLeader.h"
+#include "ViewProviderPage.h"
 #include "ViewProviderProjGroup.h"
 #include "ViewProviderProjGroupItem.h"
+#include "ViewProviderRichAnno.h"
+#include "ViewProviderSpreadsheet.h"
+#include "ViewProviderSymbol.h"
 #include "ViewProviderTemplate.h"
+#include "ViewProviderTile.h"
+#include "ViewProviderViewClip.h"
 #include "ViewProviderViewPart.h"
 #include "ViewProviderViewSection.h"
-#include "ViewProviderAnnotation.h"
-#include "ViewProviderSymbol.h"
-#include "ViewProviderViewClip.h"
-#include "ViewProviderHatch.h"
-#include "ViewProviderGeomHatch.h"
-#include "ViewProviderSpreadsheet.h"
-#include "ViewProviderImage.h"
-#include "ViewProviderRichAnno.h"
-#include "ViewProviderLeader.h"
-#include "ViewProviderTile.h"
 #include "ViewProviderWeld.h"
-
-#include "ViewProviderCosmeticExtension.h"
+#include "Workbench.h"
 
 
 // use a different name to CreateCommand()
diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp
index 1620040789..4460e85690 100644
--- a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp
+++ b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp
@@ -22,31 +22,18 @@
 
 #include "PreCompiled.h"
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
-#include <Base/Console.h>
-#include <Base/PyObjectBase.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-#include <Base/GeometryPyCXX.h>
-#include <Base/Vector3D.h>
-#include <Base/VectorPy.h>
-
 #include <App/Document.h>
-#include <App/DocumentPy.h>
 #include <App/DocumentObject.h>
 #include <App/DocumentObjectPy.h>
-#include <App/Material.h>
+#include <Base/Console.h>
+#include <Base/Exception.h>
+#include <Base/FileInfo.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/PythonWrapper.h>
-
 #include <Mod/Part/App/OCCError.h>
 #include <Mod/TechDraw/App/DrawPage.h>
-#include <Mod/TechDraw/App/DrawView.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
 #include <Mod/TechDraw/App/DrawViewPy.h>  // generated from DrawViewPy.xml
 
 #include "MDIViewPage.h"
@@ -54,6 +41,7 @@
 #include "ViewProviderPage.h"
 #include "ViewProviderDrawingView.h"
 
+
 namespace TechDrawGui {
 
 class Module : public Py::ExtensionModule<Module>
diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp
index 07f5df34d8..5d8004b218 100644
--- a/src/Mod/TechDraw/Gui/Command.cpp
+++ b/src/Mod/TechDraw/Gui/Command.cpp
@@ -19,41 +19,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <QCoreApplication>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QGraphicsView>
-#include <QMessageBox>
-#include <QPainter>
-#include <QStringBuilder>
-#include <QSvgGenerator>
-#include <QSvgRenderer>
-#include <sstream>
-#include <vector>
+# include <QFileInfo>
+# include <QMessageBox>
+# include <sstream>
+# include <vector>
 #endif
 
-#include <App/Application.h>
 #include <App/Document.h>
-#include <App/DocumentObjectGroup.h>
 #include <App/DocumentObject.h>
-#include <App/FeaturePython.h>
-#include <App/GeoFeature.h>
 #include <App/Link.h>
-#include <App/PropertyGeo.h>
-#include <App/PropertyLinks.h>
 #include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Exception.h>
-#include <Base/Parameter.h>
-#include <Base/PyObjectBase.h>
 #include <Base/Tools.h>
 #include <Gui/Action.h>
 #include <Gui/Application.h>
-#include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
 #include <Gui/Control.h>
 #include <Gui/Document.h>
@@ -63,45 +43,36 @@
 #include <Gui/SelectionObject.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
-
-#include <Mod/Part/App/PartFeature.h>
-#include <Mod/Part/App/Part2DObject.h>
 #include <Mod/Spreadsheet/App/Sheet.h>
-
 #include <Mod/TechDraw/App/DrawPage.h>
-#include <Mod/TechDraw/App/DrawViewPart.h>
-#include <Mod/TechDraw/App/DrawProjGroupItem.h>
 #include <Mod/TechDraw/App/DrawProjGroup.h>
-#include <Mod/TechDraw/App/DrawViewDimension.h>
-#include <Mod/TechDraw/App/DrawViewBalloon.h>
+#include <Mod/TechDraw/App/DrawUtil.h>
+#include <Mod/TechDraw/App/DrawViewArch.h>
 #include <Mod/TechDraw/App/DrawViewClip.h>
-#include <Mod/TechDraw/App/DrawViewSymbol.h>
 #include <Mod/TechDraw/App/DrawViewDraft.h>
 #include <Mod/TechDraw/App/DrawViewMulti.h>
-#include <Mod/TechDraw/App/DrawViewDetail.h>
-#include <Mod/TechDraw/App/DrawViewArch.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
+#include <Mod/TechDraw/App/DrawViewPart.h>
+#include <Mod/TechDraw/App/DrawViewSymbol.h>
 #include <Mod/TechDraw/App/Preferences.h>
 
 #include "DrawGuiUtil.h"
-#include "QGSPage.h"
-#include "QGVPage.h"
 #include "MDIViewPage.h"
 #include "QGIViewPart.h"
+#include "QGSPage.h"
+#include "QGVPage.h"
 #include "Rez.h"
-#include "TaskProjGroup.h"
-#include "TaskSectionView.h"
 #include "TaskActiveView.h"
 #include "TaskDetail.h"
+#include "TaskProjGroup.h"
 #include "TaskProjection.h"
 #include "ViewProviderPage.h"
 #include "ViewProviderViewPart.h"
+#include "TaskSectionView.h"
 
 
 class Vertex;
 using namespace TechDrawGui;
 using namespace TechDraw;
-using namespace std;
 
 //===========================================================================
 // TechDraw_PageDefault
diff --git a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
index 3547242e57..b1243c4a1f 100644
--- a/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
+++ b/src/Mod/TechDraw/Gui/CommandAnnotate.cpp
@@ -23,58 +23,45 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QApplication>
-# include <QGraphicsView>
 # include <QMessageBox>
-# include <iostream>
-# include <string>
 # include <sstream>
-# include <cstdlib>
-# include <exception>
-#endif  //#ifndef _PreComp_
+#endif
 
-#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Gui/Action.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
 #include <Gui/Control.h>
-#include <Gui/Document.h>
+#include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionObject.h>
-#include <Gui/MainWindow.h>
-#include <Gui/FileDialog.h>
 #include <Gui/ViewProvider.h>
-
-#include <Mod/Part/App/PartFeature.h>
-
-#include <Mod/TechDraw/App/DrawView.h>
-#include <Mod/TechDraw/App/DrawViewPart.h>
-#include <Mod/TechDraw/App/DrawViewCollection.h>
-#include <Mod/TechDraw/App/DrawViewAnnotation.h>
-#include <Mod/TechDraw/App/DrawLeaderLine.h>
-#include <Mod/TechDraw/App/DrawWeldSymbol.h>
-#include <Mod/TechDraw/App/DrawPage.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
-#include <Mod/TechDraw/App/Geometry.h>
 #include <Mod/TechDraw/App/Cosmetic.h>
+#include <Mod/TechDraw/App/Geometry.h>
+#include <Mod/TechDraw/App/DrawLeaderLine.h>
+#include <Mod/TechDraw/App/DrawPage.h>
+#include <Mod/TechDraw/App/DrawView.h>
+#include <Mod/TechDraw/App/DrawViewAnnotation.h>
+#include <Mod/TechDraw/App/DrawViewPart.h>
+#include <Mod/TechDraw/App/DrawWeldSymbol.h>
+#include <Mod/TechDraw/App/DrawUtil.h>
 
 #include "DrawGuiUtil.h"
-#include "TaskLeaderLine.h"
-#include "TaskRichAnno.h"
-#include "TaskCosVertex.h"
-#include "TaskCenterLine.h"
-#include "TaskLineDecor.h"
-#include "TaskWeldingSymbol.h"
-#include "TaskCosmeticLine.h"
-#include "ViewProviderViewPart.h"
 #include "QGIView.h"
+#include "TaskCenterLine.h"
+#include "TaskCosmeticLine.h"
+#include "TaskCosVertex.h"
+#include "TaskLeaderLine.h"
+#include "TaskLineDecor.h"
+#include "TaskRichAnno.h"
 #include "TaskSurfaceFinishSymbols.h"
+#include "TaskWeldingSymbol.h"
+#include "ViewProviderViewPart.h"
+
 
 using namespace TechDrawGui;
 using namespace TechDraw;
-using namespace std;
-
 
 //internal functions
 bool _checkSelectionHatch(Gui::Command* cmd);
diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
index dfc3a09f89..2cac992b5f 100644
--- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
+++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
@@ -24,18 +24,11 @@
 #ifndef _PreComp_
 # include <QApplication>
 # include <QMessageBox>
-# include <QGraphicsView>
-# include <iostream>
-# include <string>
 # include <sstream>
-# include <cstdlib>
-# include <exception>
-#endif  //#ifndef _PreComp_
-
+#endif
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
-#include <Base/Exception.h>
 #include <Base/Console.h>
 #include <Base/Type.h>
 #include <Gui/Action.h>
@@ -44,36 +37,25 @@
 #include <Gui/Command.h>
 #include <Gui/Control.h>
 #include <Gui/Document.h>
+#include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionObject.h>
-#include <Gui/MainWindow.h>
-#include <Gui/FileDialog.h>
-#include <Gui/ViewProvider.h>
 
-# include <Mod/Part/App/PartFeature.h>
-
-# include <Mod/TechDraw/App/DrawViewPart.h>
-# include <Mod/TechDraw/App/DrawProjGroupItem.h>
-# include <Mod/TechDraw/App/DrawProjGroup.h>
-# include <Mod/TechDraw/App/DrawViewDimension.h>
 # include <Mod/TechDraw/App/DrawDimHelper.h>
-# include <Mod/TechDraw/App/LandmarkDimension.h>
 # include <Mod/TechDraw/App/DrawPage.h>
 # include <Mod/TechDraw/App/DrawUtil.h>
+# include <Mod/TechDraw/App/DrawViewDimension.h>
+# include <Mod/TechDraw/App/DrawViewPart.h>
 # include <Mod/TechDraw/App/Geometry.h>
+# include <Mod/TechDraw/App/LandmarkDimension.h>
 # include <Mod/TechDraw/App/Preferences.h>
 
-#include <Mod/TechDraw/Gui/QGVPage.h>
-
 #include "DrawGuiUtil.h"
-#include "MDIViewPage.h"
-#include "ViewProviderPage.h"
 #include "TaskLinkDim.h"
 
+
 using namespace TechDrawGui;
 using namespace TechDraw;
-using namespace std;
-
 
 enum EdgeType{
         isInvalid,
@@ -88,12 +70,10 @@ enum EdgeType{
         isAngle3Pt
     };
 
-
 //===========================================================================
 // utility routines
 //===========================================================================
 
-
 //internal functions
 bool _checkSelection(Gui::Command* cmd, unsigned maxObjs = 2);
 bool _checkDrawViewPart(Gui::Command* cmd);
@@ -1516,7 +1496,7 @@ int _isValidSingleEdge(Gui::Command* cmd) {
                 geom->geomType == TechDraw::ARCOFELLIPSE) {
         return isEllipse;
     } else if (geom->geomType == TechDraw::BSPLINE) {
-        TechDraw::BSplinePtr  spline = static_pointer_cast<TechDraw::BSpline> (geom);
+        TechDraw::BSplinePtr  spline = std::static_pointer_cast<TechDraw::BSpline> (geom);
         if (spline->isCircle()) {
             return isBSplineCircle;
         } else {
diff --git a/src/Mod/TechDraw/Gui/CommandDecorate.cpp b/src/Mod/TechDraw/Gui/CommandDecorate.cpp
index bd9d229010..cf004bdccf 100644
--- a/src/Mod/TechDraw/Gui/CommandDecorate.cpp
+++ b/src/Mod/TechDraw/Gui/CommandDecorate.cpp
@@ -23,59 +23,41 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QMessageBox>
-# include <QGraphicsView>
-# include <iostream>
-# include <string>
 # include <sstream>
-# include <cstdlib>
-# include <exception>
-#endif  //#ifndef _PreComp_
+#endif
 
-
-#include <Base/Tools.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
+#include <Base/Tools.h>
 #include <Gui/Action.h>
 #include <Gui/Application.h>
-#include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
 #include <Gui/Control.h>
 #include <Gui/Document.h>
+#include <Gui/FileDialog.h>
+#include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionObject.h>
-#include <Gui/MainWindow.h>
-#include <Gui/FileDialog.h>
 #include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-
-# include <Mod/Part/App/PartFeature.h>
-
-#include <Mod/TechDraw/App/DrawView.h>
-#include <Mod/TechDraw/App/DrawViewPart.h>
 #include <Mod/TechDraw/App/DrawHatch.h>
 #include <Mod/TechDraw/App/DrawGeomHatch.h>
 #include <Mod/TechDraw/App/DrawPage.h>
 #include <Mod/TechDraw/App/DrawUtil.h>
-#include <Mod/TechDraw/Gui/QGVPage.h>
+#include <Mod/TechDraw/App/DrawView.h>
+#include <Mod/TechDraw/App/DrawViewPart.h>
 
 #include "DrawGuiUtil.h"
-#include "MDIViewPage.h"
 #include "TaskGeomHatch.h"
 #include "TaskHatch.h"
-//#include "TaskLeaderLine.h"
-//#include "TaskRichAnno.h"
 #include "ViewProviderGeomHatch.h"
-#include "ViewProviderHatch.h"
 #include "ViewProviderPage.h"
 
-using namespace TechDrawGui;
-using namespace std;
 
+using namespace TechDrawGui;
 
 //internal functions
 bool _checkSelectionHatch(Gui::Command* cmd);
 
-
 //===========================================================================
 // TechDraw_Hatch
 //===========================================================================
diff --git a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp
index 589d8e7471..f06f9c534f 100644
--- a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp
+++ b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp
@@ -24,9 +24,8 @@
 #ifndef _PreComp_
 # include <QApplication>
 # include <QMessageBox>
-# include <string>
 # include <sstream>
-#endif  //#ifndef _PreComp_
+#endif
 
 # include <App/Document.h>
 # include <App/DocumentObject.h>
@@ -45,8 +44,8 @@
 # include <Mod/TechDraw/App/DrawViewBalloon.h>
 # include <Mod/TechDraw/App/DrawViewDimension.h>
 # include <Mod/TechDraw/App/DrawPage.h>
-# include <Mod/TechDraw/App/DrawViewPart.h>
 # include <Mod/TechDraw/App/DrawUtil.h>
+# include <Mod/TechDraw/App/DrawViewPart.h>
 # include <Mod/TechDraw/App/Preferences.h>
 
 #include "DrawGuiUtil.h"
@@ -56,7 +55,6 @@
 
 using namespace TechDrawGui;
 using namespace TechDraw;
-using namespace std;
 
 namespace TechDrawGui {
     //internal structures and sort functions
diff --git a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
index cfcd079cd9..d8470e0963 100644
--- a/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
+++ b/src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
@@ -24,59 +24,44 @@
 #ifndef _PreComp_
 # include <QApplication>
 # include <QMessageBox>
-# include <iostream>
-# include <string>
 # include <sstream>
-# include <cstdlib>
-# include <exception>
-#endif  //#ifndef _PreComp_
+#endif
 
-# include <App/Document.h>
-# include <App/DocumentObject.h>
-# include <Base/Exception.h>
-# include <Base/Console.h>
-# include <Base/Tools.h>
-# include <Base/Type.h>
-# include <Gui/Action.h>
-# include <Gui/Application.h>
-# include <Gui/BitmapFactory.h>
-# include <Gui/Command.h>
-# include <Gui/Control.h>
-# include <Gui/Document.h>
-# include <Gui/Selection.h>
-# include <Gui/SelectionObject.h>
-# include <Gui/MainWindow.h>
-# include <Gui/FileDialog.h>
-# include <Gui/ViewProvider.h>
-
-# include <Mod/Part/App/PartFeature.h>
-# include <Mod/Part/App/Geometry2d.h>
-
-# include <Mod/TechDraw/App/Cosmetic.h>
-# include <Mod/TechDraw/App/DrawViewPart.h>
-# include <Mod/TechDraw/App/DrawProjGroupItem.h>
-# include <Mod/TechDraw/App/DrawProjGroup.h>
-# include <Mod/TechDraw/App/DrawViewDimension.h>
-# include <Mod/TechDraw/App/DrawDimHelper.h>
-# include <Mod/TechDraw/App/LandmarkDimension.h>
-# include <Mod/TechDraw/App/DrawPage.h>
-# include <Mod/TechDraw/App/DrawUtil.h>
-# include <Mod/TechDraw/App/Geometry.h>
-# include <Mod/TechDraw/App/DrawViewSection.h>
-# include <Mod/TechDraw/App/DrawViewBalloon.h>
-
-# include "ViewProviderBalloon.h"
-# include "QGSPage.h"
-# include "QGVPage.h"
-# include "DrawGuiUtil.h"
-# include "ViewProviderPage.h"
-# include "TaskLinkDim.h"
+#include <App/Document.h>
+#include <App/DocumentObject.h>
+#include <Base/Console.h>
+#include <Base/Tools.h>
+#include <Base/Type.h>
+#include <Gui/Action.h>
+#include <Gui/Application.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/Command.h>
+#include <Gui/Control.h>
+#include <Gui/Document.h>
+#include <Gui/MainWindow.h>
+#include <Gui/Selection.h>
+#include <Gui/SelectionObject.h>
+#include <Gui/ViewProvider.h>
+#include <Mod/Part/App/Geometry2d.h>
+#include <Mod/TechDraw/App/Cosmetic.h>
+#include <Mod/TechDraw/App/DrawPage.h>
+#include <Mod/TechDraw/App/DrawProjGroup.h>
+#include <Mod/TechDraw/App/DrawProjGroupItem.h>
+#include <Mod/TechDraw/App/DrawUtil.h>
+#include <Mod/TechDraw/App/DrawViewBalloon.h>
+#include <Mod/TechDraw/App/DrawViewPart.h>
+#include <Mod/TechDraw/App/DrawViewSection.h>
 
+#include "DrawGuiUtil.h"
+#include "QGSPage.h"
 #include "TaskSelectLineAttributes.h"
+#include "ViewProviderBalloon.h"
+#include "ViewProviderPage.h"
+
 
 using namespace TechDrawGui;
 using namespace TechDraw;
-using namespace std;
+
 
 namespace TechDrawGui {
     //LineAttributes activeAttributes; // container holding global line attributes
diff --git a/src/Mod/TechDraw/Gui/CommandStack.cpp b/src/Mod/TechDraw/Gui/CommandStack.cpp
index 5d1f0857cf..b2a8426d4a 100644
--- a/src/Mod/TechDraw/Gui/CommandStack.cpp
+++ b/src/Mod/TechDraw/Gui/CommandStack.cpp
@@ -18,14 +18,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include <QApplication>
-#include <QMessageBox>
+#ifndef _PreComp_
+# include <QApplication>
+# include <QMessageBox>
+#endif
 
-#include <App/Application.h>
-#include <App/Document.h>
+#include <App/DocumentObject.h>
 #include <Base/Console.h>
 #include <Gui/Action.h>
 #include <Gui/Application.h>
@@ -36,7 +36,6 @@
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
 #include <Gui/ViewProvider.h>
-
 #include <Mod/TechDraw/App/DrawPage.h>
 #include <Mod/TechDraw/App/DrawView.h>
 
@@ -46,14 +45,12 @@
 
 using namespace TechDrawGui;
 using namespace TechDraw;
-using namespace std;
 
 void execStackTop(Gui::Command* cmd);
 void execStackBottom(Gui::Command* cmd);
 void execStackUp(Gui::Command* cmd);
 void execStackDown(Gui::Command* cmd);
 
-
 //===========================================================================
 // TechDraw_StackGroup
 //===========================================================================
diff --git a/src/Mod/TechDraw/Gui/PreCompiled.h b/src/Mod/TechDraw/Gui/PreCompiled.h
index aece8d1213..991f4a746a 100644
--- a/src/Mod/TechDraw/Gui/PreCompiled.h
+++ b/src/Mod/TechDraw/Gui/PreCompiled.h
@@ -53,9 +53,10 @@
 #ifdef _PreComp_
 
 // standard
-#include <iostream>
 #include <cassert>
 #include <cmath>
+#include <iostream>
+#include <sstream>
 
 // STL
 #include <vector>
diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.h b/src/Mod/TechDraw/Gui/TaskCenterLine.h
index 06cf54bb41..54684088f9 100644
--- a/src/Mod/TechDraw/Gui/TaskCenterLine.h
+++ b/src/Mod/TechDraw/Gui/TaskCenterLine.h
@@ -31,14 +31,6 @@
 #include <Mod/TechDraw/App/Cosmetic.h>
 
 
-//TODO: make this a proper enum
-#define TRACKERPICK 0
-#define TRACKEREDIT 1
-#define TRACKERCANCEL 2
-#define TRACKERCANCELEDIT 3
-#define TRACKERFINISHED 4
-#define TRACKERSAVE 5
-
 namespace TechDraw
 {
 class DrawPage;