diff --git a/reactos/lib/kernel32/file/cnotify.c b/reactos/lib/kernel32/file/cnotify.c
index 8c5ed206dc0..b618a73f626 100644
--- a/reactos/lib/kernel32/file/cnotify.c
+++ b/reactos/lib/kernel32/file/cnotify.c
@@ -1,4 +1,4 @@
-/* $Id: cnotify.c,v 1.9 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: cnotify.c,v 1.10 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -12,7 +12,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /*
  * @implemented
diff --git a/reactos/lib/kernel32/file/copy.c b/reactos/lib/kernel32/file/copy.c
index a4ced7852d0..64a653ca5db 100644
--- a/reactos/lib/kernel32/file/copy.c
+++ b/reactos/lib/kernel32/file/copy.c
@@ -1,4 +1,4 @@
-/* $Id: copy.c,v 1.17 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: copy.c,v 1.18 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -15,7 +15,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/lib/kernel32/file/create.c b/reactos/lib/kernel32/file/create.c
index 4624f84e0ce..c6c90d4ebc2 100644
--- a/reactos/lib/kernel32/file/create.c
+++ b/reactos/lib/kernel32/file/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.34 2003/11/27 20:57:58 gdalsnes Exp $
+/* $Id: create.c,v 1.35 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -18,7 +18,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/lib/kernel32/file/curdir.c b/reactos/lib/kernel32/file/curdir.c
index a1ded69cb87..8b836e61eed 100644
--- a/reactos/lib/kernel32/file/curdir.c
+++ b/reactos/lib/kernel32/file/curdir.c
@@ -1,4 +1,4 @@
-/* $Id: curdir.c,v 1.40 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: curdir.c,v 1.41 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -14,7 +14,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* GLOBAL VARIABLES **********************************************************/
diff --git a/reactos/lib/kernel32/file/delete.c b/reactos/lib/kernel32/file/delete.c
index 90aad66e53f..1a0ee677630 100644
--- a/reactos/lib/kernel32/file/delete.c
+++ b/reactos/lib/kernel32/file/delete.c
@@ -1,4 +1,4 @@
-/* $Id: delete.c,v 1.15 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: delete.c,v 1.16 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -14,7 +14,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/lib/kernel32/file/deviceio.c b/reactos/lib/kernel32/file/deviceio.c
index 3d85c55f24d..ee8528ff518 100644
--- a/reactos/lib/kernel32/file/deviceio.c
+++ b/reactos/lib/kernel32/file/deviceio.c
@@ -1,4 +1,4 @@
-/* $Id: deviceio.c,v 1.14 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: deviceio.c,v 1.15 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -12,8 +12,7 @@
 #include <k32.h>
 
 #define NDEBUG
-//#define DBG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /*
diff --git a/reactos/lib/kernel32/file/dir.c b/reactos/lib/kernel32/file/dir.c
index 2ec292c742c..f8411ee5857 100644
--- a/reactos/lib/kernel32/file/dir.c
+++ b/reactos/lib/kernel32/file/dir.c
@@ -1,4 +1,4 @@
-/* $Id: dir.c,v 1.43 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: dir.c,v 1.44 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -18,7 +18,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* FUNCTIONS *****************************************************************/
diff --git a/reactos/lib/kernel32/file/dosdev.c b/reactos/lib/kernel32/file/dosdev.c
index b88d26907c0..db5c2fffceb 100644
--- a/reactos/lib/kernel32/file/dosdev.c
+++ b/reactos/lib/kernel32/file/dosdev.c
@@ -1,4 +1,4 @@
-/* $Id: dosdev.c,v 1.10 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: dosdev.c,v 1.11 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -14,7 +14,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* FUNCTIONS *****************************************************************/
diff --git a/reactos/lib/kernel32/file/file.c b/reactos/lib/kernel32/file/file.c
index 9d1ff901bdf..95a29b30042 100644
--- a/reactos/lib/kernel32/file/file.c
+++ b/reactos/lib/kernel32/file/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.48 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: file.c,v 1.49 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -15,7 +15,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* GLOBALS ******************************************************************/
diff --git a/reactos/lib/kernel32/file/find.c b/reactos/lib/kernel32/file/find.c
index 8e9b531de6e..c8b1b29b675 100644
--- a/reactos/lib/kernel32/file/find.c
+++ b/reactos/lib/kernel32/file/find.c
@@ -1,4 +1,4 @@
-/* $Id: find.c,v 1.42 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: find.c,v 1.43 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -14,7 +14,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* TYPES ********************************************************************/
diff --git a/reactos/lib/kernel32/file/lock.c b/reactos/lib/kernel32/file/lock.c
index 87212f0e2eb..f9cc2f2ff4d 100644
--- a/reactos/lib/kernel32/file/lock.c
+++ b/reactos/lib/kernel32/file/lock.c
@@ -1,4 +1,4 @@
-/* $Id: lock.c,v 1.10 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: lock.c,v 1.11 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -17,7 +17,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/lib/kernel32/file/mailslot.c b/reactos/lib/kernel32/file/mailslot.c
index dcd5a9b5dff..c4148da0056 100644
--- a/reactos/lib/kernel32/file/mailslot.c
+++ b/reactos/lib/kernel32/file/mailslot.c
@@ -1,4 +1,4 @@
-/* $Id: mailslot.c,v 1.9 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: mailslot.c,v 1.10 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -13,7 +13,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/lib/kernel32/file/move.c b/reactos/lib/kernel32/file/move.c
index a4193dcbfeb..1d6bbf87928 100644
--- a/reactos/lib/kernel32/file/move.c
+++ b/reactos/lib/kernel32/file/move.c
@@ -1,4 +1,4 @@
-/* $Id: move.c,v 1.12 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: move.c,v 1.13 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -14,7 +14,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 #define FILE_RENAME_SIZE  MAX_PATH +sizeof(FILE_RENAME_INFORMATION)
diff --git a/reactos/lib/kernel32/file/npipe.c b/reactos/lib/kernel32/file/npipe.c
index 28fa4310c2e..70806160325 100644
--- a/reactos/lib/kernel32/file/npipe.c
+++ b/reactos/lib/kernel32/file/npipe.c
@@ -1,4 +1,4 @@
-/* $Id: npipe.c,v 1.16 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: npipe.c,v 1.17 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -12,9 +12,8 @@
 
 #include <k32.h>
 
-
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/lib/kernel32/file/pipe.c b/reactos/lib/kernel32/file/pipe.c
index 12b3ce6ef4b..9008fe63b4b 100644
--- a/reactos/lib/kernel32/file/pipe.c
+++ b/reactos/lib/kernel32/file/pipe.c
@@ -1,4 +1,4 @@
-/* $Id: pipe.c,v 1.9 2003/07/10 18:50:51 chorns Exp $
+/* $Id: pipe.c,v 1.10 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -13,7 +13,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /* GLOBALS ******************************************************************/
 
