diff --git a/Core/Detector/SphericalDetector.h b/Core/Detector/SphericalDetector.h
index a9fa092345028363ded852e8124a6b7430a5b6a6..e9777b7a34cce6dd4089f62e5206bf7353a8f015 100644
--- a/Core/Detector/SphericalDetector.h
+++ b/Core/Detector/SphericalDetector.h
@@ -18,7 +18,6 @@
 
 #include "IDetector2D.h"
 
-
 //! @class SphericalDetector
 //! @ingroup simulation
 //! @brief A spherical detector with axes and resolution function.
@@ -46,7 +45,7 @@ public:
     virtual ~SphericalDetector() {}
 
     //! Adds parameters from local pool to external pool and recursively calls its direct children.
-    virtual std::string addParametersToExternalPool(std::string path, ParameterPool *external_pool,
+    virtual std::string addParametersToExternalPool(std::string path, ParameterPool* external_pool,
                                                     int copy_number = -1) const;
 
     //! Returns detector map in given axes units
@@ -62,7 +61,7 @@ protected:
     //! Create an IPixelMap for the given OutputData object and index
     virtual IPixelMap* createPixelMap(size_t index) const;
 
-    virtual void print(std::ostream &ostr) const;
+    virtual void print(std::ostream& ostr) const;
 
     //! Registers some class members for later access via parameter pool.
     virtual void init_parameters() {}
diff --git a/Core/Samples/ILayout.h b/Core/Samples/ILayout.h
index 993f2c627a0c649fddd8d63c09dc63ad2c7d2ba6..459ca44675c29efbdf84137b36c0516e846f9153 100644
--- a/Core/Samples/ILayout.h
+++ b/Core/Samples/ILayout.h
@@ -17,8 +17,7 @@
 #define ILAYOUT_H
 
 #include "IParticle.h"
-
-
+#include "SafePointerVector.h"
 
 //! @class ILayout
 //! @ingroup samples_internal
@@ -32,19 +31,19 @@ public:
     ILayout() : me_approx(DA) {}
     virtual ~ILayout() {}
 
-    virtual ILayout *clone() const=0;
+    virtual ILayout* clone() const=0;
 
     //! calls the ISampleVisitor's visit method
-    virtual void accept(ISampleVisitor *visitor) const=0;
+    virtual void accept(ISampleVisitor* visitor) const=0;
 
     //! Returns a clone with inverted magnetic fields
-    virtual ILayout *cloneInvertB() const=0;
+    virtual ILayout* cloneInvertB() const=0;
 
     //! Returns number of particles
     virtual size_t getNumberOfParticles() const=0;
 
     //! Returns information about particle with index
-    virtual const IAbstractParticle *getParticle(size_t index) const=0;
+    virtual const IAbstractParticle* getParticle(size_t index) const=0;
 
     //! Returns information on all particles (type and abundance)
     //! and generates new particles if an IAbstractParticle denotes a collection
diff --git a/Core/Samples/Layer.h b/Core/Samples/Layer.h
index 4464690ed909840b5cd6fb76db82287dfe285ccb..9ba65f334d1adbdf03b738f79b1b802732fac4a0 100644
--- a/Core/Samples/Layer.h
+++ b/Core/Samples/Layer.h
@@ -16,7 +16,6 @@
 #ifndef LAYER_H
 #define LAYER_H
 
-#include "LayerDWBASimulation.h"
 #include "Materials.h"
 #include "ParticleLayout.h"
 
@@ -77,7 +76,7 @@ public:
     virtual bool hasDWBASimulation() const;
 
     //! creates and returns a LayerDWBASimulation for the given layout
-    LayerDWBASimulation *createLayoutSimulation(size_t layout_index) const;
+    class LayerDWBASimulation *createLayoutSimulation(size_t layout_index) const;
 
     double getTotalParticleSurfaceDensity(size_t layout_index) const;
 
diff --git a/Core/Samples/LayerStrategyBuilder.cpp b/Core/Samples/LayerStrategyBuilder.cpp
index 2be04fb70526476779df365439acdaf78f68d0e8..64a0de6c053427447e9dfc37352976ca80b09046 100644
--- a/Core/Samples/LayerStrategyBuilder.cpp
+++ b/Core/Samples/LayerStrategyBuilder.cpp
@@ -18,7 +18,7 @@
 #include "InterferenceFunctionStrategies.h"
 #include "InterferenceFunctions.h"
 #include "Layer.h"
-
+#include "Simulation.h"
 
 LayerStrategyBuilder::LayerStrategyBuilder(const Layer &decorated_layer,
                                            const Simulation &simulation,
diff --git a/Core/Simulation/LayerDWBASimulation.cpp b/Core/Simulation/LayerDWBASimulation.cpp
index 3b9a1872b159ccf6f1812919394aeca6ed33ff15..d8ea03d0205e982d5ee5c33f92b8c53cac604004 100644
--- a/Core/Simulation/LayerDWBASimulation.cpp
+++ b/Core/Simulation/LayerDWBASimulation.cpp
@@ -14,9 +14,9 @@
 // ************************************************************************** //
 
 #include "Layer.h"
+#include "LayerDWBASimulation.h"
 
-
-LayerDWBASimulation::LayerDWBASimulation(const Layer *p_layer)
+LayerDWBASimulation::LayerDWBASimulation(const Layer* p_layer)
 : mp_specular_info(0)
 {
     mp_layer = p_layer->clone();
diff --git a/Doc/Doxygen/Doxyfile.dirgraphs b/Doc/Doxygen/Doxyfile.dirgraphs
index d18ad15dfd473802b3307ff9043507245107b6e4..edf1efc26555e532c7867a3fcb74731f145e337f 100644
--- a/Doc/Doxygen/Doxyfile.dirgraphs
+++ b/Doc/Doxygen/Doxyfile.dirgraphs
@@ -38,7 +38,7 @@ PROJECT_NAME           = "BornAgain"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.5.0
+PROJECT_NUMBER         = "under development"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/GUI/coregui/Models/GUIObjectBuilder.cpp b/GUI/coregui/Models/GUIObjectBuilder.cpp
index e42f450b0d902452ffebe03e1138506c3ecd100a..607a4fde8989cb760d5f02aa03c7872ac6655f0c 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.cpp
+++ b/GUI/coregui/Models/GUIObjectBuilder.cpp
@@ -15,39 +15,40 @@
 // ************************************************************************** //
 
 #include "GUIObjectBuilder.h"
-#include "InstrumentModel.h"
-#include "SampleModel.h"
-#include "LayerItem.h"
+#include "BeamDistributionItem.h"
 #include "BeamItem.h"
+#include "ComboProperty.h"
 #include "DetectorItems.h"
-#include "MultiLayerItem.h"
-#include "MaterialUtils.h"
-#include "MaterialSvc.h"
-#include "MaterialModel.h"
-#include "ParticleItem.h"
-#include "TransformationItem.h"
+#include "DocumentModel.h"
 #include "FormFactorItems.h"
-#include "TransformFromDomain.h"
-#include "ComboProperty.h"
 #include "GUIHelpers.h"
+#include "InstrumentModel.h"
+#include "LayerItem.h"
+#include "MaterialModel.h"
+#include "MaterialSvc.h"
+#include "MaterialUtils.h"
+#include "MultiLayerItem.h"
 #include "ParticleCoreShellItem.h"
-#include "VectorItem.h"
+#include "ParticleDistributionItem.h"
+#include "ParticleItem.h"
 #include "ParticleLayoutItem.h"
+#include "RectangularDetector.h"
 #include "RotationItems.h"
-#include "ParticleDistributionItem.h"
-#include "DocumentModel.h"
+#include "SampleModel.h"
 #include "SimulationOptionsItem.h"
+#include "SphericalDetector.h"
+#include "TransformFromDomain.h"
+#include "TransformationItem.h"
+#include "VectorItem.h"
 #include <QDebug>
 
-
 GUIObjectBuilder::GUIObjectBuilder()
     : m_sampleModel(0)
 {
 }
 
-
-SessionItem *GUIObjectBuilder::populateSampleModel(SampleModel *sampleModel,
-                                       const GISASSimulation &simulation, const QString &sampleName)
+SessionItem *GUIObjectBuilder::populateSampleModel(
+    SampleModel *sampleModel, const GISASSimulation &simulation, const QString &sampleName)
 {
     std::unique_ptr<ISample> P_sample;
     if(simulation.getSampleBuilder()) {
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index 388728de151e042397fef94cae66811b08975c9d..26d27036eec9a801258eb9ef6369aa9da2eb278c 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -14,38 +14,39 @@
 //
 // ************************************************************************** //
 
-#include "InterferenceFunctions.h"
-#include "InterferenceFunctionItems.h"
-#include "FTDistributionItems.h"
+#include "TransformFromDomain.h"
+#include "AxesItems.h"
+#include "Beam.h"
+#include "BeamAngleItems.h"
+#include "BeamItem.h"
+#include "ComboProperty.h"
+#include "ConvolutionDetectorResolution.h"
+#include "DetectorItems.h"
+#include "Distributions.h"
+#include "Ellipse.h"
 #include "FTDecayFunctionItems.h"
+#include "FTDistributionItems.h"
+#include "GISASSimulation.h"
+#include "GUIHelpers.h"
+#include "InfinitePlane.h"
+#include "InterferenceFunctionItems.h"
+#include "InterferenceFunctions.h"
 #include "LatticeTypeItems.h"
-#include "LayerItem.h"
 #include "Layer.h"
 #include "LayerInterface.h"
-#include "GUIHelpers.h"
+#include "LayerItem.h"
 #include "LayerRoughnessItems.h"
-#include "SphericalDetector.h"
-#include "ParticleItem.h"
-#include "ParticleDistributionItem.h"
-#include "Distributions.h"
-#include "DetectorItems.h"
-#include "BeamItem.h"
-#include "ComboProperty.h"
-#include "BeamAngleItems.h"
-#include "AxesItems.h"
-#include "ResolutionFunctionItems.h"
-#include "ConvolutionDetectorResolution.h"
-#include "Rectangle.h"
-#include "Ellipse.h"
-#include "Polygon.h"
 #include "Line.h"
-#include "InfinitePlane.h"
 #include "MaskItems.h"
+#include "ModelPath.h"
+#include "ParticleDistributionItem.h"
+#include "ParticleItem.h"
+#include "Polygon.h"
+#include "Rectangle.h"
 #include "RectangularDetector.h"
+#include "ResolutionFunctionItems.h"
+#include "SphericalDetector.h"
 #include "VectorItem.h"
-#include "ModelPath.h"
-#include "TransformFromDomain.h"
-
 #include <QDebug>
 
 using namespace BornAgain;
diff --git a/GUI/coregui/Models/TransformFromDomain.h b/GUI/coregui/Models/TransformFromDomain.h
index 50da9f185775bfa049ae3a46fd4919ab7307a844..e84c812e014498ad64cface9f8a53c011165781a 100644
--- a/GUI/coregui/Models/TransformFromDomain.h
+++ b/GUI/coregui/Models/TransformFromDomain.h
@@ -17,62 +17,81 @@
 #ifndef TRANSFORMFROMDOMAIN_H
 #define TRANSFORMFROMDOMAIN_H
 
+#include <QString>
+class BeamDistributionItem;
+class BeamItem;
+class DetectorItem;
+class FormFactorAnisoPyramid;
+class GISASSimulation;
+class InterferenceFunction1DLattice;
+class InterferenceFunction2DLattice;
+class InterferenceFunction2DParaCrystal;
+class InterferenceFunctionRadialParaCrystal;
+class Layer;
+class LayerInterface;
+class LayerRoughness;
+class ParameterDistribution;
+class ParticleDistribution;
+class RectangularDetector;
+class RectangularDetectorItem;
+class SessionItem;
+class SphericalDetector;
+class SphericalDetectorItem;
 
 namespace TransformFromDomain
 {
-BA_CORE_API_ void setItemFromSample(class SessionItem *item,
-                                    const class FormFactorAnisoPyramid *sample);
+BA_CORE_API_ void setItemFromSample(SessionItem *item,
+                                    const FormFactorAnisoPyramid *sample);
 
-BA_CORE_API_ void setItemFromSample(class SessionItem *item,
-                                    const class InterferenceFunctionRadialParaCrystal *sample);
+BA_CORE_API_ void setItemFromSample(SessionItem *item,
+                                    const InterferenceFunctionRadialParaCrystal *sample);
 
-BA_CORE_API_ void setItemFromSample(class SessionItem *item,
-                                    const class InterferenceFunction2DParaCrystal *sample);
+BA_CORE_API_ void setItemFromSample(SessionItem *item,
+                                    const InterferenceFunction2DParaCrystal *sample);
 
-BA_CORE_API_ void setItemFromSample(class SessionItem *item,
-                                    const class InterferenceFunction1DLattice *sample);
+BA_CORE_API_ void setItemFromSample(SessionItem *item,
+                                    const InterferenceFunction1DLattice *sample);
 
-BA_CORE_API_ void setItemFromSample(class SessionItem *item,
-                                    const class InterferenceFunction2DLattice *sample);
+BA_CORE_API_ void setItemFromSample(SessionItem *item,
+                                    const InterferenceFunction2DLattice *sample);
 
-BA_CORE_API_ void setItemFromSample(class SessionItem *layerItem, const class Layer *layer,
-                                    const class LayerInterface *top_interface);
+BA_CORE_API_ void setItemFromSample(SessionItem *layerItem, const Layer *layer,
+                                    const LayerInterface *top_interface);
 
-BA_CORE_API_ void setItemFromSample(class SessionItem *item,
-                                    const class LayerRoughness *sample);
+BA_CORE_API_ void setItemFromSample(SessionItem *item,
+                                    const LayerRoughness *sample);
 
-BA_CORE_API_ void setItemFromSample(class SessionItem *item,
-                                    const class ParticleDistribution *sample);
+BA_CORE_API_ void setItemFromSample(SessionItem *item,
+                                    const ParticleDistribution *sample);
 
-BA_CORE_API_ bool isValidRoughness(const class LayerRoughness *roughness);
+BA_CORE_API_ bool isValidRoughness(const LayerRoughness *roughness);
 
 BA_CORE_API_ bool isSquareLattice(double length1, double length2, double angle);
 
 BA_CORE_API_ bool isHexagonalLattice(double length1, double length2, double angle);
 
-BA_CORE_API_ void setItemFromSample(class BeamItem *beamItem,
-                                    const class GISASSimulation &simulation);
+BA_CORE_API_ void setItemFromSample(BeamItem *beamItem,
+                                    const GISASSimulation &simulation);
 
-BA_CORE_API_ void setItemFromSample(class DetectorItem *detectorItem,
-                                    const class GISASSimulation &simulation);
+BA_CORE_API_ void setItemFromSample(DetectorItem *detectorItem,
+                                    const GISASSimulation &simulation);
 
-BA_CORE_API_ void setItemFromSample(class SphericalDetectorItem *detectorItem,
-                                    const class SphericalDetector &detector);
+BA_CORE_API_ void setItemFromSample(SphericalDetectorItem *detectorItem,
+                                    const SphericalDetector &detector);
 
-BA_CORE_API_ void setItemFromSample(class RectangularDetectorItem *detectorItem,
-                                    const class RectangularDetector &detector);
+BA_CORE_API_ void setItemFromSample(RectangularDetectorItem *detectorItem,
+                                    const RectangularDetector &detector);
 
-BA_CORE_API_ void setDetectorMasks(class DetectorItem *detectorItem,
-                                   const class GISASSimulation &simulation);
+BA_CORE_API_ void setDetectorMasks(DetectorItem *detectorItem,
+                                   const GISASSimulation &simulation);
 
-BA_CORE_API_ void setItemFromSample(class BeamDistributionItem *beamDistributionItem,
-                                    const class ParameterDistribution &parameterDistribution);
+BA_CORE_API_ void setItemFromSample(BeamDistributionItem *beamDistributionItem,
+                                    const ParameterDistribution &parameterDistribution);
 
-BA_CORE_API_ void setItemFromSample(class BeamDistributionItem *beamDistributionItem,
-                                    const class ParameterDistribution &parameterDistribution);
+BA_CORE_API_ void setItemFromSample(BeamDistributionItem *beamDistributionItem,
+                                    const ParameterDistribution &parameterDistribution);
 
-BA_CORE_API_ QString translateParameterNameToGUI(class SessionItem *item,
-                                                 const class QString &par_name);
+BA_CORE_API_ QString translateParameterNameToGUI(SessionItem *item, const QString &par_name);
 }
 
 #endif // TRANSFORMFROMDOMAIN_H