diff -ur orig/cmake/FindIconv.cmake new/cmake/FindIconv.cmake
--- orig/cmake/FindIconv.cmake	2010-09-14 16:36:14.384428396 +0200
+++ new/cmake/FindIconv.cmake	2010-09-14 16:36:14.384428396 +0200
@@ -27,7 +27,7 @@
   )
 FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
 
-FIND_LIBRARY(ICONV_LIBRARY NAMES iconv PATHS
+FIND_LIBRARY(ICONV_LIBRARY NAMES iconv libiconv PATHS
   "$ENV{LIB_DIR}/lib"
   /usr/local/lib
   /usr/lib
diff -ur orig/src/core/spatialindex/include/Tools.h new/src/core/spatialindex/include/Tools.h
--- orig/src/core/spatialindex/include/Tools.h	2010-09-14 16:50:18.160424816 +0200
+++ new/src/core/spatialindex/include/Tools.h	2010-09-14 16:50:53.648423623 +0200
@@ -60,7 +60,6 @@
 #ifndef WIN32
 #include <sys/resource.h>
 #endif
-#include <unistd.h>
 
 #if HAVE_PTHREAD_H
 #include <pthread.h>
diff -ur orig/src/core/spatialindex/rtree/BulkLoader.cc new/src/core/spatialindex/rtree/BulkLoader.cc
--- orig/src/core/spatialindex/rtree/BulkLoader.cc	2010-09-14 16:50:17.932425020 +0200
+++ new/src/core/spatialindex/rtree/BulkLoader.cc	2010-09-14 16:50:53.480800174 +0200
@@ -20,7 +20,6 @@
 //    mhadji@gmail.com
 
 #include <stdio.h>
-#include <unistd.h>
 #include <cstring>
 
 #include "../spatialindex/SpatialIndexImpl.h"
diff -ur orig/src/core/spatialindex/storagemanager/DiskStorageManager.cc new/src/core/spatialindex/storagemanager/DiskStorageManager.cc
--- orig/src/core/spatialindex/storagemanager/DiskStorageManager.cc	2010-09-14 16:50:17.848424753 +0200
+++ new/src/core/spatialindex/storagemanager/DiskStorageManager.cc	2010-09-14 16:50:53.412675315 +0200
@@ -21,7 +21,6 @@
 
 #include "../spatialindex/SpatialIndexImpl.h"
 
-#include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff -ur orig/src/core/spatialindex/tools/ExternalSort.cc new/src/core/spatialindex/tools/ExternalSort.cc
--- orig/src/core/spatialindex/tools/ExternalSort.cc	2010-09-14 16:50:17.780549493 +0200
+++ new/src/core/spatialindex/tools/ExternalSort.cc	2010-09-14 16:50:53.364674125 +0200
@@ -20,7 +20,6 @@
 //    mhadji@gmail.com
 
 #include <stdio.h>
-#include <unistd.h>
 
 #include <Tools.h>
 
diff -ur orig/src/core/spatialindex/tools/TemporaryFile.cc new/src/core/spatialindex/tools/TemporaryFile.cc
--- orig/src/core/spatialindex/tools/TemporaryFile.cc	2010-09-14 16:50:17.796549984 +0200
+++ new/src/core/spatialindex/tools/TemporaryFile.cc	2010-09-14 16:50:53.376675527 +0200
@@ -20,11 +20,11 @@
 //    mhadji@gmail.com
 
 #include <stdio.h>
-#include <unistd.h>
 
 #include <Tools.h>
 
 #ifdef WIN32
+#include <io.h>
 #include <fcntl.h>
 int mkstemp( char* prefix )
 {