diff --git a/src/common/iniparser/iniparser.c b/src/common/iniparser/iniparser.c
index f6eb91cb5..747d5a183 100644
--- a/src/common/iniparser/iniparser.c
+++ b/src/common/iniparser/iniparser.c
@@ -31,7 +31,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "iniparser.h"
 
@@ -170,9 +169,9 @@ static void * mem_double(void * ptr, int size)
 
 static unsigned dictionary_hash(const char * key)
 {
-    int         len ;
-    unsigned    hash ;
-    int         i ;
+    size_t len ;
+    unsigned int   hash ;
+    unsigned int i;
 
     len = strlen(key);
     for (hash=0, i=0 ; i<len ; i++) {
diff --git a/src/common/iniparser/iniparser.h b/src/common/iniparser/iniparser.h
index a40dedbe4..675b5a26a 100644
--- a/src/common/iniparser/iniparser.h
+++ b/src/common/iniparser/iniparser.h
@@ -33,7 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <ctype.h>
 
 #ifdef __cplusplus
diff --git a/src/eressea/eressea-lua.vcproj b/src/eressea/eressea-lua.vcproj
index b4fbaafb0..1b3f78483 100644
--- a/src/eressea/eressea-lua.vcproj
+++ b/src/eressea/eressea-lua.vcproj
@@ -560,6 +560,12 @@
 		<File
 			RelativePath=".\console.h">
 		</File>
+		<File
+			RelativePath="..\common\iniparser\iniparser.c">
+		</File>
+		<File
+			RelativePath="..\common\iniparser\iniparser.h">
+		</File>
 		<File
 			RelativePath=".\korrektur.c">
 			<FileConfiguration
diff --git a/src/eressea/gmtool.vcproj b/src/eressea/gmtool.vcproj
index 4650e518f..530d94dad 100644
--- a/src/eressea/gmtool.vcproj
+++ b/src/eressea/gmtool.vcproj
@@ -279,6 +279,12 @@
 		<File
 			RelativePath=".\gmtool.c">
 		</File>
+		<File
+			RelativePath="..\common\iniparser\iniparser.c">
+		</File>
+		<File
+			RelativePath="..\common\iniparser\iniparser.h">
+		</File>
 		<File
 			RelativePath=".\curses\listbox.c">
 		</File>
diff --git a/src/eressea/server.cpp b/src/eressea/server.cpp
index dd1dc19bf..57b2a472b 100644
--- a/src/eressea/server.cpp
+++ b/src/eressea/server.cpp
@@ -124,10 +124,10 @@
 ** global variables we are importing from other modules
 **/
 extern "C" {
-  extern char * g_reportdir;
-  extern char * g_datadir;
-  extern char * g_basedir;
-  extern char * g_resourcedir;
+  extern const char * g_reportdir;
+  extern const char * g_datadir;
+  extern const char * g_basedir;
+  extern const char * g_resourcedir;
 
   extern boolean nonr;
   extern boolean nosh;