From 9ff8ae1f1b11a5f3dfd76e404dd3cac4f5d1bd66 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 3 Feb 2014 00:03:57 +0000
Subject: [PATCH] [NDIS] * Remove one time inclusions from the main header and
 put them back where they belong. * Improve header inclusions. CORE-7716

svn path=/trunk/; revision=61938
---
 reactos/drivers/network/ndis/include/buffer.h   |  3 ---
 reactos/drivers/network/ndis/include/miniport.h |  3 ---
 reactos/drivers/network/ndis/include/ndissys.h  | 10 +---------
 reactos/drivers/network/ndis/ndis/30stubs.c     |  1 +
 reactos/drivers/network/ndis/ndis/40stubs.c     |  1 -
 reactos/drivers/network/ndis/ndis/50stubs.c     |  2 ++
 reactos/drivers/network/ndis/ndis/buffer.c      |  1 -
 reactos/drivers/network/ndis/ndis/cm.c          |  1 -
 reactos/drivers/network/ndis/ndis/co.c          |  2 ++
 reactos/drivers/network/ndis/ndis/config.c      |  2 ++
 reactos/drivers/network/ndis/ndis/control.c     |  1 -
 reactos/drivers/network/ndis/ndis/io.c          |  1 -
 reactos/drivers/network/ndis/ndis/main.c        |  2 --
 reactos/drivers/network/ndis/ndis/memory.c      |  1 -
 reactos/drivers/network/ndis/ndis/miniport.c    |  3 ++-
 reactos/drivers/network/ndis/ndis/object.c      |  1 -
 reactos/drivers/network/ndis/ndis/string.c      |  1 -
 reactos/drivers/network/ndis/ndis/time.c        |  1 -
 18 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/reactos/drivers/network/ndis/include/buffer.h b/reactos/drivers/network/ndis/include/buffer.h
index b938cedb70d..d02f5315ee7 100644
--- a/reactos/drivers/network/ndis/include/buffer.h
+++ b/reactos/drivers/network/ndis/include/buffer.h
@@ -7,9 +7,6 @@
 
 #pragma once
 
