diff --git a/BaseLib/BuildInfo.cpp.in b/BaseLib/BuildInfo.cpp.in
new file mode 100644
index 0000000000000000000000000000000000000000..de7ffa9ece1011ec689311872309c91f001d1af8
--- /dev/null
+++ b/BaseLib/BuildInfo.cpp.in
@@ -0,0 +1,37 @@
+/**
+ * \brief  Build information.
+ *
+ * \copyright
+ * Copyright (c) 2014, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/project/license
+ *
+ */
+
+#include "BaseLib/BuildInfo.h"
+
+namespace BaseLib
+{
+
+namespace BuildInfo
+{
+
+    const std::string build_timestamp("@BUILD_TIMESTAMP@");
+
+    const std::string cmake_cxx_compiler("@CMAKE_CXX_COMPILER@");
+    const std::string cmake_cxx_flags("@CMAKE_CXX_FLAGS@");
+    const std::string cmake_cxx_flags_release("@CMAKE_CXX_FLAGS_RELEASE@");
+    const std::string cmake_cxx_flags_debug("@CMAKE_CXX_FLAGS_DEBUG@");
+
+    const std::string git_version_sha1("@GIT_SHA1@");
+    const std::string git_version_sha1_short("@GIT_SHA1_SHORT@");
+
+    const std::string ogs_version("@OGS_VERSION@");
+    const std::string ogs_version_and_persons("@OGS_VERSION_AND_PERSONS@");
+
+    const std::string source_path("@CMAKE_CURRENT_SOURCE_DIR@");
+    const std::string tests_tmp_path("@PROJECT_BINARY_DIR@/Tests/");
+
+}
+}
diff --git a/BaseLib/BuildInfo.h b/BaseLib/BuildInfo.h
new file mode 100644
index 0000000000000000000000000000000000000000..c363bbafb102c28517a75c2dcefea005bb64e1cf
--- /dev/null
+++ b/BaseLib/BuildInfo.h
@@ -0,0 +1,40 @@
+/**
+ * \brief  Build information.
+ *
+ * \copyright
+ * Copyright (c) 2014, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/project/license
+ *
+ */
+
+#ifndef BASE_LIB_BUILD_INFO_H_
+#define BASE_LIB_BUILD_INFO_H_
+
+#include <string>
+
+namespace BaseLib
+{
+
+namespace BuildInfo
+{
+    extern const std::string build_timestamp;
+
+    extern const std::string cmake_cxx_compiler;
+    extern const std::string cmake_cxx_flags;
+    extern const std::string cmake_cxx_flags_release;
+    extern const std::string cmake_cxx_flags_debug;
+
+    extern const std::string git_version_sha1;
+    extern const std::string git_version_sha1_short;
+
+    extern const std::string ogs_version;
+    extern const std::string ogs_version_and_persons;
+
+    extern const std::string source_path;
+    extern const std::string tests_tmp_path;
+}
+}
+
+#endif  // BASE_LIB_BUILD_INFO_H_
diff --git a/BaseLib/BuildInfo.h.in b/BaseLib/BuildInfo.h.in
deleted file mode 100644
index b76854e0db251cbbafa8fb3c630e2520a9edad29..0000000000000000000000000000000000000000
--- a/BaseLib/BuildInfo.h.in
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * \file
- * \author Lars Bilke
- * \date   2010-08-24
- * \brief  #defines which gets set through CMake.
- *
- * \copyright
- * Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.org/project/license
- *
- */
-
-#ifndef BUILDINFO_H
-#define BUILDINFO_H
-
-#cmakedefine CMAKE_CMD_ARGS "${CMAKE_CMD_ARGS}"
-#cmakedefine CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}"
-
-// #cmakedefine SVN_REVISION "${SVN_REVISION}"
-// #cmakedefine GIT_COMMIT_INFO "${GIT_COMMIT_INFO}"
-// #cmakedefine GIT_BRANCH_INFO "${GIT_BRANCH_INFO}"
-// #cmakedefine BUILD_TIMESTAMP "${BUILD_TIMESTAMP}"
-// #cmakedefine CMAKE_RUN_TIMESTAMP ""
-// #cmakedefine CMAKE_SYSTEM "${CMAKE_SYSTEM}-x${BITS}"
-
-#cmakedefine CMAKE_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}"
-#cmakedefine CMAKE_CXX_COMPILER "${CMAKE_CXX_COMPILER}"
-#cmakedefine CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}"
-#cmakedefine CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}"
-#cmakedefine CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}"
-#cmakedefine CMAKE_GENERATOR "${CMAKE_GENERATOR}"
-#cmakedefine HOSTNAME "${HOSTNAME}"
-
-#ifndef CMAKE_CXX_FLAGS
-#define CMAKE_CXX_FLAGS ""
-#endif // CMAKE_CXX_FLAGS
-
-#ifndef CMAKE_CXX_FLAGS_DEBUG
-#define CMAKE_CXX_FLAGS_DEBUG ""
-#endif // CMAKE_CXX_FLAGS_DEBUG
-
-#endif // BUILDINFO_H
diff --git a/BaseLib/CMakeLists.txt b/BaseLib/CMakeLists.txt
index ad1c17ab64a915ebf7c841898e7a8148fd00eef6..4ccc1008d13b462fc32378ac0faf42ad61436e4d 100644
--- a/BaseLib/CMakeLists.txt
+++ b/BaseLib/CMakeLists.txt
@@ -2,8 +2,7 @@
 
 GET_SOURCE_FILES(SOURCES)
 
-CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/GitSHA1.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp" @ONLY)
-LIST(APPEND SOURCES "${CMAKE_CURRENT_BINARY_DIR}/GitSHA1.cpp" GitSHA1.h)
+LIST(APPEND SOURCES "${CMAKE_CURRENT_BINARY_DIR}/BuildInfo.cpp" BuildInfo.h)
 
 # Create the library
 ADD_LIBRARY( BaseLib STATIC ${SOURCES})
diff --git a/BaseLib/Configure.h.in b/BaseLib/Configure.h.in
deleted file mode 100644
index 513420e9199e7f20e20c923616d7a3b754394622..0000000000000000000000000000000000000000
--- a/BaseLib/Configure.h.in
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * \file
- * \author Lars Bilke
- * \date   no date
- * \brief  #defines which gets set through CMake
- *
- * \copyright
- * Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.org/project/license
- *
- */
-
- #ifndef CONFIGURE_H
- #define CONFIGURE_H
-
-// Type sizes
-#cmakedefine SIZEOF_INT ${SIZEOF_INT}
-#cmakedefine SIZEOF_LONG ${SIZEOF_LONG}
-#cmakedefine SIZEOF_LONG_LONG ${SIZEOF_LONG_LONG}
-#cmakedefine SIZEOF_VOID_P ${SIZEOF_VOID_P}
-
-// Has includes?
-#cmakedefine HAVE_DLFCN_H 1
-#cmakedefine HAVE_INTTYPES_H 1
-#cmakedefine HAVE_MALLOC_H 1
-#cmakedefine HAVE_MEMORY_H 1
-#cmakedefine HAVE_STDINT_H 1
-#cmakedefine HAVE_STDLIB_H 1
-#cmakedefine HAVE_STRINGS_H 1
-#cmakedefine HAVE_STRING_H 1
-#cmakedefine HAVE_SYS_STAT_H 1
-#cmakedefine HAVE_SYS_TIME_H 1
-#cmakedefine HAVE_SYS_TYPES_H 1
-#cmakedefine HAVE_UNISTD_H 1
-#cmakedefine HAVE_SYS_MOUNT_H 1
-#cmakedefine QT4_FOUND ${QT4_FOUND}
-
-#define SOURCEPATH "${CMAKE_CURRENT_SOURCE_DIR}"
-
-#cmakedefine OGS_VERSION "${OGS_VERSION}"
-#cmakedefine OGS_VERSION_AND_PERSONS "${OGS_VERSION_AND_PERSONS}"
-#cmakedefine OGS_DATE "${OGS_DATE}"
-
-// for tests
-#cmakedefine OGS_EXECUTABLE "${OGS_EXECUTABLE}"
-#define PUT_TMP_DIR_IN "${PROJECT_BINARY_DIR}/Tests/"
-
-#cmakedefine PROCESSOR_COUNT ${PROCESSOR_COUNT}
-
-#endif // CONFIGURE_H
diff --git a/BaseLib/FileFinder.h b/BaseLib/FileFinder.h
index 05173fcc0c1f38b959fcb67f7af14391b24c0521..36798d6be4adeb47bc8e456394322c5f960cb3c0 100644
--- a/BaseLib/FileFinder.h
+++ b/BaseLib/FileFinder.h
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include "Configure.h"
+#include "BuildInfo.h"
 #include "logog/include/logog.hpp"
 
 namespace BaseLib
