diff --git a/GUI/coregui/Views/ImportDataView.cpp b/GUI/coregui/Views/ImportDataView.cpp
index a6729da1d947f0e968a423b06009d6322c467430..30dc823c802e2df3e8a51a0b9ccfa54918a4c274 100644
--- a/GUI/coregui/Views/ImportDataView.cpp
+++ b/GUI/coregui/Views/ImportDataView.cpp
@@ -14,14 +14,14 @@
 //
 // ************************************************************************** //
 
-#include "ImportDataView.h"
-#include "mainwindow.h"
+#include <QVBoxLayout>
 #include "ImportDataToolBar.h"
 #include "ItemSelectorWidget.h"
 #include "RealDataModel.h"
+#include "mainwindow.h"
 #include "mainwindow_constants.h"
 #include "minisplitter.h"
-#include <QVBoxLayout>
+#include "ImportDataView.h"
 
 ImportDataView::ImportDataView(MainWindow *mainWindow)
     : QWidget(mainWindow)
diff --git a/GUI/coregui/Views/InstrumentView.cpp b/GUI/coregui/Views/InstrumentView.cpp
index ee2512f12087cbc981570af8d71cfca70e4bd8da..e38c24fa961b7c9a1515ca369070616fc1faa8ea 100644
--- a/GUI/coregui/Views/InstrumentView.cpp
+++ b/GUI/coregui/Views/InstrumentView.cpp
@@ -14,18 +14,18 @@
 //
 // ************************************************************************** //
 
-#include "InstrumentView.h"
-#include "mainwindow.h"
-#include "InstrumentModel.h"
-#include "InstrumentSelectorWidget.h"
-#include "InstrumentEditorWidget.h"
-#include "ExtendedDetectorDialog.h"
-#include "StyledToolBar.h"
 #include <QBoxLayout>
+#include <QDebug>
 #include <QListView>
 #include <QStackedWidget>
 #include <QToolButton>
-#include <QDebug>
+#include "ExtendedDetectorDialog.h"
+#include "InstrumentEditorWidget.h"
+#include "InstrumentModel.h"
+#include "InstrumentSelectorWidget.h"
+#include "StyledToolBar.h"
+#include "mainwindow.h"
+#include "InstrumentView.h"
 
 
 InstrumentView::InstrumentView(MainWindow *mainWindow)
diff --git a/GUI/coregui/Views/InstrumentView.h b/GUI/coregui/Views/InstrumentView.h
index f61f5686ef02532d5b2a5bdc32ccb8a2d38cd6f1..b4a20d4a5c5d8c9a3b7f82fe8a069f09593e923c 100644
--- a/GUI/coregui/Views/InstrumentView.h
+++ b/GUI/coregui/Views/InstrumentView.h
@@ -17,8 +17,8 @@
 #ifndef INSTRUMENTVIEW_H
 #define INSTRUMENTVIEW_H
 
-#include <QWidget>
 #include <QMap>
+#include <QWidget>
 
 class MainWindow;
 class InstrumentSelectorWidget;
diff --git a/GUI/coregui/Views/JobView.cpp b/GUI/coregui/Views/JobView.cpp
index 6050b1719995f4e846f26d993b07d95cea35d41b..13003a8733b659a95ec8bded156f5e8a4efaf60b 100644
--- a/GUI/coregui/Views/JobView.cpp
+++ b/GUI/coregui/Views/JobView.cpp
@@ -14,16 +14,16 @@
 //
 // ************************************************************************** //
 
-#include "JobView.h"
-#include "JobViewDocks.h"
-#include "JobSelectorWidget.h"
+#include <QMenu>
+#include "JobActivityStatusBar.h"
+#include "JobItem.h"
+#include "JobModel.h"
 #include "JobOutputDataWidget.h"
 #include "JobProgressAssistant.h"
-#include "JobModel.h"
+#include "JobSelectorWidget.h"
+#include "JobViewDocks.h"
 #include "mainwindow.h"
-#include "JobActivityStatusBar.h"
-#include "JobItem.h"
-#include <QMenu>
+#include "JobView.h"
 
 JobView::JobView(MainWindow *mainWindow)
     : m_docks(new JobViewDocks(this))
diff --git a/GUI/coregui/Views/SampleView.cpp b/GUI/coregui/Views/SampleView.cpp
index 80b310a80aebb31bac78b61542c97c673d7fbb01..ec16553c58b8164e7844d4c2c880b94045bebb91 100644
--- a/GUI/coregui/Views/SampleView.cpp
+++ b/GUI/coregui/Views/SampleView.cpp
@@ -14,19 +14,19 @@
 //
 // ************************************************************************** //
 