diff --git a/reactos/lib/kernel32/file/rw.c b/reactos/lib/kernel32/file/rw.c
index 98ab04d3ee1..c4d384efdbb 100644
--- a/reactos/lib/kernel32/file/rw.c
+++ b/reactos/lib/kernel32/file/rw.c
@@ -1,4 +1,4 @@
-/* $Id: rw.c,v 1.24 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: rw.c,v 1.25 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -14,7 +14,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/lib/kernel32/file/tape.c b/reactos/lib/kernel32/file/tape.c
index fc7d95232b3..25a25a09d71 100644
--- a/reactos/lib/kernel32/file/tape.c
+++ b/reactos/lib/kernel32/file/tape.c
@@ -1,4 +1,4 @@
-/* $Id: tape.c,v 1.6 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: tape.c,v 1.7 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -15,7 +15,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/lib/kernel32/file/volume.c b/reactos/lib/kernel32/file/volume.c
index 36de769a319..39fcf68c02e 100644
--- a/reactos/lib/kernel32/file/volume.c
+++ b/reactos/lib/kernel32/file/volume.c
@@ -1,4 +1,4 @@
-/* $Id: volume.c,v 1.37 2004/01/23 16:37:11 ekohl Exp $
+/* $Id: volume.c,v 1.38 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -22,7 +22,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 #define MAX_DOS_DRIVES 26
diff --git a/reactos/lib/kernel32/include/debug.h b/reactos/lib/kernel32/include/debug.h
new file mode 100644
index 00000000000..45a87555015
--- /dev/null
+++ b/reactos/lib/kernel32/include/debug.h
@@ -0,0 +1,25 @@
+#ifndef _KERNEL32_INCLUDE_DEBUG_H
+#define _KERNEL32_INCLUDE_DEBUG_H
+
+#define UNIMPLEMENTED DbgPrint("%s at %s:%d is unimplemented\n",__FUNCTION__,__FILE__,__LINE__);
+
+#ifdef NDEBUG
+#define DPRINT(args...)
+#define CHECKPOINT
+#ifdef assert
+#undef assert
+#endif
+#define assert(x)
+#else
+#define DPRINT(args...) do { DbgPrint("(KERNEL32:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0);
+#define CHECKPOINT do { DbgPrint("(KERNEL32:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0);
+#ifdef assert
+#undef assert
+#endif
+#define assert(x) do { if(!x) RtlAssert(x, __FILE__,__LINE__, ""); } while(0);
+#endif
+
+#define DPRINT1(args...) do { DbgPrint("(KERNEL32:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0);
+#define CHECKPOINT1 do { DbgPrint("(KERNEL32:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0);
+
+#endif /* ndef _KERNEL32_INCLUDE_DEBUG_H */
diff --git a/reactos/lib/kernel32/include/kernel32.h b/reactos/lib/kernel32/include/kernel32.h
new file mode 100755
index 00000000000..66ec9d1faf9
--- /dev/null
+++ b/reactos/lib/kernel32/include/kernel32.h
@@ -0,0 +1,47 @@
+#ifndef _KERNEL32_INCLUDE_KERNEL32_H
+#define _KERNEL32_INCLUDE_KERNEL32_H
+
+
+#define  MAGIC(c1,c2,c3,c4)  ((c1) + ((c2)<<8) + ((c3)<<16) + ((c4)<<24))
+
+#define  MAGIC_HEAP        MAGIC( 'H','E','A','P' )
+
+#define ROUNDUP(a,b)	((((a)+(b)-1)/(b))*(b))
+#define ROUNDDOWN(a,b)	(((a)/(b))*(b))
+
+#ifndef FIELD_OFFSET
+#define FIELD_OFFSET(type,fld)	((LONG)&(((type *)0)->fld))
+#endif
+
+#define SetLastErrorByStatus(__S__) \
+ ((void)SetLastError(RtlNtStatusToDosError(__S__)))
+
+typedef 
+DWORD
+(*WaitForInputIdleType)(
+    HANDLE hProcess,
+    DWORD dwMilliseconds);
+
+/* GLOBAL VARIABLES **********************************************************/
+
+extern BOOL bIsFileApiAnsi;
+extern HANDLE hProcessHeap;
+extern HANDLE hBaseDir;
+
+extern CRITICAL_SECTION DllLock;
+
+/* FUNCTION PROTOTYPES *******************************************************/
+
+BOOL STDCALL IsConsoleHandle(HANDLE Handle);
+
+BOOL STDCALL CloseConsoleHandle(HANDLE Handle);
+
+HANDLE STDCALL OpenConsoleW (LPWSTR wsName,
+			     DWORD  dwDesiredAccess,
+			     BOOL   bInheritHandle,
+			     DWORD  dwCreationDistribution);
+
+PTEB GetTeb(VOID);
+
+#endif /* ndef _KERNEL32_INCLUDE_KERNEL32_H */
+
diff --git a/reactos/lib/kernel32/k32.h b/reactos/lib/kernel32/k32.h
index b121cb1ce4b..9859cc5eabb 100755
--- a/reactos/lib/kernel32/k32.h
+++ b/reactos/lib/kernel32/k32.h
@@ -10,8 +10,6 @@
 #include <ddk/ntddbeep.h>
 #include <ddk/ntddser.h>
 #include <windows.h>
