diff --git a/BornAgain.pro b/BornAgain.pro
index e8273592b4aee3478a540c010490e050cbf54bf5..3a48eab880c7f26520a5df22f7f230b5a8d1212e 100644
--- a/BornAgain.pro
+++ b/BornAgain.pro
@@ -9,10 +9,10 @@ TestCore.depends = ThirdParty/gtest
 
 SUBDIRS += Tests/FunctionalTests/TestCore
 
-isEmpty(ROOT_FRAMEWORK) {
-    message("No ROOT installation found. Additional library libRootMinimizers.so will be compiled.")
+#isEmpty(ROOT_FRAMEWORK) {
+#    message("No ROOT installation found. Additional library libRootMinimizers.so will be compiled.")
     SUBDIRS += ThirdParty/RootMinimizers
-}
+#}
 
 #SUBDIRS += ThirdParty/RootMathMore
 
diff --git a/Core/Algorithms/inc/Beam.h b/Core/Algorithms/inc/Beam.h
index c0e329ce11e57c772d6b95cd7d308c29b97f751b..816496431b136ce015dc7b32fad802b03cb621a7 100644
--- a/Core/Algorithms/inc/Beam.h
+++ b/Core/Algorithms/inc/Beam.h
@@ -21,17 +21,12 @@
 #include "IParameterized.h"
 
 #ifndef GCCXML_SKIP_THIS
-
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #ifdef _WIN32
 //#define EIGEN_DONT_ALIGN 1
 #define EIGEN_DONT_VECTORIZE 1
 #define EIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT 1
 #endif
 #include <Eigen/Core>
-GCC_DIAG_ON(unused-local-typedefs);
-
 #endif
 
 
diff --git a/Core/Algorithms/inc/SpecularMagnetic.h b/Core/Algorithms/inc/SpecularMagnetic.h
index 738d96206165e22985912f0e705518fa5667808d..835b3cc3b77da53eb2c85b620e36cdb39fae9228 100644
--- a/Core/Algorithms/inc/SpecularMagnetic.h
+++ b/Core/Algorithms/inc/SpecularMagnetic.h
@@ -19,11 +19,7 @@
 #include "Types.h"
 #include "ISimulation.h"
 #include "MultiLayer.h"
-
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <Eigen/Core>
-GCC_DIAG_ON(unused-local-typedefs);
 
 
 //! Implements the matrix formalism for the calculation of wave amplitudes of
diff --git a/Core/Algorithms/inc/SpecularMatrix.h b/Core/Algorithms/inc/SpecularMatrix.h
index 8c7f7ba111de92494ecb72eab3dfc2d43f52d822..7e323ea9b9fd119590d1b20a1a0166eb3144ca05 100644
--- a/Core/Algorithms/inc/SpecularMatrix.h
+++ b/Core/Algorithms/inc/SpecularMatrix.h
@@ -19,11 +19,7 @@
 #include "Types.h"
 #include "ISimulation.h"
 #include "MultiLayer.h"
-
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <Eigen/Core>
-GCC_DIAG_ON(unused-local-typedefs);
 
 //! Implements the matrix formalism for the calculation of wave amplitudes of
 //! the coherent wave solution in a multilayer
diff --git a/Core/Algorithms/src/Beam.cpp b/Core/Algorithms/src/Beam.cpp
index 59c746f772d0af847a78a88a3a222efb132a10ca..49228ffa0b9e5b377aceafc4e6bbc2242a9656b9 100644
--- a/Core/Algorithms/src/Beam.cpp
+++ b/Core/Algorithms/src/Beam.cpp
@@ -15,10 +15,7 @@
 
 #include "Beam.h"
 #include "Exceptions.h"
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <Eigen/LU>
-GCC_DIAG_ON(unused-local-typedefs);
 
 
 Beam::Beam() : m_central_k(), m_intensity(1.0)
diff --git a/Core/Algorithms/src/Simulation.cpp b/Core/Algorithms/src/Simulation.cpp
index 378fde04fd2cf8012fb556ec92937dc1cc23840f..86fd7382ca5e118667a0a1a3159f623c17615d53 100644
--- a/Core/Algorithms/src/Simulation.cpp
+++ b/Core/Algorithms/src/Simulation.cpp
@@ -21,11 +21,9 @@
 #include "MessageService.h"
 
 #include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 GCC_DIAG_OFF(strict-aliasing);
 #include <boost/thread.hpp>
 GCC_DIAG_ON(strict-aliasing);
