--- ./packetNtx/Dll/Project/GNUmakefile.orig	2009-02-16 19:35:23.000000000 +0100
+++ ./packetNtx/Dll/Project/GNUmakefile	2009-02-16 19:35:35.000000000 +0100
@@ -5,7 +5,7 @@
 OPTFLAGS = -O -D_WINNT4
 # I am suspicious of -O2 since it hosed wpcap.dll. To be safe, use -O only
 
-CFLAGS = -I ../../../common -shared -mno-cygwin ${OPTFLAGS} -I..
+CFLAGS = -I ../../../Common -shared -mno-cygwin ${OPTFLAGS} -I..
 LDFLAGS = -Wl,--out-implib,libpacket.a
 OBJS = ../Packet32.o ../AdInfo.o
 LIBS = -lws2_32 -lversion
--- ./packetNtx/Dll/AdInfo.c.orig	2009-02-16 19:35:13.000000000 +0100
+++ ./packetNtx/Dll/AdInfo.c	2009-02-16 19:36:30.000000000 +0100
@@ -53,7 +53,7 @@
 //
 #define _CRT_SECURE_NO_DEPRECATE
 
-#include <packet32.h>
+#include <Packet32.h>
 #include "Packet32-Int.h"
 #include "debug.h"
 
@@ -63,7 +63,7 @@
 
 #include <windows.h>
 #include <windowsx.h>
-#include <Iphlpapi.h>
+#include <iphlpapi.h>
 #include <strsafe.h>
 #include <WpcapNames.h>
 
--- ./packetNtx/Dll/Packet32.c.orig	2009-02-16 19:35:09.000000000 +0100
+++ ./packetNtx/Dll/Packet32.c	2009-02-16 19:36:04.000000000 +0100
@@ -44,11 +44,11 @@
 //
 #define _CRT_SECURE_NO_WARNINGS
 
-#include <packet32.h>
-#include <StrSafe.h>
+#include <Packet32.h>
+#include <strsafe.h>
 
 #include "Packet32-Int.h"
-#include "..\driver\ioctls.h"
+#include "../driver/ioctls.h"
 
 #ifdef HAVE_WANPACKET_API
 #include "wanpacket/wanpacket.h"
@@ -98,8 +98,8 @@
 
 #include <windows.h>
 #include <windowsx.h>
-#include <Iphlpapi.h>
-#include <IPIfCons.h>
+#include <iphlpapi.h>
+#include <ipifcons.h>
 
 #include <WpcapNames.h>
 
--- ./wpcap/libpcap/inet.c.orig	2009-02-16 19:40:53.000000000 +0100
+++ ./wpcap/libpcap/inet.c	2009-02-16 19:41:37.000000000 +0100
@@ -804,7 +804,7 @@
 		while(NAdapts--)
 		{
 			strcpy((char*)tUstr, tAstr);
-			(char*)tUstr += strlen(tAstr) + 1;;
+			tUstr = (WCHAR *)((char *)tUstr + strlen(tAstr) + 1);
 			tAstr += strlen(tAstr) + 1;
 		}
 
--- ./wpcap/PRJ/GNUmakefile.orig	2008-12-21 04:46:22.000000000 +0100
+++ ./wpcap/PRJ/GNUmakefile	2009-02-16 19:38:23.000000000 +0100
@@ -17,24 +17,24 @@
 LFLAGS = -Ppcap_
 YFLAGS = -y -p pcap_
 
-PACKET_DIR = packetNTx
+PACKET_DIR = packetNtx
 INSTALL_DIR = ${SYSTEMROOT}\system32
 
 CFLAGS = -I ../libpcap -I ../libpcap/bpf -I ../libpcap/lbl \
 	-I ../libpcap/Win32/Include -I../libpcap/Win32/Include/ipv6kit \
-	-I ../../common -I ../Win32-Extensions \
+	-I ../../Common -I ../Win32-Extensions \
 	-I ../../../Airpcap_DevPack/include \
 	-DLIBPCAP_EXPORTS -DYY_NEVER_INTERACTIVE -Dyylval=pcap_lval \
 	-DHAVE_STRERROR -DNEED_ADDRINFO_H -DINET6 -DWIN32 \
 	-DSIZEOF_CHAR=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG_LONG=8 -DWPCAP -D'_U_=' \
 	-DHAVE_SNPRINTF -DHAVE_VSNPRINTF \
 	-DSIZEOF_LONG_LONG=8 \
-	-DHAVE_REMOTE -DHAVE_AIRPCAP_API \
+	-DHAVE_REMOTE \
 	-DHAVE_TC_API \
 	-DHAVE_ADDRINFO \
 	-mno-cygwin -shared ${OPTFLAGS}
 LDFLAGS = -Wl,--out-implib,../lib/libwpcap.a
-LIBS = -L ../../${PACKET_DIR}/DLL/Project -lPacket -lws2_32
+LIBS = -L ../../${PACKET_DIR}/Dll/Project -lPacket -lws2_32
 OBJS = ../libpcap/bpf/net/bpf_filter.o \
 	../libpcap/bpf_dump.o \
 	../libpcap/bpf_image.o \
@@ -67,7 +67,7 @@
 main: ${OBJS}
 	@${RM} -rf ../lib/
 	mkdir ../lib/
-	${CC} ${CFLAGS} ${LDFLAGS} -o wpcap.dll wpcap.def ${OBJS} ${LIBS}
+	${CC} ${CFLAGS} ${LDFLAGS} -o wpcap.dll WPCAP.DEF ${OBJS} ${LIBS}
 
 install:
 	cp wpcap.dll ${INSTALL_DIR}
--- ./wpcap/Win32-Extensions/Win32-Extensions.c.orig	2009-02-16 19:43:25.000000000 +0100
+++ ./wpcap/Win32-Extensions/Win32-Extensions.c	2009-02-16 19:43:33.000000000 +0100
@@ -33,7 +33,7 @@
 
 
 #include "pcap-int.h"
-#include <packet32.h>
+#include <Packet32.h>
 
 #ifdef HAVE_REMOTE
 #include <pcap-remote.h>