From ffe5c754af6d0e907f087adf52a4569c0227283b Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Thu, 8 Dec 2022 01:02:52 +0100
Subject: [PATCH] [Sketch] App: improve PreCompiled.h handling

---
 src/Mod/Part/App/OpenCascadeAll.h             |  2 +
 .../Sketcher/App/ExternalGeometryFacade.cpp   |  5 +--
 src/Mod/Sketcher/App/GeometryFacade.cpp       |  5 +--
 src/Mod/Sketcher/App/PreCompiled.h            | 45 +++++--------------
 src/Mod/Sketcher/App/PythonConverter.cpp      |  5 +--
 5 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/src/Mod/Part/App/OpenCascadeAll.h b/src/Mod/Part/App/OpenCascadeAll.h
index fa9716129d..0ae278a9ed 100644
--- a/src/Mod/Part/App/OpenCascadeAll.h
+++ b/src/Mod/Part/App/OpenCascadeAll.h
@@ -177,6 +177,7 @@
 #include <BRepOffsetAPI_MakePipe.hxx>
 #include <BRepOffsetAPI_MakePipeShell.hxx>
 #include <BRepOffsetAPI_MakeThickSolid.hxx>
+#include <BRepOffsetAPI_NormalProjection.hxx>
 #include <BRepOffsetAPI_ThruSections.hxx>
 
 #include <BRepPrimAPI_MakeBox.hxx>
@@ -297,6 +298,7 @@
 #include <GeomConvert.hxx>
 #include <GeomConvert_ApproxCurve.hxx>
 #include <GeomConvert_ApproxSurface.hxx>
+#include <GeomConvert_BSplineCurveKnotSplitting.hxx>
 #include <GeomConvert_BSplineCurveToBezierCurve.hxx>
 #include <GeomConvert_CompCurveToBSplineCurve.hxx>
 #include <GeomFill.hxx>
diff --git a/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp b/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp
index 7e11451732..4f0a69aefe 100644
--- a/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp
+++ b/src/Mod/Sketcher/App/ExternalGeometryFacade.cpp
@@ -20,17 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-
+# include <boost/uuid/uuid_io.hpp>
 #endif
 
 #include "ExternalGeometryFacade.h"
 
 #include <Base/Console.h> // Only for Debug - To be removed
 #include <Base/Exception.h>
-#include <boost/uuid/uuid_io.hpp>
+
 
 #include "ExternalGeometryFacadePy.h"
 
diff --git a/src/Mod/Sketcher/App/GeometryFacade.cpp b/src/Mod/Sketcher/App/GeometryFacade.cpp
index 8137f767ce..b5dae65f32 100644
--- a/src/Mod/Sketcher/App/GeometryFacade.cpp
+++ b/src/Mod/Sketcher/App/GeometryFacade.cpp
@@ -20,17 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-
+# include <boost/uuid/uuid_io.hpp>
 #endif
 
 #include "GeometryFacade.h"
 
 //#include <Base/Console.h> // Only for Debug, when/if necessary
 #include <Base/Exception.h>
-#include <boost/uuid/uuid_io.hpp>
+
 
 #include "GeometryFacadePy.h"
 
diff --git a/src/Mod/Sketcher/App/PreCompiled.h b/src/Mod/Sketcher/App/PreCompiled.h
index becbfd4898..bf41f16fa2 100644
--- a/src/Mod/Sketcher/App/PreCompiled.h
+++ b/src/Mod/Sketcher/App/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef __PRECOMPILED__
 #define __PRECOMPILED__
 
@@ -29,53 +28,33 @@
 #ifdef _PreComp_
 
 // standard
-#include <iostream>
-#include <sstream>
-#include <cstdio>
+#include <algorithm>
+#include <bitset>
+#include <cmath>
 #include <cassert>
-#include <string>
 #include <map>
 #include <memory>
-#include <vector>
+#include <iostream>
 #include <set>
-#include <bitset>
-
-#include <cmath>
-#include <algorithm>
+#include <sstream>
+#include <string>
+#include <vector>
 
 // QT
 #include <QDateTime>
 
 // Boost
-#include <boost/bind/bind.hpp>
+#include <boost/format.hpp>
+#include <boost/uuid/uuid_io.hpp>
 
 // Opencascade
 #include <Mod/Part/App/OpenCascadeAll.h>
 
-// Other needed opencascade
-# include <ShapeFix_Wire.hxx>
-# include <BRepOffsetAPI_NormalProjection.hxx>
-# include <GeomConvert_BSplineCurveKnotSplitting.hxx>
-# include <TopoDS.hxx>
-# include <TopoDS_Edge.hxx>
-# include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRep_Tool.hxx>
-#include <gp_Pnt.hxx>
-#include <Precision.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Vertex.hxx>
-
-
 #elif defined(FC_OS_WIN32)
 #ifndef NOMINMAX
-#define NOMINMAX
+# define NOMINMAX
 #endif
-#include <windows.h>
+# include <windows.h>
 #endif // _PreComp_
-#endif
 
+#endif
diff --git a/src/Mod/Sketcher/App/PythonConverter.cpp b/src/Mod/Sketcher/App/PythonConverter.cpp
index 4d75f1b085..cbde8faa48 100644
--- a/src/Mod/Sketcher/App/PythonConverter.cpp
+++ b/src/Mod/Sketcher/App/PythonConverter.cpp
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
+# include <boost/format.hpp>
 #endif  // #ifndef _PreComp_
 
-#include <boost/format.hpp>
-
 #include <Base/Exception.h>
 
 #include <Mod/Part/App/Geometry.h>