@@ -36,7 +36,7 @@ public:
 	FileFinder()
 	{
 		addDirectory(".");
-		addDirectory(std::string(SOURCEPATH).append("/FileIO"));
+		addDirectory(BuildInfo::source_path + "/FileIO");
 	}
 
 	/**
diff --git a/BaseLib/GitSHA1.cpp.in b/BaseLib/GitSHA1.cpp.in
deleted file mode 100644
index 7198e7d92ad0c3aa6014fc45e24868228d4853ee..0000000000000000000000000000000000000000
--- a/BaseLib/GitSHA1.cpp.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <stdio.h>
-#include "GitSHA1.h"
-
-#define GIT_SHA1 "@GIT_SHA1@"
-const char g_GIT_SHA1[] = GIT_SHA1;
-
-#define GIT_SHA1_SHORT "@GIT_SHA1_SHORT@"
-const char g_GIT_SHA1_SHORT[] = GIT_SHA1_SHORT;
-
-void dummy()
-{
-	printf(g_GIT_SHA1);
-	printf(g_GIT_SHA1_SHORT);
-}
diff --git a/BaseLib/GitSHA1.h b/BaseLib/GitSHA1.h
deleted file mode 100644
index 599cd7d3417cc86c285053b2cab5858ef29cf718..0000000000000000000000000000000000000000
--- a/BaseLib/GitSHA1.h
+++ /dev/null
@@ -1,2 +0,0 @@
-extern const char g_GIT_SHA1[];
-extern const char g_GIT_SHA1_SHORT[];
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd2da6b5cb9d20957109b500dff5615ba4c56010..ecf5bc23f082bfcb0f75df15219a9feda1f92601 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -166,5 +166,6 @@ IF(OGS_BUILD_UTILS AND NOT IS_SUBPROJECT)
 	ADD_SUBDIRECTORY( Utils/MeshEdit )
 ENDIF() # OGS_BUILD_UTILS
 
-CONFIGURE_FILE (BaseLib/BuildInfo.h.in ${PROJECT_BINARY_DIR}/BaseLib/BuildInfo.h)
-CONFIGURE_FILE (BaseLib/Configure.h.in ${PROJECT_BINARY_DIR}/BaseLib/Configure.h)
+# The configuration must be called from the source dir and not BaseLib/.
+CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/BaseLib/BuildInfo.cpp.in"
+	"${CMAKE_CURRENT_BINARY_DIR}/BaseLib/BuildInfo.cpp" @ONLY)
diff --git a/FileIO/GMSHInterface.cpp b/FileIO/GMSHInterface.cpp
index 35218aadf0c34f2b926c66a5c7f8da22608da4eb..db1d4697b8b2ebfc419a7abb8f5348fc786a2676 100644
--- a/FileIO/GMSHInterface.cpp
+++ b/FileIO/GMSHInterface.cpp
@@ -22,8 +22,7 @@
 #include "logog/include/logog.hpp"
 
 // BaseLib
-#include "BuildInfo.h"
-#include "Configure.h"
+#include "BaseLib/BuildInfo.h"
 #include "FileTools.h"
 #include "StringTools.h"
 
@@ -256,9 +255,9 @@ void GMSHInterface::readNodeIDs(std::ifstream &in,
 
 bool GMSHInterface::write()
 {
-	_out << "// GMSH input file created by OpenGeoSys " << OGS_VERSION_AND_PERSONS;
+	_out << "// GMSH input file created by OpenGeoSys " << BaseLib::BuildInfo::ogs_version_and_persons;
 #ifdef BUILD_TIMESTAMP
-	_out << " built on " << BUILD_TIMESTAMP;
+	_out << " built on " << BaseLib::BuildInfo::build_timestamp;
 #endif
 	_out << "\n\n";
 
diff --git a/Gui/DataView/GEOModels.h b/Gui/DataView/GEOModels.h
index ffed6e902e36bd46bf5dd1cc689dffa4cd7c24b3..52ee266ed25fe321a9a222a2d3dc8396af148786 100644
--- a/Gui/DataView/GEOModels.h
+++ b/Gui/DataView/GEOModels.h
@@ -15,11 +15,11 @@
 #ifndef GEOMODELS_H
 #define GEOMODELS_H
 
-// ** INCLUDES **
-#include "GEOObjects.h"
-#include "GeoType.h"
 #include <QObject>
 
+#include "GeoLib/GEOObjects.h"
+#include "GeoLib/GeoType.h"
+
 class GeoTreeModel;
 class Model;
 class PntsModel;
diff --git a/Gui/main.cpp b/Gui/main.cpp
index 520d098fe34f0895a62edac03144aeb65ce47ef5..f4c6d16682fb184e75e2af2e303e45763f4ae3c7 100644
--- a/Gui/main.cpp
+++ b/Gui/main.cpp
@@ -1,4 +1,3 @@
-#include "Configure.h"
 #include "mainwindow.h"
 #include <QtGui/QApplication>
 #ifdef VTKOSGCONVERTER_FOUND
@@ -13,6 +12,8 @@ FbxManager* lSdkManager = NULL;
 FbxScene* lScene = NULL;
 #endif
 
+#include "BaseLib/BuildInfo.h"
+
 int main(int argc, char* argv[])
 {
 #ifdef VTKOSGCONVERTER_FOUND
@@ -27,13 +28,16 @@ int main(int argc, char* argv[])
 	logogCout->SetFormatter(*formatter);
 	QApplication a(argc, argv);
 	QApplication::setApplicationName("OpenGeoSys - Data Explorer");
-	QApplication::setApplicationVersion(QString(OGS_VERSION));
+	QApplication::setApplicationVersion(QString::fromStdString(
+		BaseLib::BuildInfo::ogs_version));
 	QApplication::setOrganizationName("OpenGeoSys Community");
 	QApplication::setOrganizationDomain("opengeosys.org");
 	setlocale(LC_NUMERIC,"C");
 	QLocale::setDefault(QLocale::German);
 	MainWindow* w = new MainWindow();
-	w->setWindowTitle( w->windowTitle() + " - " + QString(OGS_VERSION_AND_PERSONS) + " - FirstFloor");
+	w->setWindowTitle( w->windowTitle() + " - " +
+		QString::fromStdString(BaseLib::BuildInfo::ogs_version_and_persons) +
+		" - FirstFloor");
 	w->show();
 	int returncode = a.exec();
 	delete w;
diff --git a/Gui/mainwindow.cpp b/Gui/mainwindow.cpp
index c16a9ba8f38acb0281498b3093471917cde273c7..f917d13cb43284b96ba68e0ed341fdb4784f85bb 100644
--- a/Gui/mainwindow.cpp
+++ b/Gui/mainwindow.cpp
@@ -12,14 +12,13 @@
  *
  */
 
