- Build AFD, TCPIP and TDI with w32api headers.

- Removed the old TDI headers from include/net.

svn path=/trunk/; revision=8508

reactos/lib/iphlpapi/ifenum_reactos.c

@@ -152,7 +152,7 @@ NTSTATUS tdiGetSetOfThings( HANDLE tcpFile,
      * stabilizes.
      */
     do {
-        assert( !entitySet ); /* We must not have an entity set allocated */
+        ASSERT( !entitySet ); /* We must not have an entity set allocated */
         status = DeviceIoControl( tcpFile,
                                   IOCTL_TCP_QUERY_INFORMATION_EX,
                                   &req,

reactos/lib/iphlpapi/iphlpapi_private.h

@@ -23,8 +23,8 @@
 #define _WIN32_WINNT 0x500
 #include <ddk/ntddk.h>
 #include <rosrtl/string.h>
-#include <ntdll/rtl.h>
-#include <net/miniport.h>
+#include <ddk/miniport.h>
+#include <tcpmisc.h>
 #include <winsock2.h>
 #include <nspapi.h>
 #include <iptypes.h>
@@ -32,7 +32,7 @@
 #include "resinfo.h"
 #include "wine/debug.h"
 
-#include "net/tdiinfo.h"
+#include "ddk/tdiinfo.h"
 #include "tcpioctl.h"
 
 #ifndef ETH_ALEN