diff --git a/Applications/ApplicationsLib/CMakeLists.txt b/Applications/ApplicationsLib/CMakeLists.txt
index 6316f23afea5d231f3bdeb25b6c518110a17e2b0..071e323937c9249494a55f3420afc51106890319 100644
--- a/Applications/ApplicationsLib/CMakeLists.txt
+++ b/Applications/ApplicationsLib/CMakeLists.txt
@@ -9,7 +9,6 @@ target_link_libraries(ApplicationsLib
 	NumLib
 	ProcessLib
 	${VTK_LIBRARIES}
-	logog
 )
 ADD_VTK_DEPENDENCY(ApplicationsLib)
 
diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt
index 8324aba968de1d4b7f64607eff7f7aa339a23d7f..810d5001909188ae4b81acba7a0ddfab3f138f39 100644
--- a/Applications/CLI/CMakeLists.txt
+++ b/Applications/CLI/CMakeLists.txt
@@ -5,6 +5,10 @@ add_executable(ogs
 
 target_link_libraries(ogs
     ApplicationsLib
+    AssemblerLib
+    MeshGeoToolsLib
+    ProcessLib
+    NumLib
     FileIO
 )
 
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 5bfac32991b6d16679ce6953cf463078cf327661..70ca1d8aef1c4879a25ca875912a5686d5012be9 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -55,6 +55,7 @@ target_link_libraries(DataExplorer
 	ApplicationsLib
 	DataHolderLib
 	FileIO
+	InSituLib
 	QtDataView
 	QtDiagramView
 	QtStratView
@@ -63,6 +64,7 @@ target_link_libraries(DataExplorer
 	Threads::Threads
 	OGSFileConverterLib
 	vtkGUISupportQt
+	logog
 )
 
 if(CMAKE_CROSSCOMPILING)
diff --git a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
index 429e13c37f974d32c69ff7d9c233b19f989ab764..efc44136bac7dbbf9efa06675df52bd56984e49a 100644
--- a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
@@ -30,6 +30,6 @@ add_library(QtStratView
 	${UIS}
 )
 
-target_link_libraries(QtStratView Qt4::QtGui)
+target_link_libraries(QtStratView Qt4::QtGui QtBase)
 
 set_property(TARGET QtStratView PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index 0ad4be4c44ea47ecf836e57f9d0273a6dda05b9b..2cde9ff9fc0d005201a607294e0cc10bae766892 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -38,7 +38,12 @@ target_link_libraries(OGSFileConverterLib QtBase)
 
 add_executable(OGSFileConverter main.cpp)
 
-target_link_libraries(OGSFileConverter OGSFileConverterLib FileIO QtBase)
+target_link_libraries(OGSFileConverter
+	ApplicationsLib
+	OGSFileConverterLib
+	FileIO
+	QtBase
+	GeoLib)
 ADD_VTK_DEPENDENCY(OGSFileConverter)
 
 include(${QT_USE_FILE})
diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index 3c2152b5ca4e67de2e72d8b497b886a56d10aa71..969ed1ff3ad874108a5d9a947d56c8d6547adc60 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -57,8 +57,8 @@ add_library(FileIO ${SOURCES})
 
 target_link_libraries(FileIO
 	GeoLib
-	InSituLib
 	MeshLib
+	InSituLib
 	logog
 )
 if(QT4_FOUND)
diff --git a/GeoLib/CMakeLists.txt b/GeoLib/CMakeLists.txt
index 7efcc2985afd5fe29e22d7f288db2d1609af9ae2..1938997b3a13f4615d7139b16f1b9a1569008228 100644
--- a/GeoLib/CMakeLists.txt
+++ b/GeoLib/CMakeLists.txt
@@ -9,7 +9,6 @@ add_library(GeoLib ${SOURCES_GeoLib}
 target_link_libraries(GeoLib
 	BaseLib
 	MathLib
-	logog
 )
 
 if(TARGET Boost)
diff --git a/MeshGeoToolsLib/CMakeLists.txt b/MeshGeoToolsLib/CMakeLists.txt
index 19fcf7d9ee341849ad9904e143081b5567a446ea..728c484ac92aae3ad9bb17cc1554e493907abb74 100644
--- a/MeshGeoToolsLib/CMakeLists.txt
+++ b/MeshGeoToolsLib/CMakeLists.txt
@@ -10,7 +10,6 @@ target_link_libraries(MeshGeoToolsLib
 	MeshLib
 	GeoLib
 	FileIO
-	logog
 )
 
 if(TARGET Boost)
diff --git a/MeshLib/CMakeLists.txt b/MeshLib/CMakeLists.txt
index 4e783d668d74ebdf63ae9f133d0cbde3bd4ddab2..b275ab4e15cef3515fe36346bbbc901a81b72eb0 100644
--- a/MeshLib/CMakeLists.txt
+++ b/MeshLib/CMakeLists.txt
@@ -22,7 +22,6 @@ target_link_libraries(MeshLib
 	GeoLib
 	MathLib
 	${VTK_LIBRARIES}
-	logog
 )
 
 ADD_VTK_DEPENDENCY(MeshLib)
diff --git a/ProcessLib/CMakeLists.txt b/ProcessLib/CMakeLists.txt
index d8bffbd0bec1d1e95610e6731f245638899c33b3..a4006e515958d53dcd9d2b348e98b8ad0f397967 100644
--- a/ProcessLib/CMakeLists.txt
+++ b/ProcessLib/CMakeLists.txt
@@ -10,11 +10,9 @@ add_library(ProcessLib ${SOURCES})
 
 target_link_libraries(ProcessLib
     AssemblerLib
-    MeshLib
     MeshGeoToolsLib
     NumLib # for shape matrices
     ${VTK_LIBRARIES}
-    logog
 )
 
 ADD_VTK_DEPENDENCY(ProcessLib)
diff --git a/SimpleTests/MeshTests/CMakeLists.txt b/SimpleTests/MeshTests/CMakeLists.txt
index 1610e782ba2700d0ebe864923ebd57ac958bd739..a8cb4900136bdf021b01e4f8473c81a6c0472f52 100644
--- a/SimpleTests/MeshTests/CMakeLists.txt
+++ b/SimpleTests/MeshTests/CMakeLists.txt
@@ -11,7 +11,6 @@ target_link_libraries(MeshRead
 	MathLib
 	BaseLib
 	GeoLib
-	logog
 	${BOOST_LIBRARIES}
 )
 
@@ -28,6 +27,5 @@ target_link_libraries(MeshSearchTest
 	MathLib
 	BaseLib
 	GeoLib
-	logog
 	${BOOST_LIBRARIES}
 )
diff --git a/SimpleTests/MeshTests/MPI/CMakeLists.txt b/SimpleTests/MeshTests/MPI/CMakeLists.txt
index ce6812080df875b9556918c2ac9268a86f6b194d..66ff53474fa1ddbd83f1556a61f495c3a3fcb5b5 100644
--- a/SimpleTests/MeshTests/MPI/CMakeLists.txt
+++ b/SimpleTests/MeshTests/MPI/CMakeLists.txt
@@ -5,8 +5,6 @@ add_executable(test_node_partitioned_mesh
 target_link_libraries(test_node_partitioned_mesh
 	MeshLib
 	FileIO
-	BaseLib
-	logog
 	${ADDITIONAL_LIBS}
 	${BOOST_LIBRARIES}
 )
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 248daaec388226bf3bce6a9228468f4c4bf8c1e0..cd2f627f592d4c2020b6e6a52ed107f7d856557f 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -33,9 +33,11 @@ target_link_libraries(testrunner
 	ApplicationsLib
 	AssemblerLib
 	FileIO
+	GTest
+	InSituLib
 	MeshGeoToolsLib
+	MeshLib
 	NumLib
-	GTest
 	Threads::Threads
 )
 ADD_VTK_DEPENDENCY(testrunner)