diff --git a/src/connection.c b/src/connection.c
index d1620063..5292f790 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -9,8 +9,10 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #else
+#include <winsock2.h>
 #define snprintf _snprintf
 #define strcasecmp stricmp
+#define strncasecmp strnicmp
 #endif
 
 #include "os.h"
diff --git a/src/logging.h b/src/logging.h
index 4e6e0149..475b5cd3 100644
--- a/src/logging.h
+++ b/src/logging.h
@@ -13,6 +13,10 @@ extern int accesslog;
 ** feel free to add more here if needed. 
 */
 
+#ifdef _WIN32
+#define __FUNCTION__ __FILE__ ":" __LINE__
+#endif
+
 #define ERROR0(y) log_write(errorlog, 1, CATMODULE "/" __FUNCTION__, y)
 #define ERROR1(y, a) log_write(errorlog, 1, CATMODULE "/" __FUNCTION__, y, a)
 #define ERROR2(y, a, b) log_write(errorlog, 1, CATMODULE "/" __FUNCTION__, y, a, b)
diff --git a/src/net/resolver.c b/src/net/resolver.c
index a554b044..cc2b6af3 100644
--- a/src/net/resolver.c
+++ b/src/net/resolver.c
@@ -8,16 +8,16 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <stdlib.h>
-#include <netdb.h>
 #include <string.h>
 
 #ifndef _WIN32
+#include <netdb.h>
 #include <sys/socket.h>
 #include <pthread.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #else
-#include <winsock.h>
+#include <winsock2.h>
 #define sethostent(x)
 #endif
 
diff --git a/src/net/sock.h b/src/net/sock.h
index ddb54251..f8c3337d 100644
--- a/src/net/sock.h
+++ b/src/net/sock.h
@@ -24,11 +24,10 @@
 
 #ifdef _WIN32
 #include <winsock2.h>
-typedef SOCKET sock_t
-#else
-typedef int sock_t;
 #endif
 
+typedef int sock_t;
+
 #define SOCK_ERROR -1
 #define SOCK_BLOCK 0
 #define SOCK_NONBLOCK 1
diff --git a/src/os.h b/src/os.h
index ff9c2064..fa386e43 100644
--- a/src/os.h
+++ b/src/os.h
@@ -8,7 +8,7 @@
 #endif
 
 #ifdef _WIN32
-#define PATH_DEPARATOR "\\"
+#define PATH_SEPARATOR "\\"
 #else
 #define PATH_SEPARATOR "/"
 #endif
diff --git a/src/source.c b/src/source.c
index 42f185da..21ddba20 100644
--- a/src/source.c
+++ b/src/source.c
@@ -1,15 +1,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/types.h>
 #include <ogg/ogg.h>
 
 #ifndef _WIN32
+#include <unistd.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #else
-#include <window.h>
+#include <winsock2.h>
+#include <windows.h>
 #endif
 
 #include "thread.h"
@@ -23,6 +24,7 @@
 #include "client.h"
 #include "stats.h"
 #include "format.h"
+#include "log.h"
 #include "logging.h"
 #include "config.h"
 
diff --git a/src/thread/thread.c b/src/thread/thread.c
index 8d64b9d3..2e1360f5 100644
--- a/src/thread/thread.c
+++ b/src/thread/thread.c
@@ -28,6 +28,9 @@
 #ifndef _WIN32
 #include <unistd.h>
 #include <sys/time.h>
+#else
+#include <windows.h>
+#include <winbase.h>
 #endif
 
 #include <pthread.h>
@@ -38,6 +41,10 @@
 #include "thread.h"
 #include "avl.h"
 
+#ifdef _WIN32
+#define __FUNCTION__ __FILE__ ":" __LINE__
+#endif
+
 #define CATMODULE "thread"
 #define LOG_ERROR(y) log_write(_logid, 1, CATMODULE "/" __FUNCTION__, y)
 #define LOG_ERROR3(y, z1, z2, z3) log_write(_logid, 1, CATMODULE "/" __FUNCTION__, y, z1, z2, z3)
diff --git a/src/timing/timing.c b/src/timing/timing.c
index af33d055..c1299e2b 100644
--- a/src/timing/timing.c
+++ b/src/timing/timing.c
@@ -4,14 +4,16 @@
 
 #include <stdlib.h>
 #include <sys/types.h>
-#include <sys/time.h>
-#include <unistd.h>
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
 
 #ifdef _WIN32
-# include <mmsystem.h>
+#include <windows.h>
+#include <mmsystem.h>
+#else
+#include <sys/time.h>
+#include <unistd.h>
 #endif
 
 #include "timing.h"
diff --git a/src/timing/timing.h b/src/timing/timing.h
index 1febca1f..8fa181b1 100644
--- a/src/timing/timing.h
+++ b/src/timing/timing.h
@@ -3,11 +3,12 @@
 
 #include <sys/types.h>
 #ifdef HAVE_STDINT_H
-# include <stdint.h>
+#include <stdint.h>
 #endif
+
 #ifdef _WIN32
-typedef int64_t __int64;
-typedef uint64_t unsigned __int64;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
 #endif
 
 uint64_t timing_get_time(void);
diff --git a/src/util.c b/src/util.c
index 49356d38..7abc2f0e 100644
--- a/src/util.c
+++ b/src/util.c
@@ -5,6 +5,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 #else
+#include <winsock2.h>
 #include <windows.h>
 #endif