-#include "SampleView.h"
-#include "mainwindow.h"
-#include "SampleViewComponents.h"
-#include "SampleDesigner.h"
-#include "SampleToolBar.h"
-#include "SamplePropertyWidget.h"
-#include "InfoWidget.h"
-#include "ItemFactory.h"
-#include "FilterPropertyProxy.h"
+#include <QDebug>
 #include <QDockWidget>
 #include <QMenu>
-#include <QDebug>
 #include <QTimer>
+#include "FilterPropertyProxy.h"
+#include "InfoWidget.h"
+#include "ItemFactory.h"
+#include "SampleDesigner.h"
+#include "SamplePropertyWidget.h"
+#include "SampleToolBar.h"
+#include "SampleViewComponents.h"
+#include "mainwindow.h"
+#include "SampleView.h"
 
 SampleView::SampleView(MainWindow *mainWindow)
     : Manhattan::FancyMainWindow(mainWindow)
diff --git a/GUI/coregui/Views/SampleView.h b/GUI/coregui/Views/SampleView.h
index 78696bbf33c01236e124315681d89db155ee8c56..00d08e0023380199fd1f760aa6dddee5e1999bf4 100644
--- a/GUI/coregui/Views/SampleView.h
+++ b/GUI/coregui/Views/SampleView.h
@@ -17,10 +17,10 @@
 #ifndef SAMPLEVIEW_H
 #define SAMPLEVIEW_H
 
-#include "fancymainwindow.h"
-#include <QTreeView>
 #include <QAction>
 #include <QSignalMapper>
+#include <QTreeView>
+#include "fancymainwindow.h"
 
 
 class MainWindow;
diff --git a/GUI/coregui/Views/SampleViewComponents.cpp b/GUI/coregui/Views/SampleViewComponents.cpp
index c5eefe1cc9555e1330ab537f18d76ea590ae625c..befd002c89ef82938b06badb5f3f641ca39825d1 100644
--- a/GUI/coregui/Views/SampleViewComponents.cpp
+++ b/GUI/coregui/Views/SampleViewComponents.cpp
@@ -14,8 +14,8 @@
 //
 // ************************************************************************** //
 
-#include "SampleViewComponents.h"
 #include "FilterPropertyProxy.h"
