diff --git a/reactos/drivers/net/tcpip/include/precomp.h b/reactos/drivers/net/tcpip/include/precomp.h
index 407a76c5ac1..29e4338ef7d 100644
--- a/reactos/drivers/net/tcpip/include/precomp.h
+++ b/reactos/drivers/net/tcpip/include/precomp.h
@@ -1,6 +1,8 @@
 #include <roscfg.h>
 #include <limits.h>
 #include <ntddk.h>
+#include <tdi.h>
+#include <tdistat.h>
 #include <../recmutex/recmutex.h>
 #include <roscfg.h>
 #include <tcpip.h>
diff --git a/reactos/drivers/net/tcpip/include/router.h b/reactos/drivers/net/tcpip/include/router.h
index 9b407912971..92ff35e435c 100644
--- a/reactos/drivers/net/tcpip/include/router.h
+++ b/reactos/drivers/net/tcpip/include/router.h
@@ -43,7 +43,7 @@ NTSTATUS RouterStartup(
 NTSTATUS RouterShutdown(
     VOID);
 
-UINT CountFIBs();
+UINT CountFIBs(VOID);
 
 UINT CopyFIBs( PFIB_ENTRY Target );
 
diff --git a/reactos/drivers/net/tcpip/recmutex/recmutex.c b/reactos/drivers/net/tcpip/recmutex/recmutex.c
index 550dbf8d327..84264ab39cb 100644
--- a/reactos/drivers/net/tcpip/recmutex/recmutex.c
+++ b/reactos/drivers/net/tcpip/recmutex/recmutex.c
@@ -11,7 +11,7 @@ VOID RecursiveMutexInit( PRECURSIVE_MUTEX RecMutex ) {
 
 /* NOTE: When we leave, the FAST_MUTEX must have been released.  The result
  * is that we always exit in the same irql as entering */
-UINT RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOL ToWrite ) {
+SIZE_T RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN ToWrite ) {
     NTSTATUS Status = STATUS_SUCCESS;
     PVOID CurrentThread = KeGetCurrentThread();
 
diff --git a/reactos/drivers/net/tcpip/tcpip/dispatch.c b/reactos/drivers/net/tcpip/tcpip/dispatch.c
index 4b8aa875eac..ced62e23abf 100644
--- a/reactos/drivers/net/tcpip/tcpip/dispatch.c
+++ b/reactos/drivers/net/tcpip/tcpip/dispatch.c
@@ -160,7 +160,7 @@ VOID DispDoDisconnect( PVOID Data ) {
     DispCancelComplete(DisType->FileObject);
 }
 
-VOID DDKAPI DispCancelRequest(
+VOID NTAPI DispCancelRequest(
     PDEVICE_OBJECT Device,
     PIRP Irp)
 /*
@@ -245,7 +245,7 @@ VOID DDKAPI DispCancelRequest(
 }
 
 
-VOID DDKAPI DispCancelListenRequest(
+VOID NTAPI DispCancelListenRequest(
     PDEVICE_OBJECT Device,
     PIRP Irp)
 /*
diff --git a/reactos/drivers/net/tcpip/tcpip/ninfo.c b/reactos/drivers/net/tcpip/tcpip/ninfo.c
index 8f81565d75d..6935ad25bfd 100644
--- a/reactos/drivers/net/tcpip/tcpip/ninfo.c
+++ b/reactos/drivers/net/tcpip/tcpip/ninfo.c
@@ -16,7 +16,6 @@
 TDI_STATUS InfoTdiQueryGetAddrTable( PNDIS_BUFFER Buffer,
 				     PUINT BufferSize ) {
 
-    IF_LIST_ITER(CurrentIF);
     TDI_STATUS Status = TDI_INVALID_REQUEST;
     KIRQL OldIrql;
     UINT Count = 0;
@@ -24,6 +23,7 @@ TDI_STATUS InfoTdiQueryGetAddrTable( PNDIS_BUFFER Buffer,
     PIPADDR_ENTRY IpAddress =
 	ExAllocatePool( NonPagedPool, sizeof( IPADDR_ENTRY ) * IfCount );
     PIPADDR_ENTRY IpCurrent = IpAddress;
+    IF_LIST_ITER(CurrentIF);
 
     TI_DbgPrint(DEBUG_INFO, ("Called.\n"));
 
@@ -66,8 +66,8 @@ TDI_STATUS InfoTdiQueryGetAddrTable( PNDIS_BUFFER Buffer,
 TDI_STATUS InfoTdiQueryGetRouteTable( PNDIS_BUFFER Buffer, PUINT BufferSize ) {
     TDI_STATUS Status;
     KIRQL OldIrql;
-    UINT RtCount = CountFIBs(),
-	Size = sizeof( IPROUTE_ENTRY ) * RtCount;
+    UINT RtCount = CountFIBs();
+    UINT Size = sizeof( IPROUTE_ENTRY ) * RtCount;
     PFIB_ENTRY RCache =
 	ExAllocatePool( NonPagedPool, sizeof( FIB_ENTRY ) * RtCount ),
 	RCacheCur = RCache;
@@ -142,7 +142,7 @@ TDI_STATUS InfoTdiQueryGetIPSnmpInfo( PNDIS_BUFFER Buffer,
 				      PUINT BufferSize ) {
     IPSNMP_INFO SnmpInfo;
     UINT IfCount = CountInterfaces();
-    UINT RouteCount = CountFIBs( NULL );
+    UINT RouteCount = CountFIBs();
     TDI_STATUS Status = TDI_INVALID_REQUEST;
 
     TI_DbgPrint(DEBUG_INFO, ("Called.\n"));