diff --git a/src/App/MeasureDistance.cpp b/src/App/MeasureDistance.cpp
index d1bde29b1c..8132075eaf 100644
--- a/src/App/MeasureDistance.cpp
+++ b/src/App/MeasureDistance.cpp
@@ -23,9 +23,6 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "MeasureDistance.h"
 
 using namespace App;
diff --git a/src/App/MergeDocuments.cpp b/src/App/MergeDocuments.cpp
index 95d9f0633a..8ba07372a7 100644
--- a/src/App/MergeDocuments.cpp
+++ b/src/App/MergeDocuments.cpp
@@ -23,17 +23,15 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <stack>
-# include <boost_bind_bind.hpp>
 #endif
 
 #include <QCoreApplication>
-
-#include "MergeDocuments.h"
-#include <Base/Console.h>
+#include <App/Document.h>
 #include <Base/Reader.h>
 #include <Base/Writer.h>
-#include <App/Document.h>
-#include <App/DocumentObject.h>
+
+#include "MergeDocuments.h"
+
 
 using namespace App;
 namespace bp = boost::placeholders;
diff --git a/src/App/MergeDocuments.h b/src/App/MergeDocuments.h
index 3f807e2bfd..a33e5594b7 100644
--- a/src/App/MergeDocuments.h
+++ b/src/App/MergeDocuments.h
@@ -24,7 +24,6 @@
 #ifndef APP_MERGEDOCUMENTS_H
 #define APP_MERGEDOCUMENTS_H
 
-#include <boost_signals2.hpp>
 #include <Base/Persistence.h>
 
 namespace zipios {
diff --git a/src/App/Metadata.cpp b/src/App/Metadata.cpp
index 1780c7f266..dc0e4973ec 100644
--- a/src/App/Metadata.cpp
+++ b/src/App/Metadata.cpp
@@ -29,19 +29,11 @@
 #include "Metadata.h"
 
 #include <xercesc/sax/HandlerBase.hpp>
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/parsers/XercesDOMParser.hpp>
-#include <xercesc/dom/DOMImplementation.hpp>
-#include <xercesc/dom/DOMImplementationLS.hpp>
 #include <xercesc/framework/LocalFileFormatTarget.hpp>
 
-
-#include "Base/XMLTools.h"
-#include "App/Expression.h"
 #include "App/Application.h"
+#include "App/Expression.h"
+#include "Base/XMLTools.h"
 
 /*
 *** From GCC: ***
diff --git a/src/App/Metadata.h b/src/App/Metadata.h
index 3c1dcf1c73..67b1f76a25 100644
--- a/src/App/Metadata.h
+++ b/src/App/Metadata.h
@@ -27,10 +27,10 @@
 
 #include <boost/filesystem.hpp>
 
-#include <string>
-#include <vector>
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/parsers/XercesDOMParser.hpp>
@@ -304,4 +304,4 @@ namespace App {
 
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/App/ObjectIdentifier.cpp b/src/App/ObjectIdentifier.cpp
index 31bfd21953..4fe209cad9 100644
--- a/src/App/ObjectIdentifier.cpp
+++ b/src/App/ObjectIdentifier.cpp
@@ -26,26 +26,22 @@
 #	include <cassert>
 #endif
 
-#include <limits>
-#include <iomanip>
-
 #include <boost/algorithm/string/predicate.hpp>
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
+#include <App/DocumentObjectPy.h>
 #include <Base/GeometryPyCXX.h>
 #include <Base/Tools.h>
 #include <Base/Interpreter.h>
 #include <Base/QuantityPy.h>
 #include <Base/Console.h>
-#include <App/DocumentObjectPy.h>
-#include "ComplexGeoData.h"
-#include "Property.h"
+
+#include "ObjectIdentifier.h"
 #include "Application.h"
 #include "Document.h"
-#include "DocumentObject.h"
-#include "ObjectIdentifier.h"
 #include "ExpressionParser.h"
 #include "Link.h"
+#include "Property.h"
+
 
 FC_LOG_LEVEL_INIT("Expression",true,true)
 
diff --git a/src/App/ObjectIdentifier.h b/src/App/ObjectIdentifier.h
index c510278157..a74868d43b 100644
--- a/src/App/ObjectIdentifier.h
+++ b/src/App/ObjectIdentifier.h
@@ -24,17 +24,16 @@
 #ifndef APP_PATH_H
 #define APP_PATH_H
 
-#include <climits>
-#include <memory>
-#include <vector>
-#include <string>
-#include <set>
-#include <map>
 #include <bitset>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
 #include <boost/any.hpp>
 #include <CXX/Objects.hxx>
 #include <FCConfig.h>
 
+
 namespace App
 {