diff --git a/src/compat.h b/src/compat.h
index 6aa3e90a..863dd1fb 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -6,15 +6,16 @@
 #endif
 
 #ifndef HAVE_STRCASESTR
-extern char * strcasestr(char* haystack, char* needle);
+extern char *strcasestr(char* haystack, char* needle);
 #endif
 
 #ifndef HAVE_STRPTIME
-char * strptime( char *buf, char *fmt, struct tm *tm );
+extern char *strptime(char *buf, char *fmt, struct tm *tm );
 #endif
 
 #ifndef HAVE_STRTOK_R
-extern char *strtok_r(char *s, const char *delim, char **last);
+#undef strtok_r /* defend against win32 pthreads */
+extern char *strtok_r(char *s, char *delim, char **last);
 #endif
 
 #ifndef HAVE_TIMEGM
diff --git a/src/os-win32.c b/src/os-win32.c
index c70b9018..cd442e00 100644
--- a/src/os-win32.c
+++ b/src/os-win32.c
@@ -2,11 +2,15 @@
  *
  */
 
-#include <errno.h>
-#include <pthread.h>
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <time.h>
+#include <pthread.h>
 
 #include "daapd.h"
 #include "win32.h"
diff --git a/src/scan-xml.c b/src/scan-xml.c
index a0f64128..95981893 100644
--- a/src/scan-xml.c
+++ b/src/scan-xml.c
@@ -32,6 +32,7 @@
 #include <sys/stat.h>
 #include <time.h>
 
+#include "daapd.h"
 #include "db-generic.h"
 #include "err.h"
 #include "mp3-scanner.h"
diff --git a/src/smart-parser.c b/src/smart-parser.c
index 4ebcd7be..451538d4 100644
--- a/src/smart-parser.c
+++ b/src/smart-parser.c
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "daapd.h"
 #include "err.h"
 
 #ifdef HAVE_SQL
diff --git a/win32/mt-daapd.vcproj b/win32/mt-daapd.vcproj
index c46d2dda..ce0806a9 100644
--- a/win32/mt-daapd.vcproj
+++ b/win32/mt-daapd.vcproj
@@ -123,6 +123,9 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\src\compat.c">
+			</File>
 			<File
 				RelativePath="..\src\conf.c">
 			</File>
@@ -204,15 +207,6 @@
 			<File
 				RelativePath="..\src\ssc.c">
 			</File>
-			<File
-				RelativePath="..\src\strcasestr.c">
-			</File>
-			<File
-				RelativePath="..\src\strptime.c">
-			</File>
-			<File
-				RelativePath="..\src\strtok_r.c">
-			</File>
 			<File
 				RelativePath="..\src\w32-eventlog.c">
 			</File>
@@ -230,6 +224,9 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\src\conf.h">
+			</File>
 			<File
 				RelativePath=".\config.h">
 			</File>