[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

reactos/dll/ntdll/csr/api.c

@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>
 

reactos/dll/ntdll/csr/capture.c

@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>
 

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>
 

reactos/dll/ntdll/dbg/dbgui.c

@@ -9,6 +9,9 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntdll.h>
+
+#include <ndk/dbgkfuncs.h>
+
 #define NDEBUG
 #include <debug.h>
 

reactos/dll/ntdll/dispatch/dispatch.c

@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>
 

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 */

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))

reactos/dll/ntdll/ldr/ldrapi.c

@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>
 

reactos/dll/ntdll/ldr/ldrinit.c

@@ -10,6 +10,8 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntdll.h>
+
+#include <wingdi.h>
 #include <callback.h>
 
 #define NDEBUG

reactos/dll/ntdll/ldr/ldrpe.c

@@ -9,6 +9,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>
 

reactos/dll/ntdll/ldr/ldrutils.c

@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>
 

reactos/dll/ntdll/rtl/libsupp.c

@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>
 

reactos/dll/ntdll/rtl/version.c

@@ -11,6 +11,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>