From df348acfe291fd65e0c837790902c1687c46c1be Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 4 Feb 2014 10:47:12 +0000
Subject: [PATCH] [ROSSYM] * Improve header inclusions. CORE-7716

svn path=/trunk/; revision=61973
---
 reactos/lib/rossym/delete.c   | 7 +------
 reactos/lib/rossym/find.c     | 2 +-
 reactos/lib/rossym/fromfile.c | 2 +-
 reactos/lib/rossym/frommem.c  | 2 +-
 reactos/lib/rossym/fromraw.c  | 2 +-
 reactos/lib/rossym/getraw.c   | 7 +------
 reactos/lib/rossym/init.c     | 2 --
 reactos/lib/rossym/initkm.c   | 5 +----
 reactos/lib/rossym/initum.c   | 5 -----
 reactos/lib/rossym/zwfile.c   | 7 +------
 10 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/reactos/lib/rossym/delete.c b/reactos/lib/rossym/delete.c
index c97e40c7799..65f694e63c0 100644
--- a/reactos/lib/rossym/delete.c
+++ b/reactos/lib/rossym/delete.c
@@ -8,17 +8,12 @@
  */
 
 #define NTOSAPI
-#include <ntddk.h>
+#include <ntdef.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 
-#define NDEBUG
-#include <debug.h>
-
 VOID
 RosSymDelete(PROSSYM_INFO RosSymInfo)
 {
   RosSymFreeMem(RosSymInfo);
 }
-
-/* EOF */
diff --git a/reactos/lib/rossym/find.c b/reactos/lib/rossym/find.c
index c311e3eed0a..d64377bebe3 100644
--- a/reactos/lib/rossym/find.c
+++ b/reactos/lib/rossym/find.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  */
 
-#include <ntddk.h>
+#include <ntdef.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 
diff --git a/reactos/lib/rossym/fromfile.c b/reactos/lib/rossym/fromfile.c
index 21339b7ac3f..fbefb637959 100644
--- a/reactos/lib/rossym/fromfile.c
+++ b/reactos/lib/rossym/fromfile.c
@@ -8,7 +8,7 @@
  */
 
 #define NTOSAPI
-#include <ntddk.h>
+#include <ntdef.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 #include <ntimage.h>
diff --git a/reactos/lib/rossym/frommem.c b/reactos/lib/rossym/frommem.c
index f03274eb735..21f8334585d 100644
--- a/reactos/lib/rossym/frommem.c
+++ b/reactos/lib/rossym/frommem.c
@@ -8,7 +8,7 @@
  */
 
 #define NTOSAPI
-#include <ntddk.h>
+#include <ntdef.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 #include <ntimage.h>
diff --git a/reactos/lib/rossym/fromraw.c b/reactos/lib/rossym/fromraw.c
index ae484252424..33be4fd6003 100644
--- a/reactos/lib/rossym/fromraw.c
+++ b/reactos/lib/rossym/fromraw.c
@@ -8,7 +8,7 @@
  */
 
 #define NTOSAPI
-#include <ntddk.h>
+#include <ntdef.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 
diff --git a/reactos/lib/rossym/getraw.c b/reactos/lib/rossym/getraw.c
index 1f11057a38e..6635f19de94 100644
--- a/reactos/lib/rossym/getraw.c
+++ b/reactos/lib/rossym/getraw.c
@@ -8,13 +8,10 @@
  */
 
 #define NTOSAPI
-#include <ntddk.h>
+#include <ntdef.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 
-#define NDEBUG
-#include <debug.h>
-
 ULONG
 RosSymGetRawDataLength(PROSSYM_INFO RosSymInfo)
 {
@@ -39,5 +36,3 @@ RosSymGetRawData(PROSSYM_INFO RosSymInfo, PVOID RawData)
   memcpy((char *) RawData + RosSymHeader->StringsOffset, RosSymInfo->Strings,
          RosSymHeader->StringsLength);
 }
-
-/* EOF */
diff --git a/reactos/lib/rossym/init.c b/reactos/lib/rossym/init.c
index d77f63f9849..4ab3698cfbd 100644
--- a/reactos/lib/rossym/init.c
+++ b/reactos/lib/rossym/init.c
@@ -18,5 +18,3 @@ RosSymInit(PROSSYM_CALLBACKS Callbacks)
 {
   RosSymCallbacks = *Callbacks;
 }
-
-/* EOF */
diff --git a/reactos/lib/rossym/initkm.c b/reactos/lib/rossym/initkm.c
index a50680e11da..7db13e25bf6 100644
--- a/reactos/lib/rossym/initkm.c
+++ b/reactos/lib/rossym/initkm.c
@@ -10,13 +10,10 @@
 #include <ntdef.h>
 #undef DECLSPEC_IMPORT
 #define DECLSPEC_IMPORT
-#include <ntddk.h>
+#include <wdm.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 
-#define NDEBUG
-#include <debug.h>
-
 #define TAG_ROSSYM 'MYSR'
 
 static PVOID
diff --git a/reactos/lib/rossym/initum.c b/reactos/lib/rossym/initum.c
index a26a42adcc6..7a859a93f0b 100644
--- a/reactos/lib/rossym/initum.c
+++ b/reactos/lib/rossym/initum.c
@@ -13,9 +13,6 @@
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 
-#define NDEBUG
-#include <debug.h>
-
 static PVOID
 RosSymAllocMemUM(ULONG_PTR Size)
 {
@@ -41,5 +38,3 @@ RosSymInitUserMode(VOID)
 
   RosSymInit(&KmCallbacks);
 }
-
-/* EOF */
diff --git a/reactos/lib/rossym/zwfile.c b/reactos/lib/rossym/zwfile.c
index dc89c3e3157..f4d7e6bb3e9 100644
--- a/reactos/lib/rossym/zwfile.c
+++ b/reactos/lib/rossym/zwfile.c
@@ -8,13 +8,10 @@
  */
 
 #define NTOSAPI
-#include <ntddk.h>
+#include <wdm.h>
 #include <reactos/rossym.h>
 #include "rossympriv.h"
 
-#define NDEBUG
-#include <debug.h>
-
 BOOLEAN
 RosSymZwReadFile(PVOID FileContext, PVOID Buffer, ULONG Size)
 {
@@ -48,5 +45,3 @@ RosSymZwSeekFile(PVOID FileContext, ULONG_PTR Position)
 
   return NT_SUCCESS(Status);
 }
-
-/* EOF */
-- 
2.17.1