+#include "SampleViewComponents.h"
 
 
 SampleWidgetBox *SampleViewComponents::createWidgetBox(
diff --git a/GUI/coregui/Views/SampleViewComponents.h b/GUI/coregui/Views/SampleViewComponents.h
index 5853561fcf2a33bffb4524807ba4b6a7879d845c..c562102df049cf89cdf552fd0893e2dd0c31af14 100644
--- a/GUI/coregui/Views/SampleViewComponents.h
+++ b/GUI/coregui/Views/SampleViewComponents.h
@@ -18,10 +18,8 @@
 #define SAMPLEVIEWCOMPONENTS_H
 
 #include "ItemTreeView.h"
-
-//#include "SamplePropertyEditor.h"
-#include "SampleWidgetBox.h"
 #include "SampleModel.h"
+#include "SampleWidgetBox.h"
 
 
 
diff --git a/GUI/coregui/Views/SessionModelView.cpp b/GUI/coregui/Views/SessionModelView.cpp
index 789d2a5a74604cf3a8315793d604bb8e3ad46550..f4d05e9ec7bb3fe657533eb451398d7b0641dc9e 100644
--- a/GUI/coregui/Views/SessionModelView.cpp
+++ b/GUI/coregui/Views/SessionModelView.cpp
@@ -14,18 +14,18 @@
 //
 // ************************************************************************** //
 
-#include "SessionModelView.h"
-#include "mainwindow.h"
+#include <QToolBar>
+#include <QToolButton>
+#include <QTreeView>
+#include <QVBoxLayout>
 #include "InstrumentModel.h"
+#include "JobModel.h"
+#include "MaterialModel.h"
 #include "RealDataModel.h"
 #include "SampleModel.h"
-#include "MaterialModel.h"
-#include "JobModel.h"
 #include "SessionModelDelegate.h"
-#include <QVBoxLayout>
-#include <QToolBar>
-#include <QToolButton>
-#include <QTreeView>
+#include "mainwindow.h"
+#include "SessionModelView.h"
 
 
 SessionModelView::ModelTree::ModelTree(SessionModel *model, QTreeView *tree)
diff --git a/GUI/coregui/Views/SimulationView.cpp b/GUI/coregui/Views/SimulationView.cpp
index 5ae271198fe1c7c0af3abebcce974bb5d97c6480..bb502b97c46f1219b397c18ee54ff1a7e03f83ba 100644
--- a/GUI/coregui/Views/SimulationView.cpp
+++ b/GUI/coregui/Views/SimulationView.cpp
@@ -14,11 +14,11 @@
 //
 // ************************************************************************** //
 
-#include "SimulationView.h"
+#include <QVBoxLayout>
 #include "SimulationSetupWidget.h"
 #include "StyledToolBar.h"
 #include "mainwindow.h"
-#include <QVBoxLayout>
+#include "SimulationView.h"
 
 SimulationView::SimulationView(MainWindow *mainWindow)
     : QWidget(mainWindow)
diff --git a/GUI/coregui/Views/TestComponentView.cpp b/GUI/coregui/Views/TestComponentView.cpp
index 662ea5476f7c7cd925cf4581059762e671daf18a..24dbdf810c8bb1d1ae7bf88d6973696be6f7504e 100644
--- a/GUI/coregui/Views/TestComponentView.cpp
+++ b/GUI/coregui/Views/TestComponentView.cpp
@@ -13,12 +13,12 @@
 //! @authors   Walter Van Herck, Joachim Wuttke
 //
 // ************************************************************************** //
-#include "TestComponentView.h"
-#include "mainwindow.h"
-#include "SampleModel.h"
-#include "ComponentEditor.h"
 #include <QHBoxLayout>
 #include <QTreeView>
+#include "ComponentEditor.h"
+#include "SampleModel.h"
+#include "mainwindow.h"
+#include "TestComponentView.h"
 
 TestComponentView::TestComponentView(MainWindow *mainWindow)
     : QWidget(mainWindow)
diff --git a/GUI/coregui/Views/TestView.cpp b/GUI/coregui/Views/TestView.cpp
index b00f2611a3aa304b50f65aa16dcc3bfaefd3ce0f..bd86dd1dfc09bcf99c209e2944312cb311366469 100644
--- a/GUI/coregui/Views/TestView.cpp
+++ b/GUI/coregui/Views/TestView.cpp
@@ -14,16 +14,16 @@
 //
 // ************************************************************************** //
 
-#include "TestView.h"
+#include <QCheckBox>
+#include <QLineEdit>
+#include "AccordionWidget.h"
+#include "JobModel.h"
 #include "MaskEditor.h"
-#include "mainwindow.h"
 #include "MaterialEditor.h"
-#include "MinimizerSettingsWidget.h"
-#include "AccordionWidget.h"
 #include "MinimizerItem.h"
-#include "JobModel.h"
-#include <QLineEdit>
-#include <QCheckBox>
+#include "MinimizerSettingsWidget.h"
+#include "mainwindow.h"
+#include "TestView.h"
 
 TestView::TestView(MainWindow *mainWindow)
     : QWidget(mainWindow)
diff --git a/GUI/coregui/Views/WelcomeView.cpp b/GUI/coregui/Views/WelcomeView.cpp
index 387acd6031a73beb443861daca9cb8591957828a..eb061f7d046b3d3d5b7caab020c66d137629dddb 100644
--- a/GUI/coregui/Views/WelcomeView.cpp
+++ b/GUI/coregui/Views/WelcomeView.cpp
@@ -14,7 +14,12 @@
 //
 // ************************************************************************** //
 
-#include "WelcomeView.h"
+#include <QCommandLinkButton>
+#include <QDebug>
+#include <QDesktopServices>
+#include <QSignalMapper>
+#include <QUrl>
+#include <QVBoxLayout>
 #include "DesignerHelper.h"
 #include "FancyLabel.h"
 #include "mainwindow.h"
@@ -22,12 +27,7 @@
 #include "projectdocument.h"
 #include "projectmanager.h"
 #include "qstringutils.h"
-#include <QVBoxLayout>
-#include <QDesktopServices>
-#include <QUrl>
-#include <QCommandLinkButton>
-#include <QSignalMapper>
-#include <QDebug>
+#include "WelcomeView.h"
 
 WelcomeView::WelcomeView(MainWindow *parent)
     : m_mainWindow(parent)