-#include <kernel32/proc.h>
-#include <kernel32/thread.h>
 #include <ntdll/base.h>
 #include <ntdll/rtl.h>
 #include <ntdll/dbg.h>
@@ -25,3 +23,5 @@
 #include <reactos/buildno.h>
 #include <rosrtl/thread.h>
 #include <rosrtl/string.h>
+
+#include "include/kernel32.h"
diff --git a/reactos/lib/kernel32/mem/global.c b/reactos/lib/kernel32/mem/global.c
index 3c4eb0f4e54..b12c25b250a 100644
--- a/reactos/lib/kernel32/mem/global.c
+++ b/reactos/lib/kernel32/mem/global.c
@@ -1,4 +1,4 @@
-/* $Id: global.c,v 1.19 2004/01/21 18:57:21 navaraf Exp $
+/* $Id: global.c,v 1.20 2004/01/23 21:16:03 ekohl Exp $
  *
  * Win32 Global/Local heap functions (GlobalXXX, LocalXXX).
  * These functions included in Win32 for compatibility with 16 bit Windows
@@ -13,7 +13,7 @@
 #include <time.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 #ifdef _GNUC_
 #define STRUCT_PACK __attribute__((packed))
diff --git a/reactos/lib/kernel32/mem/heap.c b/reactos/lib/kernel32/mem/heap.c
index 3a6432af598..9a0ed7462c7 100644
--- a/reactos/lib/kernel32/mem/heap.c
+++ b/reactos/lib/kernel32/mem/heap.c
@@ -1,4 +1,4 @@
-/* $Id: heap.c,v 1.25 2004/01/23 17:13:36 ekohl Exp $
+/* $Id: heap.c,v 1.26 2004/01/23 21:16:03 ekohl Exp $
  *
  * kernel/heap.c
  * Copyright (C) 1996, Onno Hovers, All rights reserved
@@ -30,7 +30,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /*********************************************************************
 *                     HeapCreate -- KERNEL32                         *
diff --git a/reactos/lib/kernel32/mem/isbad.c b/reactos/lib/kernel32/mem/isbad.c
index ba88c95c267..c38c8a1548b 100644
--- a/reactos/lib/kernel32/mem/isbad.c
+++ b/reactos/lib/kernel32/mem/isbad.c
@@ -1,4 +1,4 @@
-/* $Id: isbad.c,v 1.9 2004/01/23 17:13:36 ekohl Exp $
+/* $Id: isbad.c,v 1.10 2004/01/23 21:16:03 ekohl Exp $
  *
  * lib/kernel32/mem/isbad.c
  *
@@ -8,7 +8,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /* FIXME: Stubs. What is it for? */
 /*
diff --git a/reactos/lib/kernel32/mem/local.c b/reactos/lib/kernel32/mem/local.c
index 71b37faecf8..ae3f076841c 100644
--- a/reactos/lib/kernel32/mem/local.c
+++ b/reactos/lib/kernel32/mem/local.c
@@ -1,4 +1,4 @@
-/* $Id: local.c,v 1.9 2003/07/10 18:50:51 chorns Exp $
+/* $Id: local.c,v 1.10 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  *              Copyright (C) 1996, Onno Hovers, All rights reserved
@@ -24,7 +24,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /* FUNCTIONS ***************************************************************/
 