-#include "Configure.h"
 #include "mainwindow.h"
 
 // ThirdParty/logog
 #include "logog/include/logog.hpp"
 
 // BaseLib
-#include "GitSHA1.h"
+#include "BaseLib/BuildInfo.h"
 #include "FileTools.h"
 
 // models
@@ -121,7 +120,7 @@
 #endif // OGS_USE_VRPN
 
 #ifdef OGS_BUILD_INFO
-#include "BuildInfo.h"
+#include "BaseLib/BuildInfo.h"
 #endif // OGS_BUILD_INFO
 
 using namespace FileIO;
@@ -749,11 +748,12 @@ void MainWindow::showLicense()
 void MainWindow::about()
 {
 	QString about("<a href='http://www.opengeosys.org'>http://www.opengeosys.org</a><br /><br />");
-	QString ogsVersion = QString(OGS_VERSION_AND_PERSONS);
+	QString ogsVersion = QString::fromStdString(
+		BaseLib::BuildInfo::ogs_version_and_persons);
 	about.append(QString("Version: %1<br /><br />").arg(ogsVersion));
 
 	about.append(QString("Git commit: <a href='https://github.com/ufz/ogs/commit/%1'>%1</a><br />")
-		.arg(QString(g_GIT_SHA1_SHORT)));
+		.arg(QString::fromStdString(BaseLib::BuildInfo::git_version_sha1_short)));
 	about.append(QString("Built date: %1<br />").arg(QDate::currentDate().toString(Qt::ISODate)));
 
 	QMessageBox::about(this, "About OpenGeoSys 6", about);