-#include "ndissys.h"
-
-
 /* FIXME: Possibly move this to ntddk.h */
 typedef struct _NETWORK_HEADER
 {
diff --git a/reactos/drivers/network/ndis/include/miniport.h b/reactos/drivers/network/ndis/include/miniport.h
index 8555ed83336..6df63d74409 100644
--- a/reactos/drivers/network/ndis/include/miniport.h
+++ b/reactos/drivers/network/ndis/include/miniport.h
@@ -7,9 +7,6 @@
 
 #pragma once
 
-#include <ndis.h>
-#include <ndissys.h>
-
 struct _ADAPTER_BINDING;
 
 typedef struct _HARDWARE_ADDRESS {
diff --git a/reactos/drivers/network/ndis/include/ndissys.h b/reactos/drivers/network/ndis/include/ndissys.h
index 29238856aaa..b80a6a0bbfa 100644
--- a/reactos/drivers/network/ndis/include/ndissys.h
+++ b/reactos/drivers/network/ndis/include/ndissys.h
@@ -10,15 +10,9 @@
 #ifndef __NDISSYS_H
 #define __NDISSYS_H
 
-#include <ntifs.h>
 #include <ndis.h>
-#include <xfilter.h>
-#include <afilter.h>
-#include <atm.h>
-#include <ndistapi.h>
-#include <ndisguid.h>
-#include <debug.h>
 
+#include "debug.h"
 #include "miniport.h"
 #include "protocol.h"
 #include "efilter.h"
@@ -68,5 +62,3 @@ ExGetCurrentProcessorCpuUsage(
 #endif
 
 #endif /* __NDISSYS_H */
-
-/* EOF */
diff --git a/reactos/drivers/network/ndis/ndis/30stubs.c b/reactos/drivers/network/ndis/ndis/30stubs.c
index 5d318fac375..f338882017f 100644
--- a/reactos/drivers/network/ndis/ndis/30stubs.c
+++ b/reactos/drivers/network/ndis/ndis/30stubs.c
@@ -10,6 +10,7 @@
 
 #include "ndissys.h"
 
+#include <afilter.h>
 
 /*
  * @unimplemented
diff --git a/reactos/drivers/network/ndis/ndis/40stubs.c b/reactos/drivers/network/ndis/ndis/40stubs.c
index 37fe121c22e..e42fdb2c45e 100644
--- a/reactos/drivers/network/ndis/ndis/40stubs.c
+++ b/reactos/drivers/network/ndis/ndis/40stubs.c
@@ -10,7 +10,6 @@
 
 #include "ndissys.h"
 
-
 /*
  * @unimplemented
  */
diff --git a/reactos/drivers/network/ndis/ndis/50stubs.c b/reactos/drivers/network/ndis/ndis/50stubs.c
index 9771cbccb4b..e19f9b79f87 100644
--- a/reactos/drivers/network/ndis/ndis/50stubs.c
+++ b/reactos/drivers/network/ndis/ndis/50stubs.c
@@ -10,6 +10,8 @@
 
 #include "ndissys.h"
 
+#include <atm.h>
+
 /*
  * @unimplemented
  */
diff --git a/reactos/drivers/network/ndis/ndis/buffer.c b/reactos/drivers/network/ndis/ndis/buffer.c
index 8c135046ef4..318c9d81df2 100644
--- a/reactos/drivers/network/ndis/ndis/buffer.c
+++ b/reactos/drivers/network/ndis/ndis/buffer.c
@@ -10,7 +10,6 @@
 
 #include <ndissys.h>
 
-
 __inline ULONG SkipToOffset(
     IN PNDIS_BUFFER Buffer,
     IN UINT Offset,
diff --git a/reactos/drivers/network/ndis/ndis/cm.c b/reactos/drivers/network/ndis/ndis/cm.c
index 5b68352cf34..c32971cb777 100644
--- a/reactos/drivers/network/ndis/ndis/cm.c
+++ b/reactos/drivers/network/ndis/ndis/cm.c
@@ -10,7 +10,6 @@
 
 #include "ndissys.h"
 
-
 /*
  * @unimplemented
  */
diff --git a/reactos/drivers/network/ndis/ndis/co.c b/reactos/drivers/network/ndis/ndis/co.c
index c256e1722f5..55120a1028c 100644
--- a/reactos/drivers/network/ndis/ndis/co.c
+++ b/reactos/drivers/network/ndis/ndis/co.c
@@ -10,6 +10,8 @@
 
 #include "ndissys.h"
 
+#include <ndistapi.h>
+
 /*
  * @unimplemented
  */
diff --git a/reactos/drivers/network/ndis/ndis/config.c b/reactos/drivers/network/ndis/ndis/config.c
index addcd715086..9d1afa5378e 100644
--- a/reactos/drivers/network/ndis/ndis/config.c
+++ b/reactos/drivers/network/ndis/ndis/config.c
@@ -33,6 +33,8 @@
 
 #include "ndissys.h"
 
+#include <ntifs.h>
+
 #define PARAMETERS_KEY L"Parameters"     /* The parameters subkey under the device-specific key */
 
 /*
diff --git a/reactos/drivers/network/ndis/ndis/control.c b/reactos/drivers/network/ndis/ndis/control.c
index 912edb45cdc..614bf398580 100644
--- a/reactos/drivers/network/ndis/ndis/control.c
+++ b/reactos/drivers/network/ndis/ndis/control.c
@@ -310,4 +310,3 @@ NdisWaitEvent(
 }
 
 /* EOF */
-
diff --git a/reactos/drivers/network/ndis/ndis/io.c b/reactos/drivers/network/ndis/ndis/io.c
index 2b972a5b837..e5d954cb35a 100644
--- a/reactos/drivers/network/ndis/ndis/io.c
+++ b/reactos/drivers/network/ndis/ndis/io.c
@@ -1256,4 +1256,3 @@ NdisFreeDmaChannel(
 
 
 /* EOF */
-
diff --git a/reactos/drivers/network/ndis/ndis/main.c b/reactos/drivers/network/ndis/ndis/main.c
index 75ce902102a..79541745ffa 100644
--- a/reactos/drivers/network/ndis/ndis/main.c
+++ b/reactos/drivers/network/ndis/ndis/main.c
@@ -13,7 +13,6 @@
 
 #include "ndissys.h"
 
-
 #if DBG
 
 /* See debug.h for debug/trace constants */
@@ -133,4 +132,3 @@ NdisWriteEventLogEntry(
 }
 
 /* EOF */
-
diff --git a/reactos/drivers/network/ndis/ndis/memory.c b/reactos/drivers/network/ndis/ndis/memory.c
index 4f98142c4ab..7a65ae932e4 100644
--- a/reactos/drivers/network/ndis/ndis/memory.c
+++ b/reactos/drivers/network/ndis/ndis/memory.c
@@ -418,4 +418,3 @@ NdisFreeSharedMemory(
 
 
 /* EOF */
-
diff --git a/reactos/drivers/network/ndis/ndis/miniport.c b/reactos/drivers/network/ndis/ndis/miniport.c
index 846da655b5f..3119e6f9295 100644
--- a/reactos/drivers/network/ndis/ndis/miniport.c
+++ b/reactos/drivers/network/ndis/ndis/miniport.c
@@ -13,6 +13,8 @@
 
 #include "ndissys.h"
 
+#include <ndisguid.h>
+
 /*
  * Define to 1 to get a debugger breakpoint at the end of NdisInitializeWrapper
  * for each new miniport starting up
@@ -3345,4 +3347,3 @@ NdisIMGetDeviceContext(
 }
 
 /* EOF */
-
diff --git a/reactos/drivers/network/ndis/ndis/object.c b/reactos/drivers/network/ndis/ndis/object.c
index 47d95617476..e311d720bdb 100644
--- a/reactos/drivers/network/ndis/ndis/object.c
+++ b/reactos/drivers/network/ndis/ndis/object.c
@@ -37,4 +37,3 @@ NdisFreeGenericObject(
 {
   ExFreePool(NdisGenericObject);
 }
-
diff --git a/reactos/drivers/network/ndis/ndis/string.c b/reactos/drivers/network/ndis/ndis/string.c
index cd5c02b9350..dbe536fcdf5 100644
--- a/reactos/drivers/network/ndis/ndis/string.c
+++ b/reactos/drivers/network/ndis/ndis/string.c
@@ -200,4 +200,3 @@ NdisUpcaseUnicodeString(
 }
 
 /* EOF */
-
diff --git a/reactos/drivers/network/ndis/ndis/time.c b/reactos/drivers/network/ndis/ndis/time.c
index 0e26b6264fe..c27a511c099 100644
--- a/reactos/drivers/network/ndis/ndis/time.c
+++ b/reactos/drivers/network/ndis/ndis/time.c
@@ -359,4 +359,3 @@ NdisSetTimerEx(
 }
 
 /* EOF */
-