From 9ec0bcdcf2e975ee2086a9f8c2b5b8910e80949c Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Thu, 24 Feb 2022 03:39:26 +0100
Subject: [PATCH] [Base] Units and Uui: remove unused includes

---
 src/Base/Unit.cpp                           | 4 ++--
 src/Base/Unit.h                             | 7 +------
 src/Base/UnitsApi.cpp                       | 3 ++-
 src/Base/UnitsApi.h                         | 1 -
 src/Base/UnitsApiPy.cpp                     | 3 +--
 src/Base/UnitsSchema.cpp                    | 5 ++---
 src/Base/UnitsSchema.h                      | 2 --
 src/Base/UnitsSchemaCentimeters.cpp         | 5 ++---
 src/Base/UnitsSchemaCentimeters.h           | 3 +--
 src/Base/UnitsSchemaFemMilliMeterNewton.cpp | 4 +---
 src/Base/UnitsSchemaFemMilliMeterNewton.h   | 3 +--
 src/Base/UnitsSchemaImperial1.cpp           | 7 ++-----
 src/Base/UnitsSchemaImperial1.h             | 3 +--
 src/Base/UnitsSchemaInternal.cpp            | 4 +---
 src/Base/UnitsSchemaInternal.h              | 3 +--
 src/Base/UnitsSchemaMKS.cpp                 | 5 ++---
 src/Base/UnitsSchemaMKS.h                   | 3 +--
 src/Base/UnitsSchemaMmMin.cpp               | 4 +---
 src/Base/UnitsSchemaMmMin.h                 | 3 +--
 src/Base/Uuid.cpp                           | 5 -----
 src/Base/Vector3D.cpp                       | 5 ++++-
 21 files changed, 27 insertions(+), 55 deletions(-)

diff --git a/src/Base/Unit.cpp b/src/Base/Unit.cpp
index 4fb1d9597b..d67a26522d 100644
--- a/src/Base/Unit.cpp
+++ b/src/Base/Unit.cpp
@@ -23,12 +23,12 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <sstream>
-# include <cstdlib>
 #endif
 
 #include "Unit.h"
-#include "Quantity.h"
 #include "Exception.h"
+#include "Quantity.h"
+
 
 using namespace Base;
 
diff --git a/src/Base/Unit.h b/src/Base/Unit.h
index b99364e710..162772e1d7 100644
--- a/src/Base/Unit.h
+++ b/src/Base/Unit.h
@@ -24,12 +24,7 @@
 #ifndef BASE_Unit_H
 #define BASE_Unit_H
 
-#ifdef _MSC_VER
-#  include <boost/cstdint.hpp>
-#else
-#  include <cstdint>
-#endif
-#include <string>
+#include <cstdint>
 #include <QString>
 #include <FCGlobal.h>
 
diff --git a/src/Base/UnitsApi.cpp b/src/Base/UnitsApi.cpp
index 95fd323caa..f48986161e 100644
--- a/src/Base/UnitsApi.cpp
+++ b/src/Base/UnitsApi.cpp
@@ -29,11 +29,12 @@
 #include <memory>
 #include <QString>
 #include "Exception.h"
+
 #include "UnitsApi.h"
+#include "UnitsSchemaCentimeters.h"
 #include "UnitsSchemaInternal.h"
 #include "UnitsSchemaImperial1.h"
 #include "UnitsSchemaMKS.h"
-#include "UnitsSchemaCentimeters.h"
 #include "UnitsSchemaMmMin.h"
 #include "UnitsSchemaFemMilliMeterNewton.h"
 
diff --git a/src/Base/UnitsApi.h b/src/Base/UnitsApi.h
index d45275f48c..74668f84b1 100644
--- a/src/Base/UnitsApi.h
+++ b/src/Base/UnitsApi.h
@@ -26,7 +26,6 @@
 
 #include <CXX/WrapPython.h>
 #include <memory>
-#include <string>
 #include <QString>
 #include "UnitsSchema.h"
 #include "Quantity.h"
diff --git a/src/Base/UnitsApiPy.cpp b/src/Base/UnitsApiPy.cpp
index bcdbe48c95..e391c1fb5b 100644
--- a/src/Base/UnitsApiPy.cpp
+++ b/src/Base/UnitsApiPy.cpp
@@ -28,8 +28,7 @@
 #endif
 
 #include <CXX/Objects.hxx>
-#include "Exception.h"
-/// Here the FreeCAD includes sorted by Base,App,Gui......
+
 #include "UnitsApi.h"
 #include "Quantity.h"
 #include "QuantityPy.h"
