diff --git a/reactos/include/win32k/kapi.h b/reactos/include/win32k/kapi.h
index 8078b8b26e3..7e6c30f2cb3 100644
--- a/reactos/include/win32k/kapi.h
+++ b/reactos/include/win32k/kapi.h
@@ -1,6 +1,5 @@
 #ifndef _WIN32K_KAPI_H
 #define _WIN32K_KAPI_H
-#include <win32k/ntddraw.h>
 #include <win32k/bitmaps.h>
 #include <win32k/brush.h>
 #include <win32k/cliprgn.h>
diff --git a/reactos/subsys/win32k/dib/dib.c b/reactos/subsys/win32k/dib/dib.c
index 5023165be5a..e7a62938f18 100644
--- a/reactos/subsys/win32k/dib/dib.c
+++ b/reactos/subsys/win32k/dib/dib.c
@@ -16,14 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib.c,v 1.9 2004/04/06 21:53:48 weiden Exp $ */
-
-#include <windows.h>
-#include <ddk/winddi.h>
-#include <win32k/debug.h>
-#include <debug.h>
-#include "../eng/objects.h"
-#include "dib.h"
+/* $Id: dib.c,v 1.10 2004/05/10 17:07:16 weiden Exp $ */
+#include <w32k.h>
 
 /* Static data */
 
diff --git a/reactos/subsys/win32k/dib/dib.h b/reactos/subsys/win32k/dib/dib.h
index 55ab9d52ed3..dad5d27f9c6 100644
--- a/reactos/subsys/win32k/dib/dib.h
+++ b/reactos/subsys/win32k/dib/dib.h
@@ -1,3 +1,6 @@
+#ifndef _W32K_DIB_DIB_H
+#define _W32K_DIB_DIB_H
+
 extern unsigned char notmask[2];
 extern unsigned char altnotmask[2];
 #define MASK1BPP(x) (1<<(7-((x)&7)))
@@ -119,3 +122,5 @@ BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
                                  RECTL*  DestRect,  POINTL  *SourcePoint,
                                  XLATEOBJ *ColorTranslation, ULONG iTransColor);
 
+#endif /* _W32K_DIB_DIB_H */
+
diff --git a/reactos/subsys/win32k/dib/dib16bpp.c b/reactos/subsys/win32k/dib/dib16bpp.c
index 83b7498b45c..abeafbd808d 100644
--- a/reactos/subsys/win32k/dib/dib16bpp.c
+++ b/reactos/subsys/win32k/dib/dib16bpp.c
@@ -16,19 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib16bpp.c,v 1.30 2004/04/25 11:34:12 weiden Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <math.h>
-#include <debug.h>
-#include <ddk/winddi.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/debug.h>
-#include <include/object.h>
-#include "../eng/objects.h"
-#include "dib.h"
+/* $Id: dib16bpp.c,v 1.31 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
 
 VOID
 DIB_16BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
diff --git a/reactos/subsys/win32k/dib/dib1bpp.c b/reactos/subsys/win32k/dib/dib1bpp.c
index 6aab975bccb..795f2241df0 100644
--- a/reactos/subsys/win32k/dib/dib1bpp.c
+++ b/reactos/subsys/win32k/dib/dib1bpp.c
@@ -16,19 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib1bpp.c,v 1.26 2004/05/01 09:04:37 gvg Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/debug.h>
-#include <include/object.h>
-#include <debug.h>
-#include <ddk/winddi.h>
-#include "../eng/objects.h"
-#include "dib.h"
+/* $Id: dib1bpp.c,v 1.27 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
 
 VOID
 DIB_1BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
diff --git a/reactos/subsys/win32k/dib/dib24bpp.c b/reactos/subsys/win32k/dib/dib24bpp.c
index 2051be0d5ab..2e0cdb31754 100644
--- a/reactos/subsys/win32k/dib/dib24bpp.c
+++ b/reactos/subsys/win32k/dib/dib24bpp.c
@@ -16,18 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib24bpp.c,v 1.25 2004/04/25 11:34:12 weiden Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/debug.h>
-#include <debug.h>
-#include <include/object.h>
-#include <ddk/winddi.h>
-#include "../eng/objects.h"
-#include "dib.h"
+/* $Id: dib24bpp.c,v 1.26 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
 
 VOID
 DIB_24BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
diff --git a/reactos/subsys/win32k/dib/dib32bpp.c b/reactos/subsys/win32k/dib/dib32bpp.c
index 5a886e8c523..577d3dc30b4 100644
--- a/reactos/subsys/win32k/dib/dib32bpp.c
+++ b/reactos/subsys/win32k/dib/dib32bpp.c
@@ -16,18 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib32bpp.c,v 1.25 2004/04/25 11:34:12 weiden Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/debug.h>
-#include <debug.h>
-#include <ddk/winddi.h>
-#include <include/object.h>
-#include "../eng/objects.h"
-#include "dib.h"
+/* $Id: dib32bpp.c,v 1.26 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
 
 VOID
 DIB_32BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
diff --git a/reactos/subsys/win32k/dib/dib4bpp.c b/reactos/subsys/win32k/dib/dib4bpp.c
index a2762a45387..7fc52aa891e 100644
--- a/reactos/subsys/win32k/dib/dib4bpp.c
+++ b/reactos/subsys/win32k/dib/dib4bpp.c
@@ -16,18 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib4bpp.c,v 1.33 2004/04/09 22:00:38 navaraf Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/debug.h>
-#include <debug.h>
-#include <include/object.h>
-#include <ddk/winddi.h>
-#include "../eng/objects.h"
-#include "dib.h"
+/* $Id: dib4bpp.c,v 1.34 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
 
 VOID
 DIB_4BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
diff --git a/reactos/subsys/win32k/dib/dib8bpp.c b/reactos/subsys/win32k/dib/dib8bpp.c
index c83aff8701b..ce217be3ec9 100644
--- a/reactos/subsys/win32k/dib/dib8bpp.c
+++ b/reactos/subsys/win32k/dib/dib8bpp.c
@@ -16,18 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dib8bpp.c,v 1.24 2004/04/30 23:42:20 navaraf Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/debug.h>
-#include <debug.h>
-#include <include/object.h>
-#include <ddk/winddi.h>
-#include "../eng/objects.h"
-#include "dib.h"
+/* $Id: dib8bpp.c,v 1.25 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
 
 VOID
 DIB_8BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
diff --git a/reactos/subsys/win32k/eng/bitblt.c b/reactos/subsys/win32k/eng/bitblt.c
index 76968a1e8ee..5db8f9de343 100644
--- a/reactos/subsys/win32k/eng/bitblt.c
+++ b/reactos/subsys/win32k/eng/bitblt.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bitblt.c,v 1.53 2004/04/30 14:22:44 weiden Exp $
+/* $Id: bitblt.c,v 1.54 2004/05/10 17:07:17 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -26,25 +26,7 @@
  * REVISION HISTORY:
  *        2/10/1999: Created
  */
-
-#include <ddk/winddi.h>
-#include <ddk/ntddk.h>
-#include <ddk/ntddmou.h>
-#include <ntos/minmax.h>
-#include "brush.h"
-#include "clip.h"
-#include "objects.h"
-#include "../dib/dib.h"
-#include "misc.h"
-#include <include/mouse.h>
-#include <include/object.h>
-#include <include/dib.h>
-#include <include/surface.h>
-#include <include/eng.h>
-#include <include/inteng.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 typedef BOOLEAN STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj,
                                         SURFGDI* OutputGDI,
diff --git a/reactos/subsys/win32k/eng/brush.c b/reactos/subsys/win32k/eng/brush.c
index 2093f1546b8..b18133409fc 100644
--- a/reactos/subsys/win32k/eng/brush.c
+++ b/reactos/subsys/win32k/eng/brush.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: brush.c,v 1.10 2004/01/30 16:36:16 navaraf Exp $
+/* $Id: brush.c,v 1.11 2004/05/10 17:07:17 weiden Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -26,8 +26,7 @@
  * REVISION HISTORY:
  *                 3/7/1999: Created
  */
-
-#include <ddk/winddi.h>
+#include <w32k.h>
 
 /*
  * @implemented
diff --git a/reactos/subsys/win32k/eng/clip.c b/reactos/subsys/win32k/eng/clip.c
index 0eac12bb529..7aa2d0a9138 100644
--- a/reactos/subsys/win32k/eng/clip.c
+++ b/reactos/subsys/win32k/eng/clip.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: clip.c,v 1.19 2004/04/09 20:03:16 navaraf Exp $
+/* $Id: clip.c,v 1.20 2004/05/10 17:07:17 weiden Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -26,15 +26,7 @@
  * REVISION HISTORY:
  *                 21/8/1999: Created
  */
