diff --git a/src/App/Range.cpp b/src/App/Range.cpp
index d77dab7b86..ce5d360b34 100644
--- a/src/App/Range.cpp
+++ b/src/App/Range.cpp
@@ -21,13 +21,14 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+#ifndef _PreComp_
+#include <boost/regex.hpp>
+#include <cassert>
+#include <sstream>
+#include <string>
+#endif
 
 #include <Base/Exception.h>
-#include <boost/regex.hpp>
-#include <assert.h>
-#include <sstream>
-#include <string.h>
-
 #include "Range.h"
 
 
diff --git a/src/App/TextDocument.cpp b/src/App/TextDocument.cpp
index 82e4416d8c..24cb355e3b 100644
--- a/src/App/TextDocument.cpp
+++ b/src/App/TextDocument.cpp
@@ -23,12 +23,8 @@
 
 #include "PreCompiled.h"
 
-#include <string>
-#include <fstream>
-#include <boost_signals2.hpp>
-
-#include "DocumentObject.h"
 #include "TextDocument.h"
+#include "DocumentObject.h"
 
 
 using namespace App;
diff --git a/src/App/TextDocument.h b/src/App/TextDocument.h
index 2a57b301df..b9abdf44ed 100644
--- a/src/App/TextDocument.h
+++ b/src/App/TextDocument.h
@@ -24,10 +24,6 @@
 #ifndef APP_TEXTDOCUMENT_H
 #define APP_TEXTDOCUMENT_H
 
-
-#include <string>
-#include <boost_signals2.hpp>
-
 #include "DocumentObject.h"
 #include "PropertyStandard.h"
 
diff --git a/src/App/TransactionalObject.cpp b/src/App/TransactionalObject.cpp
index 036802327f..7235d10d44 100644
--- a/src/App/TransactionalObject.cpp
+++ b/src/App/TransactionalObject.cpp
@@ -23,15 +23,9 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <sstream>
-#endif
-
-#include <Base/Writer.h>
-#include <Base/Exception.h>
-
-#include "Document.h"
 #include "TransactionalObject.h"
+#include "Document.h"
+
 
 using namespace App;
 
diff --git a/src/App/Transactions.cpp b/src/App/Transactions.cpp
index 0e57ff0e81..71c4e72b65 100644
--- a/src/App/Transactions.cpp
+++ b/src/App/Transactions.cpp
@@ -29,17 +29,15 @@
 #endif
 
 #include <atomic>
-
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Writer.h>
-using Base::Writer;
-#include <Base/Reader.h>
-using Base::XMLReader;
 #include <Base/Console.h>
+#include <Base/Reader.h>
+#include <Base/Writer.h>
+
 #include "Transactions.h"
-#include "Property.h"
 #include "Document.h"
 #include "DocumentObject.h"
+#include "Property.h"
+
 
 FC_LOG_LEVEL_INIT("App",true,true)
 
diff --git a/src/App/VRMLObject.cpp b/src/App/VRMLObject.cpp
index 008e0aa199..1a994e5f51 100644
--- a/src/App/VRMLObject.cpp
+++ b/src/App/VRMLObject.cpp
@@ -23,17 +23,15 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "VRMLObject.h"
 #include "Document.h"
 #include "DocumentObjectPy.h"
 #include <Base/FileInfo.h>
-#include <Base/Stream.h>
 #include <Base/Reader.h>
+#include <Base/Stream.h>
 #include <Base/Writer.h>
 
+
 using namespace App;
 
 PROPERTY_SOURCE(App::VRMLObject, App::GeoFeature)