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

Author: akhaldi
Date: Thu Jan 23 17:45:58 2014
New Revision: 61772

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

Modified:
    trunk/reactos/dll/win32/kernel32/client/debugger.c
    trunk/reactos/dll/win32/kernel32/client/dosdev.c
    trunk/reactos/dll/win32/kernel32/client/file/deviceio.c
    trunk/reactos/dll/win32/kernel32/client/power.c
    trunk/reactos/dll/win32/kernel32/client/toolhelp.c
    trunk/reactos/dll/win32/kernel32/k32.h

Modified: trunk/reactos/dll/win32/kernel32/client/debugger.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/d...
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/debugger.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/debugger.c	[iso-8859-1] Thu Jan 23 17:45:58 2014
@@ -9,6 +9,9 @@
 /* INCLUDES *****************************************************************/

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

Modified: trunk/reactos/dll/win32/kernel32/client/dosdev.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/d...
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/dosdev.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/dosdev.c	[iso-8859-1] Thu Jan 23 17:45:58 2014
@@ -11,6 +11,7 @@
 /* INCLUDES ******************************************************************/

#include <k32.h>
+
 #define NDEBUG
 #include <debug.h>
 #include <dbt.h>

Modified: trunk/reactos/dll/win32/kernel32/client/file/deviceio.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/f...
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/file/deviceio.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/file/deviceio.c	[iso-8859-1] Thu Jan 23 17:45:58 2014
@@ -9,6 +9,9 @@
 /* INCLUDES *******************************************************************/

#include <k32.h>
+
+#include <ntddbeep.h>
+
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/dll/win32/kernel32/client/power.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/p...
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/power.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/power.c	[iso-8859-1] Thu Jan 23 17:45:58 2014
@@ -12,6 +12,8 @@

#include <k32.h>

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

Modified: trunk/reactos/dll/win32/kernel32/client/toolhelp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/t...
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/toolhelp.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/toolhelp.c	[iso-8859-1] Thu Jan 23 17:45:58 2014
@@ -16,8 +16,6 @@
  */

#include <k32.h>
-
-#include <tlhelp32.h>

#define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/dll/win32/kernel32/k32.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?re...
==============================================================================
--- trunk/reactos/dll/win32/kernel32/k32.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/k32.h	[iso-8859-1] Thu Jan 23 17:45:58 2014
@@ -11,10 +11,10 @@

/* INCLUDES ******************************************************************/

+#include <stdio.h>
+
 /* PSDK/NDK Headers */
 #define WIN32_NO_STATUS
-#include <stdarg.h>
-#include <stdio.h>
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
@@ -28,7 +28,6 @@
 #define NTDDI_VERSION NTDDI_WS03SP1

#include <ndk/cmfuncs.h>
-#include <ndk/dbgkfuncs.h>
 #include <ndk/exfuncs.h>
 #include <ndk/iofuncs.h>
 #include <ndk/kdtypes.h>
@@ -36,7 +35,6 @@
 #include <ndk/ldrfuncs.h>
 #include <ndk/mmfuncs.h>
 #include <ndk/obfuncs.h>
-#include <ndk/pofuncs.h>
 #include <ndk/psfuncs.h>
 #include <ndk/rtlfuncs.h>
 #include <ndk/setypes.h>
@@ -48,10 +46,8 @@
 #include <win/basemsg.h>
 #include <win/console.h>
 #include <win/conmsg.h>
-#include <win/winmsg.h>

/* DDK Driver Headers */
-#include <ntddbeep.h>
 #include <mountmgr.h>

/* Internal Kernel32 Header */
@@ -69,4 +65,4 @@
 /* Virtual DOS Machines (VDM) Support Definitions */
 #include "include/vdm.h"

-#endif
+#endif /* __K32_H */