diff --git a/SimpleTests/MatrixTests/MatMult.cpp b/SimpleTests/MatrixTests/MatMult.cpp
index 28552a3d331f562d274d4a0af0b370985cd3073d..fbd318729a34da5f4d3ddc667bc0709ab3ff304b 100644
--- a/SimpleTests/MatrixTests/MatMult.cpp
+++ b/SimpleTests/MatrixTests/MatMult.cpp
@@ -36,7 +36,7 @@
 #endif
 
 #ifdef OGS_BUILD_INFO
-#include "BuildInfo.h"
+#include "BaseLib/BuildInfo.h"
 #endif
 
 #ifdef _OPENMP
@@ -102,11 +102,17 @@ int main(int argc, char *argv[])
 	unsigned n_threads (n_cores_arg.getValue());
 
 #ifdef OGS_BUILD_INFO
-	INFO("%s was build with compiler %s", argv[0], CMAKE_CXX_COMPILER);
+	INFO("%s was build with compiler %s",
+		argv[0],
+		BaseLib::BuildInfo::cmake_cxx_compiler.c_str());
 	#ifdef NDEBUG
-		INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_RELEASE);
+		INFO("CXX_FLAGS: %s %s",
+			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+			BaseLib::BuildInfo::cmake_cxx_flags_release.c_str());
 	#else
-		INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_DEBUG);
+		INFO("CXX_FLAGS: %s %s",
+			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+			BaseLib::BuildInfo::cmake_cxx_flags_debug.c_str());
 	#endif
 #endif
 
diff --git a/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp b/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp
index b8071bf648779292ee85b8d54ee0b2e740414dc9..a7c834d3948d7610d68db2fe6b72cfe10d61b8a8 100644
--- a/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp
+++ b/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp
@@ -15,7 +15,7 @@
 #include <cstdlib>
 
 #ifdef OGS_BUILD_INFO
-#include "BuildInfo.h"
+#include "BaseLib/BuildInfo.h"
 #endif
 
 #ifdef UNIX
@@ -90,12 +90,18 @@ int main(int argc, char *argv[])
 	logogCout->SetFormatter(*custom_format);
 
 #ifdef OGS_BUILD_INFO