diff --git a/src/Base/UnitsSchema.cpp b/src/Base/UnitsSchema.cpp
index 512fda4ee6..25b6ec5b7c 100644
--- a/src/Base/UnitsSchema.cpp
+++ b/src/Base/UnitsSchema.cpp
@@ -26,13 +26,12 @@
 # include <unistd.h>
 #endif
 
-#include <QString>
 #include <QLocale>
+#include <QString>
 
-#include "Exception.h"
-#include "UnitsApi.h"
 #include "UnitsSchema.h"
 
+
 using namespace Base;
 
 QString UnitsSchema::toLocale(const Base::Quantity& quant, double factor, const QString& unitString) const
diff --git a/src/Base/UnitsSchema.h b/src/Base/UnitsSchema.h
index e90e72fbe8..020b323eac 100644
--- a/src/Base/UnitsSchema.h
+++ b/src/Base/UnitsSchema.h
@@ -24,8 +24,6 @@
 #ifndef BASE_UNITSSCHEMA_H
 #define BASE_UNITSSCHEMA_H
 
-
-#include <string>
 #include <QString>
 #include <Base/Quantity.h>
 
diff --git a/src/Base/UnitsSchemaCentimeters.cpp b/src/Base/UnitsSchemaCentimeters.cpp
index cd38607137..e66418578a 100644
--- a/src/Base/UnitsSchemaCentimeters.cpp
+++ b/src/Base/UnitsSchemaCentimeters.cpp
@@ -27,10 +27,9 @@
 #endif
 
 #include <QString>
-#include "Exception.h"
-#include "UnitsApi.h"
+
 #include "UnitsSchemaCentimeters.h"
-#include <cmath>
+
 
 using namespace Base;
 
diff --git a/src/Base/UnitsSchemaCentimeters.h b/src/Base/UnitsSchemaCentimeters.h
index 2ca513759a..415483b5e0 100644
--- a/src/Base/UnitsSchemaCentimeters.h
+++ b/src/Base/UnitsSchemaCentimeters.h
@@ -24,11 +24,10 @@
 #ifndef BASE_UNITSSCHEMACENTIMETERS_H
 #define BASE_UNITSSCHEMACENTIMETERS_H
 
-
-#include <string>
 #include <QString>
 #include "UnitsSchema.h"
 
