diff --git a/src/App/Application.cpp b/src/App/Application.cpp
index 40feea32ed..2cf3df1bed 100644
--- a/src/App/Application.cpp
+++ b/src/App/Application.cpp
@@ -21,7 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -47,6 +46,8 @@
 #include <sys/sysctl.h>
 #endif
 
+#include <csignal>
+
 #include <QDir>
 #include <QFileInfo>
 #include <QProcessEnvironment>
diff --git a/src/Base/Converter.h b/src/Base/Converter.h
index efec0a08f1..2ebfb8be26 100644
--- a/src/Base/Converter.h
+++ b/src/Base/Converter.h
@@ -24,9 +24,10 @@
 #ifndef BASE_CONVERTER_H
 #define BASE_CONVERTER_H
 
-#include "Vector3D.h"
-#include "Rotation.h"
 #include <tuple>
+#include "Rotation.h"
+#include "Vector3D.h"
+
 
 namespace Base {
 
diff --git a/src/Base/Debugger.cpp b/src/Base/Debugger.cpp
index 2b08f0aa41..64de00c83e 100644
--- a/src/Base/Debugger.cpp
+++ b/src/Base/Debugger.cpp
@@ -30,6 +30,7 @@
 #include "Debugger.h"
 #include "Console.h"
 
+
 using namespace Base;
 
 Debugger::Debugger(QObject* parent)
diff --git a/src/Base/Debugger.h b/src/Base/Debugger.h
index 146f39ba90..b85a804eea 100644
--- a/src/Base/Debugger.h
+++ b/src/Base/Debugger.h
@@ -24,8 +24,8 @@
 #ifndef BASE_DEBUGGER_H
 #define BASE_DEBUGGER_H
 
-#include <QObject>
 #include <QEventLoop>
+#include <QObject>
 #ifndef FC_GLOBAL_H
 #include <FCGlobal.h>
 #endif
diff --git a/src/Base/DualQuaternion.cpp b/src/Base/DualQuaternion.cpp
index f3bba44633..e45d663abc 100644
--- a/src/Base/DualQuaternion.cpp
+++ b/src/Base/DualQuaternion.cpp
@@ -22,9 +22,9 @@
 
 #include "PreCompiled.h"
 
+#include <cassert>
 #include "DualQuaternion.h"
 
-#include "cassert"
 
 Base::DualQuat Base::operator+(Base::DualQuat a, Base::DualQuat b)
 {
diff --git a/src/Base/DualQuaternion.h b/src/Base/DualQuaternion.h
index 2f0ab52e9d..6f4986a0f5 100644
--- a/src/Base/DualQuaternion.h
+++ b/src/Base/DualQuaternion.h
@@ -25,7 +25,7 @@
 
 #include "DualNumber.h"
 #include <FCGlobal.h>
-//#include <Console.h> //DEBUG
+
 
 namespace Base {
 
diff --git a/src/Base/Exception.cpp b/src/Base/Exception.cpp
index b81a1a0b5e..ff8e2fb428 100644
--- a/src/Base/Exception.cpp
+++ b/src/Base/Exception.cpp
@@ -28,6 +28,7 @@
 #include "Console.h"
 #include "PyObjectBase.h"
 
+
 FC_LOG_LEVEL_INIT("Exception", true, true)
 
 using namespace Base;
diff --git a/src/Base/ExceptionFactory.cpp b/src/Base/ExceptionFactory.cpp
index b0025f1db7..f574597573 100644
--- a/src/Base/ExceptionFactory.cpp
+++ b/src/Base/ExceptionFactory.cpp
@@ -25,6 +25,7 @@
 #include "ExceptionFactory.h"
 #include <CXX/Objects.hxx>
 
+
 using namespace Base;
 
 ExceptionFactory* ExceptionFactory::_pcSingleton = nullptr;
diff --git a/src/Base/Factory.cpp b/src/Base/Factory.cpp
index 9acf202eba..7864c4b367 100644
--- a/src/Base/Factory.cpp
+++ b/src/Base/Factory.cpp
@@ -28,10 +28,10 @@
 #	include <list>
 #endif
 
-
 #include "Factory.h"
 #include "Console.h"
 
+
 using namespace Base;
 
 
diff --git a/src/Base/FileTemplate.h b/src/Base/FileTemplate.h
index 0b3473ce3d..9e18094782 100644
--- a/src/Base/FileTemplate.h
+++ b/src/Base/FileTemplate.h
@@ -24,13 +24,12 @@
 #ifndef BASE_FILETEMPLATE_H
 #define BASE_FILETEMPLATE_H
 
-// Std. configurations
-
 #include <string>
 #ifndef FC_GLOBAL_H
 #include <FCGlobal.h>
 #endif
 
+
 namespace Base
 {
 
diff --git a/src/Base/FutureWatcherProgress.h b/src/Base/FutureWatcherProgress.h
index d3a4bf2121..86726fbf26 100644
--- a/src/Base/FutureWatcherProgress.h
+++ b/src/Base/FutureWatcherProgress.h
@@ -27,6 +27,7 @@
 #include <QObject>
 #include <Base/Sequencer.h>
 
+
 namespace Base
 {