2003-01-15 Casper S. Hornstrup <[email protected]>

* lib/kernel32/k32.h: New file.
	* lib/kernel32/makefile (TARGET_CFLAGS): Add -I./.
	(TARGET_PCH): Set to k32.h.
	* lib/kernel32/except/except.c: Use <k32.h>.
	* lib/kernel32/file/backup.c: Ditto.
	* lib/kernel32/file/cnotify.c: Ditto.
	* lib/kernel32/file/copy.c: Ditto.
	* lib/kernel32/file/create.c: Ditto.
	* lib/kernel32/file/curdir.c: Ditto.
	* lib/kernel32/file/delete.c: Ditto.
	* lib/kernel32/file/deviceio.c: Ditto.
	* lib/kernel32/file/dir.c: Ditto.
	* lib/kernel32/file/dosdev.c: Ditto.
	* lib/kernel32/file/file.c: Ditto.
	* lib/kernel32/file/find.c: Ditto.
	* lib/kernel32/file/iocompl.c: Ditto.
	* lib/kernel32/file/lfile.c: Ditto.
	* lib/kernel32/file/lock.c: Ditto.
	* lib/kernel32/file/mailslot.c: Ditto.
	* lib/kernel32/file/move.c: Ditto.
	* lib/kernel32/file/npipe.c: Ditto.
	* lib/kernel32/file/pipe.c: Ditto.
	* lib/kernel32/file/rw.c: Ditto.
	* lib/kernel32/file/tape.c: Ditto.
	* lib/kernel32/file/volume.c: Ditto.
	* lib/kernel32/mem/global.c: Ditto.
	* lib/kernel32/mem/heap.c: Ditto.
	* lib/kernel32/mem/isbad.c: Ditto.
	* lib/kernel32/mem/local.c: Ditto.
	* lib/kernel32/mem/procmem.c: Ditto.
	* lib/kernel32/mem/section.c: Ditto.
	* lib/kernel32/mem/virtual.c: Ditto.
	* lib/kernel32/misc/atom.c: Ditto.
	* lib/kernel32/misc/comm.c: Ditto.
	* lib/kernel32/misc/console.c: Ditto.
	* lib/kernel32/misc/debug.c: Ditto.
	* lib/kernel32/misc/dllmain.c: Ditto.
	* lib/kernel32/misc/env.c: Ditto.
	* lib/kernel32/misc/error.c: Ditto.
	* lib/kernel32/misc/handle.c: Ditto.
	* lib/kernel32/misc/ldr.c: Ditto.
	* lib/kernel32/misc/profile.c: Ditto.
	* lib/kernel32/misc/res.c: Ditto.
	* lib/kernel32/misc/stubs.c: Ditto.
	* lib/kernel32/misc/sysinfo.c: Ditto.
	* lib/kernel32/misc/time.c: Ditto.
	* lib/kernel32/process/cmdline.c: Ditto.
	* lib/kernel32/process/create.c: Ditto.
	* lib/kernel32/process/proc.c: Ditto.
	* lib/kernel32/process/session.c: Ditto.
	* lib/kernel32/string/lstring.c: Ditto.
	* lib/kernel32/synch/critical.c: Ditto.
	* lib/kernel32/synch/event.c: Ditto.
	* lib/kernel32/synch/intrlck.c: Ditto.
	* lib/kernel32/synch/mutex.c: Ditto.
	* lib/kernel32/synch/sem.c: Ditto.
	* lib/kernel32/synch/timer.c: Ditto.
	* lib/kernel32/synch/wait.c: Ditto.
	* lib/kernel32/thread/fiber.c: Ditto.
	* lib/kernel32/thread/thread.c: Ditto.
	* lib/kernel32/thread/tls.c: Ditto.

svn path=/trunk/; revision=4009

reactos/ChangeLog