diff --git a/reactos/lib/kernel32/mem/section.c b/reactos/lib/kernel32/mem/section.c
index 1978126e9f5..f8c2bba1a9b 100644
--- a/reactos/lib/kernel32/mem/section.c
+++ b/reactos/lib/kernel32/mem/section.c
@@ -1,4 +1,4 @@
-/* $Id: section.c,v 1.22 2004/01/23 17:13:36 ekohl Exp $
+/* $Id: section.c,v 1.23 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -12,7 +12,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/lib/kernel32/misc/atom.c b/reactos/lib/kernel32/misc/atom.c
index 75ddb2696ee..688c3597cd2 100644
--- a/reactos/lib/kernel32/misc/atom.c
+++ b/reactos/lib/kernel32/misc/atom.c
@@ -1,4 +1,4 @@
-/* $Id: atom.c,v 1.18 2003/10/28 09:49:04 navaraf Exp $
+/* $Id: atom.c,v 1.19 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -13,7 +13,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* GLOBALS *******************************************************************/
diff --git a/reactos/lib/kernel32/misc/comm.c b/reactos/lib/kernel32/misc/comm.c
index 965d34b5cb2..6aa3698432b 100644
--- a/reactos/lib/kernel32/misc/comm.c
+++ b/reactos/lib/kernel32/misc/comm.c
@@ -1,4 +1,4 @@
-/* $Id: comm.c,v 1.10 2004/01/23 17:15:23 ekohl Exp $
+/* $Id: comm.c,v 1.11 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -16,7 +16,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /* BUILDCOMMDCB & BUILDCOMMDCBANDTIMEOUTS */
 
diff --git a/reactos/lib/kernel32/misc/computername.c b/reactos/lib/kernel32/misc/computername.c
index ce3def286f8..153b517bb3f 100644
--- a/reactos/lib/kernel32/misc/computername.c
+++ b/reactos/lib/kernel32/misc/computername.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: computername.c,v 1.3 2003/09/12 17:51:47 vizzini Exp $
+/* $Id: computername.c,v 1.4 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -30,7 +30,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* FUNCTIONS *****************************************************************/
diff --git a/reactos/lib/kernel32/misc/console.c b/reactos/lib/kernel32/misc/console.c
index 9e494297856..1d01b163f42 100644
--- a/reactos/lib/kernel32/misc/console.c
+++ b/reactos/lib/kernel32/misc/console.c
@@ -1,4 +1,4 @@
-/* $Id: console.c,v 1.72 2004/01/23 17:15:23 ekohl Exp $
+/* $Id: console.c,v 1.73 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -17,7 +17,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 #define _NOACHS(__X) (sizeof(__X) / sizeof((__X)[0]))
 extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event);
diff --git a/reactos/lib/kernel32/misc/dllmain.c b/reactos/lib/kernel32/misc/dllmain.c
index d01e8e9a644..e9ef56235ca 100644
--- a/reactos/lib/kernel32/misc/dllmain.c
+++ b/reactos/lib/kernel32/misc/dllmain.c
@@ -1,4 +1,4 @@
-/* $Id: dllmain.c,v 1.31 2004/01/23 17:15:23 ekohl Exp $
+/* $Id: dllmain.c,v 1.32 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -14,7 +14,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /* GLOBALS *******************************************************************/
 
