[NTDLL]

* 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=61728

diff --git a/reactos/dll/ntdll/csr/api.c b/reactos/dll/ntdll/csr/api.c
index 4e3556c..fd0687e 100644 (file)
--- a/reactos/dll/ntdll/csr/api.c
+++ b/reactos/dll/ntdll/csr/api.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/dll/ntdll/csr/capture.c b/reactos/dll/ntdll/csr/capture.c
index 1ab781d..d22644b 100644 (file)
--- a/reactos/dll/ntdll/csr/capture.c
+++ b/reactos/dll/ntdll/csr/capture.c
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/dll/ntdll/csr/connect.c b/reactos/dll/ntdll/csr/connect.c
index c2d2ac8..cef68d9 100644 (file)
--- a/reactos/dll/ntdll/csr/connect.c
+++ b/reactos/dll/ntdll/csr/connect.c
@@ -9,6 +9,10 @@
 /* INCLUDES *******************************************************************/
 
 #include <ntdll.h>
+
+#include <ndk/lpcfuncs.h>
+#include <csr/csrsrv.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/dll/ntdll/dbg/dbgui.c b/reactos/dll/ntdll/dbg/dbgui.c
index b65e06c..e745374 100644 (file)
--- a/reactos/dll/ntdll/dbg/dbgui.c
+++ b/reactos/dll/ntdll/dbg/dbgui.c
@@ -9,6 +9,9 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntdll.h>
+
+#include <ndk/dbgkfuncs.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/dll/ntdll/dispatch/dispatch.c b/reactos/dll/ntdll/dispatch/dispatch.c
index 50a9ee8..37f59d2 100644 (file)
--- a/reactos/dll/ntdll/dispatch/dispatch.c
+++ b/reactos/dll/ntdll/dispatch/dispatch.c
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/dll/ntdll/include/ntdll.h b/reactos/dll/ntdll/include/ntdll.h
index afd6a2a..1121c9f 100644 (file)
--- a/reactos/dll/ntdll/include/ntdll.h
+++ b/reactos/dll/ntdll/include/ntdll.h
@@ -23,18 +23,14 @@
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
-#include <wingdi.h>
-#include <wincon.h>
 #include <winuser.h>
 #define NTOS_MODE_USER
 #include <ndk/cmfuncs.h>
-#include <ndk/dbgkfuncs.h>
 #include <ndk/exfuncs.h>
 #include <ndk/iofuncs.h>
 #include <ndk/kdtypes.h>
 #include <ndk/kefuncs.h>
 #include <ndk/ldrfuncs.h>
-#include <ndk/lpcfuncs.h>
 #include <ndk/mmfuncs.h>
 #include <ndk/obfuncs.h>
 #include <ndk/psfuncs.h>
@@ -45,7 +41,6 @@
 #include "ntdllp.h"
 
 /* CSRSS Headers */
-#include <csr/csrsrv.h>
 #include <csr/csr.h>
 
 /* PSEH */

diff --git a/reactos/dll/ntdll/include/ntdllp.h b/reactos/dll/ntdll/include/ntdllp.h
index 606b5fc..d8b6e21 100644 (file)
--- a/reactos/dll/ntdll/include/ntdllp.h
+++ b/reactos/dll/ntdll/include/ntdllp.h
@@ -6,7 +6,7 @@
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
-/* INCLUDES ******************************************************************/
+#pragma once
 
 #define LDR_HASH_TABLE_ENTRIES 32
 #define LDR_GET_HASH_ENTRY(x) (RtlUpcaseUnicodeChar((x)) & (LDR_HASH_TABLE_ENTRIES - 1))

diff --git a/reactos/dll/ntdll/ldr/ldrapi.c b/reactos/dll/ntdll/ldr/ldrapi.c
index 5107649..a7b25f0 100644 (file)
--- a/reactos/dll/ntdll/ldr/ldrapi.c
+++ b/reactos/dll/ntdll/ldr/ldrapi.c
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/dll/ntdll/ldr/ldrinit.c b/reactos/dll/ntdll/ldr/ldrinit.c
index 8aa9e74..2c7094d 100644 (file)
--- a/reactos/dll/ntdll/ldr/ldrinit.c
+++ b/reactos/dll/ntdll/ldr/ldrinit.c
@@ -10,6 +10,8 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntdll.h>
+
+#include <wingdi.h>
 #include <callback.h>
 
 #define NDEBUG

diff --git a/reactos/dll/ntdll/ldr/ldrpe.c b/reactos/dll/ntdll/ldr/ldrpe.c
index 6b351ae..a127e57 100644 (file)
--- a/reactos/dll/ntdll/ldr/ldrpe.c
+++ b/reactos/dll/ntdll/ldr/ldrpe.c
@@ -9,6 +9,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/dll/ntdll/ldr/ldrutils.c b/reactos/dll/ntdll/ldr/ldrutils.c
index b042ee8..12d487c 100644 (file)
--- a/reactos/dll/ntdll/ldr/ldrutils.c
+++ b/reactos/dll/ntdll/ldr/ldrutils.c
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/dll/ntdll/rtl/libsupp.c b/reactos/dll/ntdll/rtl/libsupp.c
index c2cbf25..9ceb2b0 100644 (file)
--- a/reactos/dll/ntdll/rtl/libsupp.c
+++ b/reactos/dll/ntdll/rtl/libsupp.c
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/dll/ntdll/rtl/version.c b/reactos/dll/ntdll/rtl/version.c
index 66193fe..94e1caa 100644 (file)
--- a/reactos/dll/ntdll/rtl/version.c
+++ b/reactos/dll/ntdll/rtl/version.c
@@ -11,6 +11,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>