diff -Nraupb nmap/libdnet-stripped/include/dnet/os.h nmap-fixed/libdnet-stripped/include/dnet/os.h
--- nmap/libdnet-stripped/include/dnet/os.h	2008-04-09 02:28:39.000000000 +0200
+++ nmap-fixed/libdnet-stripped/include/dnet/os.h	2008-04-11 01:04:33.000000000 +0200
@@ -28,7 +28,6 @@
 #if !defined(__GNUC__)
 typedef unsigned int                ssize_t;
 #define snprintf _snprintf
-#define vsnprintf _vsnprintf
 #endif
 #else
 # include <sys/param.h>
diff -Nraupb nmap/libdnet-stripped/src/arp-win32.c nmap-fixed/libdnet-stripped/src/arp-win32.c
--- nmap/libdnet-stripped/src/arp-win32.c	2008-04-09 02:28:40.000000000 +0200
+++ nmap-fixed/libdnet-stripped/src/arp-win32.c	2008-04-11 01:05:46.000000000 +0200
@@ -13,7 +13,6 @@
 #endif
 
 #include <winsock2.h>
-#include <ws2tcpip.h>
 #include <iphlpapi.h>
 
 #include <errno.h>
diff -Nraupb nmap/libdnet-stripped/src/ip-win32.c nmap-fixed/libdnet-stripped/src/ip-win32.c
--- nmap/libdnet-stripped/src/ip-win32.c	2008-04-09 02:28:40.000000000 +0200
+++ nmap-fixed/libdnet-stripped/src/ip-win32.c	2008-04-11 01:06:50.000000000 +0200
@@ -13,7 +13,8 @@
 #endif
 
 #include <winsock2.h>
-#include <ws2tcpip.h>
+/* fix for vs2008, do everything not to include ws2tcpip.h */
+#define       IP_HDRINCL              2 /* header is included with data */
 
 #include <errno.h>
 #include <stdlib.h>
diff -Nraupb nmap/libdnet-stripped/src/route-win32.c nmap-fixed/libdnet-stripped/src/route-win32.c
--- nmap/libdnet-stripped/src/route-win32.c	2008-04-09 02:28:40.000000000 +0200
+++ nmap-fixed/libdnet-stripped/src/route-win32.c	2008-04-11 01:05:31.000000000 +0200
@@ -14,7 +14,6 @@
 
 #include <winsock2.h>
 #include <windows.h>
-#include <ws2tcpip.h>
 #include <iphlpapi.h>
 
 #include <errno.h>
diff -Nraupb nmap/mswin32/pcap-include/ip6_misc.h nmap-fixed/mswin32/pcap-include/ip6_misc.h
--- nmap/mswin32/pcap-include/ip6_misc.h	2008-04-09 02:28:39.000000000 +0200
+++ nmap-fixed/mswin32/pcap-include/ip6_misc.h	2008-04-11 01:09:31.000000000 +0200
@@ -27,10 +27,6 @@
 
 #include <winsock2.h>
 
-#ifndef __MINGW32__
-#include <ws2tcpip.h>
-#endif /* __MINGW32__ */
-
 #define	IN_MULTICAST(a)		IN_CLASSD(a)
 
 #define	IN_EXPERIMENTAL(a)	((((u_int32_t) (a)) & 0xf0000000) == 0xf0000000)
diff -Nraupb nmap/mswin32/pcap-include/pcap-stdinc.h nmap-fixed/mswin32/pcap-include/pcap-stdinc.h
--- nmap/mswin32/pcap-include/pcap-stdinc.h	2008-04-09 02:28:39.000000000 +0200
+++ nmap-fixed/mswin32/pcap-include/pcap-stdinc.h	2008-04-11 01:09:58.000000000 +0200
@@ -61,5 +61,4 @@
 #define caddr_t char*
 
 #define snprintf _snprintf
-#define vsnprintf _vsnprintf
 #define inline __inline 
diff -Nraupb nmap/mswin32/winfix.h nmap-fixed/mswin32/winfix.h
--- nmap/mswin32/winfix.h	2008-04-09 02:28:39.000000000 +0200
+++ nmap-fixed/mswin32/winfix.h	2008-04-11 01:02:28.000000000 +0200
@@ -3,7 +3,6 @@
 
 #include <winsock2.h>
 #include <windows.h>
-#include <ws2tcpip.h>
 #include <iphlpapi.h>
 
 #ifndef EXTERNC
diff -Nraupb nmap/nbase/nbase.h nmap-fixed/nbase/nbase.h
--- nmap/nbase/nbase.h	2008-04-09 02:28:50.000000000 +0200
+++ nmap-fixed/nbase/nbase.h	2008-04-11 01:10:27.000000000 +0200
@@ -313,7 +313,6 @@ extern "C" int vsnprintf (char *, size_t
 
 #if !defined(__GNUC__)
 #define snprintf _snprintf
-#define vsnprintf _vsnprintf
 #endif
 
 #define strcasecmp _stricmp
diff -Nraupb nmap/nbase/nbase_winunix.h nmap-fixed/nbase/nbase_winunix.h
--- nmap/nbase/nbase_winunix.h	2008-04-09 02:28:50.000000000 +0200
+++ nmap-fixed/nbase/nbase_winunix.h	2008-04-09 02:31:34.000000000 +0200
@@ -110,7 +110,13 @@
 
 #include <windows.h>
 #include <winsock2.h>
+/* fix for vs2008 */
+
+#undef NTDDI_VERSION
+#define NTDDI_VERSION (NTDDI_LONGHORN-1)
 #include <ws2tcpip.h> /* IPv6 stuff */
+#undef NTDDI_VERSION 
+
 #include <time.h>
 #include <iptypes.h>
 #include <stdlib.h>