-	INFO("%s was build with compiler %s", argv[0], CMAKE_CXX_COMPILER);
-#ifdef NDEBUG
-	INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_RELEASE);
-#else
-	INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_DEBUG);
-#endif
+	INFO("%s was build with compiler %s",
+		argv[0],
+		BaseLib::BuildInfo::cmake_cxx_compiler.c_str());
+	#ifdef NDEBUG
+		INFO("CXX_FLAGS: %s %s",
+			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+			BaseLib::BuildInfo::cmake_cxx_flags_release.c_str());
+	#else
+		INFO("CXX_FLAGS: %s %s",
+			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+			BaseLib::BuildInfo::cmake_cxx_flags_debug.c_str());
+	#endif
 #endif
 
 #ifdef UNIX
diff --git a/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp b/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp
index c522ed6a3fcf952af90206c3e1ff03541540829e..9bc713be379dafff0625a0f4c61bf85e9ff4bf10 100644
--- a/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp
+++ b/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp
@@ -35,7 +35,7 @@
 #endif
 
 #ifdef OGS_BUILD_INFO
-#include "BuildInfo.h"
+#include "BaseLib/BuildInfo.h"
 #endif
 
 #ifdef _OPENMP
@@ -100,12 +100,18 @@ int main(int argc, char *argv[])
 	unsigned n_threads (n_cores_arg.getValue());
 
 #ifdef OGS_BUILD_INFO
-	INFO("%s was build with compiler %s", argv[0], CMAKE_CXX_COMPILER);
-#ifdef NDEBUG
-	INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_RELEASE);
-#else
-	INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_DEBUG);
-#endif
+	INFO("%s was build with compiler %s",
+		argv[0],
+		BaseLib::BuildInfo::cmake_cxx_compiler.c_str());
+	#ifdef NDEBUG
+		INFO("CXX_FLAGS: %s %s",
+			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+			BaseLib::BuildInfo::cmake_cxx_flags_release.c_str());
+	#else
+		INFO("CXX_FLAGS: %s %s",
+			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+			BaseLib::BuildInfo::cmake_cxx_flags_debug.c_str());
+	#endif
 #endif
 
 #ifdef UNIX
diff --git a/SimpleTests/MatrixTests/MatVecMultPthreads.cpp b/SimpleTests/MatrixTests/MatVecMultPthreads.cpp
index 2452bec807612eeea3b5dd4b89ad9c947cf66314..2ef9024a7751e0d9b5f3a20143ac0f9ce509d3ed 100644
--- a/SimpleTests/MatrixTests/MatVecMultPthreads.cpp
+++ b/SimpleTests/MatrixTests/MatVecMultPthreads.cpp
@@ -33,7 +33,7 @@
 #endif
 
 #ifdef OGS_BUILD_INFO
-#include "BuildInfo.h"
+#include "BaseLib/BuildInfo.h"
 #endif
 
 #ifdef HAVE_PTHREADS
@@ -94,16 +94,18 @@ int main(int argc, char *argv[])
 	}
 
 #ifdef OGS_BUILD_INFO
-	INFO("%s was build with compiler %s", argv[0], CMAKE_CXX_COMPILER);
-#ifdef CMAKE_BUILD_TYPE
-	if (std::string(CMAKE_BUILD_TYPE).compare("Release") == 0) {
-		INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_RELEASE);
-	} else {
-		INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_DEBUG);
-	}
-#else
-    INFO("CXX_FLAGS: %s", CMAKE_CXX_FLAGS);
-#endif
+	INFO("%s was build with compiler %s",
+		argv[0],
+		BaseLib::BuildInfo::cmake_cxx_compiler.c_str());
+	#ifdef NDEBUG
+		INFO("CXX_FLAGS: %s %s",
+			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+			BaseLib::BuildInfo::cmake_cxx_flags_release.c_str());
+	#else
+		INFO("CXX_FLAGS: %s %s",
+			BaseLib::BuildInfo::cmake_cxx_flags.c_str(),
+			BaseLib::BuildInfo::cmake_cxx_flags_debug.c_str());
+	#endif
 #endif
 
 #ifdef UNIX
