[akhaldi] 61728: [NTDLL] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716

Author: akhaldi
Date: Mon Jan 20 12:59:27 2014
New Revision: 61728

URL: http://svn.reactos.org/svn/reactos?rev=61728&view=rev
Log:
[NTDLL]
* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
CORE-7716

Modified:
    trunk/reactos/dll/ntdll/csr/api.c
    trunk/reactos/dll/ntdll/csr/capture.c
    trunk/reactos/dll/ntdll/csr/connect.c
    trunk/reactos/dll/ntdll/dbg/dbgui.c
    trunk/reactos/dll/ntdll/dispatch/dispatch.c
    trunk/reactos/dll/ntdll/include/ntdll.h
    trunk/reactos/dll/ntdll/include/ntdllp.h
    trunk/reactos/dll/ntdll/ldr/ldrapi.c
    trunk/reactos/dll/ntdll/ldr/ldrinit.c
    trunk/reactos/dll/ntdll/ldr/ldrpe.c
    trunk/reactos/dll/ntdll/ldr/ldrutils.c
    trunk/reactos/dll/ntdll/rtl/libsupp.c
    trunk/reactos/dll/ntdll/rtl/version.c

Modified: trunk/reactos/dll/ntdll/csr/api.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/api.c?rev=617...
==============================================================================
--- trunk/reactos/dll/ntdll/csr/api.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/csr/api.c	[iso-8859-1] Mon Jan 20 12:59:27 2014
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

#include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/dll/ntdll/csr/capture.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/capture.c?rev...
==============================================================================
--- trunk/reactos/dll/ntdll/csr/capture.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/csr/capture.c	[iso-8859-1] Mon Jan 20 12:59:27 2014
@@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

#include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/dll/ntdll/csr/connect.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?rev...
==============================================================================
--- trunk/reactos/dll/ntdll/csr/connect.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/csr/connect.c	[iso-8859-1] Mon Jan 20 12:59:27 2014
@@ -9,6 +9,10 @@
 /* INCLUDES *******************************************************************/

#include <ntdll.h>
+
+#include <ndk/lpcfuncs.h>
+#include <csr/csrsrv.h>
+
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dbg/dbgui.c?rev=6...
==============================================================================
--- trunk/reactos/dll/ntdll/dbg/dbgui.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/dbg/dbgui.c	[iso-8859-1] Mon Jan 20 12:59:27 2014
@@ -9,6 +9,9 @@
 /* INCLUDES *****************************************************************/

#include <ntdll.h>
+
+#include <ndk/dbgkfuncs.h>
+
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/dll/ntdll/dispatch/dispatch.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/dispatch...
==============================================================================
--- trunk/reactos/dll/ntdll/dispatch/dispatch.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/dispatch/dispatch.c	[iso-8859-1] Mon Jan 20 12:59:27 2014
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/

#include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/dll/ntdll/include/ntdll.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdll.h?r...
==============================================================================
--- trunk/reactos/dll/ntdll/include/ntdll.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/include/ntdll.h	[iso-8859-1] Mon Jan 20 12:59:27 2014
@@ -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 */

Modified: trunk/reactos/dll/ntdll/include/ntdllp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h?...
==============================================================================
--- trunk/reactos/dll/ntdll/include/ntdllp.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/include/ntdllp.h	[iso-8859-1] Mon Jan 20 12:59:27 2014
@@ -6,7 +6,7 @@
  * PROGRAMMER:      Alex Ionescu ([e-mail])
  */

-/* INCLUDES ******************************************************************/
+#pragma once

#define LDR_HASH_TABLE_ENTRIES 32
 #define LDR_GET_HASH_ENTRY(x) (RtlUpcaseUnicodeChar((x)) & (LDR_HASH_TABLE_ENTRIES - 1))

Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev=...
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/ldrapi.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/ldrapi.c	[iso-8859-1] Mon Jan 20 12:59:27 2014
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/

#include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?rev...
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/ldrinit.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/ldrinit.c	[iso-8859-1] Mon Jan 20 12:59:27 2014
@@ -10,6 +10,8 @@
 /* INCLUDES *****************************************************************/

#include <ntdll.h>
+
+#include <wingdi.h>
 #include <callback.h>

#define NDEBUG

Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrpe.c?rev=6...
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/ldrpe.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/ldrpe.c	[iso-8859-1] Mon Jan 20 12:59:27 2014
@@ -9,6 +9,7 @@
 /* INCLUDES *****************************************************************/

#include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?re...
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/ldrutils.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/ldrutils.c	[iso-8859-1] Mon Jan 20 12:59:27 2014
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/

#include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?rev...
==============================================================================
--- trunk/reactos/dll/ntdll/rtl/libsupp.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/rtl/libsupp.c	[iso-8859-1] Mon Jan 20 12:59:27 2014
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/

#include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/dll/ntdll/rtl/version.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/version.c?rev...
==============================================================================
--- trunk/reactos/dll/ntdll/rtl/version.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/rtl/version.c	[iso-8859-1] Mon Jan 20 12:59:27 2014
@@ -11,6 +11,7 @@
 /* INCLUDES *******************************************************************/

#include <ntdll.h>
+
 #define NDEBUG
 #include <debug.h>