diff --git a/Core/Aggregates/InterferenceFunction1DLattice.cpp b/Core/Aggregates/InterferenceFunction1DLattice.cpp
index 3dd187372550494696cc8aad87e2cc4cb0094965..5a2efbad044c699423336ac189df99cfa9f6076f 100644
--- a/Core/Aggregates/InterferenceFunction1DLattice.cpp
+++ b/Core/Aggregates/InterferenceFunction1DLattice.cpp
@@ -15,8 +15,8 @@
 
 #include "InterferenceFunction1DLattice.h"
 #include "BornAgainNamespace.h"
-#include "ISampleVisitor.h"
 #include "FTDecayFunctions.h"
+#include "ISampleVisitor.h"
 #include "Units.h"
 
 using namespace BornAgain;
diff --git a/Core/Basics/ISingleton.h b/Core/Basics/ISingleton.h
index 663ec73f16fce07bd495458c88ea9e7e84895533..7a7647cea815cb110a97ba9dd096f8d960b3c918 100644
--- a/Core/Basics/ISingleton.h
+++ b/Core/Basics/ISingleton.h
@@ -18,6 +18,7 @@
 
 #include <iostream>
 #include <mutex>
+#include <stdexcept> // need overlooked by g++ 5.4
 
 //! @class ISingleton
 //! @ingroup tools_internal
@@ -33,7 +34,7 @@ public:
         std::unique_lock<std::mutex> single_lock( single_mutex );
         if( !m_instance) {
             if( m_destroyed )
-                throw std::runtime_error("ISingleton: object was destructed!");
+                throw std::runtime_error("BUG in ISingleton: object was destructed!");
             static T theInstance;
             m_instance = &theInstance;
         }
diff --git a/Core/FormFactor/FormFactorDecoratorMaterial.cpp b/Core/FormFactor/FormFactorDecoratorMaterial.cpp
index 39d38d1699cae6c25e0852b85b4d7ac7c785942d..386af326b9a3cc619259ffa1c840462d24b1d334 100644
--- a/Core/FormFactor/FormFactorDecoratorMaterial.cpp
+++ b/Core/FormFactor/FormFactorDecoratorMaterial.cpp
@@ -14,8 +14,8 @@
 // ************************************************************************** //
 
 #include "FormFactorDecoratorMaterial.h"
-#include "ISampleVisitor.h"
 #include "IMaterial.h"
+#include "ISampleVisitor.h"
 #include "Units.h"
 #include "WavevectorInfo.h"
 
diff --git a/Core/HardParticles/FormFactorPolyhedron.cpp b/Core/HardParticles/FormFactorPolyhedron.cpp
index c7b691700bb0cb7baf2ce83440efd614143e0b2c..379ba4fef97d1ce1d8866cc3c27df5243a9340f4 100644
--- a/Core/HardParticles/FormFactorPolyhedron.cpp
+++ b/Core/HardParticles/FormFactorPolyhedron.cpp
@@ -22,6 +22,7 @@
 #include "MathFunctions.h"
 #include "Precomputed.h"
 #include <iomanip>
+#include <stdexcept> // need overlooked by g++ 5.4
 
 static const complex_t I(0.,1.);
 static const double eps(2e-16);
diff --git a/Core/InputOutput/OutputDataReadStrategy.cpp b/Core/InputOutput/OutputDataReadStrategy.cpp
index 0a1519683687c0e4c7d257d9d4c1fc0a5a611249..8befa87381d4152ee8e226f58402117b2db78cab 100644
--- a/Core/InputOutput/OutputDataReadStrategy.cpp
+++ b/Core/InputOutput/OutputDataReadStrategy.cpp
@@ -13,11 +13,11 @@
 //
 // ************************************************************************** //
 
-
 #include "OutputDataReadStrategy.h"
 #include "OutputData.h"
 #include "OutputDataIOHelper.h"
 #include "TiffHandler.h"
