diff --git a/FileIO/XmlIO/Qt/XmlGspInterface.h b/FileIO/XmlIO/Qt/XmlGspInterface.h
index 5cb48c32f6a65e15c06f7f8403631ceb172ae064..efbb415d0b7af0a12ffa770ffc553c1fbb686e84 100644
--- a/FileIO/XmlIO/Qt/XmlGspInterface.h
+++ b/FileIO/XmlIO/Qt/XmlGspInterface.h
@@ -18,7 +18,7 @@
 #include "../XMLInterface.h"
 #include "XMLQtInterface.h"
 
-#include "OGS/ProjectData.h"
+#include "Applications/ProjectData.h"
 
 namespace FileIO
 {
diff --git a/Gui/DataExplorer.cmake b/Gui/DataExplorer.cmake
index e83745cb494f0134af535e9f10bd3e8a56534c98..5a320ba63858dbf08d0c4d0f80165a3a2f4f10ec 100644
--- a/Gui/DataExplorer.cmake
+++ b/Gui/DataExplorer.cmake
@@ -70,6 +70,7 @@ ADD_EXECUTABLE( ogs-gui MACOSX_BUNDLE
 
 TARGET_LINK_LIBRARIES( ogs-gui
 	${QT_LIBRARIES}
+	ApplicationsLib
 	BaseLib
 	GeoLib
 	FileIO
diff --git a/Gui/DataView/CondFromRasterDialog.h b/Gui/DataView/CondFromRasterDialog.h
index c2917ec6339550ba117e9ea641575684b5c74439..7b12e04e0c6e571aaa24d222bb5e92f6ef7cf9a2 100644
--- a/Gui/DataView/CondFromRasterDialog.h
+++ b/Gui/DataView/CondFromRasterDialog.h
@@ -18,7 +18,7 @@
 #include "ui_CondFromRaster.h"
 #include <QDialog>
 
-#include "ProjectData.h"
+#include "Applications/ProjectData.h"
 
 namespace MeshLib {
 	class Mesh;
diff --git a/Gui/DataView/MeshElementRemovalDialog.h b/Gui/DataView/MeshElementRemovalDialog.h
index 6f2a77e8f30f587f9212872d52af6355ac62c0ae..bf0a2c21b9104b195ce7cbb60a7f67d6b64300c2 100644
--- a/Gui/DataView/MeshElementRemovalDialog.h
+++ b/Gui/DataView/MeshElementRemovalDialog.h
@@ -18,7 +18,7 @@
 #include "ui_MeshElementRemoval.h"
 #include <QDialog>
 
-#include "ProjectData.h"
+#include "Applications/ProjectData.h"
 
 class Node;
 
diff --git a/Gui/DataView/MshModel.h b/Gui/DataView/MshModel.h
index d07d3215b14c428d38ed5a444ac96260ff3a55c5..d0fcd7360788eac4db3f92f1ccff058dce60b172 100644
--- a/Gui/DataView/MshModel.h
+++ b/Gui/DataView/MshModel.h
@@ -16,7 +16,7 @@
 #define MSHMODEL_H
 
 // ** INCLUDES **
-#include "ProjectData.h"
+#include "Applications/ProjectData.h"
 #include "TreeModel.h"
 
 namespace MeshLib {
diff --git a/Gui/mainwindow.h b/Gui/mainwindow.h
index b12bb5da3f125d49a9137623bcc5a6fcdc3b7c04..2a5af6d66dced8143c4a81c02cdc652c8f9209b7 100644
--- a/Gui/mainwindow.h
+++ b/Gui/mainwindow.h
@@ -15,7 +15,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include "ProjectData.h"
+#include "Applications/ProjectData.h"
 #include "ImportFileTypes.h"
 #include "ui_mainwindow.h"
 
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 0e3b5c0eae842f60e1db2db9abdb0484a64885e7..72069e17af29e88f8b9c89d39a2b7939a9d58115 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -44,6 +44,7 @@ ENDIF()
 
 TARGET_LINK_LIBRARIES(testrunner
 	GTest
+	ApplicationsLib
 	AssemblerLib
 	BaseLib
 	FileIO
diff --git a/Tests/FileIO/TestXmlGmlReader.cpp b/Tests/FileIO/TestXmlGmlReader.cpp
index 6262d8589924cf9adb1f78bd2d684facab272003..9dfa12496d3466fd7972eb439e9a0b815831a97a 100644
--- a/Tests/FileIO/TestXmlGmlReader.cpp
+++ b/Tests/FileIO/TestXmlGmlReader.cpp
@@ -20,8 +20,7 @@
 // FileIO
 #include "XmlIO/Qt/XmlGmlInterface.h"
 
-// OgsLib
-#include "OGS/ProjectData.h"
+#include "Applications/ProjectData.h"
 
 // GeoLib
 #include "Polyline.h"
diff --git a/Utils/FileConverter/CMakeLists.txt b/Utils/FileConverter/CMakeLists.txt
index 2ba98630f99cf12399df911b306d76502918f57e..a40352dec986e99c29b2061b21cdc3921345e81f 100644
--- a/Utils/FileConverter/CMakeLists.txt
+++ b/Utils/FileConverter/CMakeLists.txt
@@ -26,6 +26,7 @@ IF (QT4_FOUND)
 
 	ADD_EXECUTABLE (generateBCandGLI generateBCandGLI.cpp )
 	TARGET_LINK_LIBRARIES (generateBCandGLI
+		ApplicationsLib
 		FileIO
 		GeoLib
 		OgsLib
@@ -34,6 +35,7 @@ IF (QT4_FOUND)
 
 	ADD_EXECUTABLE (generateBCFromPolyline generateBCFromPolyline.cpp )
 	TARGET_LINK_LIBRARIES (generateBCFromPolyline
+		ApplicationsLib
 		FileIO
 		GeoLib
 		OgsLib
diff --git a/Utils/FileConverter/generateBCFromPolyline.cpp b/Utils/FileConverter/generateBCFromPolyline.cpp
index 198b04df6327784ce68e989f3ad5d3f7d51d45e6..b4ef4c9d6951b20cc2eb3556ec32327a56b02ee8 100644
--- a/Utils/FileConverter/generateBCFromPolyline.cpp
+++ b/Utils/FileConverter/generateBCFromPolyline.cpp
@@ -21,7 +21,7 @@
 #include "PolylineVec.h"
 
 // OGS
-#include "OGS/ProjectData.h"
+#include "Applications/ProjectData.h"
 
 // FileIO
 #include "XmlIO/Qt/XmlGmlInterface.h"
diff --git a/Utils/FileConverter/generateBCandGLI.cpp b/Utils/FileConverter/generateBCandGLI.cpp
index 5832fc800d9bcee18785d3f83ea13dcb8e9d78b3..8c266c4027af178ad2c5e77990252b67603241a4 100644
--- a/Utils/FileConverter/generateBCandGLI.cpp
+++ b/Utils/FileConverter/generateBCandGLI.cpp
@@ -23,8 +23,7 @@
 #include "GEOObjects.h"
 #include "SurfaceVec.h"
 
-// OgsLib
-#include "OGS/ProjectData.h"
+#include "Applications/ProjectData.h"
 
 // FileIO
 #include "XmlIO/Qt/XmlGmlInterface.h"