diff --git a/App/App.pro b/App/App.pro
index 1a816bcb704ff12cb529ec869fe7a25ddc8ff53e..3538034c3fc12ab15548d822efb84f09def48a42 100644
--- a/App/App.pro
+++ b/App/App.pro
@@ -10,15 +10,12 @@ CONFIG += BORNAGAIN_ROOT # depend on ROOT libraries
 # -----------------------------------------------------------------------------
 # (note, that when Qt libraries are used, it is already done in <qglobal.h>)
 macx {
-    QMAKE_CXXFLAGS_DEBUG += -DQ_OS_MAC
-    QMAKE_CXXFLAGS_RELEASE += -DQ_OS_MAC
+    DEFINES += Q_OS_MAC
 }
 unix:!macx {
-    QMAKE_CXXFLAGS_DEBUG += -DQ_OS_LINUX
-    QMAKE_CXXFLAGS_RELEASE += -DQ_OS_LINUX
+    DEFINES += Q_OS_LINUX
 }
 
-
 FUNCTIONAL_TESTS = $$PWD/../Tests/FunctionalTests/TestCore
 
 # -----------------------------------------------------------------------------
@@ -43,11 +40,6 @@ SOURCES += \
     src/IFunctionalTest.cpp \
     src/IsGISAXSData.cpp \
     src/IsGISAXSTools.cpp \
-#    src/MinimizerFactory.cpp \
-#    src/ROOTGSLNLSMinimizer.cpp \
-#    src/ROOTGSLSimAnMinimizer.cpp \
-#    src/ROOTMinimizer.cpp \
-#    src/ROOTMinimizerHelper.cpp \
     src/SampleFactory.cpp \
     src/StandardSamples.cpp \
     src/TestConvolution.cpp \
@@ -109,12 +101,6 @@ HEADERS += \
     inc/IFunctionalTest.h \
     inc/IsGISAXSData.h \
     inc/IsGISAXSTools.h \
-#    inc/MinimizerFactory.h \
-#    inc/ROOTGSLNLSMinimizer.h \
-#    inc/ROOTGSLSimAnMinimizer.h \
-#    inc/ROOTMinimizer.h \
-#    inc/ROOTMinimizerFunction.h \
-#    inc/ROOTMinimizerHelper.h \
     inc/SampleFactory.h \
     inc/StandardSamples.h \
     inc/TestConvolution.h \
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS01/IsGISAXS01.pro b/Tests/FunctionalTests/TestCore/IsGISAXS01/IsGISAXS01.pro
index e9f0921efd1e51d5018ed18bb7ac4e07ae220c18..e6eb9f89c789b19f5cdcc1bfeb4ffde1b0d00d4a 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS01/IsGISAXS01.pro
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS01/IsGISAXS01.pro
@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS01.cpp
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS02/IsGISAXS02.pro b/Tests/FunctionalTests/TestCore/IsGISAXS02/IsGISAXS02.pro
index 1cada207f583156f1b7661f0a3a4770856174776..39bbbc68109899248ffdd9b5981081808e4e0897 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS02/IsGISAXS02.pro
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS02/IsGISAXS02.pro
@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS02.cpp
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS03/IsGISAXS03.pro b/Tests/FunctionalTests/TestCore/IsGISAXS03/IsGISAXS03.pro
index 6e36a428a08094c190c10b602e39f84d936f29a9..5e0f7f65bc28ab4ce472a9fb854cf0a48336e097 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS03/IsGISAXS03.pro
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS03/IsGISAXS03.pro
@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS03.cpp
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS04/IsGISAXS04.pro b/Tests/FunctionalTests/TestCore/IsGISAXS04/IsGISAXS04.pro
index 022b17b0f5bad5ec7ff36a53c76951b76dab7115..eb0e005f54d118f19a48702c344e38000db9b547 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS04/IsGISAXS04.pro
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS04/IsGISAXS04.pro
@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS04.cpp
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS06/IsGISAXS06.pro b/Tests/FunctionalTests/TestCore/IsGISAXS06/IsGISAXS06.pro
index 2d57bdcdd1bf3500ddc7363317635181e8e83d44..75a6d76a4bf3b527cf7e26ad5582bed5a53c5115 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS06/IsGISAXS06.pro
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS06/IsGISAXS06.pro
@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS06.cpp
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS07/IsGISAXS07.pro b/Tests/FunctionalTests/TestCore/IsGISAXS07/IsGISAXS07.pro
index 00e7fd1649c5bb69ddc8e4db6c9ec09aa8a2fbe4..72c0d51e08fcedd573e2ec98ab109e418289a463 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS07/IsGISAXS07.pro
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS07/IsGISAXS07.pro
@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS07.cpp
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS08/IsGISAXS08.pro b/Tests/FunctionalTests/TestCore/IsGISAXS08/IsGISAXS08.pro
index 1b36b7b05db716a644ab3a3072171e3dd9492cef..371a81ab18144294cb541f68216483611e7befdf 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS08/IsGISAXS08.pro
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS08/IsGISAXS08.pro
@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS08.cpp
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS09/IsGISAXS09.pro b/Tests/FunctionalTests/TestCore/IsGISAXS09/IsGISAXS09.pro
index c58f86dbfde5ab824788246fc3ad21388dd1f572..45d2e1c9d96d8e428054d7a4d6cec4452814ea38 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS09/IsGISAXS09.pro
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS09/IsGISAXS09.pro
@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS09.cpp
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS10/IsGISAXS10.pro b/Tests/FunctionalTests/TestCore/IsGISAXS10/IsGISAXS10.pro
index 6a7c87907bcca2f78eaa8796f6ca6ee8e187f833..276cd36ba6a8ba33fa204e3c5fec687aa98afb02 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS10/IsGISAXS10.pro
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS10/IsGISAXS10.pro
@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS10.cpp
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS11/IsGISAXS11.pro b/Tests/FunctionalTests/TestCore/IsGISAXS11/IsGISAXS11.pro
index b901a25fefce01e7bee19f8ac91cda3ca584d663..0845f1b3819e6de1c82395d2aff987ff92f04d59 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS11/IsGISAXS11.pro
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS11/IsGISAXS11.pro
@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS11.cpp
diff --git a/Tests/FunctionalTests/TestCore/IsGISAXS15/IsGISAXS15.pro b/Tests/FunctionalTests/TestCore/IsGISAXS15/IsGISAXS15.pro
index 26c7d3850ce5e69124b39234817abfe7f5258374..bd21d55bf77973d5a6ea00083957f56c89f36688 100644
--- a/Tests/FunctionalTests/TestCore/IsGISAXS15/IsGISAXS15.pro
+++ b/Tests/FunctionalTests/TestCore/IsGISAXS15/IsGISAXS15.pro
@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS15.cpp