diff --git a/src/App/AutoTransaction.cpp b/src/App/AutoTransaction.cpp
index 08fe11a69f..595d1424c4 100644
--- a/src/App/AutoTransaction.cpp
+++ b/src/App/AutoTransaction.cpp
@@ -22,12 +22,13 @@
 
 #include "PreCompiled.h"
 
-#include <Base/Console.h>
 #include <Base/Interpreter.h>
-#include "Application.h"
-#include "Transactions.h"
-#include "Document.h"
+
 #include "AutoTransaction.h"
+#include "Application.h"
+#include "Document.h"
+#include "Transactions.h"
+
 
 FC_LOG_LEVEL_INIT("App",true,true)
 
diff --git a/src/App/Branding.cpp b/src/App/Branding.cpp
index 5b79cc6aba..a8b8eca594 100644
--- a/src/App/Branding.cpp
+++ b/src/App/Branding.cpp
@@ -22,17 +22,12 @@
 
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
-#include <QXmlSimpleReader>
-#include <QXmlInputSource>
-#include <QDir>
 #include <QFile>
-#include <QFileInfo>
 
 #include "Branding.h"
 
+
 using namespace App;
 
 Branding::Branding()
diff --git a/src/App/Branding.h b/src/App/Branding.h
index 3d4804fdab..8685fa0705 100644
--- a/src/App/Branding.h
+++ b/src/App/Branding.h
@@ -25,10 +25,11 @@
 #define APP_BRANDING_H
 
 #include <string>
-#include <QMap>
-#include <QVector>
-#include <QString>
 #include <QDomDocument>
+#include <QMap>
+#include <QString>
+#include <QVector>
+
 
 class QIODevice;
 
diff --git a/src/App/ColorModel.cpp b/src/App/ColorModel.cpp
index 99c39308e8..4be0e60808 100644
--- a/src/App/ColorModel.cpp
+++ b/src/App/ColorModel.cpp
@@ -26,9 +26,11 @@
 # include <cstdlib>
 #endif
 
-#include "ColorModel.h"
 #include <Base/Exception.h>
 
+#include "ColorModel.h"
+
+
 using namespace App;
 
 
diff --git a/src/App/ColorModel.h b/src/App/ColorModel.h
index e8e8f78007..65cc051d23 100644
--- a/src/App/ColorModel.h
+++ b/src/App/ColorModel.h
@@ -31,6 +31,7 @@
 #include <string>
 #include <vector>
 
+
 namespace App
 {
 
diff --git a/src/App/ComplexGeoData.cpp b/src/App/ComplexGeoData.cpp
index da6890b96b..dc490bed13 100644
--- a/src/App/ComplexGeoData.cpp
+++ b/src/App/ComplexGeoData.cpp
@@ -29,10 +29,9 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 
-#include <Base/Exception.h>
-#include <Base/Console.h>
 #include "ComplexGeoData.h"
 
+
 using namespace Data;
 
 TYPESYSTEM_SOURCE_ABSTRACT(Data::Segment , Base::BaseClass)
diff --git a/src/App/ComplexGeoData.h b/src/App/ComplexGeoData.h
index 06bbf206bd..875e9b309b 100644
--- a/src/App/ComplexGeoData.h
+++ b/src/App/ComplexGeoData.h
@@ -24,11 +24,11 @@
 #ifndef _AppComplexGeoData_h_
 #define _AppComplexGeoData_h_
 
-#include <Base/Placement.h>
-#include <Base/Persistence.h>
+#include <Base/BoundBox.h>
 #include <Base/Handle.h>
 #include <Base/Matrix.h>
-#include <Base/BoundBox.h>
+#include <Base/Persistence.h>
+#include <Base/Placement.h>
 #include <Base/Rotation.h>
 
 #ifdef __GNUC__