-GCC_DIAG_ON(unused-local-typedefs);
 #include <gsl/gsl_errno.h>
 
 Simulation::Simulation()
diff --git a/Core/Geometry/inc/ITransform3D.h b/Core/Geometry/inc/ITransform3D.h
index 7594abd5748929095775f2fa36fe719f67129f50..5c70797a281d921657933b8e32c30d8378d5816f 100644
--- a/Core/Geometry/inc/ITransform3D.h
+++ b/Core/Geometry/inc/ITransform3D.h
@@ -17,10 +17,7 @@
 
 #include "Types.h"
 #include "BasicVector3D.h"
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/shared_ptr.hpp>
-GCC_DIAG_ON(unused-local-typedefs);
 
 namespace Geometry {
 
diff --git a/Core/Samples/inc/HomogeneousMagneticMaterial.h b/Core/Samples/inc/HomogeneousMagneticMaterial.h
index 607ebdfbfed055239df10e62a1db3139651d7584..dfb31fab610327ea06bc1f4e7a165d8cdeab96de 100644
--- a/Core/Samples/inc/HomogeneousMagneticMaterial.h
+++ b/Core/Samples/inc/HomogeneousMagneticMaterial.h
@@ -17,10 +17,7 @@
 #define HOMOGENEOUSMAGNETICMATERIAL_H_
 
 #include "HomogeneousMaterial.h"
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <Eigen/Core>
-GCC_DIAG_ON(unused-local-typedefs);
 
 //! An homogeneous material with magnetization
 
diff --git a/Core/Samples/inc/IMaterial.h b/Core/Samples/inc/IMaterial.h
index b9e82b6a18cce245521d8716534c1c12d74a9e07..faebc04b626ce09e719bf484915e056beede913d 100644
--- a/Core/Samples/inc/IMaterial.h
+++ b/Core/Samples/inc/IMaterial.h
@@ -23,14 +23,9 @@
 #include <iostream>
 
 #ifndef GCCXML_SKIP_THIS
-
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <Eigen/Core>
-GCC_DIAG_ON(unused-local-typedefs);
 #endif
 
-
 //! Interface to a named material.
 
 class IMaterial : public INamed
diff --git a/Core/Samples/src/MaterialManager.cpp b/Core/Samples/src/MaterialManager.cpp
index e1ff050872d06152bcb19c0a184e650843e16cfc..1888b31ce97ac9d14c64f4cf0ac4550a98f0dce0 100644
--- a/Core/Samples/src/MaterialManager.cpp
+++ b/Core/Samples/src/MaterialManager.cpp
@@ -19,11 +19,9 @@
 #include "Exceptions.h"
 #include "MessageService.h"
 #include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 GCC_DIAG_OFF(strict-aliasing);
 #include <boost/thread.hpp>
 GCC_DIAG_ON(strict-aliasing);
-GCC_DIAG_ON(unused-local-typedefs);
 
 //! Materials database type.
 
diff --git a/Core/Tools/inc/DoubleToComplexInterpolatingFunction.h b/Core/Tools/inc/DoubleToComplexInterpolatingFunction.h
index 752911b0e789a17fd5434ee150340d852687e6ff..72ef2943a0737a9c8227a4ad102b6742f1d89fa4 100644
--- a/Core/Tools/inc/DoubleToComplexInterpolatingFunction.h
+++ b/Core/Tools/inc/DoubleToComplexInterpolatingFunction.h
@@ -18,10 +18,7 @@
 
 #include "IDoubleToComplexFunction.h"
 #include <map>
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/unordered_map.hpp>
-GCC_DIAG_ON(unused-local-typedefs);
 
 
 class DoubleToComplexInterpolatingFunction : public IDoubleToComplexFunction
diff --git a/Core/Tools/inc/IObserver.h b/Core/Tools/inc/IObserver.h
index bc4bf7d048d44a67b23623224ffa580516853a6f..3a5c7d87ab7df847f6b0be61e32cc26ca4a0ce65 100644
--- a/Core/Tools/inc/IObserver.h
+++ b/Core/Tools/inc/IObserver.h
@@ -18,10 +18,7 @@
 
 #include "Exceptions.h"
 #include <list>
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/shared_ptr.hpp>
-GCC_DIAG_ON(unused-local-typedefs);
 
 
 class IObservable;
diff --git a/Core/Tools/inc/ISingleton.h b/Core/Tools/inc/ISingleton.h
index 0245027d136be9f5c68e0ae2e2b7fff4493e1c4c..0bbc693638ec57eb8ebbb3a8be018f02edefc1ee 100644
--- a/Core/Tools/inc/ISingleton.h
+++ b/Core/Tools/inc/ISingleton.h
@@ -20,11 +20,9 @@
 #include <iostream>
 #include <typeinfo>
 #include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 GCC_DIAG_OFF(strict-aliasing);
 #include <boost/thread.hpp>
 GCC_DIAG_ON(strict-aliasing);
-GCC_DIAG_ON(unused-local-typedefs);
 
 
 template <class T>
diff --git a/Core/Tools/inc/Macros.h b/Core/Tools/inc/Macros.h
index ef5f24a8288ea36533fcf2a13eee53cd942b4dac..f91bdd0acadf20da673952519abcc99bd986fae7 100644
--- a/Core/Tools/inc/Macros.h
+++ b/Core/Tools/inc/Macros.h
@@ -39,21 +39,21 @@ http://gcc.gnu.org/onlinedocs/gcc-4.4.7/gcc/Diagnostic-Pragmas.html
 */
 
 #if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402
-#define GCC_DIAG_STR(s) #s
-#define GCC_DIAG_JOINSTR(x,y) GCC_DIAG_STR(x ## y)
-# define GCC_DIAG_DO_PRAGMA(x) _Pragma (#x)
-# define GCC_DIAG_PRAGMA(x) GCC_DIAG_DO_PRAGMA(GCC diagnostic x)
-# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406
-#  define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(push) \
-       GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W,x))
-#  define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(pop)
-# else
-#  define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W,x))
-#  define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(warning GCC_DIAG_JOINSTR(-W,x))
-# endif
+    #define GCC_DIAG_STR(s) #s
+    #define GCC_DIAG_JOINSTR(x,y) GCC_DIAG_STR(x ## y)
+    # define GCC_DIAG_DO_PRAGMA(x) _Pragma (#x)
+    # define GCC_DIAG_PRAGMA(x) GCC_DIAG_DO_PRAGMA(GCC diagnostic x)
+    # if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406
+        #  define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(push) \
+            GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W,x))
+        #  define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(pop)
+    # else
+        #  define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W,x))
+        #  define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(warning GCC_DIAG_JOINSTR(-W,x))
+    # endif
 #else