diff --git a/reactos/lib/kernel32/misc/env.c b/reactos/lib/kernel32/misc/env.c
index b72f2dc3a4f..b9ae5dc3875 100644
--- a/reactos/lib/kernel32/misc/env.c
+++ b/reactos/lib/kernel32/misc/env.c
@@ -1,4 +1,4 @@
-/* $Id: env.c,v 1.24 2004/01/23 17:15:23 ekohl Exp $
+/* $Id: env.c,v 1.25 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -12,7 +12,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* FUNCTIONS ******************************************************************/
diff --git a/reactos/lib/kernel32/misc/error.c b/reactos/lib/kernel32/misc/error.c
index 5ebc8eb9bd9..9de32a5332b 100644
--- a/reactos/lib/kernel32/misc/error.c
+++ b/reactos/lib/kernel32/misc/error.c
@@ -1,4 +1,4 @@
-/* $Id: error.c,v 1.21 2004/01/23 17:15:23 ekohl Exp $
+/* $Id: error.c,v 1.22 2004/01/23 21:16:03 ekohl Exp $
  *
  * reactos/lib/kernel32/misc/error.c
  *
@@ -7,7 +7,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /*
diff --git a/reactos/lib/kernel32/misc/errormsg.c b/reactos/lib/kernel32/misc/errormsg.c
index 20ec5ff9351..43a7adf3b11 100644
--- a/reactos/lib/kernel32/misc/errormsg.c
+++ b/reactos/lib/kernel32/misc/errormsg.c
@@ -1,4 +1,4 @@
-/* $Id: errormsg.c,v 1.15 2003/11/19 22:19:17 sedwards Exp $
+/* $Id: errormsg.c,v 1.16 2004/01/23 21:16:03 ekohl Exp $
  *
  * reactos/lib/kernel32/misc/errormsg.c
  *
@@ -23,8 +23,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <ddk/ntddk.h>
-#include <kernel32/kernel32.h>
+#include <k32.h>
+
+#define NDEBUG
+#include "../include/debug.h"
 
 #define TRACE DPRINT
 #define FIXME DPRINT
@@ -45,8 +47,6 @@ inline static LPSTR HEAP_strdupWtoA( HANDLE heap, DWORD flags, LPCWSTR str )
 
 /* INTERNAL */
 