@@ -1,3 +1,67 @@
+2003-01-15  Casper S. Hornstrup  <[email protected]>
+
+	* lib/kernel32/k32.h: New file.
+	* lib/kernel32/makefile (TARGET_CFLAGS): Add -I./.
+	(TARGET_PCH): Set to k32.h.
+	* lib/kernel32/except/except.c: Use <k32.h>.
+	* lib/kernel32/file/backup.c: Ditto.
+	* lib/kernel32/file/cnotify.c: Ditto.
+	* lib/kernel32/file/copy.c: Ditto.
+	* lib/kernel32/file/create.c: Ditto.
+	* lib/kernel32/file/curdir.c: Ditto.
+	* lib/kernel32/file/delete.c: Ditto.
+	* lib/kernel32/file/deviceio.c: Ditto.
+	* lib/kernel32/file/dir.c: Ditto.
+	* lib/kernel32/file/dosdev.c: Ditto.
+	* lib/kernel32/file/file.c: Ditto.
+	* lib/kernel32/file/find.c: Ditto.
+	* lib/kernel32/file/iocompl.c: Ditto.
+	* lib/kernel32/file/lfile.c: Ditto.
+	* lib/kernel32/file/lock.c: Ditto.
+	* lib/kernel32/file/mailslot.c: Ditto.
+	* lib/kernel32/file/move.c: Ditto.
+	* lib/kernel32/file/npipe.c: Ditto.
+	* lib/kernel32/file/pipe.c: Ditto.
+	* lib/kernel32/file/rw.c: Ditto.
+	* lib/kernel32/file/tape.c: Ditto.
+	* lib/kernel32/file/volume.c: Ditto.
+	* lib/kernel32/mem/global.c: Ditto.
+	* lib/kernel32/mem/heap.c: Ditto.
+	* lib/kernel32/mem/isbad.c: Ditto.
+	* lib/kernel32/mem/local.c: Ditto.
+	* lib/kernel32/mem/procmem.c: Ditto.
+	* lib/kernel32/mem/section.c: Ditto.
+	* lib/kernel32/mem/virtual.c: Ditto.
+	* lib/kernel32/misc/atom.c: Ditto.
+	* lib/kernel32/misc/comm.c: Ditto.
+	* lib/kernel32/misc/console.c: Ditto.
+	* lib/kernel32/misc/debug.c: Ditto.
+	* lib/kernel32/misc/dllmain.c: Ditto.
+	* lib/kernel32/misc/env.c: Ditto.
+	* lib/kernel32/misc/error.c: Ditto.
+	* lib/kernel32/misc/handle.c: Ditto.
+	* lib/kernel32/misc/ldr.c: Ditto.
+	* lib/kernel32/misc/profile.c: Ditto.
+	* lib/kernel32/misc/res.c: Ditto.
+	* lib/kernel32/misc/stubs.c: Ditto.
+	* lib/kernel32/misc/sysinfo.c: Ditto.
+	* lib/kernel32/misc/time.c: Ditto.
+	* lib/kernel32/process/cmdline.c: Ditto.
+	* lib/kernel32/process/create.c: Ditto.
+	* lib/kernel32/process/proc.c: Ditto.
+	* lib/kernel32/process/session.c: Ditto.
+	* lib/kernel32/string/lstring.c: Ditto.
+	* lib/kernel32/synch/critical.c: Ditto.
+	* lib/kernel32/synch/event.c: Ditto.
+	* lib/kernel32/synch/intrlck.c: Ditto.
+	* lib/kernel32/synch/mutex.c: Ditto.
+	* lib/kernel32/synch/sem.c: Ditto.
+	* lib/kernel32/synch/timer.c: Ditto.
+	* lib/kernel32/synch/wait.c: Ditto.
+	* lib/kernel32/thread/fiber.c: Ditto.
+	* lib/kernel32/thread/thread.c: Ditto.
+	* lib/kernel32/thread/tls.c: Ditto.
+
 2003-01-15  Casper S. Hornstrup  <[email protected]>
 
 	* apps/testsets/Makefile (TEST_SETS): Remove ldr.

reactos/lib/kernel32/except/except.c

@@ -1,4 +1,4 @@
-/* $Id: except.c,v 1.9 2002/09/08 10:22:41 chorns Exp $
+/* $Id: except.c,v 1.10 2003/01/15 21:24:33 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -10,10 +10,8 @@
  *                  Created 01/11/98
  */
 
-#include <ddk/ntddk.h>
-#include <windows.h>
+#include <k32.h>
 