-# define GCC_DIAG_OFF(x)
-# define GCC_DIAG_ON(x)
+    # define GCC_DIAG_OFF(x)
+    # define GCC_DIAG_ON(x)
 #endif
 
 #endif // MACROS_H
diff --git a/Core/Tools/inc/MathFunctions.h b/Core/Tools/inc/MathFunctions.h
index b678e200cf1e34a6889c7646f7eb7da0850f6a16..3ea2cc9474704c13d97ab10e08a70122ef40ad0e 100644
--- a/Core/Tools/inc/MathFunctions.h
+++ b/Core/Tools/inc/MathFunctions.h
@@ -30,10 +30,7 @@
 #include "gsl/gsl_integration.h"
 
 #ifndef GCCXML_SKIP_THIS
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <Eigen/Core>
-GCC_DIAG_ON(unused-local-typedefs);
 #endif
 
 //! Various mathematical functions.
diff --git a/Core/Tools/inc/OutputDataIOFactory.h b/Core/Tools/inc/OutputDataIOFactory.h
index 2399881bd012b78d5620b12777ebf1fb75813470..cda97c1907101bfd08e95a328365f2e80a15135d 100644
--- a/Core/Tools/inc/OutputDataIOFactory.h
+++ b/Core/Tools/inc/OutputDataIOFactory.h
@@ -20,10 +20,7 @@
 #include "OutputDataReader.h"
 #include "OutputDataWriter.h"
 #include <string>
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/shared_ptr.hpp>
-GCC_DIAG_ON(unused-local-typedefs);
 
 
 //! Reads OutputData from files in different format
diff --git a/Core/Tools/inc/ProgramOptions.h b/Core/Tools/inc/ProgramOptions.h
index 5ff5a9902a5f46f3a3421889d7b899ed528cc351..7219d07d656874d19b10eb4e515d2bed391995ef 100644
--- a/Core/Tools/inc/ProgramOptions.h
+++ b/Core/Tools/inc/ProgramOptions.h
@@ -18,12 +18,10 @@
 
 #include "Macros.h"
 GCC_DIAG_OFF(unused-parameter);
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/positional_options.hpp>
 #include <boost/program_options/variables_map.hpp>
 GCC_DIAG_ON(unused-parameter);
