diff --git a/configure.ac b/configure.ac
index 8d87d741..4b71bd5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,7 +335,6 @@ AC_CONFIG_FILES([ \
 	src/Utils/Makefile \
 	src/Utils/cdrom/Makefile \
 	src/Utils/download-map/Makefile \
-	src/Utils/TerraSync/Makefile \
 ])
 AC_OUTPUT
 
diff --git a/src/Airports/GenAirports/build.cxx b/src/Airports/GenAirports/build.cxx
index 9e40775c..fdcb6c3f 100644
--- a/src/Airports/GenAirports/build.cxx
+++ b/src/Airports/GenAirports/build.cxx
@@ -72,6 +72,7 @@
 #include "texparams.hxx"
 
 SG_USING_STD(map);
+SG_USING_STD(less);
 SG_USING_STD(string);
 
 
diff --git a/src/BuildTiles/Main/main.cxx b/src/BuildTiles/Main/main.cxx
index 8c95b508..6cbb470e 100644
--- a/src/BuildTiles/Main/main.cxx
+++ b/src/BuildTiles/Main/main.cxx
@@ -21,6 +21,10 @@
 // $Id$
 
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifdef _MSC_VER
 #  include <io.h>
 #else
diff --git a/src/BuildTiles/Parallel/server.cxx b/src/BuildTiles/Parallel/server.cxx
index a2f52874..4753e044 100644
--- a/src/BuildTiles/Parallel/server.cxx
+++ b/src/BuildTiles/Parallel/server.cxx
@@ -32,6 +32,9 @@ SG_USING_STD( endl );
 
 #define MAXBUF 1024
 
+#if defined (__APPLE__)
+typedef int socklen_t;
+#endif
 
 static double start_lon, start_lat;
 static double lat = 0.0;
diff --git a/src/Utils/Makefile.am b/src/Utils/Makefile.am
index 690099d0..f80f74a4 100644
--- a/src/Utils/Makefile.am
+++ b/src/Utils/Makefile.am
@@ -2,5 +2,4 @@ EXTRA_DIST = mirror-dem
 
 SUBDIRS = \
         cdrom \
-        download-map \
-	TerraSync
+        download-map