[IP]

* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
CORE-7716

svn path=/trunk/; revision=61510

diff --git a/reactos/lib/drivers/ip/network/icmp.c b/reactos/lib/drivers/ip/network/icmp.c
index 0772727..b95ecaa 100644 (file)
--- a/reactos/lib/drivers/ip/network/icmp.c
+++ b/reactos/lib/drivers/ip/network/icmp.c
@@ -10,6 +10,8 @@
 
 #include "precomp.h"
 
 
 #include "precomp.h"
 

+#include <icmp.h>
+

 NTSTATUS ICMPStartup()
 {
     IPRegisterProtocol(IPPROTO_ICMP, ICMPReceive);
 NTSTATUS ICMPStartup()
 {
     IPRegisterProtocol(IPPROTO_ICMP, ICMPReceive);

diff --git a/reactos/lib/drivers/ip/network/interface.c b/reactos/lib/drivers/ip/network/interface.c
index 7efb3ac..cd6786d 100644 (file)
--- a/reactos/lib/drivers/ip/network/interface.c
+++ b/reactos/lib/drivers/ip/network/interface.c
@@ -11,6 +11,9 @@
 
 #include "precomp.h"
 
 
 #include "precomp.h"
 

+#include <ntifs.h>
+#include <ipifcons.h>
+

 ULONG NextDefaultAdapter = 0;
 
 NTSTATUS GetInterfaceIPv4Address( PIP_INTERFACE Interface,
 ULONG NextDefaultAdapter = 0;
 
 NTSTATUS GetInterfaceIPv4Address( PIP_INTERFACE Interface,

diff --git a/reactos/lib/drivers/ip/network/router.c b/reactos/lib/drivers/ip/network/router.c
index c9e2f31..b740623 100644 (file)
--- a/reactos/lib/drivers/ip/network/router.c
+++ b/reactos/lib/drivers/ip/network/router.c
@@ -14,7 +14,6 @@
 
 #include "precomp.h"
 
 
 #include "precomp.h"
 

-

 LIST_ENTRY FIBListHead;
 KSPIN_LOCK FIBLock;
 
 LIST_ENTRY FIBListHead;
 KSPIN_LOCK FIBLock;
 

diff --git a/reactos/lib/drivers/ip/precomp.h b/reactos/lib/drivers/ip/precomp.h
index f80c7de..9f2f06d 100644 (file)
--- a/reactos/lib/drivers/ip/precomp.h
+++ b/reactos/lib/drivers/ip/precomp.h
@@ -1,36 +1,19 @@
-#include <limits.h>
-#include <ntddk.h>
-#include <ntifs.h>

 #include <tags.h>
 #include <tags.h>

-#include <tdi.h>
-#include <tdistat.h>

 #include <tcpip.h>
 #include <loopback.h>
 #include <tcpip.h>
 #include <loopback.h>

-#include <ip.h>
-#include <lan.h>

 #include <datagram.h>
 #include <checksum.h>
 #include <datagram.h>
 #include <checksum.h>

-#include <address.h>

 #include <routines.h>
 #include <info.h>
 #include <routines.h>
 #include <info.h>

-#include <neighbor.h>

 #include <route.h>
 #include <receive.h>
 #include <transmit.h>
 #include <route.h>
 #include <receive.h>
 #include <transmit.h>

-#include <router.h>
-#include <pool.h>

 #include <rawip.h>
 #include <rawip.h>

-#include <icmp.h>

 #include <udp.h>
 #include <tcp.h>
 #include <udp.h>
 #include <tcp.h>

-#include <arp.h>

 #include <tilists.h>
 #include <tilists.h>

-#include <dispatch.h>

 #include <fileobjs.h>
 #include <lock.h>
 #include <fileobjs.h>
 #include <lock.h>

-#include <wait.h>

 #include <interface.h>
 #include <ports.h>
 #include <interface.h>
 #include <ports.h>

-#include <ipifcons.h>

 #include <chew/chew.h>
 #include <chew/chew.h>

-#include <pseh/pseh2.h>