diff --git a/CMakeModules/FindSimGear.cmake b/CMakeModules/FindSimGear.cmake
index 2764fa7eb..901b63c68 100644
--- a/CMakeModules/FindSimGear.cmake
+++ b/CMakeModules/FindSimGear.cmake
@@ -192,12 +192,12 @@ else(SIMGEAR_SHARED)
     
     set(SIMGEAR_CORE_LIBRARY_DEPENDENCIES
         ${CMAKE_THREAD_LIBS_INIT}
-        ${ZLIB_LIBRARY})
+        ${ZLIB_LIBRARY}
+        ${LIBSVN_LIBRARIES})
 
     set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES 
         ${ALUT_LIBRARY} 
-    	${OPENAL_LIBRARY}
-    	${LIBSVN_LIBRARIES})
+        ${OPENAL_LIBRARY})
 
     if(WIN32)
         list(APPEND SIMGEAR_CORE_LIBRARY_DEPENDENCIES ws2_32.lib)
diff --git a/CMakeModules/FindSvnClient.cmake b/CMakeModules/FindSvnClient.cmake
index 15f6ba27a..1135ee03b 100644
--- a/CMakeModules/FindSvnClient.cmake
+++ b/CMakeModules/FindSvnClient.cmake
@@ -70,7 +70,8 @@ if(HAVE_APR_CONFIG OR MSVC)
 
 	include(FindPackageHandleStandardArgs)
 	FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSVN DEFAULT_MSG LIBSVN_LIBRARIES LIBSVN_INCLUDE_DIR)
-        if(NOT LIBSVN_FOUND)
+	if(NOT LIBSVN_FOUND)
 		set(LIBSVN_LIBRARIES "")
-        endif(NOT LIBSVN_FOUND)
+	endif(NOT LIBSVN_FOUND)
+
 endif(HAVE_APR_CONFIG OR MSVC)
diff --git a/src/FDM/YASim/CMakeLists.txt b/src/FDM/YASim/CMakeLists.txt
index d129acef2..d774a1d04 100644
--- a/src/FDM/YASim/CMakeLists.txt
+++ b/src/FDM/YASim/CMakeLists.txt
@@ -1,7 +1,7 @@
 include(FlightGearComponent)
 
 set(SOURCES
-    Airplane.cpp
+	Airplane.cpp
 	Atmosphere.cpp
 	ControlMap.cpp
 	FGFDM.cpp
@@ -29,17 +29,15 @@ set(SOURCES
 	Turbulence.cpp
 	Wing.cpp
 	YASim.cxx
-    )
+)
 
 flightgear_component(YASim "${SOURCES}")
-    
+
 add_executable(yasim yasim-test.cpp)
 
 target_link_libraries(yasim 
 	fgYASim
 	${SIMGEAR_CORE_LIBRARIES}
-        ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
+	${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
 
 install(TARGETS yasim RUNTIME DESTINATION bin)
-	
-
diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index f96ca1e07..718c052a0 100644
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -85,11 +85,8 @@ target_link_libraries(fgfs
 
 install(TARGETS fgfs RUNTIME DESTINATION bin)
 
-check_library_exists(rt clock_gettime "" HAVE_CLOCK_GETTIME)
 add_executable(metar metar_main.cxx)
-if(HAVE_CLOCK_GETTIME)
-        target_link_libraries(metar rt)
-endif(HAVE_CLOCK_GETTIME)
+
 target_link_libraries(metar
 	${SIMGEAR_LIBRARIES}
 	${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
@@ -98,4 +95,3 @@ target_link_libraries(metar
 )
 
 install(TARGETS metar RUNTIME DESTINATION bin)
-
diff --git a/utils/GPSsmooth/CMakeLists.txt b/utils/GPSsmooth/CMakeLists.txt
index 8844bb341..47bc1d54f 100644
--- a/utils/GPSsmooth/CMakeLists.txt
+++ b/utils/GPSsmooth/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-check_library_exists(rt clock_gettime "" HAVE_CLOCK_GETTIME)
-
 add_executable(GPSsmooth gps.cxx gps.hxx gps_main.cxx)
 add_executable(MIDGsmooth MIDG-II.cxx MIDG-II.hxx MIDG_main.cxx)
 add_executable(UGsmooth 
@@ -10,10 +8,6 @@ add_executable(UGsmooth
     UGear_telnet.cxx
     UGear_telnet.hxx)
 
-if(HAVE_CLOCK_GETTIME)
-	target_link_libraries(GPSsmooth rt)
-endif(HAVE_CLOCK_GETTIME)
-
 target_link_libraries(GPSsmooth
 	${SIMGEAR_CORE_LIBRARIES}
 	${PLIB_SG_LIBRARY}
@@ -23,10 +17,6 @@ target_link_libraries(GPSsmooth
 	${WINMM_LIBRARY}
 )
 
-if(HAVE_CLOCK_GETTIME)
-	target_link_libraries(MIDGsmooth rt)
-endif(HAVE_CLOCK_GETTIME)
-
 target_link_libraries(MIDGsmooth
 	${SIMGEAR_CORE_LIBRARIES}
 	${PLIB_SG_LIBRARY}
@@ -36,10 +26,6 @@ target_link_libraries(MIDGsmooth
 	${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
 )
 
-if(HAVE_CLOCK_GETTIME)
-	target_link_libraries(UGsmooth rt)
-endif(HAVE_CLOCK_GETTIME)
-
 target_link_libraries(UGsmooth
 	${SIMGEAR_CORE_LIBRARIES}
 	${PLIB_SG_LIBRARY}
diff --git a/utils/TerraSync/CMakeLists.txt b/utils/TerraSync/CMakeLists.txt
index 783cdffca..cc27ec82b 100644
--- a/utils/TerraSync/CMakeLists.txt
+++ b/utils/TerraSync/CMakeLists.txt
@@ -1,5 +1,4 @@
 
-
 add_executable(terrasync terrasync.cxx)
 
 target_link_libraries(terrasync
@@ -7,10 +6,4 @@ target_link_libraries(terrasync
 	${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
 )
 
-if(LIBSVN_FOUND)
-	target_link_libraries(terrasync ${LIBSVN_LIBRARIES})
-	set_property(TARGET terrasync APPEND PROPERTY COMPILE_FLAGS "${APR_CFLAGS}")
-endif()
-
-
 install(TARGETS terrasync RUNTIME DESTINATION bin)
diff --git a/utils/TerraSync/terrasync.cxx b/utils/TerraSync/terrasync.cxx
index f8b8b2551..fb0d29258 100644
--- a/utils/TerraSync/terrasync.cxx
+++ b/utils/TerraSync/terrasync.cxx
@@ -46,6 +46,7 @@
 #include <fstream>
 #include <string>
 
+#include <simgear/math/SGMath.hxx>
 #include <simgear/io/raw_socket.hxx>
 #include <simgear/scene/tsync/terrasync.hxx>