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

Author: akhaldi
Date: Wed Feb  5 16:30:19 2014
New Revision: 61991

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

Modified:
    trunk/reactos/win32ss/gdi/eng/engevent.c
    trunk/reactos/win32ss/gdi/ntgdi/freetype.c
    trunk/reactos/win32ss/pch.h
    trunk/reactos/win32ss/user/ntuser/defwnd.c
    trunk/reactos/win32ss/user/ntuser/kbdlayout.c
    trunk/reactos/win32ss/user/ntuser/message.c
    trunk/reactos/win32ss/user/ntuser/simplecall.c

Modified: trunk/reactos/win32ss/gdi/eng/engevent.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engevent.c…
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/engevent.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/engevent.c	[iso-8859-1] Wed Feb  5 16:30:19 2014
@@ -10,6 +10,9 @@
 /* INCLUDES *******************************************************************/
 
 #include <win32k.h>
+
+#include <ntddvdeo.h>
+
 #define NDEBUG
 #include <debug.h>
 

Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/freetype.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c	[iso-8859-1] Wed Feb  5 16:30:19 2014
@@ -10,6 +10,14 @@
 /** Includes ******************************************************************/
 
 #include <win32k.h>
+
+#include FT_GLYPH_H
+#include FT_TYPE1_TABLES_H
+#include <freetype/tttables.h>
+#include <freetype/fttrigon.h>
+#include <freetype/ftbitmap.h>
+#include <freetype/ftoutln.h>
+#include <freetype/ftwinfnt.h>
 
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/win32ss/pch.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=61991&am…
==============================================================================
--- trunk/reactos/win32ss/pch.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/pch.h	[iso-8859-1] Wed Feb  5 16:30:19 2014
@@ -16,22 +16,17 @@
 /* DDK/NDK/SDK headers */
 #undef NTDDI_VERSION
 #define NTDDI_VERSION NTDDI_WS03SP1
-#include <ntddk.h>
+#include <ntifs.h>
 #include <ntddmou.h>
-#include <ntddvdeo.h>
-#include <ntifs.h>
-#include <tvout.h>
 #include <ndk/exfuncs.h>
 #include <ndk/kdfuncs.h>
 #include <ndk/kefuncs.h>
-#include <ndk/lpcfuncs.h>
 #include <ndk/mmfuncs.h>
 #include <ndk/obfuncs.h>
 #include <ndk/psfuncs.h>
 #include <ndk/rtlfuncs.h>
 #include <ntstrsafe.h>
 #include <ntddkbd.h>
-#include <bugcodes.h>
 
 /* Win32 headers */
 /* FIXME: Defines in winbase.h that we need... */
@@ -61,20 +56,12 @@
 #define _ENGINE_EXPORT_
 #include <winddi.h>
 #include <winuser.h>
-#include <windowsx.h>
 #include <prntfont.h>
-#include <dde.h>
-#include <wincon.h>
-#include <winnls.h>
 #define _NOCSECT_TYPE
 #include <ddrawi.h>
 
 /* SEH support with PSEH */
 #include <pseh/pseh2.h>
-
-/* CSRSS Header */
-#include <csr/csr.h>
-#include <win/winmsg.h>
 
 /* Public Win32K headers */
 #include <include/callback.h>
@@ -87,20 +74,10 @@
 
 /* Undocumented user definitions */
 #include <undocuser.h>
-#include <winlogon.h>
 
 /* Freetype headers */
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include FT_GLYPH_H
-#include FT_TYPE1_TABLES_H
-#include <freetype/tttables.h>
-#include <freetype/fttrigon.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftbitmap.h>
-#include <freetype/ftoutln.h>
-#include <freetype/ftwinfnt.h>
-#include <freetype/freetype.h>
 
 /* Internal Win32K header */
 #include "win32kp.h"

Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/defwnd.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/defwnd.c	[iso-8859-1] Wed Feb  5 16:30:19 2014
@@ -7,6 +7,9 @@
  */
 
 #include <win32k.h>
+
+#include <windowsx.h>
+
 DBG_DEFAULT_CHANNEL(UserDefwnd);
 
 // Client Shutdown messages

Modified: trunk/reactos/win32ss/user/ntuser/kbdlayout.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/kbdlay…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/kbdlayout.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/kbdlayout.c	[iso-8859-1] Wed Feb  5 16:30:19 2014
@@ -9,6 +9,9 @@
  */
 
 #include <win32k.h>
+
+#include <winnls.h>
+
 DBG_DEFAULT_CHANNEL(UserKbdLayout);
 
 PKL gspklBaseLayout = NULL;

Modified: trunk/reactos/win32ss/user/ntuser/message.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/message.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/message.c	[iso-8859-1] Wed Feb  5 16:30:19 2014
@@ -7,6 +7,9 @@
  */
 
 #include <win32k.h>
+
+#include <dde.h>
+
 DBG_DEFAULT_CHANNEL(UserMsg);
 
 #define PM_BADMSGFLAGS ~((QS_RAWINPUT <<
16)|PM_QS_SENDMESSAGE|PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_QS_INPUT|PM_NOYIELD|PM_REMOVE)

Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/simplecall.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/simplecall.c	[iso-8859-1] Wed Feb  5 16:30:19 2014
@@ -7,6 +7,9 @@
  */
 
 #include <win32k.h>
+
+#include <winlogon.h>
+
 DBG_DEFAULT_CHANNEL(UserMisc);
 
 /* registered Logon process */