-#include <stdio.h>
-#include <string.h>
 
 typedef struct tagMESSAGE_RESOURCE_ENTRY {
         WORD    Length;
diff --git a/reactos/lib/kernel32/misc/handle.c b/reactos/lib/kernel32/misc/handle.c
index 02aecbd17d4..081229d49b2 100644
--- a/reactos/lib/kernel32/misc/handle.c
+++ b/reactos/lib/kernel32/misc/handle.c
@@ -1,4 +1,4 @@
-/* $Id: handle.c,v 1.15 2004/01/23 17:15:23 ekohl Exp $
+/* $Id: handle.c,v 1.16 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -14,7 +14,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /* GLOBALS *******************************************************************/
 
diff --git a/reactos/lib/kernel32/misc/lang.c b/reactos/lib/kernel32/misc/lang.c
index 501cb5b9e90..1acdc8628cf 100644
--- a/reactos/lib/kernel32/misc/lang.c
+++ b/reactos/lib/kernel32/misc/lang.c
@@ -1,4 +1,4 @@
-/* $Id: lang.c,v 1.10 2004/01/23 17:15:23 ekohl Exp $
+/* $Id: lang.c,v 1.11 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT: See COPYING in the top level directory
  * PROJECT  : ReactOS user mode libraries
@@ -10,8 +10,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
-#include <string.h>
+#include "../include/debug.h"
 
 /* FIXME:  these are included in winnls.h, however including this file causes alot of 
            conflicting type errors. */
diff --git a/reactos/lib/kernel32/misc/ldr.c b/reactos/lib/kernel32/misc/ldr.c
index f2cb8a8dd72..3ca1635ccae 100644
--- a/reactos/lib/kernel32/misc/ldr.c
+++ b/reactos/lib/kernel32/misc/ldr.c
@@ -1,4 +1,4 @@
-/* $Id: ldr.c,v 1.18 2004/01/23 17:15:23 ekohl Exp $
+/* $Id: ldr.c,v 1.19 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT: See COPYING in the top level directory
  * PROJECT  : ReactOS user mode libraries
@@ -10,7 +10,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/lib/kernel32/misc/lzexpand_main.c b/reactos/lib/kernel32/misc/lzexpand_main.c
index 391bb284586..0dcbb123b7d 100644
--- a/reactos/lib/kernel32/misc/lzexpand_main.c
+++ b/reactos/lib/kernel32/misc/lzexpand_main.c
@@ -1,4 +1,4 @@
-/* $Id: lzexpand_main.c,v 1.1 2003/08/28 19:34:10 gvg Exp $
+/* $Id: lzexpand_main.c,v 1.2 2004/01/23 21:16:03 ekohl Exp $
  *
  * LZ Decompression functions
  *
@@ -25,7 +25,7 @@
 //#include "config.h"
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 #include <string.h>
 #include <ctype.h>
 #include <sys/types.h>
diff --git a/reactos/lib/kernel32/misc/perfcnt.c b/reactos/lib/kernel32/misc/perfcnt.c
index 0f0b68118ab..7077b328397 100644
--- a/reactos/lib/kernel32/misc/perfcnt.c
+++ b/reactos/lib/kernel32/misc/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 2004/01/23 17:15:23 ekohl Exp $ */
+/* $Id: perfcnt.c,v 1.4 2004/01/23 21:16:03 ekohl Exp $ */
 /*
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/misc/perfcnt.c
@@ -29,7 +29,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/lib/kernel32/misc/res.c b/reactos/lib/kernel32/misc/res.c
index ff87d6597b5..850f999b5e2 100644
--- a/reactos/lib/kernel32/misc/res.c
+++ b/reactos/lib/kernel32/misc/res.c
@@ -1,4 +1,4 @@
-/* $Id: res.c,v 1.19 2004/01/23 17:15:23 ekohl Exp $
+/* $Id: res.c,v 1.20 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT: See COPYING in the top level directory
  * PROJECT  : ReactOS user mode libraries
@@ -10,7 +10,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /*
diff --git a/reactos/lib/kernel32/misc/sysinfo.c b/reactos/lib/kernel32/misc/sysinfo.c
index 74495b59a3b..2a0d62b920d 100644
--- a/reactos/lib/kernel32/misc/sysinfo.c
+++ b/reactos/lib/kernel32/misc/sysinfo.c
@@ -1,4 +1,4 @@
-/* $Id: sysinfo.c,v 1.9 2003/07/17 16:57:38 silverblade Exp $
+/* $Id: sysinfo.c,v 1.10 2004/01/23 21:16:03 ekohl Exp $
  *
  * reactos/lib/kernel32/misc/sysinfo.c
  *
@@ -6,7 +6,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 #define PV_NT351 0x00030033
diff --git a/reactos/lib/kernel32/misc/time.c b/reactos/lib/kernel32/misc/time.c
index 4ecc42d3268..51d24b51bbd 100644
--- a/reactos/lib/kernel32/misc/time.c
+++ b/reactos/lib/kernel32/misc/time.c
@@ -1,4 +1,4 @@
-/* $Id: time.c,v 1.25 2004/01/23 17:15:23 ekohl Exp $
+/* $Id: time.c,v 1.26 2004/01/23 21:16:03 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -15,7 +15,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /* TYPES *********************************************************************/
 
diff --git a/reactos/lib/kernel32/process/cmdline.c b/reactos/lib/kernel32/process/cmdline.c
index b9da5e8d9f6..3bebdf15b80 100644
--- a/reactos/lib/kernel32/process/cmdline.c
+++ b/reactos/lib/kernel32/process/cmdline.c
@@ -1,4 +1,4 @@
-/* $Id: cmdline.c,v 1.18 2004/01/23 17:16:26 ekohl Exp $
+/* $Id: cmdline.c,v 1.19 2004/01/23 21:16:04 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -14,7 +14,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* GLOBALS ******************************************************************/
diff --git a/reactos/lib/kernel32/process/create.c b/reactos/lib/kernel32/process/create.c
index 8cf572e8526..86add309055 100644
--- a/reactos/lib/kernel32/process/create.c
+++ b/reactos/lib/kernel32/process/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.79 2004/01/06 13:47:01 mf Exp $
+/* $Id: create.c,v 1.80 2004/01/23 21:16:04 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -14,7 +14,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /* FUNCTIONS ****************************************************************/
 
@@ -789,14 +789,14 @@ GetFileName(LPCWSTR CurDir, LPCWSTR AppName, LPWSTR CmdLine, LPWSTR Buffer,
 /*
  * @implemented
  */
-WINBOOL STDCALL 
+BOOL STDCALL 
 CreateProcessW
 (
  LPCWSTR lpApplicationName,
  LPWSTR lpCommandLine,
  LPSECURITY_ATTRIBUTES lpProcessAttributes,
  LPSECURITY_ATTRIBUTES lpThreadAttributes,
- WINBOOL bInheritHandles,
+ BOOL bInheritHandles,
  DWORD dwCreationFlags,
  LPVOID lpEnvironment,
  LPCWSTR lpCurrentDirectory,
diff --git a/reactos/lib/kernel32/process/proc.c b/reactos/lib/kernel32/process/proc.c
index 60521639fb0..f80e9379086 100644
--- a/reactos/lib/kernel32/process/proc.c
+++ b/reactos/lib/kernel32/process/proc.c
@@ -1,4 +1,4 @@
-/* $Id: proc.c,v 1.58 2004/01/23 17:16:26 ekohl Exp $
+/* $Id: proc.c,v 1.59 2004/01/23 21:16:04 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -15,7 +15,7 @@
 
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* GLOBALS *******************************************************************/
diff --git a/reactos/lib/kernel32/synch/critical.c b/reactos/lib/kernel32/synch/critical.c
index 77d25eb220c..935a82c173d 100644
--- a/reactos/lib/kernel32/synch/critical.c
+++ b/reactos/lib/kernel32/synch/critical.c
@@ -1,4 +1,4 @@
-/* $Id: critical.c,v 1.14 2003/07/10 18:50:51 chorns Exp $
+/* $Id: critical.c,v 1.15 2004/01/23 21:16:04 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -13,7 +13,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* FUNCTIONS *****************************************************************/
diff --git a/reactos/lib/kernel32/synch/event.c b/reactos/lib/kernel32/synch/event.c
index f5acc6eaa4b..156875a0557 100644
--- a/reactos/lib/kernel32/synch/event.c
+++ b/reactos/lib/kernel32/synch/event.c
@@ -1,4 +1,4 @@
-/* $Id: event.c,v 1.17 2004/01/23 17:17:10 ekohl Exp $
+/* $Id: event.c,v 1.18 2004/01/23 21:16:04 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -14,7 +14,8 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
+
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/lib/kernel32/synch/mutex.c b/reactos/lib/kernel32/synch/mutex.c
index ace2ac617ba..9e9835048e9 100644
--- a/reactos/lib/kernel32/synch/mutex.c
+++ b/reactos/lib/kernel32/synch/mutex.c
@@ -1,4 +1,4 @@
-/* $Id: mutex.c,v 1.7 2004/01/23 17:17:10 ekohl Exp $
+/* $Id: mutex.c,v 1.8 2004/01/23 21:16:04 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -14,7 +14,8 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
+
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/lib/kernel32/synch/sem.c b/reactos/lib/kernel32/synch/sem.c
index ada324d7b3a..d15ad17f8d9 100644
--- a/reactos/lib/kernel32/synch/sem.c
+++ b/reactos/lib/kernel32/synch/sem.c
@@ -1,4 +1,4 @@
-/* $Id: sem.c,v 1.7 2004/01/23 17:17:10 ekohl Exp $
+/* $Id: sem.c,v 1.8 2004/01/23 21:16:04 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -14,7 +14,8 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
+
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/lib/kernel32/synch/timer.c b/reactos/lib/kernel32/synch/timer.c
index 5c8508e793d..486d967e6bd 100644
--- a/reactos/lib/kernel32/synch/timer.c
+++ b/reactos/lib/kernel32/synch/timer.c
@@ -1,4 +1,4 @@
-/* $Id: timer.c,v 1.14 2004/01/23 17:17:10 ekohl Exp $
+/* $Id: timer.c,v 1.15 2004/01/23 21:16:04 ekohl Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -12,7 +12,8 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
+
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/lib/kernel32/synch/wait.c b/reactos/lib/kernel32/synch/wait.c
index 9437b9e5e34..247bb02de97 100644
--- a/reactos/lib/kernel32/synch/wait.c
+++ b/reactos/lib/kernel32/synch/wait.c
@@ -1,4 +1,4 @@
-/* $Id: wait.c,v 1.26 2004/01/23 17:17:10 ekohl Exp $
+/* $Id: wait.c,v 1.27 2004/01/23 21:16:04 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -14,7 +14,8 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
+
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/lib/kernel32/thread/fiber.c b/reactos/lib/kernel32/thread/fiber.c
index b3fbbd13943..1e53309c503 100644
--- a/reactos/lib/kernel32/thread/fiber.c
+++ b/reactos/lib/kernel32/thread/fiber.c
@@ -1,4 +1,4 @@
-/* $Id: fiber.c,v 1.8 2003/09/12 17:51:47 vizzini Exp $
+/* $Id: fiber.c,v 1.9 2004/01/23 21:16:04 ekohl Exp $
  *
  * FILE: lib/kernel32/thread/fiber.c
  *
@@ -8,7 +8,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 struct _FIBER                                           /* Field offsets:  */
 {                                                       /* 32 bit   64 bit */
diff --git a/reactos/lib/kernel32/thread/fls.c b/reactos/lib/kernel32/thread/fls.c
index ca18de0d450..43924340666 100644
--- a/reactos/lib/kernel32/thread/fls.c
+++ b/reactos/lib/kernel32/thread/fls.c
@@ -1,4 +1,4 @@
-/* $Id: fls.c,v 1.3 2003/07/10 18:50:51 chorns Exp $
+/* $Id: fls.c,v 1.4 2004/01/23 21:16:04 ekohl Exp $
  *
  * COPYRIGHT:  See COPYING in the top level directory
  * PROJECT:    ReactOS system libraries
@@ -13,7 +13,7 @@
 
 #include <k32.h>
 
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 /*
  * @unimplemented
diff --git a/reactos/lib/kernel32/thread/thread.c b/reactos/lib/kernel32/thread/thread.c
index 48ff739501a..9a69976ab99 100644
--- a/reactos/lib/kernel32/thread/thread.c
+++ b/reactos/lib/kernel32/thread/thread.c
@@ -1,4 +1,4 @@
-/* $Id: thread.c,v 1.48 2003/12/30 05:10:32 hyperion Exp $
+/* $Id: thread.c,v 1.49 2004/01/23 21:16:04 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -16,9 +16,8 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
-//static VOID ThreadAttachDlls (VOID);
 
 /* FUNCTIONS *****************************************************************/
 
@@ -263,7 +262,7 @@ GetTeb(VOID)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SwitchToThread(VOID)
 {
   NTSTATUS errCode;
@@ -315,7 +314,7 @@ ExitThread(DWORD uExitCode)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetThreadTimes(HANDLE hThread,
 	       LPFILETIME lpCreationTime,
 	       LPFILETIME lpExitTime,
@@ -349,7 +348,7 @@ GetThreadTimes(HANDLE hThread,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetThreadContext(HANDLE hThread,
 		 LPCONTEXT lpContext)
 {
@@ -370,7 +369,7 @@ GetThreadContext(HANDLE hThread,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetThreadContext(HANDLE hThread,
 		 CONST CONTEXT *lpContext)
 {
@@ -391,7 +390,7 @@ SetThreadContext(HANDLE hThread,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetExitCodeThread(HANDLE hThread,
 		  LPDWORD lpExitCode)
 {
@@ -440,7 +439,7 @@ ResumeThread(HANDLE hThread)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 TerminateThread(HANDLE hThread,
 		DWORD dwExitCode)
 {
@@ -524,7 +523,7 @@ SetThreadAffinityMask(HANDLE hThread,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetThreadPriority(HANDLE hThread,
 		  int nPriority)
 {
@@ -574,7 +573,7 @@ GetThreadPriority(HANDLE hThread)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetThreadPriorityBoost(IN HANDLE hThread,
 		       OUT PBOOL pDisablePriorityBoost)
 {
@@ -593,7 +592,7 @@ GetThreadPriorityBoost(IN HANDLE hThread,
       return(FALSE);
     }
 
-  *pDisablePriorityBoost = !((WINBOOL)PriorityBoost);
+  *pDisablePriorityBoost = !((BOOL)PriorityBoost);
 
   return(TRUE);
 }
@@ -602,9 +601,9 @@ GetThreadPriorityBoost(IN HANDLE hThread,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetThreadPriorityBoost(IN HANDLE hThread,
-		       IN WINBOOL bDisablePriorityBoost)
+		       IN BOOL bDisablePriorityBoost)
 {
   ULONG PriorityBoost;
   NTSTATUS Status;
@@ -628,7 +627,7 @@ SetThreadPriorityBoost(IN HANDLE hThread,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetThreadSelectorEntry(IN HANDLE hThread,
 		       IN DWORD dwSelector,
 		       OUT LPLDT_ENTRY lpSelectorEntry)
@@ -641,7 +640,7 @@ GetThreadSelectorEntry(IN HANDLE hThread,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetThreadIdealProcessor(HANDLE hThread,
 			DWORD dwIdealProcessor)
 {
diff --git a/reactos/lib/kernel32/thread/tls.c b/reactos/lib/kernel32/thread/tls.c
index 8ca538eee8a..e6b1cd0bbde 100644
--- a/reactos/lib/kernel32/thread/tls.c
+++ b/reactos/lib/kernel32/thread/tls.c
@@ -1,4 +1,4 @@
-/* $Id: tls.c,v 1.13 2004/01/23 17:18:16 ekohl Exp $
+/* $Id: tls.c,v 1.14 2004/01/23 21:16:04 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -15,7 +15,7 @@
 #include <k32.h>
 
 #define NDEBUG
-#include <kernel32/kernel32.h>
+#include "../include/debug.h"
 
 
 /* FUNCTIONS *****************************************************************/