+#include <stdexcept> // need overlooked by g++ 5.4
 
 OutputData<double>* OutputDataReadINTStrategy::readOutputData(std::istream& input_stream)
 {
diff --git a/Core/InputOutput/TiffHandler.h b/Core/InputOutput/TiffHandler.h
index b7f46e0c9e6c0bd68418c36f3fb8b30d25474d2d..54ff07397f35557b38caf8c1efea89f83a58ec6b 100644
--- a/Core/InputOutput/TiffHandler.h
+++ b/Core/InputOutput/TiffHandler.h
@@ -19,9 +19,9 @@
 #ifdef BORNAGAIN_TIFF_SUPPORT
 
 #include "OutputData.h"
-#include <memory>
 #include <tiffio.h>
 #include <tiffio.hxx>
+#include <memory>
 
 //! @class TiffHandler
 //! @ingroup input_output_internal
diff --git a/Core/Instrument/Instrument.cpp b/Core/Instrument/Instrument.cpp
index 9654b6ee29307ba2e23fd051e8f1cd89b37fc311..2f050687bfa1c3751ec40b24e831b46b90986044 100644
--- a/Core/Instrument/Instrument.cpp
+++ b/Core/Instrument/Instrument.cpp
@@ -16,10 +16,10 @@
 #include "Instrument.h"
 #include "Beam.h"
 #include "ConvolutionDetectorResolution.h"
-#include "SimulationElement.h"
-#include "SphericalDetector.h"
 #include "IDetector2D.h"
 #include "IResolutionFunction2D.h"
+#include "SimulationElement.h"
+#include "SphericalDetector.h"
 
 Instrument::Instrument()
     : IParameterized("Instrument")
diff --git a/Core/Parametrization/IParameterized.cpp b/Core/Parametrization/IParameterized.cpp
index 5dafc72ad164858f2f69082fae0f748df4db1574..9f53775564953c5c87a2dd49a45d64d4e51bf2a2 100644
--- a/Core/Parametrization/IParameterized.cpp
+++ b/Core/Parametrization/IParameterized.cpp
@@ -14,8 +14,8 @@
 // ************************************************************************** //
 
 #include "IParameterized.h"
-#include <memory>
 #include <iostream>
+#include <memory>
 #include <sstream>
 
 // Copies INamed, but not the parameters.
diff --git a/Core/Simulation/ProgressHandler.h b/Core/Simulation/ProgressHandler.h
index 4be5da4e4fa8e0a65ab87420c681f6cc78196998..f03aa8ad24d3bd68e3da15a5efcd8a5e9d68126a 100644
--- a/Core/Simulation/ProgressHandler.h
+++ b/Core/Simulation/ProgressHandler.h
@@ -16,8 +16,8 @@
 #ifndef PROGRESSHANDLER_H
 #define PROGRESSHANDLER_H
 
-#include <memory>
 #include <functional>
+#include <memory>
 
 class Simulation;
 
diff --git a/Core/StandardSamples/LatticeBuilder.cpp b/Core/StandardSamples/LatticeBuilder.cpp
index eedce64021df8eaed17505812864e58a5329d8f0..b6c42e806aa5cc2886a173ec612ea2fbc2ba4e5f 100644
--- a/Core/StandardSamples/LatticeBuilder.cpp
+++ b/Core/StandardSamples/LatticeBuilder.cpp
@@ -14,6 +14,7 @@
 // ************************************************************************** //
 
 #include "LatticeBuilder.h"
+#include "FTDecayFunctions.h"
 #include "FormFactorCylinder.h"
 #include "HomogeneousMaterial.h"
 #include "InterferenceFunction1DLattice.h"
@@ -21,7 +22,6 @@
 #include "MultiLayer.h"
 #include "Particle.h"
 #include "ParticleLayout.h"
-#include "FTDecayFunctions.h"
 #include "Units.h"
 
 Lattice1DBuilder::Lattice1DBuilder()
diff --git a/Core/Tools/Convolve.cpp b/Core/Tools/Convolve.cpp
index 7c4d45d44d35d7d06382eae9da738906e8f4d399..67be274e8f36c1b7b416e1d2252e674001bea5ba 100644
--- a/Core/Tools/Convolve.cpp
+++ b/Core/Tools/Convolve.cpp
@@ -17,6 +17,7 @@
 #include "Exceptions.h"
 #include <iostream>
 #include <sstream>
+#include <stdexcept> // need overlooked by g++ 5.4
 
 MathFunctions::Convolve::Convolve() : m_mode(FFTW_UNDEFINED)
 {
diff --git a/Core/Tools/MathFunctions.cpp b/Core/Tools/MathFunctions.cpp
index 8be51c426a4b91eb5480deb6d454e0200e55acd7..12bf257b939ee841c0306060ac2d8b1b5d8daa14 100644
--- a/Core/Tools/MathFunctions.cpp
+++ b/Core/Tools/MathFunctions.cpp
@@ -20,11 +20,11 @@
 #include <gsl/gsl_sf_erf.h>
 #include <gsl/gsl_sf_expint.h>
 #include <gsl/gsl_sf_trig.h>
+#include <fftw3.h>
 #include <chrono>
 #include <cstring>
-#include <exception> // need detected by TeamCity
-#include <fftw3.h>
 #include <random>
+#include <stdexcept> // need overlooked by g++ 5.4
 
 // ************************************************************************** //
 //  Various functions
@@ -311,9 +311,8 @@ MathFunctions::FastFourierTransform(const std::vector<complex_t> &data,
     // saving data for user
     std::vector<complex_t> outData;
     outData.resize(npx);
-    for (size_t i = 0; i < npx; i++) {
+    for (size_t i = 0; i < npx; i++)
         outData[i] = scale * complex_t(ftResult[i][0], ftResult[i][1]);
-    }
 
     fftw_destroy_plan(plan);
     fftw_free(ftData);
@@ -326,15 +325,13 @@ MathFunctions::FastFourierTransform(const std::vector<complex_t> &data,
 //!   for the discrete fast Fourier transformation library (fftw3);
 //!   transforms real to complex
 
-std::vector<complex_t>
-MathFunctions::FastFourierTransform(const std::vector<double> &data,
-                                    MathFunctions::EFFTDirection ftCase)
+std::vector<complex_t> MathFunctions::FastFourierTransform(
+    const std::vector<double> &data, MathFunctions::EFFTDirection ftCase)
 {
     std::vector<complex_t> cdata;
     cdata.resize(data.size());
-    for (size_t i = 0; i < data.size(); i++) {
+    for (size_t i = 0; i < data.size(); i++)
         cdata[i] = complex_t(data[i], 0);
-    }
     return MathFunctions::FastFourierTransform(cdata, ftCase);
 }
 
diff --git a/Fit/FitKernel/FitObject.h b/Fit/FitKernel/FitObject.h
index 29b5b43ed6293ac972ea51c12a43a3fb7a346a9b..66e4cb5416e025b9adbef2870d4133ce235f9b80 100644
--- a/Fit/FitKernel/FitObject.h
+++ b/Fit/FitKernel/FitObject.h
@@ -16,8 +16,8 @@
 #ifndef FITOBJECT_H
 #define FITOBJECT_H
 
+#include "IParameterized.h" // inheriting from
 #include "FitElement.h"
-#include "IParameterized.h"
 #include "OutputData.h"
 #include <memory>
 
diff --git a/Fit/FitKernel/FitParameter.h b/Fit/FitKernel/FitParameter.h
index 4636fdef63ca3988d8b882da7dce287ecda8bf5c..f90a95d2809fdd1b24464865b1b196e1355f5772 100644
--- a/Fit/FitKernel/FitParameter.h
+++ b/Fit/FitKernel/FitParameter.h
@@ -16,8 +16,8 @@
 #ifndef FITPARAMETER_H
 #define FITPARAMETER_H
 
+#include "INamed.h" // inheriting from
 #include "AttLimits.h"
-#include "INamed.h"
 
 //! @class FitParameter
 //! @ingroup fitting_internal
diff --git a/Fit/FitKernel/FitParameterLinked.h b/Fit/FitKernel/FitParameterLinked.h
index 5727b26e2ea2eaba7669f427326e196219314504..1e774c8ebff916d566cf2135a0a8de864551035a 100644
--- a/Fit/FitKernel/FitParameterLinked.h
+++ b/Fit/FitKernel/FitParameterLinked.h
@@ -16,7 +16,7 @@
 #ifndef FITPARAMETERLINKED_H
 #define FITPARAMETERLINKED_H
 
-#include "FitParameter.h"
+#include "FitParameter.h" // inheriting from
 #include "ParameterPool.h"
 
 
diff --git a/Fit/FitKernel/FitStrategyAdjustMinimizer.h b/Fit/FitKernel/FitStrategyAdjustMinimizer.h
index db70f2930b9316b8721bf58f34746ed4e86af1e6..a5c373f0b18a0c2672725a50c508e3cd580e5c5f 100644
--- a/Fit/FitKernel/FitStrategyAdjustMinimizer.h
+++ b/Fit/FitKernel/FitStrategyAdjustMinimizer.h
@@ -16,7 +16,7 @@
 #ifndef FITSTRATEGYADJUSTMINIMIZER_H
 #define FITSTRATEGYADJUSTMINIMIZER_H
 
-#include "IFitStrategy.h"
+#include "IFitStrategy.h" // inheriting from
 #include "IMinimizer.h"
 
 
diff --git a/Fit/FitKernel/FitStrategyAdjustParameters.h b/Fit/FitKernel/FitStrategyAdjustParameters.h
index 87850103a65cf1eefdd9a999234378d0eb782f0c..fbc1066f9f6b5062ee12bca8cc1830fc164cce49 100644
--- a/Fit/FitKernel/FitStrategyAdjustParameters.h
+++ b/Fit/FitKernel/FitStrategyAdjustParameters.h
@@ -16,7 +16,7 @@
 #ifndef FITSTRATEGYADJUSTPARAMETERS_H
 #define FITSTRATEGYADJUSTPARAMETERS_H
 
-#include "IFitStrategy.h"
+#include "IFitStrategy.h" // inheriting from
 #include <vector>
 
 //! @class FitStrategyAdjustParameters
diff --git a/Fit/FitKernel/FitSuitePrintObserver.h b/Fit/FitKernel/FitSuitePrintObserver.h
index c8b52bc52b144ec74909d556a673a4851fe01f4c..b844f7c47610eb8cff5a276bf6cbdccdc2066bbf 100644
--- a/Fit/FitKernel/FitSuitePrintObserver.h
+++ b/Fit/FitKernel/FitSuitePrintObserver.h
@@ -16,7 +16,7 @@
 #ifndef FITSUITEPRINTOBSERVER_H
 #define FITSUITEPRINTOBSERVER_H
 
-#include "IFitObserver.h"
+#include "IFitObserver.h" // inheriting from
 #include <boost/date_time/posix_time/posix_time.hpp>
 
 //! @class FitSuitePrintObserver
diff --git a/Fit/FitKernel/IFitObserver.h b/Fit/FitKernel/IFitObserver.h
index 5b817e199badac9ceda0830e0ab18ecd4dde4353..d65ef2b3819b6ac13a6d47db9f7cc96e0ccc302c 100644
--- a/Fit/FitKernel/IFitObserver.h
+++ b/Fit/FitKernel/IFitObserver.h
@@ -16,7 +16,7 @@
 #ifndef IFITOBSERVER_H
 #define IFITOBSERVER_H
 
-#include "IObserver.h"
+#include "IObserver.h" // inheriting from
 class FitSuite;
 
 //! @class IFitObserver
diff --git a/Fit/FitKernel/IFitStrategy.h b/Fit/FitKernel/IFitStrategy.h
index c538549d0e6e5ac9d8672b877dab1ea0084db107..6ba87237a87602aa118737598c733990c4819b28 100644
--- a/Fit/FitKernel/IFitStrategy.h
+++ b/Fit/FitKernel/IFitStrategy.h
@@ -16,7 +16,7 @@
 #ifndef IFITSTRATEGY_H
 #define IFITSTRATEGY_H
 
-#include "INamed.h"
+#include "INamed.h" // inheriting from
 
 class FitKernel;
 
diff --git a/Fit/FitKernel/MinimizerScan.h b/Fit/FitKernel/MinimizerScan.h
index f77c3d451ca0f1d9b9f65ff58cd3f9106d408627..e38a48a1868e6671a55ad83bda988c6bb5803777 100644
--- a/Fit/FitKernel/MinimizerScan.h
+++ b/Fit/FitKernel/MinimizerScan.h
@@ -16,8 +16,8 @@
 #ifndef MINIMIZERSCAN_H
 #define MINIMIZERSCAN_H
 
+#include "IMinimizer.h" // inheriting from
 #include "FitSuiteParameters.h"
-#include "IMinimizer.h"
 #include "OutputData.h"
 
 
diff --git a/Fit/FitKernel/MinimizerTest.h b/Fit/FitKernel/MinimizerTest.h
index 12e575be19d1fe39a72666cfb485a97024f759a0..b7feca9817f6686b38b1d2528b6f12b159c4bce9 100644
--- a/Fit/FitKernel/MinimizerTest.h
+++ b/Fit/FitKernel/MinimizerTest.h
@@ -16,8 +16,8 @@
 #ifndef MINIMIZERTEST_H
 #define MINIMIZERTEST_H
 
+#include "IMinimizer.h" // inheriting from
 #include "FitSuiteParameters.h"
-#include "IMinimizer.h"
 
 
 //! @class MinimizerTest
diff --git a/Fit/FitKernel/ROOTGeneticMinimizer.h b/Fit/FitKernel/ROOTGeneticMinimizer.h
index dababe1a8620aba8c8fc06e5b7487f42e811fbe4..da5fbdbd56588c276816f21e4f4e26d8ed94548c 100644
--- a/Fit/FitKernel/ROOTGeneticMinimizer.h
+++ b/Fit/FitKernel/ROOTGeneticMinimizer.h
@@ -16,8 +16,8 @@
 #ifndef ROOTGENETICMINIMIZER_H
 #define ROOTGENETICMINIMIZER_H
 
+#include "ROOTMinimizer.h" // inheriting from
 #include "Math/GeneticMinimizer.h"
-#include "ROOTMinimizer.h"
 
 //! @class ROOTGeneticMinimizer
 //! @ingroup fitting_internal
diff --git a/Fit/FitKernel/ROOTMinimizer.h b/Fit/FitKernel/ROOTMinimizer.h
index dc95140849f48f151678a51ac46da5e7a334dfbe..406e6149b28334affdbfd505a37c46e52aeedc4e 100644
--- a/Fit/FitKernel/ROOTMinimizer.h
+++ b/Fit/FitKernel/ROOTMinimizer.h
@@ -16,8 +16,8 @@
 #ifndef ROOTMINIMIZER_H
 #define ROOTMINIMIZER_H
 
+#include "IMinimizer.h" // inheriting from
 #include "FitSuiteParameters.h"
-#include "IMinimizer.h"
 
 class ROOTMinimizerChiSquaredFunction;
 class ROOTMinimizerGradientFunction;
diff --git a/Fit/FitKernel/ROOTMinuit2Minimizer.h b/Fit/FitKernel/ROOTMinuit2Minimizer.h
index c97dd52abea79fb3c08cf9bc16eedeb6de068000..249970071d0170db11eaebd6d5ed56c0e5f36b05 100644
--- a/Fit/FitKernel/ROOTMinuit2Minimizer.h
+++ b/Fit/FitKernel/ROOTMinuit2Minimizer.h
@@ -16,8 +16,8 @@
 #ifndef ROOTMINUIT2MINIMIZER_H
 #define ROOTMINUIT2MINIMIZER_H
 
+#include "ROOTMinimizer.h" // inheriting from
 #include "Minuit2/Minuit2Minimizer.h"
-#include "ROOTMinimizer.h"
 
 //! @class ROOTMinuit2Minimizer
 //! @ingroup fitting_internal
diff --git a/Fit/StandardFits/IMinimizerTest.cpp b/Fit/StandardFits/IMinimizerTest.cpp
index ea768047c83702a499dd459b5654f7b2b644299c..3492067901544d239c3aff7ba936499342e54863 100644
--- a/Fit/StandardFits/IMinimizerTest.cpp
+++ b/Fit/StandardFits/IMinimizerTest.cpp
@@ -21,8 +21,8 @@
 #include "SampleBuilderFactory.h"
 #include "SimulationFactory.h"
 #include "Units.h"
-#include <memory>
 #include <boost/format.hpp>
+#include <memory>
 
 IMinimizerTest::TestParameter::TestParameter(
     const std::string& name, double real_value, double start_value)
diff --git a/Fit/StandardFits/IMinimizerTest.h b/Fit/StandardFits/IMinimizerTest.h
index a864d7dacfa41e0bb60d03cc58f8dfa08550cfdf..b8a4ea51d1361b7c4dada6530ed4fb55daeef85a 100644
--- a/Fit/StandardFits/IMinimizerTest.h
+++ b/Fit/StandardFits/IMinimizerTest.h
@@ -16,7 +16,7 @@
 #ifndef IMINIMIZERTEST_H
 #define IMINIMIZERTEST_H
 
-#include "IFunctionalTest.h"
+#include "IFunctionalTest.h" // inheriting from
 #include "OutputData.h"
 #include <memory>
 
diff --git a/Fit/StandardFits/MinimizerTests.h b/Fit/StandardFits/MinimizerTests.h
index 51b6089b6dbcfaf5c42dde203d6a0d95a59eb506..70c07e32d4452759907b19e40af626d3ef7d9e63 100644
--- a/Fit/StandardFits/MinimizerTests.h
+++ b/Fit/StandardFits/MinimizerTests.h
@@ -16,7 +16,7 @@
 #ifndef MINIMIZERTESTS_H
 #define MINIMIZERTESTS_H
 
-#include "IMinimizerTest.h"
+#include "IMinimizerTest.h" // inheriting from
 
 //! basic test of Minuit2/Migrad minimizer
 class Minuit2MigradTest : public IMinimizerTest
diff --git a/Fit/StandardFits/RectDetectorFitTest.h b/Fit/StandardFits/RectDetectorFitTest.h
index 08240b6b35ba940e9ae9212e1c38666a3dbf7e19..dd68501fea3809a7a8018b889da4f27bc3091cea 100644
--- a/Fit/StandardFits/RectDetectorFitTest.h
+++ b/Fit/StandardFits/RectDetectorFitTest.h
@@ -16,7 +16,7 @@
 #ifndef RECTDETECTORFITTEST_H
 #define RECTDETECTORFITTEST_H
 
-#include "IMinimizerTest.h"
+#include "IMinimizerTest.h" // inheriting from
 
 
 //! @class RectDetectorFitTest
diff --git a/Fit/StandardFits/StandardFitsFactory.h b/Fit/StandardFits/StandardFitsFactory.h
index e406ee81b6036275729f90ebc051c92f93962c37..3b8111b93bfd1aba5939512492ea816396bbae65 100644
--- a/Fit/StandardFits/StandardFitsFactory.h
+++ b/Fit/StandardFits/StandardFitsFactory.h
@@ -16,7 +16,7 @@
 #ifndef STANDARDFITSFACTORY_H
 #define STANDARDFITSFACTORY_H
 
-#include "IFactory.h"
+#include "IFactory.h" // inheriting from
 
 class IFunctionalTest;
 
diff --git a/GUI/coregui/Models/AxesItems.h b/GUI/coregui/Models/AxesItems.h
index 9b9858e1609c14480644ac204dd43fcb0336a617..5cabc065f288ca0ea8214c7bed7d9db59e076e0e 100644
--- a/GUI/coregui/Models/AxesItems.h
+++ b/GUI/coregui/Models/AxesItems.h
@@ -17,7 +17,7 @@
 #ifndef AXESITEMS_H
 #define AXESITEMS_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 class BA_CORE_API_  BasicAxisItem : public SessionItem
 {
diff --git a/GUI/coregui/Models/BeamAngleItems.h b/GUI/coregui/Models/BeamAngleItems.h
index a4b2ed54e40aece8f342d31e12a59611761ac70e..3cc0c9f55124acdec099e962e259da87f5dab0ab 100644
--- a/GUI/coregui/Models/BeamAngleItems.h
+++ b/GUI/coregui/Models/BeamAngleItems.h
@@ -17,7 +17,7 @@
 #ifndef BEAMANGLEITEMS_H
 #define BEAMANGLEITEMS_H
 
-#include "BeamDistributionItem.h"
+#include "BeamDistributionItem.h" // inheriting from
 
 class BA_CORE_API_ BeamAzimuthalAngleItem : public BeamDistributionItem
 {
diff --git a/GUI/coregui/Models/BeamItem.h b/GUI/coregui/Models/BeamItem.h
index 1641a0792cb60f7e517948c41dbb08abe1056b80..c56934d482709779671cd9cc98a4b24719ad0f91 100644
--- a/GUI/coregui/Models/BeamItem.h
+++ b/GUI/coregui/Models/BeamItem.h
@@ -17,7 +17,7 @@
 #ifndef BEAMITEM_H
 #define BEAMITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 class BA_CORE_API_ BeamItem : public SessionItem
 {
diff --git a/GUI/coregui/Models/BeamWavelengthItem.h b/GUI/coregui/Models/BeamWavelengthItem.h
index 8d8b87a75240d2ef4935707dea90a2163299d436..c8e797d2d0e7fa296b7746dd40f62a4850a04a3f 100644
--- a/GUI/coregui/Models/BeamWavelengthItem.h
+++ b/GUI/coregui/Models/BeamWavelengthItem.h
@@ -17,7 +17,7 @@
 #ifndef BEAMWAVELENGTHITEM_H
 #define BEAMWAVELENGTHITEM_H
 
-#include "BeamDistributionItem.h"
+#include "BeamDistributionItem.h" // inheriting from
 
 class BA_CORE_API_ BeamWavelengthItem : public BeamDistributionItem
 {
diff --git a/GUI/coregui/Models/DistributionItem.h b/GUI/coregui/Models/DistributionItem.h
index 1fef0691a79e30919333176492c88bf4fb77db08..a06325425e708608283516a004b7b0d05726a044 100644
--- a/GUI/coregui/Models/DistributionItem.h
+++ b/GUI/coregui/Models/DistributionItem.h
@@ -17,7 +17,7 @@
 #ifndef DISTRIBUTIONITEM_H
 #define DISTRIBUTIONITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 
 class IDistribution1D;
diff --git a/GUI/coregui/Models/DocumentModel.h b/GUI/coregui/Models/DocumentModel.h
index 288c41646379b1371f3c47fa40f1521c10e9fdcd..5da559b4218b0f2534c1acde74a6cacb57212dbd 100644
--- a/GUI/coregui/Models/DocumentModel.h
+++ b/GUI/coregui/Models/DocumentModel.h
@@ -17,7 +17,7 @@
 #ifndef DOCUMENTMODEL_H
 #define DOCUMENTMODEL_H
 
-#include "SessionModel.h"
+#include "SessionModel.h" // inheriting from
 
 class SimulationOptionsItem;
 
diff --git a/GUI/coregui/Models/FTDecayFunctionItems.h b/GUI/coregui/Models/FTDecayFunctionItems.h
index df25256a3bc2671dba7c553384aca04c0dab1875..3ab65ab3032e4eef47ce6b1acce5f417ab5cf8f6 100644
--- a/GUI/coregui/Models/FTDecayFunctionItems.h
+++ b/GUI/coregui/Models/FTDecayFunctionItems.h
@@ -18,8 +18,8 @@
 #define FTDECAYFUNCTIONITEMS_H
 
 
+#include "SessionItem.h" // inheriting from
 #include "FTDecayFunctions.h"
-#include "SessionItem.h"
 
 
 class BA_CORE_API_ FTDecayFunction1DItem : public SessionItem
diff --git a/GUI/coregui/Models/FTDistributionItems.h b/GUI/coregui/Models/FTDistributionItems.h
index a465e7ad8c9a3007467909ac43f650ce574ee620..eb0400f176c5632d5565afe266d667c377cc10fa 100644
--- a/GUI/coregui/Models/FTDistributionItems.h
+++ b/GUI/coregui/Models/FTDistributionItems.h
@@ -18,8 +18,8 @@
 #define FTDISTRIBUTIONITEMS_H
 
 
+#include "SessionItem.h" // inheriting from
 #include "FTDistributions.h"
-#include "SessionItem.h"
 
 
 class BA_CORE_API_ FTDistribution1DItem : public SessionItem
diff --git a/GUI/coregui/Models/FitParameterItems.h b/GUI/coregui/Models/FitParameterItems.h
index 1e0ed6f1462a2a9b7be8bd40231939cc8195b1d5..57267f20e0a905697805f1a2baa26babdbd9dd79 100644
--- a/GUI/coregui/Models/FitParameterItems.h
+++ b/GUI/coregui/Models/FitParameterItems.h
@@ -16,7 +16,7 @@
 #ifndef FITPARAMETERITEMS_H
 #define FITPARAMETERITEMS_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 
 //! FitParameterItems is a collection of items to define fit parameters in GUI.
diff --git a/GUI/coregui/Models/FitSuiteItem.h b/GUI/coregui/Models/FitSuiteItem.h
index 195d45c8cfb4e73ba6f84e4a3674aea50b7f5d2d..8b93fcc9ee33e79b759b89c3c5fdbe2607df5b3f 100644
--- a/GUI/coregui/Models/FitSuiteItem.h
+++ b/GUI/coregui/Models/FitSuiteItem.h
@@ -17,7 +17,7 @@
 #ifndef FITSUITEITEM_H
 #define FITSUITEITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 class FitParameterContainerItem;
 class MinimizerContainerItem;
diff --git a/GUI/coregui/Models/FormFactorItems.h b/GUI/coregui/Models/FormFactorItems.h
index aef4c6de83926417c6a9daa892289988bec4c9c4..fcfb7b6c568f6acfe886e94867c73958b716b59d 100644
--- a/GUI/coregui/Models/FormFactorItems.h
+++ b/GUI/coregui/Models/FormFactorItems.h
@@ -17,7 +17,7 @@
 #ifndef FORMFACTORITEMS_H
 #define FORMFACTORITEMS_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 
 class IFormFactor;
diff --git a/GUI/coregui/Models/GUIObjectBuilder.cpp b/GUI/coregui/Models/GUIObjectBuilder.cpp
index 0132fc95a3ce831a0a26d8d635ee348095d9e752..2b732792686fb44217b6f89fbc3da71e985bed4b 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.cpp
+++ b/GUI/coregui/Models/GUIObjectBuilder.cpp
@@ -47,8 +47,8 @@
 #include "SphericalDetector.h"
 #include "TransformFromDomain.h"
 #include "TransformationItem.h"
-#include "VectorItem.h"
 #include "Units.h"
+#include "VectorItem.h"
 #include <QDebug>
 
 GUIObjectBuilder::GUIObjectBuilder()
diff --git a/GUI/coregui/Models/GUIObjectBuilder.h b/GUI/coregui/Models/GUIObjectBuilder.h
index c4094dba9af3186763a38efed764d588058806fc..8efde7995b4d551073c7e47512737ccf5a6aefcb 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.h
+++ b/GUI/coregui/Models/GUIObjectBuilder.h
@@ -17,7 +17,7 @@
 #ifndef GUIOBJECTBUILDER_H
 #define GUIOBJECTBUILDER_H
 
-#include "ISampleVisitor.h"
+#include "ISampleVisitor.h" // inheriting from
 #include "MaterialProperty.h"
 
 class IMaterial;
diff --git a/GUI/coregui/Models/GroupItem.h b/GUI/coregui/Models/GroupItem.h
index d20cb6ce6a93f5aafb85c01eaf8a1fe8f37d8520..993f7787be658bc07068371d57d0ff9d3e4e2a0c 100644
--- a/GUI/coregui/Models/GroupItem.h
+++ b/GUI/coregui/Models/GroupItem.h
@@ -17,8 +17,8 @@
 #ifndef GROUPITEM_H
 #define GROUPITEM_H
 
+#include "SessionItem.h" // inheriting from
 #include "GroupProperty.h"
-#include "SessionItem.h"
 
 class BA_CORE_API_ GroupItem : public SessionItem
 {
diff --git a/GUI/coregui/Models/InstrumentItem.h b/GUI/coregui/Models/InstrumentItem.h
index 5723aa6ee78ba97c30b96c59e4ed23b579d6d7f0..9db97fda9fddfbe466d690137e04b7a7829312c2 100644
--- a/GUI/coregui/Models/InstrumentItem.h
+++ b/GUI/coregui/Models/InstrumentItem.h
@@ -17,7 +17,7 @@
 #ifndef INSTRUMENTITEM_H
 #define INSTRUMENTITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 class BeamItem;
 class DetectorItem;
diff --git a/GUI/coregui/Models/InstrumentModel.h b/GUI/coregui/Models/InstrumentModel.h
index 628771568b24e58d902571f23a06335aafd2158b..8cd0f5f6da1cf006c58997e280b38ce867ca453d 100644
--- a/GUI/coregui/Models/InstrumentModel.h
+++ b/GUI/coregui/Models/InstrumentModel.h
@@ -17,7 +17,7 @@
 #ifndef INSTRUMENTMODEL_H
 #define INSTRUMENTMODEL_H
 
-#include "SessionModel.h"
+#include "SessionModel.h" // inheriting from
 
 class InstrumentItem;
 
diff --git a/GUI/coregui/Models/IntensityDataItem.h b/GUI/coregui/Models/IntensityDataItem.h
index 6b8daba3b9667e14d37635241e8607d1ef2e3a16..18f3e1f9f87f3e64ae26756c266b7cad17e5de26 100644
--- a/GUI/coregui/Models/IntensityDataItem.h
+++ b/GUI/coregui/Models/IntensityDataItem.h
@@ -17,8 +17,8 @@
 #ifndef INTENSITYDATAITEM_H
 #define INTENSITYDATAITEM_H
 
+#include "SessionItem.h" // inheriting from
 #include "IDetector2D.h"
-#include "SessionItem.h"
 
 class BasicAxisItem;
 
diff --git a/GUI/coregui/Models/InterferenceFunctionItems.h b/GUI/coregui/Models/InterferenceFunctionItems.h
index 8ffefffcee578c446c7f4f1795a4e624a30d805b..6020567dfe835cc4b4ef1ccf4fabe42b13f43a59 100644
--- a/GUI/coregui/Models/InterferenceFunctionItems.h
+++ b/GUI/coregui/Models/InterferenceFunctionItems.h
@@ -17,7 +17,7 @@
 #ifndef INTERFERENCEFUNCTIONITEMS_H
 #define INTERFERENCEFUNCTIONITEMS_H
 
-#include "SessionGraphicsItem.h"
+#include "SessionGraphicsItem.h" // inheriting from
 
 
 class BA_CORE_API_ InterferenceFunctionRadialParaCrystalItem : public SessionGraphicsItem
diff --git a/GUI/coregui/Models/JobItem.h b/GUI/coregui/Models/JobItem.h
index 7aa144fa2a6473227b58443b7749ca008f409bb4..e9ce7109c7390fe1af1d7f05dd152cf02fea0f58 100644
--- a/GUI/coregui/Models/JobItem.h
+++ b/GUI/coregui/Models/JobItem.h
@@ -17,7 +17,7 @@
 #ifndef JOBITEM_H
 #define JOBITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 class IntensityDataItem;
 class GISASSimulation;
 class MultiLayerItem;
diff --git a/GUI/coregui/Models/JobModel.h b/GUI/coregui/Models/JobModel.h
index dc1ef91e54c6b5fadc0a77765727d4c5165fbb2c..f452b564cf913c47b6f75ba2b7a1902ba476130c 100644
--- a/GUI/coregui/Models/JobModel.h
+++ b/GUI/coregui/Models/JobModel.h
@@ -16,7 +16,7 @@
 #ifndef JOBMODEL_H
 #define JOBMODEL_H
 
-#include "SessionModel.h"
+#include "SessionModel.h" // inheriting from
 class JobQueueData;
 class JobItem;
 class MultiLayerItem;
diff --git a/GUI/coregui/Models/LatticeTypeItems.h b/GUI/coregui/Models/LatticeTypeItems.h
index 5829382a146201f6ee9ce32c0baf0379333caf97..215eff61c1d775ce647016ad4d180c18b7a1f315 100644
--- a/GUI/coregui/Models/LatticeTypeItems.h
+++ b/GUI/coregui/Models/LatticeTypeItems.h
@@ -17,7 +17,7 @@
 #ifndef LATTICETYPEITEMS_H
 #define LATTICETYPEITEMS_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 class BA_CORE_API_ BasicLatticeTypeItem : public SessionItem
 {
diff --git a/GUI/coregui/Models/LayerItem.h b/GUI/coregui/Models/LayerItem.h
index a56e429b63fba18fab02aabf9d4d8888b9ff3064..0505cf24531cb5aa11be4cc37d70dec7f308102d 100644
--- a/GUI/coregui/Models/LayerItem.h
+++ b/GUI/coregui/Models/LayerItem.h
@@ -17,7 +17,7 @@
 #ifndef LAYERITEM_H
 #define LAYERITEM_H
 
-#include "SessionGraphicsItem.h"
+#include "SessionGraphicsItem.h" // inheriting from
 
 class BA_CORE_API_ LayerItem : public SessionGraphicsItem
 {
diff --git a/GUI/coregui/Models/LayerRoughnessItems.h b/GUI/coregui/Models/LayerRoughnessItems.h
index 6c63fae755c2c05a3d2794f5c7f3a4285a22d200..3d0c6beab06d6695331aa3e1f8456e6d22c1f648 100644
--- a/GUI/coregui/Models/LayerRoughnessItems.h
+++ b/GUI/coregui/Models/LayerRoughnessItems.h
@@ -18,7 +18,7 @@
 #define LAYERROUGHNESSITEMS_H
 
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 class BA_CORE_API_ LayerZeroRoughnessItem : public SessionItem
 {
diff --git a/GUI/coregui/Models/MagneticFieldItem.h b/GUI/coregui/Models/MagneticFieldItem.h
index ce322edc286684ae5e49c9aeb49e658acc679e90..5574435640ca1287e6fbf6cb53371770c682a3aa 100644
--- a/GUI/coregui/Models/MagneticFieldItem.h
+++ b/GUI/coregui/Models/MagneticFieldItem.h
@@ -18,7 +18,7 @@
 #define MAGNETICFIELDITEM_H
 
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 class BA_CORE_API_ MagneticFieldItem : public SessionItem
 {
diff --git a/GUI/coregui/Models/MaskItems.h b/GUI/coregui/Models/MaskItems.h
index df96cacbb1b7614b89aaf5cb6c296ef519670195..1e9ad799ef956b46a9a100d7d1b41245f28c77c8 100644
--- a/GUI/coregui/Models/MaskItems.h
+++ b/GUI/coregui/Models/MaskItems.h
@@ -17,7 +17,7 @@
 #ifndef MASKITEMS_H
 #define MASKITEMS_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 namespace Geometry {
 class IShape2D;
diff --git a/GUI/coregui/Models/MaskModel.h b/GUI/coregui/Models/MaskModel.h
index bd9c3f7b7b9acfc13ab8a4066156ceb0c5a35046..91ea24ce1c3c8980231b9a9acf7b713b8a140ccb 100644
--- a/GUI/coregui/Models/MaskModel.h
+++ b/GUI/coregui/Models/MaskModel.h
@@ -17,7 +17,7 @@
 #ifndef MASKMODEL_H
 #define MASKMODEL_H
 
-#include "SessionModel.h"
+#include "SessionModel.h" // inheriting from
 
 class BA_CORE_API_ MaskModel : public SessionModel
 {
diff --git a/GUI/coregui/Models/MaterialItem.h b/GUI/coregui/Models/MaterialItem.h
index af048285e37d2fd1274c1aa0e88b40c70322230e..893064937ac6e15a5c318dce8af5b6061e6d3ad2 100644
--- a/GUI/coregui/Models/MaterialItem.h
+++ b/GUI/coregui/Models/MaterialItem.h
@@ -17,7 +17,7 @@
 #ifndef MATERIALITEM_H
 #define MATERIALITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 class IMaterial;
 
diff --git a/GUI/coregui/Models/MaterialModel.h b/GUI/coregui/Models/MaterialModel.h
index a1d82c16990bfc332595468c004a693406349904..031c01bc7ad81021e94a05aa7520063bec2bac72 100644
--- a/GUI/coregui/Models/MaterialModel.h
+++ b/GUI/coregui/Models/MaterialModel.h
@@ -17,7 +17,7 @@
 #ifndef MATERIALMODEL_H
 #define MATERIALMODEL_H
 
-#include "SessionModel.h"
+#include "SessionModel.h" // inheriting from
 
 class MaterialItem;
 class MaterialProperty;
diff --git a/GUI/coregui/Models/MinimizerItem.h b/GUI/coregui/Models/MinimizerItem.h
index 6626dceaf21092f6a6cdad3f75d6603748d80613..20adda1a3ece2329919df3c6c0e7dbcf5fd93577 100644
--- a/GUI/coregui/Models/MinimizerItem.h
+++ b/GUI/coregui/Models/MinimizerItem.h
@@ -17,7 +17,7 @@
 #ifndef MINIMIZERITEM_H
 #define MINIMIZERITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 class IMinimizer;
 
diff --git a/GUI/coregui/Models/MultiLayerItem.h b/GUI/coregui/Models/MultiLayerItem.h
index c44c372ba3ce4388582a19ad8562b1b64cd4c853..2c61ab96170c40d5bf09efdb88175c4a11a919d4 100644
--- a/GUI/coregui/Models/MultiLayerItem.h
+++ b/GUI/coregui/Models/MultiLayerItem.h
@@ -17,7 +17,7 @@
 #ifndef MULTILAYERITEM_H
 #define MULTILAYERITEM_H
 
-#include "SessionGraphicsItem.h"
+#include "SessionGraphicsItem.h" // inheriting from
 
 class BA_CORE_API_ MultiLayerItem : public SessionGraphicsItem
 {
diff --git a/GUI/coregui/Models/ParameterTreeItems.h b/GUI/coregui/Models/ParameterTreeItems.h
index 3f5d1494b4e4252f174190bf7de7bc61af63d5d0..ecc24b40972ed519777a61550d99cc3c5d23411a 100644
--- a/GUI/coregui/Models/ParameterTreeItems.h
+++ b/GUI/coregui/Models/ParameterTreeItems.h
@@ -17,7 +17,7 @@
 #ifndef PARAMETERTREEITEMS_H
 #define PARAMETERTREEITEMS_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 //! ParameterTreeItems is a collection of items necessary to form a tuning tree for
 //! real time widget.
diff --git a/GUI/coregui/Models/ParameterTuningModel.h b/GUI/coregui/Models/ParameterTuningModel.h
index 429904c8a3ff4c419ed0702b448fa83b22af1eb9..06dd943715e3c4a2597c4b9bbdfaeb5bedf181ee 100644
--- a/GUI/coregui/Models/ParameterTuningModel.h
+++ b/GUI/coregui/Models/ParameterTuningModel.h
@@ -17,7 +17,7 @@
 #ifndef PARAMETERTUNINGMODEL_H
 #define PARAMETERTUNINGMODEL_H
 
-#include "FilterPropertyProxy.h"
+#include "FilterPropertyProxy.h" // inheriting from
 
 class ParameterItem;
 
diff --git a/GUI/coregui/Models/ParticleCompositionItem.h b/GUI/coregui/Models/ParticleCompositionItem.h
index 47b96aa8186e3269dc7f1bdef5fd3a8b0706b919..ba2b847bdf7fbb79c2f82c98e21fe268e1948f1f 100644
--- a/GUI/coregui/Models/ParticleCompositionItem.h
+++ b/GUI/coregui/Models/ParticleCompositionItem.h
@@ -17,8 +17,8 @@
 #ifndef PARTICLECOMPOSITIONITEM_H
 #define PARTICLECOMPOSITIONITEM_H
 
+#include "SessionGraphicsItem.h" // inheriting from
 #include "ParticleComposition.h"
-#include "SessionGraphicsItem.h"
 
 
 class BA_CORE_API_ ParticleCompositionItem : public SessionGraphicsItem
diff --git a/GUI/coregui/Models/ParticleCoreShellItem.h b/GUI/coregui/Models/ParticleCoreShellItem.h
index 3f866a65158108ceab4bb70f1abddbe80da645a5..57b6e7919a0b9f43032173381bc06bb6b591182d 100644
--- a/GUI/coregui/Models/ParticleCoreShellItem.h
+++ b/GUI/coregui/Models/ParticleCoreShellItem.h
@@ -17,8 +17,8 @@
 #ifndef PARTICLECORESHELLITEM_H
 #define PARTICLECORESHELLITEM_H
 
+#include "SessionGraphicsItem.h" // inheriting from
 #include "ParticleCoreShell.h"
-#include "SessionGraphicsItem.h"
 
 
 class BA_CORE_API_ ParticleCoreShellItem : public SessionGraphicsItem
diff --git a/GUI/coregui/Models/ParticleDistributionItem.h b/GUI/coregui/Models/ParticleDistributionItem.h
index 9279ed8cdaec31ca2fc74a63f7a148e9b125ad87..9b197bc04d02b0d084eaf79210dfc7245749ebe7 100644
--- a/GUI/coregui/Models/ParticleDistributionItem.h
+++ b/GUI/coregui/Models/ParticleDistributionItem.h
@@ -17,8 +17,8 @@
 #ifndef PARTICLEDISTRIBUTIONITEM_H
 #define PARTICLEDISTRIBUTIONITEM_H
 
+#include "SessionGraphicsItem.h" // inheriting from
 #include "ParticleDistribution.h"
-#include "SessionGraphicsItem.h"
 
 
 
diff --git a/GUI/coregui/Models/ParticleItem.h b/GUI/coregui/Models/ParticleItem.h
index 7acf515ac17f5d087e3b1d73f48c3f0978a8f8a2..cb87d3f2362532dac6bcfda59c505ed435dc5a99 100644
--- a/GUI/coregui/Models/ParticleItem.h
+++ b/GUI/coregui/Models/ParticleItem.h
@@ -17,8 +17,8 @@
 #ifndef PARTICLEITEM_H
 #define PARTICLEITEM_H
 
+#include "SessionGraphicsItem.h" // inheriting from
 #include "Particle.h"
-#include "SessionGraphicsItem.h"
 
 
 class BA_CORE_API_ ParticleItem : public SessionGraphicsItem
diff --git a/GUI/coregui/Models/ParticleLayoutItem.h b/GUI/coregui/Models/ParticleLayoutItem.h
index 0ba4c8fb87cc103d296acbd71a328a04e1e1e508..a4ca92411ec5eb88b2e0add52678defe2a82a8ea 100644
--- a/GUI/coregui/Models/ParticleLayoutItem.h
+++ b/GUI/coregui/Models/ParticleLayoutItem.h
@@ -17,7 +17,7 @@
 #ifndef PARTICLELAYOUTITEM_H
 #define PARTICLELAYOUTITEM_H
 
-#include "SessionGraphicsItem.h"
+#include "SessionGraphicsItem.h" // inheriting from
 
 class BA_CORE_API_ ParticleLayoutItem : public SessionGraphicsItem
 {
diff --git a/GUI/coregui/Models/PropertyItem.h b/GUI/coregui/Models/PropertyItem.h
index 49a8969dc8d79476954cc6c2c84e2034c31ef562..27ad175640cb11ddb5bb97befb6654396a479d78 100644
--- a/GUI/coregui/Models/PropertyItem.h
+++ b/GUI/coregui/Models/PropertyItem.h
@@ -17,7 +17,7 @@
 #ifndef PROPERTYITEM_H
 #define PROPERTYITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 class BA_CORE_API_ PropertyItem : public SessionItem
 {
diff --git a/GUI/coregui/Models/RealDataItem.h b/GUI/coregui/Models/RealDataItem.h
index 21c479fa3c9ef25c18e9521752ef9e6a44f1d4bc..4dc3d15dbd9dad472d75b4ce8d1f2d50ed3fc832 100644
--- a/GUI/coregui/Models/RealDataItem.h
+++ b/GUI/coregui/Models/RealDataItem.h
@@ -17,7 +17,7 @@
 #ifndef REALDATAITEM_H
 #define REALDATAITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 class IntensityDataItem;
 
diff --git a/GUI/coregui/Models/RealDataModel.h b/GUI/coregui/Models/RealDataModel.h
index 92de3dcb2a5796c01757841f5b70655c32103a73..7208f7abbe345b9289d300d95c0361978bde7096 100644
--- a/GUI/coregui/Models/RealDataModel.h
+++ b/GUI/coregui/Models/RealDataModel.h
@@ -17,7 +17,7 @@
 #ifndef REALDATAMODEL_H
 #define REALDATAMODEL_H
 
-#include "SessionModel.h"
+#include "SessionModel.h" // inheriting from
 
 //! The RealDataModel class is a model to store all imported RealDataItem's.
 
diff --git a/GUI/coregui/Models/RectangularDetectorItem.h b/GUI/coregui/Models/RectangularDetectorItem.h
index 09237fc8aeb466face4f84e4acc6afc9f2125c18..0abc0257f6e4f0471665139090feee699c131edf 100644
--- a/GUI/coregui/Models/RectangularDetectorItem.h
+++ b/GUI/coregui/Models/RectangularDetectorItem.h
@@ -17,7 +17,7 @@
 #ifndef RECTANGULARDETECTORITEM_H
 #define RECTANGULARDETECTORITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 #include "Vectors3D.h"
 
 class IDetector2D;
diff --git a/GUI/coregui/Models/RefractiveIndexItem.h b/GUI/coregui/Models/RefractiveIndexItem.h
index 571a7033cf9c0c9c7176a06312b702436fdab825..866db9f028e05fd51ab0c4f0e2d5c1ac0d0a225b 100644
--- a/GUI/coregui/Models/RefractiveIndexItem.h
+++ b/GUI/coregui/Models/RefractiveIndexItem.h
@@ -17,7 +17,7 @@
 #ifndef REFRACTIVEINDEXITEM_H
 #define REFRACTIVEINDEXITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 class BA_CORE_API_ RefractiveIndexItem : public SessionItem
 {
diff --git a/GUI/coregui/Models/ResolutionFunctionItems.h b/GUI/coregui/Models/ResolutionFunctionItems.h
index 263c248f4e4acb9dc434355ac73d35a6695ba03c..e2c40c9998a6409754481529ce2fe33956604712 100644
--- a/GUI/coregui/Models/ResolutionFunctionItems.h
+++ b/GUI/coregui/Models/ResolutionFunctionItems.h
@@ -17,8 +17,8 @@
 #ifndef RESOLUTIONFUNCTIONITEMS_H
 #define RESOLUTIONFUNCTIONITEMS_H
 
+#include "SessionItem.h" // inheriting from
 #include "ResolutionFunction2DGaussian.h"
-#include "SessionItem.h"
 
 
 class BA_CORE_API_ ResolutionFunctionItem : public SessionItem
diff --git a/GUI/coregui/Models/RotationItems.h b/GUI/coregui/Models/RotationItems.h
index d92b371fb1c3a63e61f201ee343c95e2ac56ae23..2c6d34838c4716462846174eb41338be8c3cdcd0 100644
--- a/GUI/coregui/Models/RotationItems.h
+++ b/GUI/coregui/Models/RotationItems.h
@@ -17,8 +17,8 @@
 #ifndef ROTATIONITEMS_H
 #define ROTATIONITEMS_H
 
+#include "SessionItem.h" // inheriting from
 #include "Rotations.h"
-#include "SessionItem.h"
 
 class RotationItem : public SessionItem
 {
diff --git a/GUI/coregui/Models/SampleModel.h b/GUI/coregui/Models/SampleModel.h
index 017bd9d8d42dfdf73002e3f3e3229cf505a34516..229c107141adc911f187e38533c6ddf7fc465421 100644
--- a/GUI/coregui/Models/SampleModel.h
+++ b/GUI/coregui/Models/SampleModel.h
@@ -17,7 +17,7 @@
 #ifndef SAMPLEMODEL_H
 #define SAMPLEMODEL_H
 
-#include "SessionModel.h"
+#include "SessionModel.h" // inheriting from
 
 class MultiLayerItem;
 class BA_CORE_API_ SampleModel : public SessionModel
diff --git a/GUI/coregui/Models/SessionGraphicsItem.h b/GUI/coregui/Models/SessionGraphicsItem.h
index 07a0f99e699e10c96822050e0005808fcbba1486..ae1c54dd660e567f3e3d2bbe0e7f0c2e1bb6ecc2 100644
--- a/GUI/coregui/Models/SessionGraphicsItem.h
+++ b/GUI/coregui/Models/SessionGraphicsItem.h
@@ -17,7 +17,7 @@
 #ifndef SESSIONGRAPHICSITEM_H
 #define SESSIONGRAPHICSITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 class BA_CORE_API_ SessionGraphicsItem : public SessionItem
 {
diff --git a/GUI/coregui/Models/SessionModel.h b/GUI/coregui/Models/SessionModel.h
index cae9cbfcb1fb178dfbe2c9e9a7897fe846c1d8d0..f405cf499b0ed2a0672e42218752cdaaf388704f 100644
--- a/GUI/coregui/Models/SessionModel.h
+++ b/GUI/coregui/Models/SessionModel.h
@@ -19,8 +19,8 @@
 
 #include "SessionItem.h"
 #include "SessionXML.h"
-#include <QtCore/QXmlStreamWriter>
 #include <QStringList>
+#include <QtCore/QXmlStreamWriter>
 
 class IconProvider;
 
diff --git a/GUI/coregui/Models/SimulationOptionsItem.h b/GUI/coregui/Models/SimulationOptionsItem.h
index ac244affffe2d4584dca170f4cffc608d652be38..79f8767ff3b7cbff86505762343d8fb969cedfb5 100644
--- a/GUI/coregui/Models/SimulationOptionsItem.h
+++ b/GUI/coregui/Models/SimulationOptionsItem.h
@@ -17,7 +17,7 @@
 #ifndef SIMULATIONOPTIONSITEM_H
 #define SIMULATIONOPTIONSITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 //! The SimulationOptionsItem class holds simulation status (run policy, number of threads,
 //! integration flag). Used in SimulationView to define job settings. When job is started,
diff --git a/GUI/coregui/Models/SphericalDetectorItem.h b/GUI/coregui/Models/SphericalDetectorItem.h
index 50a0202e6d8bf7f81bf1247254fd38bfe7fa8fe9..d5ef5beedaae5d76526c0ba28739cd3fd2e4f797 100644
--- a/GUI/coregui/Models/SphericalDetectorItem.h
+++ b/GUI/coregui/Models/SphericalDetectorItem.h
@@ -17,7 +17,7 @@
 #ifndef SPHERICALDETECTORITEM_H
 #define SPHERICALDETECTORITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 class IDetector2D;
 class IResolutionFunction2D;
diff --git a/GUI/coregui/Models/TestItem.h b/GUI/coregui/Models/TestItem.h
index ac82b2030262d668ae51166318f759c5015c268c..cd05c0d353b9e42a1685906702dcc947b205bb15 100644
--- a/GUI/coregui/Models/TestItem.h
+++ b/GUI/coregui/Models/TestItem.h
@@ -17,7 +17,7 @@
 #ifndef TESTITEM_H
 #define TESTITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 
 //! The TestItem class for TestSessionItem unit tests and for checking AwesomePropertyEditor machinery
 class BA_CORE_API_ TestItem : public SessionItem
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index 1c315387aa2ed0bed61ac767b87388b1d52d3c04..20a99c40bda12fa894596e7c32d72535827f3d73 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -46,8 +46,8 @@
 #include "RectangularDetector.h"
 #include "ResolutionFunctionItems.h"
 #include "SphericalDetector.h"
-#include "VectorItem.h"
 #include "Units.h"
+#include "VectorItem.h"
 #include <QDebug>
 
 using namespace BornAgain;
diff --git a/GUI/coregui/Models/TransformToDomain.cpp b/GUI/coregui/Models/TransformToDomain.cpp
index ef033229ad683bb0a9d3bfdd66f493092eaddeac..efd650cd84869afec2841d6a59d726a8f0324572 100644
--- a/GUI/coregui/Models/TransformToDomain.cpp
+++ b/GUI/coregui/Models/TransformToDomain.cpp
@@ -45,8 +45,8 @@
 #include "RotationItems.h"
 #include "SimulationOptionsItem.h"
 #include "TransformationItem.h"
-#include "VectorItem.h"
 #include "Units.h"
+#include "VectorItem.h"
 
 using namespace BornAgain;
 
diff --git a/GUI/coregui/Models/TransformationItem.h b/GUI/coregui/Models/TransformationItem.h
index 129327180e1a7ef166c147a67ede7434fcb8260b..8f31ff1e4ab9d1cf5ecc21b0c9391ea3b9677d06 100644
--- a/GUI/coregui/Models/TransformationItem.h
+++ b/GUI/coregui/Models/TransformationItem.h
@@ -17,7 +17,7 @@
 #ifndef TRANSFORMATIONITEM_H
 #define TRANSFORMATIONITEM_H
 
-#include "SessionGraphicsItem.h"
+#include "SessionGraphicsItem.h" // inheriting from
 
 class TransformationItem : public SessionGraphicsItem
 {
diff --git a/GUI/coregui/Models/VectorItem.h b/GUI/coregui/Models/VectorItem.h
index 4842b74c78a54791db8f31701d2b3967cdfc1832..33e6b18183db8a34cdfccb9c8d86549525a1ddf9 100644
--- a/GUI/coregui/Models/VectorItem.h
+++ b/GUI/coregui/Models/VectorItem.h
@@ -17,7 +17,7 @@
 #ifndef VECTORITEM_H
 #define VECTORITEM_H
 
-#include "SessionItem.h"
+#include "SessionItem.h" // inheriting from
 #include "Vectors3D.h"
 
 class BA_CORE_API_  VectorItem : public SessionItem
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.h b/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.h
index 48f59f68018fefb188f5c4ff534ff22384870343..ecb0d1882c7fe42b4e22938bec2760b75bb7402d 100644
--- a/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.h
+++ b/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.h
@@ -17,7 +17,7 @@
 #ifndef INFOPANELTOOLBAR_H
 #define INFOPANELTOOLBAR_H
 
-#include "StyledToolBar.h"
+#include "StyledToolBar.h" // inheriting from
 
 class QToolButton;
 
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h b/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h
index 35d927d31f1f74bcf08426649cb996115bf6ad9a..dae67de2681cc7d933bc44bc9cee26963257ba8a 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h
@@ -17,7 +17,7 @@
 #ifndef ITEMCOMBOTOOLBAR_H
 #define ITEMCOMBOTOOLBAR_H
 
-#include "StyledToolBar.h"
+#include "StyledToolBar.h" // inheriting from
 #include <QList>
 
 class QAction;
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h b/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
index a30a11accbdd091d32bece9747c04a288f0e65bd..8890dce683f2fcaa65ed8d92f0f3271672023f9d 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
@@ -17,7 +17,7 @@
 #ifndef ITEMSTACKPRESENTER_H
 #define ITEMSTACKPRESENTER_H
 
-#include "ItemStackWidget.h"
+#include "ItemStackWidget.h" // inheriting from
 #include <QDebug>
 #include <QMap>
 #include <QStackedWidget>
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h
index b2c36b7378cead35ed89c77f65208f7d8e2f3a53..fcc5d8e6a2bd13b712b41fa33c03d5e64f7ee3be 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h
@@ -17,7 +17,7 @@
 #ifndef FITCOMPARISONWIDGET_H
 #define FITCOMPARISONWIDGET_H
 
-#include "SessionItemWidget.h"
+#include "SessionItemWidget.h" // inheriting from
 #include <QMap>
 
 class JobItem;
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.h b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.h
index e48a8c50ce44063fbb60962e99e530396b59e779..f65717ce5edcb85ab6ccbcbf5b5736880e13317b 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.h
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.h
@@ -17,7 +17,7 @@
 #ifndef IMPORTDATATOOLBAR_H
 #define IMPORTDATATOOLBAR_H
 
-#include "StyledToolBar.h"
+#include "StyledToolBar.h" // inheriting from
 
 class QAction;
 class RealDataModel;
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h
index a544b9be0a4430d141c35122f0b9a24c30b9cbd2..249dc18e2a6141092e78495bdeddedcfc4463c2a 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h
@@ -17,7 +17,7 @@
 #ifndef REALDATAEDITORWIDGET_H
 #define REALDATAEDITORWIDGET_H
 
-#include "SessionItemWidget.h"
+#include "SessionItemWidget.h" // inheriting from
 
 class SessionItem;
 class IntensityDataWidget;
diff --git a/GUI/coregui/Views/InfoWidgets/InfoToolBar.h b/GUI/coregui/Views/InfoWidgets/InfoToolBar.h
index e7c1c1bc03e5a712edf59b55edf8f77be3e984dd..26e834333e17f738bc16a1ac51de27d5c77acbe7 100644
--- a/GUI/coregui/Views/InfoWidgets/InfoToolBar.h
+++ b/GUI/coregui/Views/InfoWidgets/InfoToolBar.h
@@ -17,7 +17,7 @@
 #ifndef INFOTOOLBAR_H
 #define INFOTOOLBAR_H
 
-#include "StyledToolBar.h"
+#include "StyledToolBar.h" // inheriting from
 
 class QToolButton;
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.h
index 79e26f48e99f9c780a7ae5fc64815368e86ae3f4..7efb18a285c571f87951b86e20fd123e4595de05 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.h
@@ -17,7 +17,7 @@
 #ifndef COLORMAPLABEL_H
 #define COLORMAPLABEL_H
 
-#include "StatusLabel.h"
+#include "StatusLabel.h" // inheriting from
 #include <QList>
 
 class ColorMap;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
index 7cf466b0cae037fe84b8592ca03968742731cd09..4a40c3bda7d13a42e9b03baf645b916221a23318 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
@@ -17,7 +17,7 @@
 #ifndef INTENSITYDATAPROPERTYWIDGET_H
 #define INTENSITYDATAPROPERTYWIDGET_H
 
-#include "SessionItemWidget.h"
+#include "SessionItemWidget.h" // inheriting from
 
 class JobModel;
 class IntensityDataItem;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
index ad9dc71f53671d39c1bb5598634e877343dfafb3..3bb9479d5763d774d984ef52fc42851f2132affa 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
@@ -17,7 +17,7 @@
 #ifndef INTENSITYDATAWIDGET_H
 #define INTENSITYDATAWIDGET_H
 
-#include "SessionItemWidget.h"
+#include "SessionItemWidget.h" // inheriting from
 
 class SessionItem;
 class IntensityDataItem;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.h b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.h
index ae66c88533a19556c0eb89a3aae9624a3cefa534..03de6223a1314c48abb03b0405a4f37bd8c78244 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.h
@@ -17,7 +17,7 @@
 #ifndef OBSOLETEINTENSITYDATAWIDGET_H
 #define OBSOLETEINTENSITYDATAWIDGET_H
 
-#include "SessionItemWidget.h"
+#include "SessionItemWidget.h" // inheriting from
 
 class IntensityDataItem;
 class ObsoleteIntensityDataWidgetActions;
diff --git a/GUI/coregui/Views/JobWidgets/JobMessagePanel.h b/GUI/coregui/Views/JobWidgets/JobMessagePanel.h
index b0d34cfc34fd94e149d56f2b5cbd57d37e68bfcf..0923cbfd2287f6b5f271d9dde8091c96ab1e324b 100644
--- a/GUI/coregui/Views/JobWidgets/JobMessagePanel.h
+++ b/GUI/coregui/Views/JobWidgets/JobMessagePanel.h
@@ -17,7 +17,7 @@
 #ifndef JOBMESSAGEPANEL_H
 #define JOBMESSAGEPANEL_H
 
-#include "InfoPanel.h"
+#include "InfoPanel.h" // inheriting from
 #include <QColor>
 
 class QTextEdit;
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h
index f3bd7a2eecf800d3481311200630b58062394835..9b20f27a8c7f3d4587cfcd256c7afe437648e21e 100644
--- a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h
+++ b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h
@@ -17,7 +17,7 @@
 #ifndef JOBREALTIMETOOLBAR_H
 #define JOBREALTIMETOOLBAR_H
 
-#include "StyledToolBar.h"
+#include "StyledToolBar.h" // inheriting from
 
 //! The JobRealTimeToolBar class represents a toolbar with buttons for JobRealTimeWidget.
 
diff --git a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.h b/GUI/coregui/Views/JobWidgets/JobResultsPresenter.h
index 03570eff03cf96a2a4a155bbdbf13acc17937d0d..362cc9ea1db81f24febfba95290e0c193d358d5d 100644
--- a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.h
+++ b/GUI/coregui/Views/JobWidgets/JobResultsPresenter.h
@@ -17,7 +17,7 @@
 #ifndef JOBRESULTSPRESENTER_H
 #define JOBRESULTSPRESENTER_H
 
-#include "ItemComboWidget.h"
+#include "ItemComboWidget.h" // inheriting from
 
 //! The JobResultsPresenter class is a widget which is able to present results of job (JobItem)
 //! using stack of different widgets and combo box in the right top corner of JobView, to switch
diff --git a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h
index d5cfdb0184859f6c60c658ee8fc4ce5ac09343bd..ec8ff7e7e36889629f8486ea1ad6099939432196 100644
--- a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h
+++ b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h
@@ -17,7 +17,7 @@
 #ifndef COLORMAPSCENEADAPTOR_H
 #define COLORMAPSCENEADAPTOR_H
 
-#include "ISceneAdaptor.h"
+#include "ISceneAdaptor.h" // inheriting from
 
 class ColorMapPlot;
 
diff --git a/GUI/coregui/Views/MaskWidgets/EllipseView.h b/GUI/coregui/Views/MaskWidgets/EllipseView.h
index a62e6e842b90fb4f28c0975ed24e804e5de89a8e..2ce37eb8d9414463790aa17a5559ac24ae00731b 100644
--- a/GUI/coregui/Views/MaskWidgets/EllipseView.h
+++ b/GUI/coregui/Views/MaskWidgets/EllipseView.h
@@ -17,7 +17,7 @@
 #ifndef ELLIPSEVIEW_H
 #define ELLIPSEVIEW_H
 
-#include "IMaskView.h"
+#include "IMaskView.h" // inheriting from
 #include "SizeHandleElement.h"
 #include <QMap>
 
diff --git a/GUI/coregui/Views/MaskWidgets/IntensityDataView.h b/GUI/coregui/Views/MaskWidgets/IntensityDataView.h
index c1a3d1c3536cd014733814d8662c229dc036bf6e..d1ea2b257e92bdb24cbabc32af8b9c671a770913 100644
--- a/GUI/coregui/Views/MaskWidgets/IntensityDataView.h
+++ b/GUI/coregui/Views/MaskWidgets/IntensityDataView.h
@@ -17,7 +17,7 @@
 #ifndef INTENSITYDATAVIEW_H
 #define INTENSITYDATAVIEW_H
 
-#include "IMaskView.h"
+#include "IMaskView.h" // inheriting from
 #include "SizeHandleElement.h"
 #include <QMap>
 
diff --git a/GUI/coregui/Views/MaskWidgets/LineViews.h b/GUI/coregui/Views/MaskWidgets/LineViews.h
index 588e197ee0f30e436cff0c0f5846ad061178e56f..5ab78a4fc54826c39eba9ec86842cd2181164e99 100644
--- a/GUI/coregui/Views/MaskWidgets/LineViews.h
+++ b/GUI/coregui/Views/MaskWidgets/LineViews.h
@@ -17,7 +17,7 @@
 #ifndef LINEVIEWS_H
 #define LINEVIEWS_H
 
-#include "IMaskView.h"
+#include "IMaskView.h" // inheriting from
 
 //! This is a view of VerticalLineItem mask
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskAllView.h b/GUI/coregui/Views/MaskWidgets/MaskAllView.h
index c198ef81a2c1fd02f41f3b246d8511819694714e..fb5566e96295bf463c2687cddcb6fb152797f40b 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskAllView.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskAllView.h
@@ -17,7 +17,7 @@
 #ifndef MASKALLVIEW_H
 #define MASKALLVIEW_H
 
-#include "IMaskView.h"
+#include "IMaskView.h" // inheriting from
 
 //! This is a view of MaskAllItem which covers whole detector plane with mask value=true.
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskContainerView.h b/GUI/coregui/Views/MaskWidgets/MaskContainerView.h
index 6cf27e5707007d4c48e9bf6177d6520335aa9344..a7e7798471d78d2dd3e5feebd4aaca2b176921cf 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskContainerView.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskContainerView.h
@@ -17,7 +17,7 @@
 #ifndef MASKCONTAINERVIEW_H
 #define MASKCONTAINERVIEW_H
 
-#include "IMaskView.h"
+#include "IMaskView.h" // inheriting from
 #include "SizeHandleElement.h"
 #include <QMap>
 
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonPointView.h b/GUI/coregui/Views/MaskWidgets/PolygonPointView.h
index 08c84895195429cac6195ca506ec2feee4712ccd..b853cc3c8ee9c051a7d2000bedfefc7b452a89f6 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonPointView.h
+++ b/GUI/coregui/Views/MaskWidgets/PolygonPointView.h
@@ -17,7 +17,7 @@
 #ifndef POLYGONPOINTVIEW_H
 #define POLYGONPOINTVIEW_H
 
-#include "IMaskView.h"
+#include "IMaskView.h" // inheriting from
 
 //! This is a View of polygon point for PolygonMaskItem
 
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonView.h b/GUI/coregui/Views/MaskWidgets/PolygonView.h
index e27498a8422b911d981acc98ee9502fea87338d9..ea8b9127eacabc94e4b095e1317d3350cc39454b 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonView.h
+++ b/GUI/coregui/Views/MaskWidgets/PolygonView.h
@@ -17,7 +17,7 @@
 #ifndef POLYGONVIEW_H
 #define POLYGONVIEW_H
 
-#include "IMaskView.h"
+#include "IMaskView.h" // inheriting from
 #include <QPolygonF>
 
 //! This is a View of polygon mask (represented by PolygonItem) on GraphicsScene.
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleView.h b/GUI/coregui/Views/MaskWidgets/RectangleView.h
index 9d2494dd3dfacdab32abf2b7eb8b8e4f45db84ee..233035b7e748aeff1c1b95376f5ff0156c87f3f9 100644
--- a/GUI/coregui/Views/MaskWidgets/RectangleView.h
+++ b/GUI/coregui/Views/MaskWidgets/RectangleView.h
@@ -17,7 +17,7 @@
 #ifndef RECTANGLEVIEW_H
 #define RECTANGLEVIEW_H
 
-#include "IMaskView.h"
+#include "IMaskView.h" // inheriting from
 #include "SizeHandleElement.h"
 #include <QMap>
 
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.h b/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.h
index 58c0087256ca1d3577b7b0dac1325d2791f65483..71c91a4854217e9b219de98ccde533ee7d4fda42 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.h
@@ -17,7 +17,7 @@
 #ifndef COMPONENTBOXEDITOR_H
 #define COMPONENTBOXEDITOR_H
 
-#include "ComponentEditor.h"
+#include "ComponentEditor.h" // inheriting from
 #include "WinDllMacros.h"
 
 //! Special version of editor to show property item as standard qt widgets
diff --git a/GUI/coregui/Views/SampleDesigner/ConnectableView.h b/GUI/coregui/Views/SampleDesigner/ConnectableView.h
index ea775fb386b74e6d371e34226df4f4908110edd6..ed081750b7471eb5ed3d35868cfc0d8764fce732 100644
--- a/GUI/coregui/Views/SampleDesigner/ConnectableView.h
+++ b/GUI/coregui/Views/SampleDesigner/ConnectableView.h
@@ -17,7 +17,7 @@
 #ifndef CONNECTABLEVIEW_H
 #define CONNECTABLEVIEW_H
 
-#include "IView.h"
+#include "IView.h" // inheriting from
 #include "NodeEditorPort.h"
 #include "WinDllMacros.h"
 
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.h b/GUI/coregui/Views/SampleDesigner/ILayerView.h
index acdb416739bbfc32ce98e1e4655b37ea59c89de8..ead4af93a15d84c3a96dd8c4a0a7028926356e70 100644
--- a/GUI/coregui/Views/SampleDesigner/ILayerView.h
+++ b/GUI/coregui/Views/SampleDesigner/ILayerView.h
@@ -17,7 +17,7 @@
 #ifndef ILAYERVIEW_H
 #define ILAYERVIEW_H
 
-#include "ConnectableView.h"
+#include "ConnectableView.h" // inheriting from
 
 class MultiLayerView;
 class MultiLayerCandidate;
diff --git a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h
index 194ec7f72bee5601a9c375686b35f41e8e98b1d3..26bab636c8c4c3fe6edb58f8540d3d4c61d427a1 100644
--- a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h
+++ b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h
@@ -18,7 +18,7 @@
 #define INTERFERENCEFUNCTIONVIEWS_H
 
 
-#include "ConnectableView.h"
+#include "ConnectableView.h" // inheriting from
 
 class BA_CORE_API_ InterferenceFunctionRadialParaCrystalView : public ConnectableView
 {
diff --git a/GUI/coregui/Views/SampleDesigner/LayerView.h b/GUI/coregui/Views/SampleDesigner/LayerView.h
index 7c787ce97e878134a467c47c2b04007408de4970..a91fbb16442662c8483cda2e7cf8c6cd7ad1c254 100644
--- a/GUI/coregui/Views/SampleDesigner/LayerView.h
+++ b/GUI/coregui/Views/SampleDesigner/LayerView.h
@@ -17,7 +17,7 @@
 #ifndef LAYERVIEW_H
 #define LAYERVIEW_H
 
-#include "ILayerView.h"
+#include "ILayerView.h" // inheriting from
 
 //! Class that represents view of Layer
 class BA_CORE_API_ LayerView : public ILayerView
diff --git a/GUI/coregui/Views/SampleDesigner/MultiLayerView.h b/GUI/coregui/Views/SampleDesigner/MultiLayerView.h
index e5387c3bd1a908a3fe4d7b65fe2d7aa68ed63860..38ef7af42b7042beecffa60031d54f87077fb7fc 100644
--- a/GUI/coregui/Views/SampleDesigner/MultiLayerView.h
+++ b/GUI/coregui/Views/SampleDesigner/MultiLayerView.h
@@ -18,7 +18,7 @@
 #define MULTILAYERVIEW_H
 
 
-#include "ILayerView.h"
+#include "ILayerView.h" // inheriting from
 
 class DesignerMimeData;
 class QGraphicsSceneDragDropEvent;
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h
index 4eaa2ed68bd93a838cfdbd500c081758c1e0de90..1884856cc3252520a90a66872cc48fa6e5393f87 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h
@@ -17,7 +17,7 @@
 #ifndef PARTICLECOMPOSITIONVIEW_H
 #define PARTICLECOMPOSITIONVIEW_H
 
-#include "ConnectableView.h"
+#include "ConnectableView.h" // inheriting from
 
 //! Class representing view of Particle item
 class BA_CORE_API_ ParticleCompositionView : public ConnectableView
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h
index 15d70286a029fd5355ab88706c19d4e1612af047..cb6e763e285e40ed1f1abcf15fb6f27ec6d68946 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h
@@ -17,7 +17,7 @@
 #ifndef PARTICLECORESHELLVIEW_H
 #define PARTICLECORESHELLVIEW_H
 
-#include "ConnectableView.h"
+#include "ConnectableView.h" // inheriting from
 
 //! Class representing view of Particle item
 class BA_CORE_API_ ParticleCoreShellView : public ConnectableView
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h
index 595183ef02f830ad617c2763c6b133640d55df2d..df8b2a22f5fcaa1fb28ffc39587ec7f2937d5b20 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h
@@ -17,7 +17,7 @@
 #ifndef PARTICLEDISTRIBUTIONVIEW_H
 #define PARTICLEDISTRIBUTIONVIEW_H
 
-#include "ConnectableView.h"
+#include "ConnectableView.h" // inheriting from
 
 //! Class representing view of distributed particle item
 class BA_CORE_API_ ParticleDistributionView : public ConnectableView
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h
index e1a12bed7d0d3a7110eb0b8e5cf8effd149e9e69..aa42e9caa7cf4f1c3108b7504310da70007f65fa 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h
@@ -17,7 +17,7 @@
 #ifndef PARTICLELAYOUTVIEW_H
 #define PARTICLELAYOUTVIEW_H
 
-#include "ConnectableView.h"
+#include "ConnectableView.h" // inheriting from
 
 class BA_CORE_API_ ParticleLayoutView : public ConnectableView
 {
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleView.h b/GUI/coregui/Views/SampleDesigner/ParticleView.h
index cadb09b453d772d163a4a26f90de702436bc0808..730b3ca65911e8dde0f8ab59bc6ac3536e14a1da 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleView.h
@@ -17,7 +17,7 @@
 #ifndef PARTICLEVIEW_H
 #define PARTICLEVIEW_H
 
-#include "ConnectableView.h"
+#include "ConnectableView.h" // inheriting from
 #include <QPixmap>
 
 //! Class representing view of Particle item
diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.h b/GUI/coregui/Views/SampleDesigner/SampleToolBar.h
index eb4181bb8ab2decb45c9bb236f9d24dc61462017..6da80ca1415741478ac28ebb47dc6dc52d81ad2e 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleToolBar.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleToolBar.h
@@ -17,7 +17,7 @@
 #ifndef SAMPLETOOLBAR_H
 #define SAMPLETOOLBAR_H
 
-#include "StyledToolBar.h"
+#include "StyledToolBar.h" // inheriting from
 
 class QAction;
 class QToolButton;
diff --git a/GUI/coregui/Views/SampleDesigner/TransformationView.h b/GUI/coregui/Views/SampleDesigner/TransformationView.h
index 14511818d5136183c7323a9170433d515a8c8a94..9b75dec4fabda79bcc4564080617c264b8dadd9a 100644
--- a/GUI/coregui/Views/SampleDesigner/TransformationView.h
+++ b/GUI/coregui/Views/SampleDesigner/TransformationView.h
@@ -18,7 +18,7 @@
 #define TRANSFORMATIONVIEW_H
 
 
-#include "ConnectableView.h"
+#include "ConnectableView.h" // inheriting from
 
 class TransformationView : public ConnectableView
 {
diff --git a/GUI/coregui/mainwindow/AppSvc.cpp b/GUI/coregui/mainwindow/AppSvc.cpp
index 428bbeb6b410fd7687dbf9e384a0da11338e3364..e304656d19149ccafa1104650fb45d31395c99d3 100644
--- a/GUI/coregui/mainwindow/AppSvc.cpp
+++ b/GUI/coregui/mainwindow/AppSvc.cpp
@@ -14,8 +14,8 @@
 //
 // ************************************************************************** //
 
-#include "GUIHelpers.h"
 #include "AppSvc.h"
+#include "GUIHelpers.h"
 
 ProjectManager *AppSvc::projectManager()
 {
diff --git a/GUI/coregui/mainwindow/AppSvc.h b/GUI/coregui/mainwindow/AppSvc.h
index 5250ca57a62cfb613187506667da0c6ff721264e..681415f667b4c89e2a7478dc5d4d992219f97250 100644
--- a/GUI/coregui/mainwindow/AppSvc.h
+++ b/GUI/coregui/mainwindow/AppSvc.h
@@ -17,7 +17,7 @@
 #ifndef APPSVC_H
 #define APPSVC_H
 
-#include "ISingleton.h"
+#include "ISingleton.h" // inheriting from
 
 class ProjectManager;
 
diff --git a/GUI/coregui/mainwindow/SplashScreen.cpp b/GUI/coregui/mainwindow/SplashScreen.cpp
index 1a2abc7935a63acbd26307b1912640f3d78270c5..e4591c957e32494b99e7e537962d82d531279a14 100644
--- a/GUI/coregui/mainwindow/SplashScreen.cpp
+++ b/GUI/coregui/mainwindow/SplashScreen.cpp
@@ -14,9 +14,9 @@
 //
 // ************************************************************************** //
 
-#include <QStyleOptionProgressBarV2>
-#include "GUIHelpers.h"
 #include "SplashScreen.h"
+#include "GUIHelpers.h"
+#include <QStyleOptionProgressBarV2>
 
 SplashScreen::SplashScreen(QWidget *parent) :
     QSplashScreen(parent),m_progress(0)
diff --git a/GUI/coregui/mainwindow/StyledToolBar.cpp b/GUI/coregui/mainwindow/StyledToolBar.cpp
index 2d1ef207fb090b51e76dac19bab6a37d1c43cc7c..83ef3c4aee33799a2b12fc60b9879249468771b2 100644
--- a/GUI/coregui/mainwindow/StyledToolBar.cpp
+++ b/GUI/coregui/mainwindow/StyledToolBar.cpp
@@ -14,9 +14,9 @@
 //
 // ************************************************************************** //
 
+#include "StyledToolBar.h"
 #include <QLabel>
 #include <QStyle>
-#include "StyledToolBar.h"
 
 StyledToolBar::StyledToolBar(QWidget *parent)
     : QToolBar(parent)
diff --git a/GUI/coregui/mainwindow/UpdateNotifier.cpp b/GUI/coregui/mainwindow/UpdateNotifier.cpp
index 727ac412aac5e252b26855a8685ef3840e9cc360..29feb187997b3d64f0d0bd6496a9f7d5cf925605 100644
--- a/GUI/coregui/mainwindow/UpdateNotifier.cpp
+++ b/GUI/coregui/mainwindow/UpdateNotifier.cpp
@@ -14,11 +14,11 @@
 //
 // ************************************************************************** //
 
-#include <QMessageBox>
-#include <QtNetwork>
+#include "UpdateNotifier.h"
 #include "GUIHelpers.h"
 #include "mainwindow_constants.h"
-#include "UpdateNotifier.h"
+#include <QMessageBox>
+#include <QtNetwork>
 
 UpdateNotifier::UpdateNotifier(QObject *parent)
     : QObject(parent), m_networkAccessManager(new QNetworkAccessManager(parent))
diff --git a/GUI/coregui/mainwindow/aboutapplicationdialog.cpp b/GUI/coregui/mainwindow/aboutapplicationdialog.cpp
index 98568273201172df76aba863073a9c15226d204c..8112dd04e4791e0daebffee5ec3a059213452f7e 100644
--- a/GUI/coregui/mainwindow/aboutapplicationdialog.cpp
+++ b/GUI/coregui/mainwindow/aboutapplicationdialog.cpp
@@ -14,13 +14,13 @@
 //
 // ************************************************************************** //
 
+#include "aboutapplicationdialog.h"
+#include "DesignerHelper.h"
+#include "GUIHelpers.h"
 #include <QDate>
 #include <QLabel>
 #include <QPushButton>
 #include <QVBoxLayout>
-#include "DesignerHelper.h"
-#include "GUIHelpers.h"
-#include "aboutapplicationdialog.h"
 
 
 AboutApplicationDialog::AboutApplicationDialog(QWidget *parent)
diff --git a/GUI/coregui/mainwindow/actionmanager.cpp b/GUI/coregui/mainwindow/actionmanager.cpp
index f57a6b39348a3a883dc603537bea0bb67330ec1c..1a72b3c118b42fb212219ce207f93fc62417accd 100644
--- a/GUI/coregui/mainwindow/actionmanager.cpp
+++ b/GUI/coregui/mainwindow/actionmanager.cpp
@@ -14,18 +14,18 @@
 //
 // ************************************************************************** //
 
-#include <QDebug>
-#include <QDir>
-#include <QMenuBar>
-#include <QSettings>
-#include <QShortcut>
+#include "actionmanager.h"
 #include "UpdateNotifier.h"
 #include "hostosinfo.h"
 #include "mainwindow.h"
 #include "mainwindow_constants.h"
 #include "projectmanager.h"
 #include "qstringutils.h"
-#include "actionmanager.h"
+#include <QDebug>
+#include <QDir>
+#include <QMenuBar>
+#include <QSettings>
+#include <QShortcut>
 
 ActionManager::ActionManager(MainWindow *parent)
     : QObject(parent)
diff --git a/GUI/coregui/mainwindow/mainwindow.cpp b/GUI/coregui/mainwindow/mainwindow.cpp
index e09abf3fbac0df4b37adc98772ac094786ea6545..5763665f710e517dc587bbd0d4aa6d75720049fc 100644
--- a/GUI/coregui/mainwindow/mainwindow.cpp
+++ b/GUI/coregui/mainwindow/mainwindow.cpp
@@ -14,10 +14,7 @@
 //
 // ************************************************************************** //
 
-#include <QApplication>
-#include <QCloseEvent>
-#include <QMessageBox>
-#include <QSettings>
+#include "mainwindow.h"
 #include "ApplicationModels.h"
 #include "GUIHelpers.h"
 #include "ImportDataView.h"
@@ -39,7 +36,10 @@
 #include "projectmanager.h"
 #include "stylehelper.h"
 #include "tooltipdatabase.h"
-#include "mainwindow.h"
+#include <QApplication>
+#include <QCloseEvent>
+#include <QMessageBox>
+#include <QSettings>
 
 MainWindow::MainWindow(QWidget *parent)
     : Manhattan::FancyMainWindow(parent)
diff --git a/GUI/coregui/mainwindow/newprojectdialog.cpp b/GUI/coregui/mainwindow/newprojectdialog.cpp
index 98cd046fac94a29f22b1f589a591f6c87695f093..58b865f608647a4bc5ead5f085cc635f8bfa4083 100644
--- a/GUI/coregui/mainwindow/newprojectdialog.cpp
+++ b/GUI/coregui/mainwindow/newprojectdialog.cpp
@@ -14,13 +14,13 @@
 //
 // ************************************************************************** //
 
+#include "newprojectdialog.h"
+#include "projectdocument.h"
 #include <QFileDialog>
 #include <QGroupBox>
 #include <QLabel>
 #include <QPushButton>
 #include <QVBoxLayout>
-#include "projectdocument.h"
-#include "newprojectdialog.h"
 
 
 NewProjectDialog::NewProjectDialog(QWidget *parent, const QString &workingDirectory
diff --git a/GUI/coregui/mainwindow/projectdocument.cpp b/GUI/coregui/mainwindow/projectdocument.cpp
index cf4df7c858cc7eec52f04527f2efb91c6edd3adc..057bfab5c5be8d1e1c9d85016a88e8c2b38f3f0f 100644
--- a/GUI/coregui/mainwindow/projectdocument.cpp
+++ b/GUI/coregui/mainwindow/projectdocument.cpp
@@ -14,13 +14,13 @@
 //
 // ************************************************************************** //
 
-#include <QDebug>
-#include <QDir>
-#include <QXmlStreamReader>
+#include "projectdocument.h"
 #include "ApplicationModels.h"
 #include "GUIHelpers.h"
 #include "WarningMessageService.h"
-#include "projectdocument.h"
+#include <QDebug>
+#include <QDir>
+#include <QXmlStreamReader>
 
 namespace {
 const QString OPEN_FILE_ERROR = "OPEN_FILE_ERROR";
diff --git a/GUI/coregui/mainwindow/projectmanager.cpp b/GUI/coregui/mainwindow/projectmanager.cpp
index 81359f5684c4467b4e7643e0d8052f41bd7f845f..6b167770cb7761cbd34110c070e7741ad9d87e8b 100644
--- a/GUI/coregui/mainwindow/projectmanager.cpp
+++ b/GUI/coregui/mainwindow/projectmanager.cpp
@@ -14,11 +14,7 @@
 //
 // ************************************************************************** //
 
-#include <QDebug>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QSettings>
-#include <QStandardPaths>
+#include "projectmanager.h"
 #include "AppSvc.h"
 #include "ApplicationModels.h"
 #include "GUIHelpers.h"
@@ -28,7 +24,11 @@
 #include "mainwindow_constants.h"
 #include "newprojectdialog.h"
 #include "projectdocument.h"
-#include "projectmanager.h"
+#include <QDebug>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QSettings>
+#include <QStandardPaths>
 
 ProjectManager::ProjectManager(MainWindow *parent)
     : m_mainWindow(parent)
diff --git a/GUI/coregui/mainwindow/tooltipdatabase.cpp b/GUI/coregui/mainwindow/tooltipdatabase.cpp
index 3059872b6156d3fa11022ec5dffc1fef1dd75d39..7592b3f6d57179d6e366b9f736507fe79ba73d75 100644
--- a/GUI/coregui/mainwindow/tooltipdatabase.cpp
+++ b/GUI/coregui/mainwindow/tooltipdatabase.cpp
@@ -14,12 +14,12 @@
 //
 // ************************************************************************** //
 
+#include "tooltipdatabase.h"
+#include "GUIHelpers.h"
+#include "item_constants.h"
 #include <QDebug>
 #include <QFile>
 #include <QXmlStreamReader>
-#include "GUIHelpers.h"
-#include "item_constants.h"
-#include "tooltipdatabase.h"
 
 ToolTipDataBase *ToolTipDataBase::m_instance = 0;
 QMap<QString, QString > ToolTipDataBase::m_tagToToolTip = QMap<QString, QString >();
diff --git a/GUI/coregui/utils/GUIHelpers.h b/GUI/coregui/utils/GUIHelpers.h
index fe2f9f93915168a96dba6e1b2cee89654cd79866..027ca815b0e9e75460c968949110e6877e8a8d50 100644
--- a/GUI/coregui/utils/GUIHelpers.h
+++ b/GUI/coregui/utils/GUIHelpers.h
@@ -17,8 +17,8 @@
 #ifndef GUIHELPERS_H
 #define GUIHELPERS_H
 
-#include <QWidget>
 #include <QStringList>
+#include <QWidget>
 #include <memory>
 
 class JobItem;
diff --git a/GUI/coregui/utils/GUITest.cpp b/GUI/coregui/utils/GUITest.cpp
index 7022e4b8d603afe32458367d90bab0cbf64ce6e9..3a562c539337c0b289e924445e2b39bf157abe59 100644
--- a/GUI/coregui/utils/GUITest.cpp
+++ b/GUI/coregui/utils/GUITest.cpp
@@ -14,6 +14,7 @@
 //
 // ************************************************************************** //
 
+#include "GUITest.h"
 #include "DocumentModel.h"
 #include "DomainSimulationBuilder.h"
 #include "GISASSimulation.h"
@@ -24,7 +25,6 @@
 #include "MaterialSvc.h"
 #include "SampleModel.h"
 #include "Utils.h"
-#include "GUITest.h"
 
 GUITest::GUITest(const std::string &name, const std::string &description,
                  GISASSimulation *reference_simulation, double threshold)
diff --git a/GUI/coregui/utils/GUITest.h b/GUI/coregui/utils/GUITest.h
index 1bc91e7cd8c334eff57bb97ae5b8e272a9588c58..f9d0cbbd75b5f53ec3457d7ceb56818337d95383 100644
--- a/GUI/coregui/utils/GUITest.h
+++ b/GUI/coregui/utils/GUITest.h
@@ -17,7 +17,7 @@
 #ifndef GUITEST_H
 #define GUITEST_H
 
-#include "IFunctionalTest.h"
+#include "IFunctionalTest.h" // inheriting from
 #include "OutputData.h"
 
 class GISASSimulation;
diff --git a/GUI/coregui/utils/WarningMessageService.cpp b/GUI/coregui/utils/WarningMessageService.cpp
index 93647959cbf9e372ebaa636bcba06dabd41484de..01c23f1486fd5f1ca0f7f6d2f6dde3b4477d2301 100644
--- a/GUI/coregui/utils/WarningMessageService.cpp
+++ b/GUI/coregui/utils/WarningMessageService.cpp
@@ -14,9 +14,9 @@
 //
 // ************************************************************************** //
 
+#include "WarningMessageService.h"
 #include "GUIMessage.h"
 #include "MessageContainer.h"
-#include "WarningMessageService.h"
 #include <QObject>
 
 WarningMessageService::~WarningMessageService()
diff --git a/GUI/coregui/utils/WarningMessageService.h b/GUI/coregui/utils/WarningMessageService.h
index b7dc3defc0d270c49d7d23ffd2eddf582362e2d4..1e57dea6c895be6b474433502f8bc33151c08841 100644
--- a/GUI/coregui/utils/WarningMessageService.h
+++ b/GUI/coregui/utils/WarningMessageService.h
@@ -17,7 +17,7 @@
 #ifndef WARNINGMESSAGESERVICE_H
 #define WARNINGMESSAGESERVICE_H
 
-#include "IMessageService.h"
+#include "IMessageService.h" // inheriting from
 #include <QMap>
 #include <QStringList> // need detected by TeamCity
 
diff --git a/GUI/coregui/utils/qstringutils.cpp b/GUI/coregui/utils/qstringutils.cpp
index 1e8e609b5734966b95f5316a46d699efd63078b5..4b5838ce7c5ca9e414e42299e256fee565adabe1 100644
--- a/GUI/coregui/utils/qstringutils.cpp
+++ b/GUI/coregui/utils/qstringutils.cpp
@@ -14,8 +14,8 @@
 //
 // ************************************************************************** //
 
-#include "hostosinfo.h"
 #include "qstringutils.h"
+#include "hostosinfo.h"
 #include <QDir>
 
 namespace Utils
diff --git a/GUI/crashhandler/crashhandler.cpp b/GUI/crashhandler/crashhandler.cpp
index 372165dcbc1a1076c8f63b960aff1acd6483cb19..83a108304660dfbbeea4ddf525e1c65e0cb82d6a 100644
--- a/GUI/crashhandler/crashhandler.cpp
+++ b/GUI/crashhandler/crashhandler.cpp
@@ -1,6 +1,4 @@
 #include "crashhandler.h"
-
-
 #include <QApplication>
 #include <QDebug>
 
diff --git a/GUI/crashhandler/crashhandlerdialog.cpp b/GUI/crashhandler/crashhandlerdialog.cpp
index 319e105eb4f126518c2c51a0e3381001085c2ad4..ef5a1b987d9d8523eec24493cfd2aef3aaeca6f0 100644
--- a/GUI/crashhandler/crashhandlerdialog.cpp
+++ b/GUI/crashhandler/crashhandlerdialog.cpp
@@ -1,8 +1,8 @@
 #include "crashhandlerdialog.h"
-#include <QtWidgets>
+#include <QClipboard>
 #include <QPushButton>
 #include <QTextEdit>
-#include <QClipboard>
+#include <QtWidgets>
 
 
 
diff --git a/GUI/main/appoptions.cpp b/GUI/main/appoptions.cpp
index d4db0de3d40c06b71b5cd5f5124c18330439bc9c..3b824469612b497194d89d542dfdbb2e731d8904 100644
--- a/GUI/main/appoptions.cpp
+++ b/GUI/main/appoptions.cpp
@@ -14,12 +14,12 @@
 //
 // ************************************************************************** //
 
-#include "GUIHelpers.h"
 #include "appoptions.h"
-#include <fstream>
-#include <iostream>
+#include "GUIHelpers.h"
 #include <boost/program_options/config.hpp>
 #include <boost/program_options/parsers.hpp>
+#include <fstream>
+#include <iostream>
 
 
 ApplicationOptions::ApplicationOptions(int argc, char **argv)