-
-#include <ddk/winddi.h>
-#include <ddk/ntddk.h>
-#include "objects.h"
-#include "clip.h"
-#include <include/object.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 VOID STDCALL IntEngDeleteClipRegion(CLIPOBJ *ClipObj)
 {
diff --git a/reactos/subsys/win32k/eng/copybits.c b/reactos/subsys/win32k/eng/copybits.c
index 7c5eb8885ca..445ce052dc1 100644
--- a/reactos/subsys/win32k/eng/copybits.c
+++ b/reactos/subsys/win32k/eng/copybits.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: copybits.c,v 1.23 2004/04/09 20:03:16 navaraf Exp $
+/* $Id: copybits.c,v 1.24 2004/05/10 17:07:17 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -26,15 +26,7 @@
  * REVISION HISTORY:
  *        8/18/1999: Created
  */
-
-#include <ddk/winddi.h>
-#include <ddk/ntddmou.h>
-#include "objects.h"
-#include "clip.h"
-#include "../dib/dib.h"
-#include <include/mouse.h>
-#include <include/object.h>
-#include <include/eng.h>
+#include <w32k.h>
 
 /*
  * @implemented
diff --git a/reactos/subsys/win32k/eng/debug.c b/reactos/subsys/win32k/eng/debug.c
index cacc954f161..e6dae144b3e 100644
--- a/reactos/subsys/win32k/eng/debug.c
+++ b/reactos/subsys/win32k/eng/debug.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: debug.c,v 1.7 2004/01/07 19:24:37 navaraf Exp $
+/* $Id: debug.c,v 1.8 2004/05/10 17:07:17 weiden Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -26,8 +26,7 @@
  * REVISION HISTORY:
  *                 11/7/1999: Created
  */
-
-#include <ddk/ntddk.h>
+#include <w32k.h>
 
 /*
  * @implemented
diff --git a/reactos/subsys/win32k/eng/device.c b/reactos/subsys/win32k/eng/device.c
index cb2dafab17f..dc5d88e347e 100644
--- a/reactos/subsys/win32k/eng/device.c
+++ b/reactos/subsys/win32k/eng/device.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: device.c,v 1.14 2004/03/14 18:36:14 dwelch Exp $
+/* $Id: device.c,v 1.15 2004/05/10 17:07:17 weiden Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -26,13 +26,7 @@
  * REVISION HISTORY:
  *                 3/7/1999: Created
  */
-
-#include <ddk/ntddk.h>
-#include <win32k/misc.h>
-#include <windows.h>
-
-#define NDEBUG
-#include <debug.h>
+#include <w32k.h>
 
 /*
  * @implemented
diff --git a/reactos/subsys/win32k/eng/error.c b/reactos/subsys/win32k/eng/error.c
index e2a9061bc77..7de6d966b0e 100644
--- a/reactos/subsys/win32k/eng/error.c
+++ b/reactos/subsys/win32k/eng/error.c
@@ -1,5 +1,4 @@
-#include <ddk/winddi.h>
-#include <include/error.h>
+#include <w32k.h>
 
 /*
  * @implemented
diff --git a/reactos/subsys/win32k/eng/event.c b/reactos/subsys/win32k/eng/event.c
index 736c064a80e..d6fea78c2f4 100644
--- a/reactos/subsys/win32k/eng/event.c
+++ b/reactos/subsys/win32k/eng/event.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: event.c,v 1.2 2004/04/09 20:03:16 navaraf Exp $
+/* $Id: event.c,v 1.3 2004/05/10 17:07:17 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -26,18 +26,7 @@
  * REVISION HISTORY:
  *        2/10/1999: Created
  */
-
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <ddk/winddi.h>
-#include <ddk/ntddk.h>
-#include <include/eng.h>
-#include <include/inteng.h>
-#include <include/tags.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 BOOL
 STDCALL
diff --git a/reactos/subsys/win32k/eng/float.c b/reactos/subsys/win32k/eng/float.c
index 69c4e2d36a5..f0a0583923c 100644
--- a/reactos/subsys/win32k/eng/float.c
+++ b/reactos/subsys/win32k/eng/float.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: float.c,v 1.2 2004/04/09 20:03:16 navaraf Exp $
+/* $Id: float.c,v 1.3 2004/05/10 17:07:17 weiden Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -25,19 +25,7 @@
  * PROGRAMER:         Jason Filby
  * REVISION HISTORY:
  */
-
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <win32k/dc.h>
-#include <win32k/gdiobj.h>
-#include <include/dib.h>
-#include <include/object.h>
-#include <include/paint.h>
-#include "handle.h"
-#include "../dib/dib.h"
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 BOOL
 STDCALL
diff --git a/reactos/subsys/win32k/eng/gradient.c b/reactos/subsys/win32k/eng/gradient.c
index f649aab8967..99f9c150d0f 100644
--- a/reactos/subsys/win32k/eng/gradient.c
+++ b/reactos/subsys/win32k/eng/gradient.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: gradient.c,v 1.8 2004/04/09 20:03:16 navaraf Exp $
+/* $Id: gradient.c,v 1.9 2004/05/10 17:07:17 weiden Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -26,25 +26,7 @@
  * REVISION HISTORY:
  *                 3/7/1999: Created
  */
-
-#include <ddk/winddi.h>
-#include <ddk/ntddmou.h>
-#include <include/eng.h>
-#include <include/inteng.h>
-#include <include/object.h>
-#include <include/paint.h>
-#include <include/surface.h>
-#include <include/rect.h>
-
-#include "objects.h"
-#include <include/mouse.h>
-#include "../dib/dib.h"
-
-#include "brush.h"
-#include "clip.h"
-
-//#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 /* MACROS *********************************************************************/
 
diff --git a/reactos/subsys/win32k/eng/handle.c b/reactos/subsys/win32k/eng/handle.c
index 94df1fe6f61..a61557330c2 100644
--- a/reactos/subsys/win32k/eng/handle.c
+++ b/reactos/subsys/win32k/eng/handle.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: handle.c,v 1.14 2003/11/24 21:20:34 gvg Exp $
+/* $Id: handle.c,v 1.15 2004/05/10 17:07:17 weiden Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -26,12 +26,7 @@
  * REVISION HISTORY:
  *                 29/8/1999: Created
  */
-
-#include <ddk/winddi.h>
-#include "handle.h"
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 static int LastHandle = MAX_GDI_HANDLES;
 
diff --git a/reactos/subsys/win32k/eng/lineto.c b/reactos/subsys/win32k/eng/lineto.c
index e56130fb60b..20752865cc1 100644
--- a/reactos/subsys/win32k/eng/lineto.c
+++ b/reactos/subsys/win32k/eng/lineto.c
@@ -16,22 +16,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: lineto.c,v 1.32 2004/04/09 20:03:16 navaraf Exp $
+ * $Id: lineto.c,v 1.33 2004/05/10 17:07:17 weiden Exp $
  */
-
-#include <ddk/winddi.h>
-#include <ddk/ntddmou.h>
-#include <include/inteng.h>
-#include <include/eng.h>
-#include <include/dib.h>
-#include "clip.h"
-#include "objects.h"
-#include "../dib/dib.h"
-#include "misc.h"
-
-#include <include/mouse.h>
-#include <include/object.h>
-#include <include/surface.h>
+#include <w32k.h>
 
 static void FASTCALL
 TranslateRects(RECT_ENUM *RectEnum, POINTL* Translate)
diff --git a/reactos/subsys/win32k/eng/mem.c b/reactos/subsys/win32k/eng/mem.c
index 551d5491c31..61524e3a4ee 100644
--- a/reactos/subsys/win32k/eng/mem.c
+++ b/reactos/subsys/win32k/eng/mem.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: mem.c,v 1.15 2004/03/15 22:01:17 gvg Exp $
+/* $Id: mem.c,v 1.16 2004/05/10 17:07:17 weiden Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -27,16 +27,7 @@
  *                 3/7/1999: Created
  */
 
-#ifdef __USE_W32API
-#include <windows.h>
-#include <ddk/ntapi.h>
-#endif
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
-#include <debug.h>
+#include <w32k.h>
 
 typedef struct _USERMEMHEADER
   {
diff --git a/reactos/subsys/win32k/eng/misc.c b/reactos/subsys/win32k/eng/misc.c
index a86549b7339..497dad6e487 100644
--- a/reactos/subsys/win32k/eng/misc.c
+++ b/reactos/subsys/win32k/eng/misc.c
@@ -16,13 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: misc.c,v 1.5 2004/04/09 20:03:16 navaraf Exp $ */
-#include <ddk/winddi.h>
-#include <include/dib.h>
-#include <include/object.h>
-#include <include/surface.h>
-#include "misc.h"
-#include "objects.h"
+/* $Id: misc.c,v 1.6 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
 
 BOOL STDCALL
 IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
diff --git a/reactos/subsys/win32k/eng/mouse.c b/reactos/subsys/win32k/eng/mouse.c
index ed9b2a23e84..94377ed8003 100644
--- a/reactos/subsys/win32k/eng/mouse.c
+++ b/reactos/subsys/win32k/eng/mouse.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: mouse.c,v 1.68 2004/05/01 08:55:04 weiden Exp $
+/* $Id: mouse.c,v 1.69 2004/05/10 17:07:17 weiden Exp $
  *
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Mouse
@@ -26,29 +26,7 @@
  *       06-06-2001  CSH  Created
  */
 /* INCLUDES ******************************************************************/
-
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/ntddmou.h>
-#include <ddk/winddi.h>
-#include <win32k/dc.h>
-#include "objects.h"
-#include "include/msgqueue.h"
-#include "include/object.h"
-#include "include/winsta.h"
-#include "include/desktop.h"
-#include "include/window.h"
-#include "include/cursoricon.h"
-#include "include/callback.h"
-#include "include/palette.h"
-#include "include/inteng.h"
-#include "include/eng.h"
-#include "include/tags.h"
-#include <include/mouse.h>
-#include <include/input.h>
-
-#define NDEBUG
-#include <debug.h>
+#include <w32k.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/subsys/win32k/eng/nls.c b/reactos/subsys/win32k/eng/nls.c
index bbd357d3c20..59b195dce1a 100644
--- a/reactos/subsys/win32k/eng/nls.c
+++ b/reactos/subsys/win32k/eng/nls.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: nls.c,v 1.3 2004/04/09 20:03:16 navaraf Exp $
+/* $Id: nls.c,v 1.4 2004/05/10 17:07:17 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -28,10 +28,7 @@
  */
 
 /* INCLUDES *****************************************************************/
-
-#include <ddk/winddi.h>
-#include <ddk/ntddk.h>
-#include <ntos.h>
+#include <w32k.h>
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/subsys/win32k/eng/paint.c b/reactos/subsys/win32k/eng/paint.c
index fcf7b45c5f5..83bade0c08d 100644
--- a/reactos/subsys/win32k/eng/paint.c
+++ b/reactos/subsys/win32k/eng/paint.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: paint.c,v 1.18 2004/02/24 13:27:02 weiden Exp $
+/* $Id: paint.c,v 1.19 2004/05/10 17:07:17 weiden Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -27,22 +27,7 @@
  *                 3/7/1999: Created
  */
 
-#include <ddk/winddi.h>
-#include <ddk/ntddmou.h>
-#include <include/object.h>
-#include <include/paint.h>
-#include <include/surface.h>
-#include <include/eng.h>
-
-#include "objects.h"
-#include <include/mouse.h>
-#include "../dib/dib.h"
-
-#include "brush.h"
-#include "clip.h"
-
-//#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 BOOL STDCALL FillSolid(SURFOBJ *Surface, PRECTL pRect, ULONG iColor)
 {
diff --git a/reactos/subsys/win32k/eng/palette.c b/reactos/subsys/win32k/eng/palette.c
index 5440d0f8ef1..e3330a4f486 100644
--- a/reactos/subsys/win32k/eng/palette.c
+++ b/reactos/subsys/win32k/eng/palette.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: palette.c,v 1.20 2003/12/20 10:31:32 navaraf Exp $
+/* $Id: palette.c,v 1.21 2004/05/10 17:07:17 weiden Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -26,14 +26,7 @@
  * REVISION HISTORY:
  *                 11/7/1999: Created
  */
-
-#include <ddk/winddi.h>
-#include <include/object.h>
-#include <include/palette.h>
-#include "handle.h"
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 /*
  * @implemented
diff --git a/reactos/subsys/win32k/eng/perfcnt.c b/reactos/subsys/win32k/eng/perfcnt.c
index d93a25060e8..80cd7733c68 100644
--- a/reactos/subsys/win32k/eng/perfcnt.c
+++ b/reactos/subsys/win32k/eng/perfcnt.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: perfcnt.c,v 1.3 2003/07/11 15:59:37 royce Exp $
+/* $Id: perfcnt.c,v 1.4 2004/05/10 17:07:17 weiden Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -24,12 +24,7 @@
  * FILE:              subsys/win32k/eng/perfcnt.c
  * PROGRAMER:         Ge van Geldorp
  */
-
-#include <ddk/ntddk.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
-#include <debug.h>
+#include <w32k.h>
 
 /*
  * @implemented
diff --git a/reactos/subsys/win32k/eng/semaphor.c b/reactos/subsys/win32k/eng/semaphor.c
index d01e5d6963d..3f93da7148c 100644
--- a/reactos/subsys/win32k/eng/semaphor.c
+++ b/reactos/subsys/win32k/eng/semaphor.c
@@ -1,14 +1,4 @@
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/debug.h>
-#include <win32k/debug1.h>
-#include <debug.h>
-#include <ddk/winddi.h>
-#include "../eng/objects.h"
-#include <include/error.h>
+#include <w32k.h>
 
 /*
  * @implemented
diff --git a/reactos/subsys/win32k/eng/sort.c b/reactos/subsys/win32k/eng/sort.c
index e7ebe17da1f..90dcc2a0ab2 100644
--- a/reactos/subsys/win32k/eng/sort.c
+++ b/reactos/subsys/win32k/eng/sort.c
@@ -16,10 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: sort.c,v 1.2 2003/07/12 14:00:05 gvg Exp $ */
-
-#include <stdlib.h>
-#include <ddk/winddi.h>
+/* $Id: sort.c,v 1.3 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
 
 /*
  * @implemented
diff --git a/reactos/subsys/win32k/eng/surface.c b/reactos/subsys/win32k/eng/surface.c
index 1519fee2a04..acaa4dbfa8d 100644
--- a/reactos/subsys/win32k/eng/surface.c
+++ b/reactos/subsys/win32k/eng/surface.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: surface.c,v 1.37 2004/04/09 20:03:16 navaraf Exp $
+/* $Id: surface.c,v 1.38 2004/05/10 17:07:17 weiden Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -30,18 +30,7 @@
  * - Create a GDI bitmap with all formats, perform all drawing operations on them, render to VGA surface
  *   refer to \test\microwin\src\engine\devdraw.c for info on correct pixel plotting for various formats
  */
-
-#include <ddk/winddi.h>
-#include <win32k/dc.h>
-#include <win32k/gdiobj.h>
-#include <include/dib.h>
-#include <include/object.h>
-#include <include/paint.h>
-#include "handle.h"
-#include "../dib/dib.h"
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 enum Rle_EscapeCodes
 {
diff --git a/reactos/subsys/win32k/eng/transblt.c b/reactos/subsys/win32k/eng/transblt.c
index 100c968b645..8ba54fe267f 100644
--- a/reactos/subsys/win32k/eng/transblt.c
+++ b/reactos/subsys/win32k/eng/transblt.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: transblt.c,v 1.17 2004/04/09 20:03:18 navaraf Exp $
+/* $Id: transblt.c,v 1.18 2004/05/10 17:07:17 weiden Exp $
  * 
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -26,24 +26,7 @@
  * REVISION HISTORY:
  *        4/6/2004: Created
  */
-
-#include <ddk/winddi.h>
-#include <ddk/ntddk.h>
-#include <ddk/ntddmou.h>
-#include <ntos/minmax.h>
-#include <include/dib.h>
-#include <include/eng.h>
-#include <include/object.h>
-#include <include/surface.h>
-#include <include/mouse.h>
-#include <include/inteng.h>
-
-#include "brush.h"
-#include "clip.h"
-#include "objects.h"
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 
 BOOL STDCALL
diff --git a/reactos/subsys/win32k/eng/xlate.c b/reactos/subsys/win32k/eng/xlate.c
index c139b944273..794275192bf 100644
--- a/reactos/subsys/win32k/eng/xlate.c
+++ b/reactos/subsys/win32k/eng/xlate.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: xlate.c,v 1.33 2004/04/28 18:38:07 navaraf Exp $
+/* $Id: xlate.c,v 1.34 2004/05/10 17:07:17 weiden Exp $
  * 
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -26,21 +26,10 @@
  * REVISION HISTORY:
  *        8/20/1999: Created
  */
+#include <w32k.h>
 
 // TODO: Cache XLATEOBJs that are created by EngCreateXlate by checking if the given palettes match a cached list
 
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <ddk/ntddvdeo.h>
-
-#include <include/object.h>
-#include <include/palette.h>
-#include "handle.h"
-#include <win32k/color.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
-
 ULONG CCMLastSourceColor = 0, CCMLastColorMatch = 0;
 
 static ULONG FASTCALL ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color)
diff --git a/reactos/subsys/win32k/include/intgdi.h b/reactos/subsys/win32k/include/intgdi.h
index 131d3457553..3e1ca399b4c 100644
--- a/reactos/subsys/win32k/include/intgdi.h
+++ b/reactos/subsys/win32k/include/intgdi.h
@@ -15,13 +15,14 @@ IntGdiCreateDIBPatternBrushPt(CONST VOID *PackedDIB,
                               UINT       Usage);
 
 BOOL FASTCALL
-IntPatBlt(DC *dc,
-          INT  XLeft,
-          INT  YLeft,
-          INT  Width,
-          INT  Height,
-          DWORD  ROP,
-          BRUSHOBJ *BrushObj);
+IntPatBlt(
+   PDC dc,
+   INT XLeft,
+   INT YLeft,
+   INT Width,
+   INT Height,
+   DWORD ROP,
+   PGDIBRUSHOBJ BrushObj);
 
 /* Pen functions */
 
diff --git a/reactos/subsys/win32k/include/path.h b/reactos/subsys/win32k/include/path.h
index 609b6c41435..2a77fef5d3f 100644
--- a/reactos/subsys/win32k/include/path.h
+++ b/reactos/subsys/win32k/include/path.h
@@ -19,16 +19,5 @@ BOOL FASTCALL PATH_PolyPolyline( PDC dc, const POINT* pts, const DWORD* counts,
 BOOL FASTCALL PATH_Rectangle (PDC dc, INT x1, INT y1, INT x2, INT y2);
 BOOL FASTCALL PATH_RoundRect (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xradius, INT yradius);
 BOOL FASTCALL PATH_PathToRegion (const GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn);
-#ifdef _WIN32K_PATH_INTERNAL
-BOOL FASTCALL PATH_AddEntry (GdiPath *pPath, const POINT *pPoint, BYTE flags);
-BOOL FASTCALL PATH_AddFlatBezier (GdiPath *pPath, POINT *pt, BOOL closed);
-BOOL FASTCALL PATH_DoArcPart (GdiPath *pPath, FLOAT_POINT corners[], double angleStart, double angleEnd, BOOL addMoveTo);
-BOOL FASTCALL PATH_FlattenPath (GdiPath *pPath);
-VOID FASTCALL PATH_GetPathFromDC (PDC dc, GdiPath **ppPath);
-VOID FASTCALL PATH_NormalizePoint (FLOAT_POINT corners[], const FLOAT_POINT *pPoint, double *pX, double *pY);
-BOOL FASTCALL PATH_PathToRegion(const GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn);
-BOOL FASTCALL PATH_ReserveEntries (GdiPath *pPath, INT numEntries);
-VOID FASTCALL PATH_ScaleNormalizedPoint (FLOAT_POINT corners[], double x, double y, POINT *pPoint);
-#endif
 
 #endif /* _WIN32K_PATH_H */
diff --git a/reactos/subsys/win32k/main/dllmain.c b/reactos/subsys/win32k/main/dllmain.c
index dded4602425..eecbeb9a26e 100644
--- a/reactos/subsys/win32k/main/dllmain.c
+++ b/reactos/subsys/win32k/main/dllmain.c
@@ -16,42 +16,11 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dllmain.c,v 1.71 2004/05/05 22:47:06 weiden Exp $
+/* $Id: dllmain.c,v 1.72 2004/05/10 17:07:17 weiden Exp $
  *
  *  Entry Point for win32k.sys
  */
-
-#undef WIN32_LEAN_AND_MEAN
-#define WIN32_NO_STATUS
-#include <windows.h>
-#define NTOS_MODE_KERNEL
-#include <ntos.h>
-
-#ifdef __USE_W32API
-#include <ddk/ddrawint.h>
-#endif
-#include <ddk/winddi.h>
-
-#include <win32k/win32k.h>
-
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/class.h>
-#include <include/window.h>
-#include <include/menu.h>
-#include <include/object.h>
-#include <include/input.h>
-#include <include/timer.h>
-#include <include/text.h>
-#include <include/caret.h>
-#include <include/hotkey.h>
-#include <include/accelerator.h>
-#include <include/cursoricon.h>
-#include <include/guicheck.h>
-#include <include/hook.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 #ifdef __USE_W32API
 typedef NTSTATUS (STDCALL *PW32_PROCESS_CALLBACK)(
diff --git a/reactos/subsys/win32k/main/svctabm.c b/reactos/subsys/win32k/main/svctabm.c
index b99f0a1ea34..3cfa9e76224 100644
--- a/reactos/subsys/win32k/main/svctabm.c
+++ b/reactos/subsys/win32k/main/svctabm.c
@@ -34,7 +34,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: svctabm.c,v 1.5 2003/06/07 10:14:40 chorns Exp $
+/* $Id: svctabm.c,v 1.6 2004/05/10 17:07:18 weiden Exp $
  * 
  *  Entry Point for win32k.sys
  */
@@ -44,6 +44,7 @@
 #include <windows.h>
 #define NTOS_MODE_KERNEL
 #include <ntos.h>
+#include <win32k/ntddraw.h>
 #include <win32k/win32k.h>
 
 /*
diff --git a/reactos/subsys/win32k/makefile b/reactos/subsys/win32k/makefile
index 103533b52fa..6a236aa70ad 100644
--- a/reactos/subsys/win32k/makefile
+++ b/reactos/subsys/win32k/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.97 2004/04/09 20:03:18 navaraf Exp $
+# $Id: makefile,v 1.98 2004/05/10 17:07:18 weiden Exp $
 
 PATH_TO_TOP = ../..
 
@@ -10,6 +10,8 @@ TARGET_BASE = 0x0
 
 TARGET_ENTRY = _DllMain@8
 
+TARGET_PCH = w32k.h
+
 TARGET_DDKLIBS = freetype.a
 
 FREETYPE_DIR = $(PATH_TO_TOP)/lib/freetype
@@ -24,11 +26,12 @@ endif
 
 TARGET_CFLAGS =\
  $(CFLAGS_DBG) \
+ -I. \
  -I$(PATH_TO_TOP)/ntoskrnl/include \
  -I$(FREETYPE_DIR)/include \
  -DUNICODE \
  -Wall -Werror \
- -D__USE_W32API -D_WIN32_WINNT=0x0500 \
+ -D__USE_W32API -D_WIN32_WINNT=0x0501 \
  -DWINVER=0x600 -D_WIN32K_
 
 TARGET_LFLAGS =\
diff --git a/reactos/subsys/win32k/ntddraw/ddraw.c b/reactos/subsys/win32k/ntddraw/ddraw.c
index bda71258571..6447a029e2a 100644
--- a/reactos/subsys/win32k/ntddraw/ddraw.c
+++ b/reactos/subsys/win32k/ntddraw/ddraw.c
@@ -9,6 +9,7 @@
  *       25-10-2003  PB  Created
  */
 #include <ddk/ntddk.h>
+#include <win32k/ntddraw.h>
 #include <win32k/win32k.h>
 #include <win32k/gdiobj.h>
 
diff --git a/reactos/subsys/win32k/ntddraw/stubs.c b/reactos/subsys/win32k/ntddraw/stubs.c
index a8fbe30aef1..104492244b9 100644
--- a/reactos/subsys/win32k/ntddraw/stubs.c
+++ b/reactos/subsys/win32k/ntddraw/stubs.c
@@ -9,6 +9,7 @@
  *       25-10-2003  PB  Created
  */
 #include <ddk/ntddk.h>
+#include <win32k/ntddraw.h>
 #include <win32k/win32k.h>
 
 #define NDEBUG
diff --git a/reactos/subsys/win32k/ntuser/accelerator.c b/reactos/subsys/win32k/ntuser/accelerator.c
index 405e21c4792..cc2405305f5 100644
--- a/reactos/subsys/win32k/ntuser/accelerator.c
+++ b/reactos/subsys/win32k/ntuser/accelerator.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: accelerator.c,v 1.9 2004/02/19 21:12:09 weiden Exp $
+/* $Id: accelerator.c,v 1.10 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -48,19 +48,7 @@
  */
 
 /* INCLUDES ******************************************************************/
-
-#include <roskrnl.h>
-#include <win32k/win32k.h>
-#include <internal/safe.h>
-#include <napi/win32.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/object.h>
-#include <include/guicheck.h>
-#include <include/window.h>
-#include <include/focus.h>
-#include <include/tags.h>
-#include <include/accelerator.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/callback.c b/reactos/subsys/win32k/ntuser/callback.c
index bfea10e9657..a3f3cd5ac4a 100644
--- a/reactos/subsys/win32k/ntuser/callback.c
+++ b/reactos/subsys/win32k/ntuser/callback.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: callback.c,v 1.21 2003/12/26 22:52:11 gvg Exp $
+/* $Id: callback.c,v 1.22 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -29,16 +29,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/window.h>
-#include <include/msgqueue.h>
-#include <user32/callback.h>
-#include <include/callback.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/caret.c b/reactos/subsys/win32k/ntuser/caret.c
index 40b8c46c70a..3cd581098ba 100644
--- a/reactos/subsys/win32k/ntuser/caret.c
+++ b/reactos/subsys/win32k/ntuser/caret.c
@@ -1,4 +1,4 @@
-/* $Id: caret.c,v 1.11 2004/02/19 21:12:09 weiden Exp $
+/* $Id: caret.c,v 1.12 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -9,16 +9,7 @@
  *       10/15/2003  Created
  */
 
-#include <win32k/win32k.h>
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
-#include <include/error.h>
-#include <include/window.h>
-#include <include/caret.h>
-#include <include/timer.h>
-#include <include/callback.h>
-#include <include/tags.h>
-#include <rosrtl/string.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/class.c b/reactos/subsys/win32k/ntuser/class.c
index 84bdaee775a..620db8c02e8 100644
--- a/reactos/subsys/win32k/ntuser/class.c
+++ b/reactos/subsys/win32k/ntuser/class.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: class.c,v 1.51 2004/04/09 20:03:19 navaraf Exp $
+/* $Id: class.c,v 1.52 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -28,18 +28,7 @@
  */
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <napi/win32.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/object.h>
-#include <include/guicheck.h>
-#include <include/window.h>
-#include <include/color.h>
-#include <include/tags.h>
-#include <internal/safe.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/clipboard.c b/reactos/subsys/win32k/ntuser/clipboard.c
index f89c580f7d1..e7103758840 100644
--- a/reactos/subsys/win32k/ntuser/clipboard.c
+++ b/reactos/subsys/win32k/ntuser/clipboard.c
@@ -24,14 +24,7 @@
  * PROGRAMER:        Filip Navara <xnavara@volny.cz>
  */
 
-#include <win32k/win32k.h>
-#include <windows.h>
-#include <internal/safe.h>
-#include <include/clipboard.h>
-#include <include/cleanup.h>
-#include <include/error.h>
-#include <include/useratom.h>
-#include <include/tags.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/desktop.c b/reactos/subsys/win32k/ntuser/desktop.c
index a59d3836ffb..60d22f8c91d 100644
--- a/reactos/subsys/win32k/ntuser/desktop.c
+++ b/reactos/subsys/win32k/ntuser/desktop.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *  $Id: desktop.c,v 1.13 2004/05/08 12:42:46 weiden Exp $
+ *  $Id: desktop.c,v 1.14 2004/05/10 17:07:18 weiden Exp $
  *
  *  COPYRIGHT:        See COPYING in the top level directory
  *  PROJECT:          ReactOS kernel
@@ -28,26 +28,7 @@
  */
 
 /* INCLUDES ******************************************************************/
-
-#define __WIN32K__
-#include <ddk/ntddmou.h>
-#include <win32k/win32k.h>
-#include <csrss/csrss.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/object.h>
-#include <include/window.h>
-#include <include/error.h>
-#include <include/cursoricon.h>
-#include <include/hotkey.h>
-#include <include/color.h>
-#include <include/mouse.h>
-#include <include/callback.h>
-#include <include/guicheck.h>
-#include <include/intgdi.h>
-
-#define NDEBUG
-#include <debug.h>
+#include <w32k.h>
 
 #if 0
 /* not yet defined in w32api... */
diff --git a/reactos/subsys/win32k/ntuser/focus.c b/reactos/subsys/win32k/ntuser/focus.c
index abc5c1c6f60..7e561a6b038 100644
--- a/reactos/subsys/win32k/ntuser/focus.c
+++ b/reactos/subsys/win32k/ntuser/focus.c
@@ -16,17 +16,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: focus.c,v 1.21 2004/04/15 23:36:03 weiden Exp $
+ * $Id: focus.c,v 1.22 2004/05/10 17:07:18 weiden Exp $
  */
 
-#include <win32k/win32k.h>
-#include <include/object.h>
-#include <include/window.h>
-#include <include/desktop.h>
-#include <include/focus.h>
-#include <include/error.h>
-#include <include/winpos.h>
-#include <include/msgqueue.h>
+#include <w32k.h>
+
 #define NDEBUG
 #include <win32k/debug1.h>
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/guicheck.c b/reactos/subsys/win32k/ntuser/guicheck.c
index 3eec497c9b6..71859c1b655 100644
--- a/reactos/subsys/win32k/ntuser/guicheck.c
+++ b/reactos/subsys/win32k/ntuser/guicheck.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: guicheck.c,v 1.17 2003/12/07 23:02:57 gvg Exp $
+/* $Id: guicheck.c,v 1.18 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -33,14 +33,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <napi/teb.h>
-#include <win32k/win32k.h>
-#include <include/guicheck.h>
-#include <include/msgqueue.h>
-#include <include/object.h>
-#include <napi/win32.h>
-#include <include/winsta.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/hook.c b/reactos/subsys/win32k/ntuser/hook.c
index 222b1a56448..6b4a61f548a 100644
--- a/reactos/subsys/win32k/ntuser/hook.c
+++ b/reactos/subsys/win32k/ntuser/hook.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: hook.c,v 1.7 2004/04/07 00:58:05 weiden Exp $
+/* $Id: hook.c,v 1.8 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -29,17 +29,7 @@
  *                   Copyright (C) 2002 Alexandre Julliard
  */
 
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <include/callback.h>
-#include <include/error.h>
-#include <include/hook.h>
-#include <include/object.h>
-#include <include/msgqueue.h>
-#include <include/winsta.h>
-#include <include/tags.h>
-#include <internal/ps.h>
-#include <internal/safe.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <win32k/debug1.h>
diff --git a/reactos/subsys/win32k/ntuser/hotkey.c b/reactos/subsys/win32k/ntuser/hotkey.c
index 3fa628f68f2..44db4b110e7 100644
--- a/reactos/subsys/win32k/ntuser/hotkey.c
+++ b/reactos/subsys/win32k/ntuser/hotkey.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: hotkey.c,v 1.8 2004/02/24 13:27:03 weiden Exp $
+/* $Id: hotkey.c,v 1.9 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -29,14 +29,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <internal/ex.h>
-#include <internal/ps.h>
-#include <include/error.h>
-#include <include/msgqueue.h>
-#include <include/hotkey.h>
-#include <include/tags.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/input.c b/reactos/subsys/win32k/ntuser/input.c
index 439bc215b23..aad68601537 100644
--- a/reactos/subsys/win32k/ntuser/input.c
+++ b/reactos/subsys/win32k/ntuser/input.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: input.c,v 1.31 2004/05/01 08:47:14 weiden Exp $
+/* $Id: input.c,v 1.32 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -29,19 +29,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <internal/safe.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/msgqueue.h>
-#include <ddk/ntddmou.h>
-#include <include/mouse.h>
-#include <include/input.h>
-#include <include/hotkey.h>
-#include <include/eng.h>
+#include <w32k.h>
+
 #include <rosrtl/string.h>
 
 #define NDEBUG
diff --git a/reactos/subsys/win32k/ntuser/keyboard.c b/reactos/subsys/win32k/ntuser/keyboard.c
index 8c2fa92b50a..d94bdcb9428 100644
--- a/reactos/subsys/win32k/ntuser/keyboard.c
+++ b/reactos/subsys/win32k/ntuser/keyboard.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: keyboard.c,v 1.28 2004/04/29 21:13:16 gvg Exp $
+/* $Id: keyboard.c,v 1.29 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -29,19 +29,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <internal/safe.h>
-#include <internal/kbd.h>
-#include <include/guicheck.h>
-#include <include/msgqueue.h>
-#include <include/window.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/object.h>
-#include <include/winsta.h>
-#include <include/tags.h>
-#include <rosrtl/string.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/menu.c b/reactos/subsys/win32k/ntuser/menu.c
index d0c4c2a7512..2137202afd8 100644
--- a/reactos/subsys/win32k/ntuser/menu.c
+++ b/reactos/subsys/win32k/ntuser/menu.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: menu.c,v 1.53 2004/05/02 21:41:18 gvg Exp $
+/* $Id: menu.c,v 1.54 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -28,18 +28,7 @@
  */
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <napi/win32.h>
-#include <include/menu.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/object.h>
-#include <include/guicheck.h>
-#include <include/window.h>
-#include <include/color.h>
-#include <include/tags.h>
-#include <internal/safe.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/message.c b/reactos/subsys/win32k/ntuser/message.c
index ce89598f2b2..07595caa06a 100644
--- a/reactos/subsys/win32k/ntuser/message.c
+++ b/reactos/subsys/win32k/ntuser/message.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: message.c,v 1.62 2004/05/05 22:26:03 weiden Exp $
+/* $Id: message.c,v 1.63 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -29,22 +29,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <include/msgqueue.h>
-#include <include/window.h>
-#include <include/winpos.h>
-#include <include/focus.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/object.h>
-#include <include/winsta.h>
-#include <include/callback.h>
-#include <include/painting.h>
-#include <include/input.h>
-#include <include/desktop.h>
-#include <include/tags.h>
-#include <internal/safe.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/metric.c b/reactos/subsys/win32k/ntuser/metric.c
index fb900857336..ba332f54e77 100644
--- a/reactos/subsys/win32k/ntuser/metric.c
+++ b/reactos/subsys/win32k/ntuser/metric.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: metric.c,v 1.19 2004/04/15 11:44:03 weiden Exp $
+/* $Id: metric.c,v 1.20 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -29,14 +29,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/msgqueue.h>
-#include <include/window.h>
-#include <include/desktop.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/misc.c b/reactos/subsys/win32k/ntuser/misc.c
index cf64bbda9d7..002efecf054 100644
--- a/reactos/subsys/win32k/ntuser/misc.c
+++ b/reactos/subsys/win32k/ntuser/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.70 2004/05/08 12:42:46 weiden Exp $
+/* $Id: misc.c,v 1.71 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -8,30 +8,8 @@
  * REVISION HISTORY:
  *       2003/05/22  Created
  */
-#define __WIN32K__
-#include <ddk/ntddk.h>
-#include <ddk/ntddmou.h>
-#include <win32k/win32k.h>
-#include <win32k/dc.h>
-#include <internal/safe.h>
-#include <include/error.h>
-#include <include/window.h>
-#include <include/menu.h>
-#include <include/painting.h>
-#include <include/dce.h>
-#include <include/inteng.h>
-#include <include/input.h>
-#include <include/intgdi.h>
-#include <include/mouse.h>
-#include <include/winsta.h>
-#include <include/caret.h>
-#include <include/object.h>
-#include <include/focus.h>
-#include <include/clipboard.h>
-#include <include/msgqueue.h>
-#include <include/desktop.h>
-#include <include/text.h>
-#include <include/tags.h>
+
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/msgqueue.c b/reactos/subsys/win32k/ntuser/msgqueue.c
index b45018e66ec..34479839c8c 100644
--- a/reactos/subsys/win32k/ntuser/msgqueue.c
+++ b/reactos/subsys/win32k/ntuser/msgqueue.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: msgqueue.c,v 1.93 2004/05/08 19:35:32 weiden Exp $
+/* $Id: msgqueue.c,v 1.94 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -29,21 +29,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <include/msgqueue.h>
-#include <include/callback.h>
-#include <include/window.h>
-#include <include/winpos.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/class.h>
-#include <include/object.h>
-#include <include/input.h>
-#include <include/cursoricon.h>
-#include <include/focus.h>
-#include <include/caret.h>
-#include <include/tags.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <win32k/debug1.h>
diff --git a/reactos/subsys/win32k/ntuser/painting.c b/reactos/subsys/win32k/ntuser/painting.c
index 13ce85c3180..ef23170da14 100644
--- a/reactos/subsys/win32k/ntuser/painting.c
+++ b/reactos/subsys/win32k/ntuser/painting.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *  $Id: painting.c,v 1.81 2004/04/29 21:13:16 gvg Exp $
+ *  $Id: painting.c,v 1.82 2004/05/10 17:07:18 weiden Exp $
  *
  *  COPYRIGHT:        See COPYING in the top level directory
  *  PROJECT:          ReactOS kernel
@@ -30,26 +30,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
-#include <win32k/win32k.h>
-#include <include/object.h>
-#include <include/guicheck.h>
-#include <include/window.h>
-#include <include/desktop.h>
-#include <include/winpos.h>
-#include <include/class.h>
-#include <include/caret.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <windows.h>
-#include <include/painting.h>
-#include <user32/wininternal.h>
-#include <include/rect.h>
-#include <win32k/coord.h>
-#include <win32k/region.h>
-#include <include/vis.h>
-#include <include/intgdi.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <win32k/debug1.h>
diff --git a/reactos/subsys/win32k/ntuser/prop.c b/reactos/subsys/win32k/ntuser/prop.c
index 0d76d267571..da9de9058bf 100644
--- a/reactos/subsys/win32k/ntuser/prop.c
+++ b/reactos/subsys/win32k/ntuser/prop.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: prop.c,v 1.10 2004/04/16 21:50:26 weiden Exp $
+/* $Id: prop.c,v 1.11 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -28,20 +28,7 @@
  */
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <internal/safe.h>
-#include <include/object.h>
-#include <include/guicheck.h>
-#include <include/window.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/winpos.h>
-#include <include/callback.h>
-#include <include/msgqueue.h>
-#include <include/rect.h>
-#include <include/tags.h>
+#include <w32k.h>
 
 //#define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/scrollbar.c b/reactos/subsys/win32k/ntuser/scrollbar.c
index 5df20efdf12..1a0e336fa8e 100644
--- a/reactos/subsys/win32k/ntuser/scrollbar.c
+++ b/reactos/subsys/win32k/ntuser/scrollbar.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: scrollbar.c,v 1.31 2004/05/05 13:58:59 weiden Exp $
+/* $Id: scrollbar.c,v 1.32 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -29,19 +29,8 @@
  */
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <internal/safe.h>
-#include <include/object.h>
-#include <include/window.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/winpos.h>
-#include <include/rect.h>
-#include <include/scroll.h>
-#include <include/painting.h>
-#include <include/tags.h>
+#include <w32k.h>
+
 #ifdef __USE_W32API
 #include <oleacc.h>
 #endif
diff --git a/reactos/subsys/win32k/ntuser/timer.c b/reactos/subsys/win32k/ntuser/timer.c
index 8dcd7b88f48..26c783427d9 100644
--- a/reactos/subsys/win32k/ntuser/timer.c
+++ b/reactos/subsys/win32k/ntuser/timer.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: timer.c,v 1.31 2004/04/29 21:13:16 gvg Exp $
+/* $Id: timer.c,v 1.32 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -30,18 +30,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <win32k/ntuser.h>
-#include <internal/ntoskrnl.h>
-#include <internal/ps.h>
-#include <include/msgqueue.h>
-#include <include/window.h>
-#include <include/error.h>
-#include <include/timer.h>
-#include <include/tags.h>
-#include <messages.h>
-#include <napi/win32.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/useratom.c b/reactos/subsys/win32k/ntuser/useratom.c
index ef19d388f1c..d595e10f119 100644
--- a/reactos/subsys/win32k/ntuser/useratom.c
+++ b/reactos/subsys/win32k/ntuser/useratom.c
@@ -24,9 +24,8 @@
  * PROGRAMER:        Filip Navara <xnavara@volny.cz>
  */
 
-#include <include/useratom.h>
-#include <include/winsta.h>
-#include <include/error.h>
+#include <w32k.h>
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/subsys/win32k/ntuser/vis.c b/reactos/subsys/win32k/ntuser/vis.c
index d9514b623a8..720d570469a 100644
--- a/reactos/subsys/win32k/ntuser/vis.c
+++ b/reactos/subsys/win32k/ntuser/vis.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: vis.c,v 1.27 2004/04/24 14:21:36 weiden Exp $
+ * $Id: vis.c,v 1.28 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -25,11 +25,7 @@
  * PROGRAMMER:       Ge van Geldorp (ge@gse.nl)
  */
 
-#include <win32k/win32k.h>
-#include <include/painting.h>
-#include <include/rect.h>
-#include <include/vis.h>
-#include <include/intgdi.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <win32k/debug1.h>
diff --git a/reactos/subsys/win32k/ntuser/windc.c b/reactos/subsys/win32k/ntuser/windc.c
index 57fddd9a80d..1d19421a186 100644
--- a/reactos/subsys/win32k/ntuser/windc.c
+++ b/reactos/subsys/win32k/ntuser/windc.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: windc.c,v 1.65 2004/04/09 20:03:19 navaraf Exp $
+/* $Id: windc.c,v 1.66 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -29,20 +29,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <win32k/region.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/msgqueue.h>
-#include <include/window.h>
-#include <include/desktop.h>
-#include <include/rect.h>
-#include <include/dce.h>
-#include <include/vis.h>
-#include <include/object.h>
-#include <include/intgdi.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c
index c4c3f9688f2..ac3cfff8f6c 100644
--- a/reactos/subsys/win32k/ntuser/window.c
+++ b/reactos/subsys/win32k/ntuser/window.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: window.c,v 1.228 2004/05/08 16:06:54 weiden Exp $
+/* $Id: window.c,v 1.229 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -27,34 +27,7 @@
  *       06-06-2001  CSH  Created
  */
 /* INCLUDES ******************************************************************/
-
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
-#include <win32k/win32k.h>
-#include <include/object.h>
-#include <include/guicheck.h>
-#include <include/window.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/winpos.h>
-#include <include/callback.h>
-#include <include/msgqueue.h>
-#include <include/rect.h>
-#include <include/dce.h>
-#include <include/paint.h>
-#include <include/painting.h>
-#include <include/scroll.h>
-#include <include/intgdi.h>
-#include <include/menu.h>
-#include <include/hotkey.h>
-#include <include/focus.h>
-#include <include/hook.h>
-#include <include/useratom.h>
-#include <include/tags.h>
-#include <include/timer.h>
-#include <include/cleanup.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <win32k/debug1.h>
diff --git a/reactos/subsys/win32k/ntuser/winpos.c b/reactos/subsys/win32k/ntuser/winpos.c
index 71aa78ab9d1..ecd50c1655a 100644
--- a/reactos/subsys/win32k/ntuser/winpos.c
+++ b/reactos/subsys/win32k/ntuser/winpos.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: winpos.c,v 1.113 2004/05/08 12:42:46 weiden Exp $
+/* $Id: winpos.c,v 1.114 2004/05/10 17:07:18 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -28,25 +28,7 @@
  */
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
-#include <win32k/win32k.h>
-#include <include/object.h>
-#include <include/guicheck.h>
-#include <include/window.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/winpos.h>
-#include <include/rect.h>
-#include <include/callback.h>
-#include <include/painting.h>
-#include <include/dce.h>
-#include <include/vis.h>
-#include <include/intgdi.h>
-#include <include/focus.h>
-#include <include/tags.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/ntuser/winsta.c b/reactos/subsys/win32k/ntuser/winsta.c
index 856beaf0c0f..7fc4a3c8b63 100644
--- a/reactos/subsys/win32k/ntuser/winsta.c
+++ b/reactos/subsys/win32k/ntuser/winsta.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *  $Id: winsta.c,v 1.58 2004/05/01 17:06:55 weiden Exp $
+ *  $Id: winsta.c,v 1.59 2004/05/10 17:07:18 weiden Exp $
  *
  *  COPYRIGHT:        See COPYING in the top level directory
  *  PROJECT:          ReactOS kernel
@@ -35,26 +35,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#define __WIN32K__
-#define NTOS_MODE_KERNEL
-#include <ntos.h>
-#include <ddk/ntddmou.h>
-#include <win32k/win32k.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/object.h>
-#include <include/window.h>
-#include <include/error.h>
-#include <include/cursoricon.h>
-#include <include/hotkey.h>
-#include <include/color.h>
-#include <include/mouse.h>
-#include <include/callback.h>
-#include <include/guicheck.h>
-#include <include/intgdi.h>
-#include <include/tags.h>
-/* Needed for DIRECTORY_OBJECT */
-#include <internal/ob.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/win32k/objects/bezier.c b/reactos/subsys/win32k/objects/bezier.c
index 415b7a2779d..6eecf949498 100644
--- a/reactos/subsys/win32k/objects/bezier.c
+++ b/reactos/subsys/win32k/objects/bezier.c
@@ -16,11 +16,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bezier.c,v 1.7 2004/05/10 13:35:28 weiden Exp $ */
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <math.h>
-#include <include/tags.h>
+/* $Id: bezier.c,v 1.8 2004/05/10 17:07:20 weiden Exp $ */
+
+#include <w32k.h>
 
 /******************************************************************
  * 
diff --git a/reactos/subsys/win32k/objects/bitmaps.c b/reactos/subsys/win32k/objects/bitmaps.c
index 71fb76aa4ea..16e85a93420 100644
--- a/reactos/subsys/win32k/objects/bitmaps.c
+++ b/reactos/subsys/win32k/objects/bitmaps.c
@@ -16,28 +16,16 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bitmaps.c,v 1.71 2004/04/28 18:38:07 navaraf Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/color.h>
-#include <win32k/gdiobj.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/region.h>
-//#include <win32k/debug.h>
-#include "../eng/handle.h"
-#include <include/inteng.h>
-#include <include/intgdi.h>
-#include <include/eng.h>
-#include <include/error.h>
-#include <include/surface.h>
-#include <include/palette.h>
-#include <include/tags.h>
-#include <rosrtl/gdimacro.h>
+/* $Id: bitmaps.c,v 1.72 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 
-#define NDEBUG
-#include <win32k/debug1.h>
+#define IN_RECT(r,x,y) \
+( \
+ (x) >= (r).left && \
+ (y) >= (r).top && \
+ (x) < (r).right && \
+ (y) < (r).bottom \
+)
 
 BOOL STDCALL
 NtGdiBitBlt(
diff --git a/reactos/subsys/win32k/objects/brush.c b/reactos/subsys/win32k/objects/brush.c
index 32934a77929..4e0e911592b 100644
--- a/reactos/subsys/win32k/objects/brush.c
+++ b/reactos/subsys/win32k/objects/brush.c
@@ -17,21 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: brush.c,v 1.36 2004/04/25 14:46:54 weiden Exp $
+ * $Id: brush.c,v 1.37 2004/05/10 17:07:20 weiden Exp $
  */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <internal/safe.h>
-#include <include/object.h>
-#include <include/inteng.h>
-#include <include/error.h>
-#include <include/tags.h>
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 static const USHORT HatchBrushes[NB_HATCH_STYLES][8] =
 {
diff --git a/reactos/subsys/win32k/objects/cliprgn.c b/reactos/subsys/win32k/objects/cliprgn.c
index 79d2c4f305a..649c9f2f3a8 100644
--- a/reactos/subsys/win32k/objects/cliprgn.c
+++ b/reactos/subsys/win32k/objects/cliprgn.c
@@ -16,22 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cliprgn.c,v 1.36 2004/04/26 19:58:45 weiden Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
-#include <win32k/dc.h>
-#include <win32k/region.h>
-#include <win32k/cliprgn.h>
-#include <win32k/coord.h>
-#include <include/error.h>
-#include <include/intgdi.h>
-#include "../eng/clip.h"
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: cliprgn.c,v 1.37 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 
 VOID FASTCALL
 CLIPPING_UpdateGCRegion(DC* Dc)
diff --git a/reactos/subsys/win32k/objects/color.c b/reactos/subsys/win32k/objects/color.c
index 00104c76b0d..333de9fbce3 100644
--- a/reactos/subsys/win32k/objects/color.c
+++ b/reactos/subsys/win32k/objects/color.c
@@ -16,30 +16,11 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: color.c,v 1.38 2004/05/01 00:51:51 navaraf Exp $ */
+/* $Id: color.c,v 1.39 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 
 // FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping
 
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <win32k/brush.h>
-#include <win32k/dc.h>
-#include <win32k/color.h>
-#include <win32k/pen.h>
-#include <win32k/ntuser.h>
-#include "../eng/handle.h"
-#include <include/inteng.h>
-#include <include/eng.h>
-#include <include/color.h>
-#include <include/palette.h>
-#include <include/error.h>
-#include <include/dce.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
-
 int COLOR_gapStart = 256;
 int COLOR_gapEnd = -1;
 int COLOR_gapFilled = 0;
diff --git a/reactos/subsys/win32k/objects/coord.c b/reactos/subsys/win32k/objects/coord.c
index ab723defed1..36e03b2ba9e 100644
--- a/reactos/subsys/win32k/objects/coord.c
+++ b/reactos/subsys/win32k/objects/coord.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: coord.c,v 1.22 2004/02/19 21:12:10 weiden Exp $
+/* $Id: coord.c,v 1.23 2004/05/10 17:07:20 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -26,16 +26,7 @@
  */
 
 /* INCLUDES ******************************************************************/
-
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
-#include <win32k/coord.h>
-#include <win32k/dc.h>
-#include <include/error.h>
-#include <include/tags.h>
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/subsys/win32k/objects/cursoricon.c b/reactos/subsys/win32k/objects/cursoricon.c
index 9893b52ac26..cbc773df92a 100644
--- a/reactos/subsys/win32k/objects/cursoricon.c
+++ b/reactos/subsys/win32k/objects/cursoricon.c
@@ -16,35 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cursoricon.c,v 1.54 2004/04/30 22:18:00 weiden Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-
-#include <ddk/ntddk.h>
-#include <ddk/ntddmou.h>
-#include <win32k/win32k.h>
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/dc.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/error.h>
-#include <include/mouse.h>
-#include <include/window.h>
-#include <include/input.h>
-#include <include/cursoricon.h>
-#include <include/inteng.h>
-#include <include/surface.h>
-#include <include/palette.h>
-#include <include/eng.h>
-#include <include/intgdi.h>
-#include <include/callback.h>
-#include "include/object.h"
-#include <internal/safe.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: cursoricon.c,v 1.55 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 
 PCURICON_OBJECT FASTCALL
 IntGetCurIconObject(PWINSTATION_OBJECT WinStaObject, HANDLE Handle)
diff --git a/reactos/subsys/win32k/objects/dc.c b/reactos/subsys/win32k/objects/dc.c
index 9dd8b4bc800..d715b43594d 100644
--- a/reactos/subsys/win32k/objects/dc.c
+++ b/reactos/subsys/win32k/objects/dc.c
@@ -16,46 +16,12 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dc.c,v 1.133 2004/04/28 18:38:07 navaraf Exp $
+/* $Id: dc.c,v 1.134 2004/05/10 17:07:20 weiden Exp $
  *
  * DC.C - Device context functions
  *
  */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/ntddvdeo.h>
-#include <internal/safe.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/cliprgn.h>
-#include <win32k/coord.h>
-#include <win32k/dc.h>
-#include <win32k/misc.h>
-#include <win32k/print.h>
-#include <win32k/region.h>
-#include <win32k/gdiobj.h>
-#include <win32k/paint.h>
-#include <win32k/color.h>
-#include <win32k/pen.h>
-#include <win32k/text.h>
-#include "../eng/clip.h"
-#include "../eng/handle.h"
-#include <include/dce.h>
-#include <include/error.h>
-#include <include/inteng.h>
-#include <include/eng.h>
-#include <include/palette.h>
-#include <include/guicheck.h>
-#include <include/desktop.h>
-#include <include/intgdi.h>
-#include <include/cleanup.h>
-#include <include/tags.h>
-#include <include/text.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 #ifndef OBJ_COLORSPACE
 #define OBJ_COLORSPACE	(14)
diff --git a/reactos/subsys/win32k/objects/dib.c b/reactos/subsys/win32k/objects/dib.c
index e986c39db8a..cee18a7d035 100644
--- a/reactos/subsys/win32k/objects/dib.c
+++ b/reactos/subsys/win32k/objects/dib.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dib.c,v 1.45 2004/04/09 20:03:20 navaraf Exp $
+ * $Id: dib.c,v 1.46 2004/05/10 17:07:20 weiden Exp $
  *
  * ReactOS W32 Subsystem
  * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team
@@ -18,26 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/debug.h>
-#include "../eng/handle.h"
-#include <ntos/minmax.h>
-#include <include/error.h>
-#include <include/inteng.h>
-#include <include/eng.h>
-#include <include/dib.h>
-#include <include/color.h>
-#include <internal/safe.h>
-#include <include/surface.h>
-#include <include/palette.h>
-#include <include/tags.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 UINT STDCALL NtGdiSetDIBColorTable(HDC  hDC,
                            UINT  StartIndex,
diff --git a/reactos/subsys/win32k/objects/fillshap.c b/reactos/subsys/win32k/objects/fillshap.c
index 9102fac49de..c515088721c 100644
--- a/reactos/subsys/win32k/objects/fillshap.c
+++ b/reactos/subsys/win32k/objects/fillshap.c
@@ -16,30 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: fillshap.c,v 1.47 2004/04/09 20:03:20 navaraf Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <win32k/fillshap.h>
-#include <win32k/brush.h>
-#include <win32k/dc.h>
-#include <win32k/pen.h>
-#include <win32k/region.h>
-#include <include/error.h>
-#include <include/object.h>
-#include <include/inteng.h>
-#include <include/path.h>
-#include <include/paint.h>
-#include <include/palette.h>
-#include <include/eng.h>
-#include <include/intgdi.h>
-#include <include/tags.h>
-#include <internal/safe.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: fillshap.c,v 1.48 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 
 /*
  * a couple macros to fill a single pixel or a line
diff --git a/reactos/subsys/win32k/objects/gdiobj.c b/reactos/subsys/win32k/objects/gdiobj.c
index e3ad32e02f9..71e08095b86 100644
--- a/reactos/subsys/win32k/objects/gdiobj.c
+++ b/reactos/subsys/win32k/objects/gdiobj.c
@@ -19,29 +19,10 @@
 /*
  * GDIOBJ.C - GDI object manipulation routines
  *
- * $Id: gdiobj.c,v 1.66 2004/04/09 20:03:20 navaraf Exp $
+ * $Id: gdiobj.c,v 1.67 2004/05/10 17:07:20 weiden Exp $
  *
  */
-
-#undef WIN32_LEAN_AND_MEAN
-#define WIN32_NO_STATUS
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <include/dce.h>
-#include <include/object.h>
-#include <win32k/gdiobj.h>
-#include <win32k/brush.h>
-#include <win32k/pen.h>
-#include <win32k/text.h>
-#include <win32k/dc.h>
-#include <win32k/bitmaps.h>
-#include <win32k/region.h>
-#include <win32k/cursoricon.h>
-#include <include/palette.h>
-#include <include/intgdi.h>
-#include <include/tags.h>
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 /* count all gdi objects */
 #define GDI_COUNT_OBJECTS 1
diff --git a/reactos/subsys/win32k/objects/icm.c b/reactos/subsys/win32k/objects/icm.c
index 95ed273d283..3eb9470ac24 100644
--- a/reactos/subsys/win32k/objects/icm.c
+++ b/reactos/subsys/win32k/objects/icm.c
@@ -16,15 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: icm.c,v 1.9 2003/08/19 11:48:50 weiden Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <win32k/icm.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: icm.c,v 1.10 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 
 BOOL
 STDCALL
diff --git a/reactos/subsys/win32k/objects/line.c b/reactos/subsys/win32k/objects/line.c
index 30c360292cf..16a2140ae53 100644
--- a/reactos/subsys/win32k/objects/line.c
+++ b/reactos/subsys/win32k/objects/line.c
@@ -16,29 +16,11 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: line.c,v 1.29 2004/04/09 20:03:20 navaraf Exp $ */
+/* $Id: line.c,v 1.30 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 
 // Some code from the WINE project source (www.winehq.com)
 
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
-#include <win32k/dc.h>
-#include <win32k/line.h>
-#include <win32k/path.h>
-#include <win32k/pen.h>
-#include <win32k/region.h>
-#include <include/error.h>
-#include <include/inteng.h>
-#include <include/object.h>
-#include <include/path.h>
-#include <include/intgdi.h>
-#include <include/tags.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
-
 
 BOOL FASTCALL
 IntGdiMoveToEx(DC      *dc,
diff --git a/reactos/subsys/win32k/objects/metafile.c b/reactos/subsys/win32k/objects/metafile.c
index 723e45e808f..97a48ee395d 100644
--- a/reactos/subsys/win32k/objects/metafile.c
+++ b/reactos/subsys/win32k/objects/metafile.c
@@ -16,15 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: metafile.c,v 1.9 2003/08/19 11:48:50 weiden Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <win32k/metafile.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: metafile.c,v 1.10 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 
 HENHMETAFILE
 STDCALL
diff --git a/reactos/subsys/win32k/objects/objconv.c b/reactos/subsys/win32k/objects/objconv.c
index da60f52ecfd..e9f74bde459 100644
--- a/reactos/subsys/win32k/objects/objconv.c
+++ b/reactos/subsys/win32k/objects/objconv.c
@@ -16,27 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: objconv.c,v 1.17 2004/04/09 20:03:20 navaraf Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-
-/* FIXME: Surely we should just have one include file that includes all of these.. */
-#include <win32k/bitmaps.h>
-#include <win32k/coord.h>
-#include <win32k/driver.h>
-#include <win32k/dc.h>
-#include <win32k/print.h>
-#include <win32k/region.h>
-#include <win32k/gdiobj.h>
-#include <win32k/pen.h>
-#include "../eng/objects.h"
-#include <include/object.h>
-#include <include/surface.h>
-
-//#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: objconv.c,v 1.18 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 
 HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice)
 {
diff --git a/reactos/subsys/win32k/objects/paint.c b/reactos/subsys/win32k/objects/paint.c
index de37cc35c3d..8cb6d9b9842 100644
--- a/reactos/subsys/win32k/objects/paint.c
+++ b/reactos/subsys/win32k/objects/paint.c
@@ -16,16 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: paint.c,v 1.10 2003/08/19 11:48:50 weiden Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-//#include <win32k/debug.h>
-#include <win32k/paint.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: paint.c,v 1.11 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 
 BOOL
 STDCALL
diff --git a/reactos/subsys/win32k/objects/palette.c b/reactos/subsys/win32k/objects/palette.c
index ee2239c6d0f..adb5410c284 100644
--- a/reactos/subsys/win32k/objects/palette.c
+++ b/reactos/subsys/win32k/objects/palette.c
@@ -16,20 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: palette.c,v 1.17 2004/04/09 20:03:20 navaraf Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <win32k/debug.h>
-#include <win32k/debug1.h>
-#include <win32k/bitmaps.h>
-#include <win32k/color.h>
-#include <win32k/gdiobj.h>
-#include <debug.h>
-#include <include/palette.h>
-#include <include/object.h>
-#include <include/color.h>
-#include <include/tags.h>
+/* $Id: palette.c,v 1.18 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 
 #ifndef NO_MAPPING
 static int           PALETTE_firstFree = 0; 
diff --git a/reactos/subsys/win32k/objects/path.c b/reactos/subsys/win32k/objects/path.c
index 1aded6a887d..b9a261ccb1a 100644
--- a/reactos/subsys/win32k/objects/path.c
+++ b/reactos/subsys/win32k/objects/path.c
@@ -16,33 +16,24 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: path.c,v 1.20 2004/04/24 14:21:37 weiden Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <win32k/brush.h>
-#include <win32k/dc.h>
-#include <win32k/path.h>
-#include <win32k/math.h>
+/* $Id: path.c,v 1.21 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 #include <win32k/float.h>
-#include <win32k/coord.h>
-#include <win32k/line.h>
-#define _WIN32K_PATH_INTERNAL
-#include <include/object.h>
-#include <include/path.h>
-#include <include/tags.h>
-
-#include <math.h>
-#include <float.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
 
 #define NUM_ENTRIES_INITIAL 16  /* Initial size of points / flags arrays  */
 #define GROW_FACTOR_NUMER    2  /* Numerator of grow factor for the array */
 #define GROW_FACTOR_DENOM    1  /* Denominator of grow factor             */
 
+BOOL FASTCALL PATH_AddEntry (GdiPath *pPath, const POINT *pPoint, BYTE flags);
+BOOL FASTCALL PATH_AddFlatBezier (GdiPath *pPath, POINT *pt, BOOL closed);
+BOOL FASTCALL PATH_DoArcPart (GdiPath *pPath, FLOAT_POINT corners[], double angleStart, double angleEnd, BOOL addMoveTo);
+BOOL FASTCALL PATH_FlattenPath (GdiPath *pPath);
+VOID FASTCALL PATH_GetPathFromDC (PDC dc, GdiPath **ppPath);
+VOID FASTCALL PATH_NormalizePoint (FLOAT_POINT corners[], const FLOAT_POINT *pPoint, double *pX, double *pY);
+BOOL FASTCALL PATH_PathToRegion(const GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn);
+BOOL FASTCALL PATH_ReserveEntries (GdiPath *pPath, INT numEntries);
+VOID FASTCALL PATH_ScaleNormalizedPoint (FLOAT_POINT corners[], double x, double y, POINT *pPoint);
+
 
 INT FASTCALL
 IntGdiGetArcDirection(DC *dc);
diff --git a/reactos/subsys/win32k/objects/pen.c b/reactos/subsys/win32k/objects/pen.c
index 72801cf1b03..f1ee19efa56 100644
--- a/reactos/subsys/win32k/objects/pen.c
+++ b/reactos/subsys/win32k/objects/pen.c
@@ -17,19 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: pen.c,v 1.14 2004/04/05 21:26:25 navaraf Exp $
+ * $Id: pen.c,v 1.15 2004/05/10 17:07:20 weiden Exp $
  */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <win32k/pen.h>
-#include <win32k/bitmaps.h>
-#include <include/error.h>
-#include <internal/safe.h>
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 /* PRIVATE FUNCTIONS **********************************************************/
 
diff --git a/reactos/subsys/win32k/objects/polyfill.c b/reactos/subsys/win32k/objects/polyfill.c
index 61216e5fe75..dffd73f1c5e 100644
--- a/reactos/subsys/win32k/objects/polyfill.c
+++ b/reactos/subsys/win32k/objects/polyfill.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: polyfill.c,v 1.13 2004/04/09 20:03:20 navaraf Exp $
+/* $Id: polyfill.c,v 1.14 2004/05/10 17:07:20 weiden Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -26,19 +26,7 @@
  * REVISION HISTORY:
  *                 21/2/2003: Created
  */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <win32k/fillshap.h>
-#include <win32k/dc.h>
-#include <win32k/pen.h>
-#include <include/inteng.h>
-#include <include/object.h>
-#include <include/paint.h>
-
-#undef NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
 
 INT abs(INT nm);
 
diff --git a/reactos/subsys/win32k/objects/print.c b/reactos/subsys/win32k/objects/print.c
index 6c9260f918f..65b565a4fff 100644
--- a/reactos/subsys/win32k/objects/print.c
+++ b/reactos/subsys/win32k/objects/print.c
@@ -16,20 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: print.c,v 1.16 2004/04/09 20:03:20 navaraf Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <win32k/print.h>
-#include <win32k/dc.h>
-#include <include/error.h>
-#include <include/tags.h>
-#include <include/object.h>
-#include <internal/safe.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: print.c,v 1.17 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 
 INT
 STDCALL
diff --git a/reactos/subsys/win32k/objects/rect.c b/reactos/subsys/win32k/objects/rect.c
index d098ff427f8..1fd5b4c12e8 100644
--- a/reactos/subsys/win32k/objects/rect.c
+++ b/reactos/subsys/win32k/objects/rect.c
@@ -16,15 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: rect.c,v 1.6 2003/08/19 11:48:50 weiden Exp $ */
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <win32k/region.h>
-#include <win32k/gdiobj.h>
-#include <include/rect.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: rect.c,v 1.7 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/subsys/win32k/objects/region.c b/reactos/subsys/win32k/objects/region.c
index 4d0f93cd86b..cc5985609e0 100644
--- a/reactos/subsys/win32k/objects/region.c
+++ b/reactos/subsys/win32k/objects/region.c
@@ -16,26 +16,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: region.c,v 1.50 2004/04/24 14:21:37 weiden Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
+/* $Id: region.c,v 1.51 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 #include <win32k/float.h>
-#include <win32k/dc.h>
-#include <win32k/bitmaps.h>
-#include <win32k/region.h>
-#include <win32k/cliprgn.h>
-#include <win32k/brush.h>
-#include <include/rect.h>
-#include <include/object.h>
-#include <include/inteng.h>
-#include <include/intgdi.h>
-#include <include/error.h>
-#include <include/tags.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
 
 BOOL STDCALL
 IntEngPaint(IN SURFOBJ *Surface,IN CLIPOBJ *ClipRegion,IN BRUSHOBJ *Brush,IN POINTL *BrushOrigin,
diff --git a/reactos/subsys/win32k/objects/text.c b/reactos/subsys/win32k/objects/text.c
index b9b383f5979..4e64e7edec5 100644
--- a/reactos/subsys/win32k/objects/text.c
+++ b/reactos/subsys/win32k/objects/text.c
@@ -22,36 +22,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: text.c,v 1.90 2004/04/23 21:35:59 weiden Exp $ */
+/* $Id: text.c,v 1.91 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <napi/win32.h>
-#include <internal/safe.h>
-#include <win32k/brush.h>
-#include <win32k/dc.h>
-#include <win32k/text.h>
-#include <win32k/font.h>
-#include <include/error.h>
-#include <include/desktop.h>
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include <freetype/tttables.h>
 
-#include "../eng/handle.h"
-
-#include <include/inteng.h>
-#include <include/text.h>
-#include <include/eng.h>
-#include <include/palette.h>
-#include <include/tags.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
-
 FT_Library  library;
 
 typedef struct _FONT_ENTRY {
diff --git a/reactos/subsys/win32k/objects/wingl.c b/reactos/subsys/win32k/objects/wingl.c
index adc00f06328..f58f7369b2d 100644
--- a/reactos/subsys/win32k/objects/wingl.c
+++ b/reactos/subsys/win32k/objects/wingl.c
@@ -16,15 +16,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: wingl.c,v 1.7 2003/08/19 11:48:50 weiden Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <win32k/wingl.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: wingl.c,v 1.8 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
 
 INT
 STDCALL
diff --git a/reactos/subsys/win32k/w32k.h b/reactos/subsys/win32k/w32k.h
new file mode 100644
index 00000000000..ceb5e53a0a3
--- /dev/null
+++ b/reactos/subsys/win32k/w32k.h
@@ -0,0 +1,81 @@
+/*
+ * Precompiled headers for win32k.sys
+ */
+
+#define __WIN32K__
+#define NTOS_MODE_KERNEL
+
+#include <roskrnl.h>
+
+#include <ddk/winddi.h>
+#include <ddk/ntddk.h>
+#include <ddk/ntddmou.h>
+
+#include <win32k/win32k.h>
+#include <csrss/csrss.h>
+
+#include <internal/ob.h>
+#include <internal/safe.h>
+
+#include <napi/win32.h>
+#include <ntos.h>
+#include <math.h>
+#include <float.h>
+#include <windows.h>
+
+#include <rosrtl/string.h>
+#include <user32/callback.h>
+
+#include <include/accelerator.h>
+#include <include/callback.h>
+#include <include/caret.h>
+#include <include/class.h>
+#include <include/cleanup.h>
+#include <include/clipboard.h>
+#include <include/color.h>
+#include <include/cursoricon.h>
+#include <include/dce.h>
+#include <include/desktop.h>
+#include <include/dib.h>
+#include <include/eng.h>
+#include <include/error.h>
+#include <include/focus.h>
+#include <include/guicheck.h>
+#include <include/hook.h>
+#include <include/hotkey.h>
+#include <include/input.h>
+#include <include/inteng.h>
+#include <include/intgdi.h>
+#include <include/menu.h>
+#include <include/mouse.h>
+#include <include/msgqueue.h>
+#include <include/object.h>
+#include <include/paint.h>
+#include <include/painting.h>
+#include <include/palette.h>
+#include <include/path.h>
+#include <include/prop.h>
+#include <include/rect.h>
+#include <include/scroll.h>
+#include <include/surface.h>
+#include <include/tags.h>
+#include <include/text.h>
+#include <include/timer.h>
+#include <include/timer.h>
+#include <include/useratom.h>
+#include <include/vis.h>
+#include <include/window.h>
+#include <include/winpos.h>
+#include <include/winsta.h>
+
+#include <eng/objects.h>
+#include <eng/misc.h>
+#include <eng/handle.h>
+#include <eng/clip.h>
+#include <eng/brush.h>
+
+#include <dib/dib.h>
+
+#define NDEBUG
+#include <win32k/debug1.h>
+