+
 namespace Base {
 
 /**
diff --git a/src/Base/UnitsSchemaFemMilliMeterNewton.cpp b/src/Base/UnitsSchemaFemMilliMeterNewton.cpp
index 4371e99b85..db0687d9bd 100644
--- a/src/Base/UnitsSchemaFemMilliMeterNewton.cpp
+++ b/src/Base/UnitsSchemaFemMilliMeterNewton.cpp
@@ -28,10 +28,8 @@
 #endif
 
 #include <QString>
-#include "Exception.h"
-#include "UnitsApi.h"
+
 #include "UnitsSchemaFemMilliMeterNewton.h"
-#include <cmath>
 
 
 using namespace Base;
diff --git a/src/Base/UnitsSchemaFemMilliMeterNewton.h b/src/Base/UnitsSchemaFemMilliMeterNewton.h
index 47fc842ee9..677818c53d 100644
--- a/src/Base/UnitsSchemaFemMilliMeterNewton.h
+++ b/src/Base/UnitsSchemaFemMilliMeterNewton.h
@@ -25,11 +25,10 @@
 #ifndef BASE_UNITSSCHEMAFEMMLLIMETERNEWTON_H
 #define BASE_UNITSSCHEMAFEMMLLIMETERNEWTON_H
 
-
-#include <string>
 #include <QString>
 #include "UnitsSchema.h"
 
+
 namespace Base {
 
 
diff --git a/src/Base/UnitsSchemaImperial1.cpp b/src/Base/UnitsSchemaImperial1.cpp
index fadafafe49..3cd062fe4d 100644
--- a/src/Base/UnitsSchemaImperial1.cpp
+++ b/src/Base/UnitsSchemaImperial1.cpp
@@ -23,6 +23,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <cmath>
 # include <sstream>
 #endif
 #ifdef __GNUC__
@@ -30,12 +31,8 @@
 #endif
 
 #include <QString>
-#include "Console.h"
-#include "Exception.h"
-#include "UnitsApi.h"
+
 #include "UnitsSchemaImperial1.h"
-#include <cmath>
-#include <iomanip>
 
 
 using namespace Base;
diff --git a/src/Base/UnitsSchemaImperial1.h b/src/Base/UnitsSchemaImperial1.h
index 664e160b25..90eccf7e81 100644
--- a/src/Base/UnitsSchemaImperial1.h
+++ b/src/Base/UnitsSchemaImperial1.h
@@ -24,11 +24,10 @@
 #ifndef BASE_UNITSSCHEMAIMPERIAL1_H
 #define BASE_UNITSSCHEMAIMPERIAL1_H
 
-
-#include <string>
 #include <QString>
 #include "UnitsSchema.h"
 
+
 namespace Base {
 
 
diff --git a/src/Base/UnitsSchemaInternal.cpp b/src/Base/UnitsSchemaInternal.cpp
index 2557b9199c..69b65fa9fc 100644
--- a/src/Base/UnitsSchemaInternal.cpp
+++ b/src/Base/UnitsSchemaInternal.cpp
@@ -27,10 +27,8 @@
 #endif
 
 #include <QString>
-#include "Exception.h"
-#include "UnitsApi.h"
+
 #include "UnitsSchemaInternal.h"
-#include <cmath>
 
 
 using namespace Base;
diff --git a/src/Base/UnitsSchemaInternal.h b/src/Base/UnitsSchemaInternal.h
index 1998452ed9..2234de20a6 100644
--- a/src/Base/UnitsSchemaInternal.h
+++ b/src/Base/UnitsSchemaInternal.h
@@ -24,11 +24,10 @@
 #ifndef BASE_UNITSSCHEMAINTERNAL_H
 #define BASE_UNITSSCHEMAINTERNAL_H
 
-
-#include <string>
 #include <QString>
 #include "UnitsSchema.h"
 
+
 namespace Base {
 
 
diff --git a/src/Base/UnitsSchemaMKS.cpp b/src/Base/UnitsSchemaMKS.cpp
index 23eaee4b4b..11d23d7d0b 100644
--- a/src/Base/UnitsSchemaMKS.cpp
+++ b/src/Base/UnitsSchemaMKS.cpp
@@ -27,10 +27,9 @@
 #endif
 
 #include <QString>
-#include "Exception.h"
-#include "UnitsApi.h"
+
 #include "UnitsSchemaMKS.h"
-#include <cmath>
+
 
 using namespace Base;
 
diff --git a/src/Base/UnitsSchemaMKS.h b/src/Base/UnitsSchemaMKS.h
index 4cff9d16e5..87b88c5937 100644
--- a/src/Base/UnitsSchemaMKS.h
+++ b/src/Base/UnitsSchemaMKS.h
@@ -24,11 +24,10 @@
 #ifndef BASE_UNITSSCHEMAMKS_H
 #define BASE_UNITSSCHEMAMKS_H
 
-
-#include <string>
 #include <QString>
 #include "UnitsSchema.h"
 
+
 namespace Base {
 
 
diff --git a/src/Base/UnitsSchemaMmMin.cpp b/src/Base/UnitsSchemaMmMin.cpp
index 2b5860b427..ead4cddda3 100644
--- a/src/Base/UnitsSchemaMmMin.cpp
+++ b/src/Base/UnitsSchemaMmMin.cpp
@@ -27,10 +27,8 @@
 #endif
 
 #include <QString>
-#include "Exception.h"
-#include "UnitsApi.h"
+
 #include "UnitsSchemaMmMin.h"
-#include <cmath>
 
 
 using namespace Base;
diff --git a/src/Base/UnitsSchemaMmMin.h b/src/Base/UnitsSchemaMmMin.h
index 256ebcbbbf..9974aee4f7 100644
--- a/src/Base/UnitsSchemaMmMin.h
+++ b/src/Base/UnitsSchemaMmMin.h
@@ -24,11 +24,10 @@
 #ifndef BASE_UNITSSCHEMAMMMIN_H
 #define BASE_UNITSSCHEMAMMMIN_H
 
-
-#include <string>
 #include <QString>
 #include "UnitsSchema.h"
 
+
 namespace Base {
 
 
diff --git a/src/Base/Uuid.cpp b/src/Base/Uuid.cpp
index 69dd9ac643..f2ede80e1c 100644
--- a/src/Base/Uuid.cpp
+++ b/src/Base/Uuid.cpp
@@ -29,12 +29,7 @@
 
 #include <stdexcept>
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
 #include "Uuid.h"
-#include "Exception.h"
-#include "Interpreter.h"
-#include <stdexcept>
-#include <CXX/Objects.hxx>
 
 
 using namespace Base;
diff --git a/src/Base/Vector3D.cpp b/src/Base/Vector3D.cpp
index 756b4ba8cd..5ae999e310 100644
--- a/src/Base/Vector3D.cpp
+++ b/src/Base/Vector3D.cpp
@@ -22,9 +22,12 @@
 
 
 #include "PreCompiled.h"
+
 #include <limits>
-#include "Tools.h"
+
 #include "Vector3D.h"
+#include "Tools.h"
+
 
 using namespace Base;