diff --git a/Tests/FileIO/TestBoostXmlCndInterface.cpp b/Tests/FileIO/TestBoostXmlCndInterface.cpp
index be5cc03b024da177633ed672454a3816aa054179..d1e4a03e531b3f0476be8b89cf8d82f133be251f 100644
--- a/Tests/FileIO/TestBoostXmlCndInterface.cpp
+++ b/Tests/FileIO/TestBoostXmlCndInterface.cpp
@@ -14,7 +14,8 @@
 #include <boost/filesystem.hpp>
 
 #include "gtest/gtest.h"
-#include "Configure.h"
+
+#include "BaseLib/BuildInfo.h"
 
 // FileIO
 #include "XmlIO/Qt/XmlCndInterface.h"
@@ -59,7 +60,7 @@ TEST(FileIO, TestBoostXmlCndInterfaceUsingBoundaryCondition)
 
 	// write bc to file
 	const std::string local_path("XmlCndInterfaceTestFile.cnd");
-	std::string fname(std::string(PUT_TMP_DIR_IN).append(local_path));
+	std::string fname(BaseLib::BuildInfo::tests_tmp_path + local_path);
 
 	FileIO::XmlCndInterface xml(project_data);
 	xml.setNameForExport(geometry_name);
diff --git a/Tests/FileIO/TestXmlGmlReader.cpp b/Tests/FileIO/TestXmlGmlReader.cpp
index d998d41ee7d68003f2a041c5a43896a35cd3a65e..606f7767504e0c7df721e06c2d46dda7bf1b9250 100644
--- a/Tests/FileIO/TestXmlGmlReader.cpp
+++ b/Tests/FileIO/TestXmlGmlReader.cpp
@@ -15,7 +15,7 @@
 #include <boost/filesystem.hpp>
 
 #include "gtest/gtest.h"
-#include "Configure.h"
+#include "BaseLib/BuildInfo.h"
 
 // FileIO
 #include "XmlIO/Qt/XmlGmlInterface.h"
@@ -30,7 +30,7 @@
 TEST(FileIO, XmlGmlWriterReaderTest)
 {
 	// Writer test
-	std::string test_data_file(std::string(SOURCEPATH).append("/Tests/FileIO/xmlgmltestdata.gml"));
+	std::string test_data_file(BaseLib::BuildInfo::source_path + "/Tests/FileIO/xmlgmltestdata.gml");
 
 	ProjectData project;
 	GeoLib::GEOObjects geo_objects;
diff --git a/Tests/testrunner.cpp b/Tests/testrunner.cpp
index af887d2e65bb1ccf5a0cba0ad4555e1e2f198657..d1e992b51c298f6852ae25bbe32f837f8f7a5dfe 100644
--- a/Tests/testrunner.cpp
+++ b/Tests/testrunner.cpp
@@ -13,7 +13,6 @@
  */
 
 // ** INCLUDES **
-#include "Configure.h"
 #include "gtest/gtest.h"
 #include "logog/include/logog.hpp"
 
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index e19efb032213aa3f72cc2e9f9f75ad24715c631f..c14977ba1ea649bd2f99c73ffcb6da35c3829bc2 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -88,7 +88,7 @@ IF ( QT4_FOUND )
 	SET(QT_USE_QTXML TRUE)
 	SET(QT_USE_QTXMLPATTERNS TRUE)
 	INCLUDE( ${QT_USE_FILE} )
-	ADD_DEFINITIONS(${QT_DEFINITIONS})
+	ADD_DEFINITIONS(${QT_DEFINITIONS} -DQT4_FOUND)
 ENDIF (QT4_FOUND )
 
 ## pthread ##