diff --git a/src/bomberclone.h b/src/bomberclone.h
index 584961c..fe16249 100644
--- a/src/bomberclone.h
+++ b/src/bomberclone.h
@@ -1,4 +1,4 @@
-/* $Id: bomberclone.h,v 1.11 2003/05/06 20:48:53 stpohle Exp $ */
+/* $Id: bomberclone.h,v 1.12 2003/05/06 22:33:40 ob1kenewb Exp $ */
 /* bomberclone.h */
 
 #ifndef _BOMBERCLONE_H_
@@ -11,23 +11,26 @@
 #include <fcntl.h>
 #include <time.h>
 #include <ctype.h>
-#include <dirent.h>
 #include <sys/stat.h>
 #ifdef _WIN32
-#include <winsock.h>
-#define IS_DIR(a) ((a & _S_IFDIR) == _S_IFDIR)
-#define IS_REG(a) ((a & _S_IFREG) == _S_IFREG)
+	#include <winsock.h>
+	#include "../confdefs.h"
+	#include <glib.h>
+	#include <sys/stat.h>
+	#define S_ISDIR(a) ((a & _S_IFDIR) == _S_IFDIR)
+	#define S_ISREG(a) ((a & _S_IFREG) == _S_IFREG)
 #else
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <sys/types.h>
+	#include <sys/time.h>
+	#include <sys/socket.h>
+	#include <netinet/in.h>
+	#include <netdb.h>
+	#include <arpa/inet.h>
+	#include <unistd.h>
+	#include <sys/types.h>
+	#include <dirent.h>
+	#include "../config.h"
 #endif
 #include <SDL.h>
-#include "../config.h"
 #include "gfx.h"
 #include "network.h"
 #include "sysfunc.h"
diff --git a/src/main.c b/src/main.c
index 439a232..da9be3a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,7 +2,9 @@
 #include "bomberclone.h"
 #include "network.h"
 #include "gfx.h"
-#include "../config.h"
+#ifndef _WIN32
+	#include "../config.h"
+#endif
 
 _bomberclone bman;              // Holds GameData
 Uint32 timestamp;				// timestamp
diff --git a/src/netmenu.c b/src/netmenu.c
index 4e0e52e..39e0bed 100644
--- a/src/netmenu.c
+++ b/src/netmenu.c
@@ -120,7 +120,7 @@ networkmenu_options ()
             break;
 
         case (2):
-#ifndef _win32
+#ifndef _WIN32
             if (bman.net_ai_family == PF_INET)
                 bman.net_ai_family = PF_INET6;
             else
diff --git a/src/udp.c b/src/udp.c
index 0bf20a3..2177063 100644
--- a/src/udp.c
+++ b/src/udp.c
@@ -1,4 +1,4 @@
-/* $Id: udp.c,v 1.4 2003/05/06 00:03:23 ob1kenewb Exp $ */
+/* $Id: udp.c,v 1.5 2003/05/06 22:33:40 ob1kenewb Exp $ */
 /* udp.c code for the network
 	File Version 0.2
 */
@@ -7,18 +7,19 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
-#include <sys/time.h>
 #include <time.h>
 #ifdef _WIN32
-#include <winsock.h>
+	#include <winsock.h>
+	#include <io.h>
 #else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <arpa/inet.h>
+	#include <sys/socket.h>
+	#include <netinet/in.h>
+	#include <netdb.h>
+	#include <arpa/inet.h>
+	#include <unistd.h>
+	#include <sys/time.h>
 #endif
 
 #ifdef _WIN32