-GCC_DIAG_ON(unused-local-typedefs);
 
 #include <string>
 
diff --git a/Core/Tools/inc/Utils.h b/Core/Tools/inc/Utils.h
index 11c1eb02ad4fd4d5e54a4b4bbe8bcbb11bd31c10..6997b1dde59a567c3fbea1be6d4af0cee71f9841 100644
--- a/Core/Tools/inc/Utils.h
+++ b/Core/Tools/inc/Utils.h
@@ -19,12 +19,7 @@
 #include "WinDllMacros.h"
 #include "Types.h"
 #include "Exceptions.h"
-
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/unordered_map.hpp>
-GCC_DIAG_ON(unused-local-typedefs);
-
 #include <map>
 
 namespace Utils {
diff --git a/Core/Tools/src/MessageService.cpp b/Core/Tools/src/MessageService.cpp
index 822f12763f13ee5c04eefe19f4c5c7f840968c8a..4138cbe574b2885a89f7c1d5d6d6dc1f73d283a0 100644
--- a/Core/Tools/src/MessageService.cpp
+++ b/Core/Tools/src/MessageService.cpp
@@ -1,8 +1,5 @@
 #include "MessageService.h"
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/assign/list_of.hpp>
-GCC_DIAG_ON(unused-local-typedefs);
 #include "Exceptions.h"
 #include <sys/time.h>
 #include <cstdio>
diff --git a/Core/Tools/src/OutputDataReadStrategy.cpp b/Core/Tools/src/OutputDataReadStrategy.cpp
index 85abbbf41c18c723d5e09fc08fea94186ddb71e5..d9e9c264466254e25a552c068753d3a47a5a3421 100644
--- a/Core/Tools/src/OutputDataReadStrategy.cpp
+++ b/Core/Tools/src/OutputDataReadStrategy.cpp
@@ -28,13 +28,11 @@
 #include <algorithm>
 #include "Macros.h"
 GCC_DIAG_OFF(unused-parameter);
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/filtering_stream.hpp>
 #include <boost/iostreams/copy.hpp>
 #include <boost/iostreams/filter/gzip.hpp>
 #include <string>
-GCC_DIAG_ON(unused-local-typedefs);
 GCC_DIAG_ON(unused-parameter);
 
 
diff --git a/Core/Tools/src/ParameterPool.cpp b/Core/Tools/src/ParameterPool.cpp
index 185bd5f8c2792b1b1972f7aaaf91fedddc89dda2..0b2b319bf0d37a15ee84996789ffc3b2248f482f 100644
--- a/Core/Tools/src/ParameterPool.cpp
+++ b/Core/Tools/src/ParameterPool.cpp
@@ -17,10 +17,7 @@
 #include "Exceptions.h"
 #include "Utils.h"
 #include "MessageService.h"
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/algorithm/string/replace.hpp>
-GCC_DIAG_ON(unused-local-typedefs);
 #include <iostream>
 #include <sstream>
 
diff --git a/Core/Tools/src/ProgramOptions.cpp b/Core/Tools/src/ProgramOptions.cpp
index bab0b3b34aa77743d227fe3811224348b3eea31c..3608a3064b815a41223ea234d3e7ea55880f84a1 100644
--- a/Core/Tools/src/ProgramOptions.cpp
+++ b/Core/Tools/src/ProgramOptions.cpp
@@ -16,11 +16,8 @@
 #include "ProgramOptions.h"
 #include "Utils.h"
 #include "MessageService.h"
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/program_options/config.hpp>
 #include <boost/program_options/parsers.hpp>
-GCC_DIAG_ON(unused-local-typedefs);
 #include <iostream>
 #include <fstream>
 
diff --git a/Core/Tools/src/Utils.cpp b/Core/Tools/src/Utils.cpp
index ea52ab45903974120c2e44915ef4ff6efc742aea..e4a19d429bfa14d3a97ba4b6ff3cbac9685b2a95 100644
--- a/Core/Tools/src/Utils.cpp
+++ b/Core/Tools/src/Utils.cpp
@@ -16,14 +16,10 @@
 #include "Utils.h"
 #include "Exceptions.h"
 #include <iomanip>
-
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/regex.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-GCC_DIAG_ON(unused-local-typedefs);
 
 #ifdef DEBUG_FPE
 #include <fenv.h>
diff --git a/Fit/Factory/inc/IMinimizer.h b/Fit/Factory/inc/IMinimizer.h
index 2da417926c8297fca1972e9b9d27bd0e9b2f672b..93d59c5d35d7b78f30203643a4a777bebb2d3ef3 100644
--- a/Fit/Factory/inc/IMinimizer.h
+++ b/Fit/Factory/inc/IMinimizer.h
@@ -17,13 +17,8 @@
 #define IMINIMIZER_H
 
 #include "WinDllMacros.h"
-
 #include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/function.hpp>
-GCC_DIAG_ON(unused-local-typedefs);
-
-
 #include "Exceptions.h"
 #include <vector>
 
diff --git a/Fit/Factory/src/FitSuite.cpp b/Fit/Factory/src/FitSuite.cpp
index 2de7c91aba73f99528649f1978ae0d63c9ac7e80..f4c4659cf670b50231cb4457e6f0d49b73090232 100644
--- a/Fit/Factory/src/FitSuite.cpp
+++ b/Fit/Factory/src/FitSuite.cpp
@@ -18,13 +18,7 @@
 #include "IMinimizer.h"
 #include "MessageService.h"
 #include "FitSuitePrintObserver.h"
-
-
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/bind.hpp>
-GCC_DIAG_ON(unused-local-typedefs);
-
 
 FitSuite::FitSuite() : m_minimizer(0), m_is_last_iteration(false)
 {
diff --git a/Fit/Factory/src/MinimizerFactory.cpp b/Fit/Factory/src/MinimizerFactory.cpp
index f82e9b72bfa17086aa874b764cacc85104617646..df0c05f5a731f11697bc7995e7f225677ccdebb7 100644
--- a/Fit/Factory/src/MinimizerFactory.cpp
+++ b/Fit/Factory/src/MinimizerFactory.cpp
@@ -4,12 +4,7 @@
 #include "MinimizerTest.h"
 #include "MinimizerScan.h"
 #include "ROOTMinimizer.h"
-
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/assign/list_of.hpp>
-GCC_DIAG_ON(unused-local-typedefs);
-
 #include <iomanip>
 
 MinimizerFactory::Catalogue MinimizerFactory::m_catalogue = MinimizerFactory::Catalogue();
diff --git a/Fit/Factory/src/ROOTMinimizer.cpp b/Fit/Factory/src/ROOTMinimizer.cpp
index efb2ded2b7576aa5d3ea0d2b76029fe1ebb00f42..fd4fd06667af55219cc46b8b77c5636286a28ff8 100644
--- a/Fit/Factory/src/ROOTMinimizer.cpp
+++ b/Fit/Factory/src/ROOTMinimizer.cpp
@@ -3,15 +3,9 @@
 #include "FitSuiteParameters.h"
 #include "Utils.h"
 #include "ROOTMinimizerFunction.h"
-
 #include <iomanip>
 #include <sstream>
-
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/assign/list_of.hpp>
-GCC_DIAG_ON(unused-local-typedefs);
-
 #include <boost/assign/list_of.hpp>
 #include "ROOTGSLNLSMinimizer.h"
 #include "ROOTGSLSimAnMinimizer.h"
diff --git a/Fit/Factory/src/ROOTMinimizerHelper.cpp b/Fit/Factory/src/ROOTMinimizerHelper.cpp
index e8eb806bfcb2b212751443fdfdf7db158b08caee..4bdaa3fc22cd9fc7ad906c404b1a0be47dab36b3 100644
--- a/Fit/Factory/src/ROOTMinimizerHelper.cpp
+++ b/Fit/Factory/src/ROOTMinimizerHelper.cpp
@@ -1,11 +1,7 @@
 #include "ROOTMinimizerHelper.h"
 #include "ROOTGSLSimAnMinimizer.h"
 #include "Utils.h"
-
-#include "Macros.h"
-GCC_DIAG_OFF(unused-local-typedefs);
 #include <boost/lexical_cast.hpp>
-GCC_DIAG_ON(unused-local-typedefs);
 
 // ----------------------------------------------------------------------------
 // translate text with options into appropriate calls of minimizer's set method
diff --git a/Fit/Fit.pro b/Fit/Fit.pro
index 36f5a2faa259d759d3f5c56a6c4ed9d3c993f31b..76dfa6f2301d57485be2f429b859eedf28bf5d53 100644
--- a/Fit/Fit.pro
+++ b/Fit/Fit.pro
@@ -70,11 +70,12 @@ INCLUDEPATH += $$PWD/Factory/inc
 DEPENDPATH +=  $$PWD/Factory/inc
 
 #INCLUDEPATH += $${RootMathMore_INCLUDEPATH}
-isEmpty(ROOT_FRAMEWORK) {
-    INCLUDEPATH += $${RootMinimizers_INCLUDEPATH}
-} else {
-    INCLUDEPATH += $${ROOT_FRAMEWORK_INCLUDEPATH}
-}
+#isEmpty(ROOT_FRAMEWORK) {
+#    INCLUDEPATH += $${RootMinimizers_INCLUDEPATH}
+#} else {
+#    INCLUDEPATH += $${ROOT_FRAMEWORK_INCLUDEPATH}
+#}
+INCLUDEPATH += $${RootMinimizers_INCLUDEPATH}
 
 
 # -----------------------------------------------------------------------------
@@ -82,11 +83,12 @@ isEmpty(ROOT_FRAMEWORK) {
 # -----------------------------------------------------------------------------
 LIBS += $$PWD/../lib/libBornAgainCore.$${SONAME}
 #LIBS += $${RootMathMore_LIB}
-isEmpty(ROOT_FRAMEWORK) {
-    LIBS += $${RootMinimizers_LIB}
-} else {
-    LIBS += $${ROOT_FRAMEWORK_LIBS}
-}
+#isEmpty(ROOT_FRAMEWORK) {
+#    LIBS += $${RootMinimizers_LIB}
+#} else {
+#    LIBS += $${ROOT_FRAMEWORK_LIBS}
+#}
+LIBS += $${RootMinimizers_LIB}
 
 
 # -----------------------------------------------------------------------------
diff --git a/shared.pri b/shared.pri
index 76d46c07f1d7b4e7a57625382bb00171a3570c6e..2a90f0fa7213c1f667dc138661c07d59a24d7b7a 100644
--- a/shared.pri
+++ b/shared.pri
@@ -192,10 +192,17 @@ QMAKE_CXXFLAGS_DEBUG += -fdiagnostics-show-option # to find out in gcc which opt
 #QMAKE_CXXFLAGS_RELEASE += -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wswitch-default -Wundef -Werror -Wno-unused
 #QMAKE_CXXFLAGS_RELEASE += -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wmissing-declarations -Wmissing-include-dirs -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-overflow=5 -Wswitch-default -Werror -Wno-unused
 
+# Eigen alighnment under windows, warnings from boost
 win32{
-QMAKE_CXXFLAGS += -mincoming-stack-boundary=2
+    QMAKE_CXXFLAGS += -mincoming-stack-boundary=2 -Wno-unused-local-typedefs
 }
 
+# Because of clang which knows nothing about unused_local_typedefs pragma
+# TODO remove this by introducing clever macros in Macros.h
+#macx|unix {
+#    QMAKE_CXXFLAGS += -Wno-unused-local-typedefs
+#}
+
 # to compile with GPERFTOOLS support for code profiling
 CONFIG(GPERFTOOLS) {
   QMAKE_CXXFLAGS += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free
@@ -311,10 +318,10 @@ CONFIG(BORNAGAIN_PYTHON) {
 #    pythonvers=$$system("$${WhichPython} -c \"import sys; sys.stdout.write(sys.version[:3])\" ")
 #    pythonnumpy=$$system("$${WhichPython} -c \"import sys; import numpy; sys.stdout.write(numpy.get_include())\" ")
 
-    message(pythonvers : $$pythonvers)
-    message(pythoninc  : $$pythonsysincdir)
-    message(pythonlib  : $$pythonsyslibdir)
-    message(pythonnumpy: $$pythonnumpy)
+    #message(pythonvers : $$pythonvers)
+    #message(pythoninc  : $$pythonsysincdir)
+    #message(pythonlib  : $$pythonsyslibdir)
+    #message(pythonnumpy: $$pythonnumpy)
     lessThan(pythonvers, 2.6): error("BornAgain requires python 2.6 or greater")
     INCLUDEPATH += $$pythonsysincdir
     #LIBS += -L$$pythonsyslibdir -lpython$$pythonvers -lboost_python