-#include <kernel32/error.h>
 
 typedef LONG (STDCALL *LPTOP_LEVEL_EXCEPTION_FILTER)(
 	struct _EXCEPTION_POINTERS *ExceptionInfo

reactos/lib/kernel32/file/backup.c

@@ -1,4 +1,4 @@
-/* $Id: backup.c,v 1.3 2002/09/08 10:22:41 chorns Exp $
+/* $Id: backup.c,v 1.4 2003/01/15 21:24:33 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -10,14 +10,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <wchar.h>
-#include <string.h>
-#include <ntdll/rtl.h>
-
-#include <kernel32/kernel32.h>
-#include <kernel32/error.h>
+#include <k32.h>
 
 /* FUNCTIONS ****************************************************************/
 

reactos/lib/kernel32/file/cnotify.c

@@ -1,4 +1,4 @@
-/* $Id: cnotify.c,v 1.3 2001/03/31 01:17:29 dwelch Exp $
+/* $Id: cnotify.c,v 1.4 2003/01/15 21:24:33 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -9,7 +9,7 @@
  *                  Created 01/11/98
  */
 
-#include <windows.h>
+#include <k32.h>
 
 
 WINBOOL STDCALL

reactos/lib/kernel32/file/copy.c

@@ -1,4 +1,4 @@
-/* $Id: copy.c,v 1.12 2002/12/27 23:50:21 gvg Exp $
+/* $Id: copy.c,v 1.13 2003/01/15 21:24:33 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -12,12 +12,10 @@
 
 /* INCLUDES ****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <windows.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 /* FUNCTIONS ****************************************************************/

reactos/lib/kernel32/file/create.c

@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.29 2002/09/08 10:22:41 chorns Exp $
+/* $Id: create.c,v 1.30 2003/01/15 21:24:33 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -15,15 +15,10 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-/* please FIXME: ddk/ntddk.h should be enough */
-#include <ddk/iodef.h>
-#include <ntdll/rtl.h>
-#include <windows.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 /* FUNCTIONS ****************************************************************/

reactos/lib/kernel32/file/curdir.c

@@ -1,4 +1,4 @@
-/* $Id: curdir.c,v 1.33 2002/11/07 02:52:37 robd Exp $
+/* $Id: curdir.c,v 1.34 2003/01/15 21:24:33 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -11,13 +11,10 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <windows.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 /* GLOBAL VARIABLES **********************************************************/

reactos/lib/kernel32/file/delete.c

@@ -1,4 +1,4 @@
-/* $Id: delete.c,v 1.12 2002/09/08 10:22:41 chorns Exp $
+/* $Id: delete.c,v 1.13 2003/01/15 21:24:33 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -11,13 +11,10 @@
 
 /* INCLUDES ****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <windows.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 /* FUNCTIONS ****************************************************************/

reactos/lib/kernel32/file/deviceio.c

@@ -1,4 +1,4 @@
-/* $Id: deviceio.c,v 1.10 2002/10/03 19:09:04 robd Exp $
+/* $Id: deviceio.c,v 1.11 2003/01/15 21:24:33 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -9,13 +9,11 @@
  *                  Created 01/11/98
  */
 
-#include <ddk/ntddk.h>
-#include <windows.h>
+#include <k32.h>
 
 #define NDEBUG
 //#define DBG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 WINBOOL

reactos/lib/kernel32/file/dir.c

@@ -1,4 +1,4 @@
-/* $Id: dir.c,v 1.32 2002/11/12 00:45:16 mdill Exp $
+/* $Id: dir.c,v 1.33 2003/01/15 21:24:33 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -15,15 +15,10 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <windows.h>
-#include <string.h>
-#include <wchar.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 /* FUNCTIONS *****************************************************************/

reactos/lib/kernel32/file/dosdev.c

@@ -1,4 +1,4 @@
-/* $Id: dosdev.c,v 1.5 2002/09/08 10:22:41 chorns Exp $
+/* $Id: dosdev.c,v 1.6 2003/01/15 21:24:33 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -9,8 +9,7 @@
  *                  Created 01/11/98
  */
 
-#include <ddk/ntddk.h>
-#include <windows.h>
+#include <k32.h>
 
 
 WINBOOL

reactos/lib/kernel32/file/file.c

@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.39 2002/12/27 23:50:21 gvg Exp $
+/* $Id: file.c,v 1.40 2003/01/15 21:24:33 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -12,14 +12,10 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <wchar.h>
-#include <string.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 /* GLOBALS ******************************************************************/

reactos/lib/kernel32/file/find.c

@@ -1,4 +1,4 @@
-/* $Id: find.c,v 1.33 2002/09/13 19:03:40 hbirr Exp $
+/* $Id: find.c,v 1.34 2003/01/15 21:24:33 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -11,13 +11,10 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <windows.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 /* TYPES ********************************************************************/

reactos/lib/kernel32/file/iocompl.c

@@ -1,4 +1,4 @@
-/* $Id: iocompl.c,v 1.6 2002/09/08 10:22:42 chorns Exp $
+/* $Id: iocompl.c,v 1.7 2003/01/15 21:24:33 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -9,9 +9,7 @@
  *                  Created 01/11/98
  */
 
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <wchar.h>
+#include <k32.h>
 
 
 #include <kernel32/error.h>

reactos/lib/kernel32/file/lfile.c

@@ -1,4 +1,4 @@
-/* $Id: lfile.c,v 1.7 2002/11/07 02:52:37 robd Exp $
+/* $Id: lfile.c,v 1.8 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -9,10 +9,7 @@
  *                  Created 01/11/98
  */
 
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <string.h>
-#include <wchar.h>
+#include <k32.h>
 
 
 long

reactos/lib/kernel32/file/lock.c

@@ -1,4 +1,4 @@
-/* $Id: lock.c,v 1.7 2002/09/08 10:22:42 chorns Exp $
+/* $Id: lock.c,v 1.8 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -14,14 +14,10 @@
 
 /* INCLUDES ****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <wchar.h>
-#include <string.h>
+#include <k32.h>
 
-//#define NDEBUG
+#define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 /* FUNCTIONS ****************************************************************/
 

reactos/lib/kernel32/file/mailslot.c

@@ -1,4 +1,4 @@
-/* $Id: mailslot.c,v 1.6 2002/09/08 10:22:42 chorns Exp $
+/* $Id: mailslot.c,v 1.7 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -10,12 +10,10 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <windows.h>
+#include <k32.h>
 
+#define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 /* FUNCTIONS ****************************************************************/
 

reactos/lib/kernel32/file/move.c

@@ -1,4 +1,4 @@
-/* $Id: move.c,v 1.8 2002/12/27 23:50:21 gvg Exp $
+/* $Id: move.c,v 1.9 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -11,9 +11,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <ntos/minmax.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>

reactos/lib/kernel32/file/npipe.c

@@ -1,4 +1,4 @@
-/* $Id: npipe.c,v 1.13 2002/09/08 10:22:42 chorns Exp $
+/* $Id: npipe.c,v 1.14 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -10,16 +10,10 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <windows.h>
-#include <kernel32/error.h>
-//#include <wchar.h>
-//#include <string.h>
-#include <limits.h>
-#include <napi/npipe.h>
+#include <k32.h>
 
-//#define NDEBUG
+
+#define NDEBUG
 #include <kernel32/kernel32.h>
 
 /* FUNCTIONS ****************************************************************/

reactos/lib/kernel32/file/pipe.c

@@ -1,4 +1,4 @@
-/* $Id: pipe.c,v 1.7 2002/09/08 10:22:42 chorns Exp $
+/* $Id: pipe.c,v 1.8 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -10,9 +10,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <kernel32/error.h>
+#include <k32.h>
 
+#define NDEBUG
 #include <kernel32/kernel32.h>
 
 /* GLOBALS ******************************************************************/

reactos/lib/kernel32/file/rw.c

@@ -1,4 +1,4 @@
-/* $Id: rw.c,v 1.19 2002/09/08 10:22:42 chorns Exp $
+/* $Id: rw.c,v 1.20 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -11,14 +11,10 @@
 
 /* INCLUDES ****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <wchar.h>
-#include <string.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 /* FUNCTIONS ****************************************************************/

reactos/lib/kernel32/file/tape.c

@@ -1,4 +1,4 @@
-/* $Id: tape.c,v 1.3 2002/09/08 10:22:42 chorns Exp $
+/* $Id: tape.c,v 1.4 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -12,14 +12,10 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <wchar.h>
-#include <string.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 /* FUNCTIONS ****************************************************************/
 

reactos/lib/kernel32/file/volume.c

@@ -1,4 +1,4 @@
-/* $Id: volume.c,v 1.27 2002/12/06 17:33:16 ekohl Exp $
+/* $Id: volume.c,v 1.28 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -19,13 +19,10 @@
  * Copyright 1996 Alexandre Julliard
  */
 
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <ntos/minmax.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 #define MAX_DOS_DRIVES 26

reactos/lib/kernel32/makefile

@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.57 2003/01/07 17:29:09 robd Exp $
+# $Id: makefile,v 1.58 2003/01/15 21:24:33 chorns Exp $
 
 PATH_TO_TOP = ../..
 
@@ -8,7 +8,7 @@ TARGET_NAME = kernel32
 
 TARGET_BASE = 0x77f00000
 
-TARGET_CFLAGS = -DKERNEL32_BASE=$(TARGET_DLLBASE)
+TARGET_CFLAGS = -DKERNEL32_BASE=$(TARGET_DLLBASE) -I./
 
 TARGET_LFLAGS = -nostartfiles
 
@@ -16,6 +16,8 @@ TARGET_SDKLIBS = ntdll.a
 
 TARGET_GCCLIBS = gcc
 
+TARGET_PCH = k32.h
+
 TARGET_OBJECTS = $(TARGET_NAME).o
 
 TARGET_CLEAN = except/*.o file/*.o mem/*.o misc/*.o nls/*.o \

reactos/lib/kernel32/mem/global.c

@@ -1,4 +1,4 @@
-/* $Id: global.c,v 1.10 2002/10/28 15:08:32 robd Exp $
+/* $Id: global.c,v 1.11 2003/01/15 21:24:34 chorns Exp $
  *
  * Win32 Global/Local heap functions (GlobalXXX, LocalXXX).
  * These functions included in Win32 for compatibility with 16 bit Windows
@@ -11,9 +11,7 @@
  * NOTE: Only fixed memory is implemented!!
  */
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <windows.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>

reactos/lib/kernel32/mem/heap.c

@@ -1,4 +1,4 @@
-/* $Id: heap.c,v 1.22 2002/11/10 13:33:26 robd Exp $
+/* $Id: heap.c,v 1.23 2003/01/15 21:24:34 chorns Exp $
  *
  * kernel/heap.c
  * Copyright (C) 1996, Onno Hovers, All rights reserved
@@ -27,8 +27,7 @@
  * Put the type definitions of the heap in a seperate header. Boudewijn Dekker
  */
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>

reactos/lib/kernel32/mem/isbad.c

@@ -1,11 +1,11 @@
-/* $Id: isbad.c,v 1.4 2002/09/08 10:22:43 chorns Exp $
+/* $Id: isbad.c,v 1.5 2003/01/15 21:24:34 chorns Exp $
  *
  * lib/kernel32/mem/isbad.c
  *
  * ReactOS Operating System
  *
  */
-#include <windows.h>
+#include <k32.h>
 
 /* FIXME: Stubs. What is it for? */
 UINT

reactos/lib/kernel32/mem/local.c

@@ -1,4 +1,4 @@
-/* $Id: local.c,v 1.7 2002/09/08 10:22:43 chorns Exp $
+/* $Id: local.c,v 1.8 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  *              Copyright (C) 1996, Onno Hovers, All rights reserved
@@ -21,9 +21,7 @@
 
 /* INCLUDES ****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <windows.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>

reactos/lib/kernel32/mem/procmem.c

@@ -1,4 +1,4 @@
-/* $Id: procmem.c,v 1.4 2002/09/08 10:22:43 chorns Exp $
+/* $Id: procmem.c,v 1.5 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -9,10 +9,7 @@
 
 /* INCLUDES ******************************************************************/
 
-
-#include <ddk/ntddk.h>
-#include <kernel32/error.h>
-#include <windows.h>
+#include <k32.h>
 
 /* FUNCTIONS *****************************************************************/
 WINBOOL

reactos/lib/kernel32/mem/section.c

@@ -1,4 +1,4 @@
-/* $Id: section.c,v 1.17 2002/12/15 17:01:51 chorns Exp $
+/* $Id: section.c,v 1.18 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -9,10 +9,9 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <kernel32/error.h>
-#include <windows.h>
+#include <k32.h>
 
+#define NDEBUG
 #include <kernel32/kernel32.h>
 
 /* FUNCTIONS *****************************************************************/

reactos/lib/kernel32/mem/virtual.c

@@ -1,4 +1,4 @@
-/* $Id: virtual.c,v 1.9 2002/09/08 10:22:43 chorns Exp $
+/* $Id: virtual.c,v 1.10 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -9,9 +9,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <kernel32/error.h>
-#include <windows.h>
+#include <k32.h>
 
 /* FUNCTIONS *****************************************************************/
 

reactos/lib/kernel32/misc/atom.c

@@ -1,4 +1,4 @@
-/* $Id: atom.c,v 1.15 2002/09/08 10:22:43 chorns Exp $
+/* $Id: atom.c,v 1.16 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -10,9 +10,7 @@
  *                  Full rewrite 27/05/2001
  */
 
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <kernel32/error.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>

reactos/lib/kernel32/misc/comm.c

@@ -1,4 +1,4 @@
-/* $Id: comm.c,v 1.5 2002/10/03 18:26:53 robd Exp $
+/* $Id: comm.c,v 1.6 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -12,17 +12,10 @@
  *					RDD (30/09/2002) implemented many function bodies to call serial driver.
  */
 
-#include <ddk/ntddk.h>
-#include <ddk/ntddser.h>
-#include <kernel32/proc.h>
-#include <kernel32/thread.h>
-#include <wchar.h>
-#include <string.h>
+#include <k32.h>
 
-//#define NDEBUG
-#define DBG
+#define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 WINBOOL

reactos/lib/kernel32/misc/console.c

@@ -1,4 +1,4 @@
-/* $Id: console.c,v 1.49 2002/12/06 17:31:33 ekohl Exp $
+/* $Id: console.c,v 1.50 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -13,18 +13,10 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ddk/ntddblue.h>
-#include <windows.h>
-#include <assert.h>
-#include <wchar.h>
-
-#include <csrss/csrss.h>
-#include <ntdll/csr.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 /* GLOBALS *******************************************************************/
 

reactos/lib/kernel32/misc/debug.c

@@ -1,4 +1,4 @@
-/* $Id: debug.c,v 1.5 2002/09/08 10:22:43 chorns Exp $
+/* $Id: debug.c,v 1.6 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -9,12 +9,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/dbg.h>
-#include <kernel32/error.h>
-#include <windows.h>
-#include <stdarg.h>
-#include <stdio.h>
+#include <k32.h>
 
 
 /* FUNCTIONS *****************************************************************/

reactos/lib/kernel32/misc/dllmain.c

@@ -1,4 +1,4 @@
-/* $Id: dllmain.c,v 1.24 2002/11/14 18:21:05 chorns Exp $
+/* $Id: dllmain.c,v 1.25 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -11,9 +11,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#define NTOS_MODE_USER
-#include <ntos.h>
-#include <wchar.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>

reactos/lib/kernel32/misc/env.c

@@ -1,4 +1,4 @@
-/* $Id: env.c,v 1.17 2002/10/21 00:53:33 mdill Exp $
+/* $Id: env.c,v 1.18 2003/01/15 21:24:34 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -9,15 +9,10 @@
  *                  Created 01/11/98
  */
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <windows.h>
-#include <wchar.h>
-#include <string.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 /* FUNCTIONS ******************************************************************/

reactos/lib/kernel32/misc/error.c

@@ -1,14 +1,13 @@
-/* $Id: error.c,v 1.16 2002/09/08 10:22:44 chorns Exp $
+/* $Id: error.c,v 1.17 2003/01/15 21:24:34 chorns Exp $
  *
  * reactos/lib/kernel32/misc/error.c
  *
  */
-#include <ddk/ntddk.h>
-#include <ddk/ntddbeep.h>
 
-// #define NDEBUG
+#include <k32.h>
+
+#define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 /* INTERNAL */

reactos/lib/kernel32/misc/handle.c

@@ -1,4 +1,4 @@
-/* $Id: handle.c,v 1.8 2002/09/08 10:22:44 chorns Exp $
+/* $Id: handle.c,v 1.9 2003/01/15 21:24:35 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -11,12 +11,10 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <windows.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 /* FUNCTIONS *****************************************************************/
 

reactos/lib/kernel32/misc/ldr.c

@@ -1,4 +1,4 @@
-/* $Id: ldr.c,v 1.13 2002/09/08 10:22:44 chorns Exp $
+/* $Id: ldr.c,v 1.14 2003/01/15 21:24:35 chorns Exp $
  *
  * COPYRIGHT: See COPYING in the top level directory
  * PROJECT  : ReactOS user mode libraries
@@ -7,13 +7,10 @@
  * AUTHOR   : Boudewijn Dekker
  */
 
-#include <ddk/ntddk.h>
-#include <ntdll/ldr.h>
-#include <windows.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 /* FUNCTIONS ****************************************************************/

reactos/lib/kernel32/misc/profile.c

@@ -1,4 +1,4 @@
-/* $Id: profile.c,v 1.5 2002/09/08 10:22:44 chorns Exp $
+/* $Id: profile.c,v 1.6 2003/01/15 21:24:35 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -10,11 +10,7 @@
  *                  Created 01/11/98
  */
 
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <wchar.h>
-#include <string.h>
-//#include <stdlib.h>
+#include <k32.h>
 
 
 /* FUNCTIONS *****************************************************************/

reactos/lib/kernel32/misc/res.c

@@ -1,4 +1,4 @@
-/* $Id: res.c,v 1.11 2002/09/08 10:22:45 chorns Exp $
+/* $Id: res.c,v 1.12 2003/01/15 21:24:35 chorns Exp $
  *
  * COPYRIGHT: See COPYING in the top level directory
  * PROJECT  : ReactOS user mode libraries
@@ -7,11 +7,10 @@
  * AUTHOR   : ???
  */
 
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <ntdll/ldr.h>
+#include <k32.h>
+
+#define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 HRSRC

reactos/lib/kernel32/misc/stubs.c

@@ -1,9 +1,9 @@
-/* $Id: stubs.c,v 1.41 2003/01/07 17:29:09 robd Exp $
+/* $Id: stubs.c,v 1.42 2003/01/15 21:24:35 chorns Exp $
  *
  * KERNEL32.DLL stubs (unimplemented functions)
  * Remove from this file, if you implement them.
  */
-#include <windows.h>
+#include <k32.h>
 
 #define _OLE2NLS_IN_BUILD_
 

reactos/lib/kernel32/misc/sysinfo.c

@@ -1,15 +1,12 @@
-/* $Id: sysinfo.c,v 1.5 2002/09/08 10:22:45 chorns Exp $
+/* $Id: sysinfo.c,v 1.6 2003/01/15 21:24:35 chorns Exp $
  *
  * reactos/lib/kernel32/misc/sysinfo.c
  *
  */
-#include <ddk/ntddk.h>
+#include <k32.h>
 
+#define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
 
 
 #define PV_NT351 0x00030033

reactos/lib/kernel32/misc/time.c

@@ -1,4 +1,4 @@
-/* $Id: time.c,v 1.18 2002/09/30 20:59:39 hbirr Exp $
+/* $Id: time.c,v 1.19 2003/01/15 21:24:35 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -12,10 +12,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <kernel32/error.h>
-//#include <string.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>

reactos/lib/kernel32/process/cmdline.c

@@ -1,4 +1,4 @@
-/* $Id: cmdline.c,v 1.15 2002/09/08 10:22:45 chorns Exp $
+/* $Id: cmdline.c,v 1.16 2003/01/15 21:24:35 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -11,14 +11,7 @@
 
 /* INCLUDES ****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <kernel32/proc.h>
-#include <kernel32/thread.h>
-#include <wchar.h>
-#include <string.h>
-#include <napi/teb.h>
-#include <ntdll/rtl.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>

reactos/lib/kernel32/process/create.c

@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.58 2003/01/07 17:29:08 robd Exp $
+/* $Id: create.c,v 1.59 2003/01/15 21:24:35 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -11,23 +11,10 @@
 
 /* INCLUDES ****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <kernel32/proc.h>
-#include <kernel32/thread.h>
-#include <wchar.h>
-#include <string.h>
-#include <napi/i386/segment.h>
-#include <ntdll/ldr.h>
-#include <napi/teb.h>
-#include <ntdll/base.h>
-#include <ntdll/rtl.h>
-#include <csrss/csrss.h>
-#include <ntdll/csr.h>
+#include <k32.h>
 
 #define DBG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 /* FUNCTIONS ****************************************************************/
 

reactos/lib/kernel32/process/proc.c

@@ -1,4 +1,4 @@
-/* $Id: proc.c,v 1.49 2003/01/15 20:05:52 robd Exp $
+/* $Id: proc.c,v 1.50 2003/01/15 21:24:35 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -11,18 +11,7 @@
 
 /* INCLUDES ****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <windows.h>
-#include <kernel32/proc.h>
-#include <kernel32/thread.h>
-#include <kernel32/error.h>
-#include <wchar.h>
-#include <string.h>
-#include <napi/i386/segment.h>
-#include <napi/teb.h>
-#include <ntdll/csr.h>
-#include <ntdll/ldr.h>
+#include <k32.h>
 
 
 #define NDEBUG

reactos/lib/kernel32/process/session.c

@@ -1,4 +1,4 @@
-/* $Id: session.c,v 1.3 2002/09/08 10:22:45 chorns Exp $
+/* $Id: session.c,v 1.4 2003/01/15 21:24:35 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -8,7 +8,7 @@
  * UPDATE HISTORY:
  *     2001-12-07 created
  */
-#include <ddk/ntddk.h>
+#include <k32.h>
 
 BOOL STDCALL ProcessIdToSessionId (
   DWORD dwProcessId,

reactos/lib/kernel32/string/lstring.c

@@ -8,9 +8,7 @@
  *                  Created 01/11/98
  */
 
-#include <windows.h>
-#include <string.h>
-#include <wchar.h>
+#include <k32.h>
 
 
 int

reactos/lib/kernel32/synch/critical.c

@@ -1,4 +1,4 @@
-/* $Id: critical.c,v 1.12 2002/09/08 10:22:45 chorns Exp $
+/* $Id: critical.c,v 1.13 2003/01/15 21:24:36 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -10,8 +10,9 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <windows.h>
+#include <k32.h>
 
+#define NDEBUG
 #include <kernel32/kernel32.h>
 
 

reactos/lib/kernel32/synch/event.c

@@ -1,4 +1,4 @@
-/* $Id: event.c,v 1.12 2002/09/08 10:22:45 chorns Exp $
+/* $Id: event.c,v 1.13 2003/01/15 21:24:36 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -11,12 +11,10 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <windows.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 /* FUNCTIONS ****************************************************************/
 

reactos/lib/kernel32/synch/intrlck.c

@@ -28,7 +28,7 @@
 *									*
 ************************************************************************/
 
-#include <windows.h>
+#include <k32.h>
 
 LONG 
 STDCALL 

reactos/lib/kernel32/synch/mutex.c

@@ -1,4 +1,4 @@
-/* $Id: mutex.c,v 1.4 2002/09/08 10:22:45 chorns Exp $
+/* $Id: mutex.c,v 1.5 2003/01/15 21:24:36 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -11,11 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <kernel32/error.h>
-#include <windows.h>
-#include <wchar.h>
+#include <k32.h>
 
+#define NDEBUG
 #include <kernel32/kernel32.h>
 
 /* FUNCTIONS *****************************************************************/

reactos/lib/kernel32/synch/sem.c

@@ -1,4 +1,4 @@
-/* $Id: sem.c,v 1.4 2002/09/08 10:22:45 chorns Exp $
+/* $Id: sem.c,v 1.5 2003/01/15 21:24:36 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -11,12 +11,10 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <windows.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 /* FUNCTIONS ****************************************************************/
 

reactos/lib/kernel32/synch/timer.c

@@ -1,4 +1,4 @@
-/* $Id: timer.c,v 1.11 2002/09/08 10:22:45 chorns Exp $
+/* $Id: timer.c,v 1.12 2003/01/15 21:24:36 chorns Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -9,9 +9,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <kernel32/error.h>
-#include <windows.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>

reactos/lib/kernel32/synch/wait.c

@@ -1,4 +1,4 @@
-/* $Id: wait.c,v 1.18 2002/09/08 10:22:45 chorns Exp $
+/* $Id: wait.c,v 1.19 2003/01/15 21:24:36 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -11,10 +11,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <kernel32/error.h>
-#include <windows.h>
-#include <wchar.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>

reactos/lib/kernel32/thread/fiber.c

@@ -1,11 +1,12 @@
-/* $Id: fiber.c,v 1.3 2002/09/08 10:22:46 chorns Exp $
+/* $Id: fiber.c,v 1.4 2003/01/15 21:24:36 chorns Exp $
  *
  * FILE: lib/kernel32/thread/fiber.c
  *
  * ReactOS Kernel32.dll
  *
  */
-#include <windows.h>
+#include <k32.h>
+
 
 
 /**********************************************************************

reactos/lib/kernel32/thread/thread.c

@@ -1,4 +1,4 @@
-/* $Id: thread.c,v 1.32 2002/12/02 21:28:40 ekohl Exp $
+/* $Id: thread.c,v 1.33 2003/01/15 21:24:36 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -12,15 +12,10 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <windows.h>
-#include <kernel32/thread.h>
-#include <ntdll/ldr.h>
-#include <string.h>
-#include <napi/i386/segment.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>
-#include <kernel32/error.h>
 
 
 static VOID ThreadAttachDlls (VOID);

reactos/lib/kernel32/thread/tls.c

@@ -1,4 +1,4 @@
-/* $Id: tls.c,v 1.9 2002/09/08 10:22:46 chorns Exp $
+/* $Id: tls.c,v 1.10 2003/01/15 21:24:36 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -12,11 +12,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <windows.h>
-#include <kernel32/thread.h>
-#include <kernel32/error.h>
+#include <k32.h>
 
 #define NDEBUG
 #include <kernel32/kernel32.h>