diff --git a/reactos/include/kernel32/kernel32.h b/reactos/include/kernel32/kernel32.h
index ce811e14beb..c8d5df72163 100644
--- a/reactos/include/kernel32/kernel32.h
+++ b/reactos/include/kernel32/kernel32.h
@@ -1,19 +1,16 @@
 #include <windows.h>
 
-#define UNIMPLEMENTED dprintf("%s at %s:%d is unimplemented\n",__FUNCTION__,__FILE__,__LINE__);
+#define UNIMPLEMENTED DbgPrint("%s at %s:%d is unimplemented\n",__FUNCTION__,__FILE__,__LINE__);
 
 #ifdef NDEBUG
 #define DPRINT(args...) 
 #define CHECKPOINT
 #else
-#define DPRINT(args...) do { dprintf("(KERNEL32:%s:%d) ",__FILE__,__LINE__); dprintf(args); } while(0);
-#define CHECKPOINT do { dprintf("(KERNEL32:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0);
+#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);
 #endif
 
-#define DPRINT1(args...) do { dprintf("(KERNEL32:%s:%d) ",__FILE__,__LINE__); dprintf(args);  } while(0);
-
-void dprintf(char* fmt, ...);
-void aprintf(char* fmt, ...);
+#define DPRINT1(args...) do { DbgPrint("(KERNEL32:%s:%d) ",__FILE__,__LINE__); DbgPrint(args);  } while(0);
 
 #define  MAGIC(c1,c2,c3,c4)  ((c1) + ((c2)<<8) + ((c3)<<16) + ((c4)<<24))
 
diff --git a/reactos/lib/kernel32/file/dir.c b/reactos/lib/kernel32/file/dir.c
index 62051fdc916..128cb044901 100644
--- a/reactos/lib/kernel32/file/dir.c
+++ b/reactos/lib/kernel32/file/dir.c
@@ -1,4 +1,4 @@
-/* $Id: dir.c,v 1.22 2000/01/11 17:30:16 ekohl Exp $
+/* $Id: dir.c,v 1.23 2000/01/20 22:55:37 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -732,7 +732,7 @@ DWORD STDCALL SearchPathW(LPCWSTR lpPath,
 	OBJECT_ATTRIBUTES ObjectAttributes;
 	IO_STATUS_BLOCK IoStatusBlock;
 
-	dprintf("SearchPath\n");
+	DPRINT("SearchPath\n");
 
 	if ( lpPath == NULL )  {
 		// check the directory from which the application loaded
diff --git a/reactos/lib/kernel32/internal/dprintf.c b/reactos/lib/kernel32/internal/dprintf.c
index b36ffc27437..ad0f79af06e 100644
--- a/reactos/lib/kernel32/internal/dprintf.c
+++ b/reactos/lib/kernel32/internal/dprintf.c
@@ -34,25 +34,3 @@ VOID STDCALL OutputDebugStringW(LPCWSTR lpOutputString)
 	
    NtDisplayString(&UnicodeOutput);
 }
-
-void dprintf(char* fmt, ...)
-{
-   va_list va_args;
-   char buffer[255];
-   
-   va_start(va_args,fmt);
-   vsprintf(buffer,fmt,va_args);
-   OutputDebugStringA(buffer);
-   va_end(fmt);
-}
-
-void aprintf(char* fmt, ...)
-{
-   va_list va_args;
-   char buffer[255];
-   
-   va_start(va_args,fmt);
-   vsprintf(buffer,fmt,va_args);
-   OutputDebugStringA(buffer);
-   va_end(fmt);
-}
diff --git a/reactos/lib/kernel32/mem/global.c b/reactos/lib/kernel32/mem/global.c
index 216a4dce0e1..d335869dde4 100644
--- a/reactos/lib/kernel32/mem/global.c
+++ b/reactos/lib/kernel32/mem/global.c
@@ -8,6 +8,9 @@
 
 #include <windows.h>
 
+#define NDEBUG
+#include <kernel32/kernel32.h>
+
 #define MAGIC_GLOBAL_USED 0x5342BEEF
 #define GLOBAL_LOCK_MAX   0xFF
 
@@ -27,7 +30,7 @@ HGLOBAL WINAPI GlobalAlloc(UINT flags, DWORD size)
    PGLOBAL_HANDLE	phandle;
    LPVOID		palloc;
 
-   aprintf("GlobalAlloc( 0x%X, 0x%lX )\n", flags, size );
+   DPRINT("GlobalAlloc( 0x%X, 0x%lX )\n", flags, size );
 
    if((flags & GMEM_MOVEABLE)==0) /* POINTER */
    {
@@ -65,7 +68,7 @@ LPVOID WINAPI GlobalLock(HGLOBAL hmem)
    PGLOBAL_HANDLE phandle;
    LPVOID         palloc;
 
-   aprintf("GlobalLock( 0x%lX )\n", (ULONG) hmem );
+   DPRINT("GlobalLock( 0x%lX )\n", (ULONG) hmem );
 
    if(((ULONG)hmem%8)==0)
       return (LPVOID) hmem;
@@ -80,7 +83,7 @@ LPVOID WINAPI GlobalLock(HGLOBAL hmem)
    }
    else
    {
-      dprintf("GlobalLock: invalid handle\n");
+      DPRINT("GlobalLock: invalid handle\n");
       palloc=(LPVOID) hmem;
    }
    HeapUnlock(__ProcessHeap);
@@ -95,7 +98,7 @@ BOOL WINAPI GlobalUnlock(HGLOBAL hmem)
    PGLOBAL_HANDLE	phandle;
    BOOL			locked;
 
-   aprintf("GlobalUnlock( 0x%lX )\n", (ULONG) hmem );
+   DPRINT("GlobalUnlock( 0x%lX )\n", (ULONG) hmem );
 
    if(((ULONG)hmem%8)==0)
       return FALSE;
@@ -111,7 +114,7 @@ BOOL WINAPI GlobalUnlock(HGLOBAL hmem)
    }
    else
    {
-      dprintf("GlobalUnlock: invalid handle\n");
+      DPRINT("GlobalUnlock: invalid handle\n");
       locked=FALSE;
    }
    HeapUnlock(__ProcessHeap);
@@ -123,7 +126,7 @@ BOOL WINAPI GlobalUnlock(HGLOBAL hmem)
 *********************************************************************/
 HGLOBAL WINAPI GlobalHandle(LPCVOID pmem)
 {
-   aprintf("GlobalHandle( 0x%lX )\n", (ULONG) pmem );
+   DPRINT("GlobalHandle( 0x%lX )\n", (ULONG) pmem );
 
    if(((ULONG)pmem%8)==0) /* FIXED */
       return (HGLOBAL) pmem;
@@ -140,7 +143,7 @@ HGLOBAL WINAPI GlobalReAlloc(HGLOBAL hmem, DWORD size, UINT flags)
    HGLOBAL		hnew;
    PGLOBAL_HANDLE	phandle;
 
-   aprintf("GlobalReAlloc( 0x%lX, 0x%lX, 0x%X )\n", (ULONG) hmem, size, flags );
+   DPRINT("GlobalReAlloc( 0x%lX, 0x%lX, 0x%X )\n", (ULONG) hmem, size, flags );
 
    hnew=NULL;
    HeapLock(__ProcessHeap);
@@ -222,7 +225,7 @@ HGLOBAL WINAPI GlobalHeapFree(GetProcessHeap(),0,HGLOBAL hmem)
 {
    PGLOBAL_HANDLE phandle;
 
-   aprintf("GlobalHeapFree(GetProcessHeap(),0, 0x%lX )\n", (ULONG) hmem );
+   DPRINT("GlobalHeapFree(GetProcessHeap(),0, 0x%lX )\n", (ULONG) hmem );
 
    if(((ULONG)hmem%4)==0) /* POINTER */
    {
@@ -254,7 +257,7 @@ DWORD WINAPI GlobalSize(HGLOBAL hmem)
    DWORD		retval;
    PGLOBAL_HANDLE	phandle;
 
-   aprintf("GlobalSize( 0x%lX )\n", (ULONG) hmem );
+   DPRINT("GlobalSize( 0x%lX )\n", (ULONG) hmem );
 
    if(((ULONG)hmem%8)==0)
    {
@@ -270,7 +273,7 @@ DWORD WINAPI GlobalSize(HGLOBAL hmem)
       }
       else
       {
-         dprintf("GlobalSize: invalid handle\n");
+         DPRINT("GlobalSize: invalid handle\n");
          retval=0;
       }
       HeapUnlock(__ProcessHeap);
diff --git a/reactos/lib/kernel32/mem/local.c b/reactos/lib/kernel32/mem/local.c
index 58d813e4929..295e31cbe44 100644
--- a/reactos/lib/kernel32/mem/local.c
+++ b/reactos/lib/kernel32/mem/local.c
@@ -23,6 +23,9 @@
 #include <windows.h>
 #include <kernel32/heap.h>
 
+#define NDEBUG
+#include <kernel32/kernel32>
+
 /* FUNCTIONS ***************************************************************/
 
 /*********************************************************************
@@ -49,7 +52,7 @@ UINT WINAPI LocalFlags(HLOCAL hmem)
       }
       else
       {
-         dprintf("GlobalSize: invalid handle\n");
+         DPRINT("GlobalSize: invalid handle\n");
          retval=0;
       }
       HeapUnlock(__ProcessHeap);
diff --git a/reactos/lib/kernel32/misc/time.c b/reactos/lib/kernel32/misc/time.c
index c5975b1b67a..d27176ea564 100644
--- a/reactos/lib/kernel32/misc/time.c
+++ b/reactos/lib/kernel32/misc/time.c
@@ -432,7 +432,7 @@ GetTimeZoneInformation(
 		       LPTIME_ZONE_INFORMATION lpTimeZoneInformation
 		       )
 {
- // aprintf("GetTimeZoneInformation()\n");
+ // DPRINT("GetTimeZoneInformation()\n");
    
  // memset(lpTimeZoneInformation, 0, sizeof(TIME_ZONE_INFORMATION));
   
diff --git a/reactos/lib/kernel32/nls/codepage.c b/reactos/lib/kernel32/nls/codepage.c
index fb32d8bd6f3..28894261145 100644
--- a/reactos/lib/kernel32/nls/codepage.c
+++ b/reactos/lib/kernel32/nls/codepage.c
@@ -26,6 +26,9 @@
 #include <kernel32/thread.h>
 #include <string.h>
 
+#define NDEBUG
+#include <kernel32/kernel32.h>
+
 
 extern PLOCALE	__TebLocale;
 
@@ -34,7 +37,7 @@ extern PLOCALE	__TebLocale;
 
 UINT STDCALL GetACP(void)
 {
-   //aprintf("GetACP()\n");
+   DPRINT("GetACP()\n");
    
    /* XXX: read from registry, take this as default */
    return GetTebLocale()->AnsiCodePage->Id;
@@ -42,7 +45,7 @@ UINT STDCALL GetACP(void)
 
 UINT STDCALL GetOEMCP(void)
 {
-   //aprintf("GetOEMCP()\n");
+   DPRINT("GetOEMCP()\n");
    /* XXX: read from registry, take this as default */
    return GetTebLocale()->OemCodePage->Id;
 }
@@ -51,7 +54,7 @@ WINBOOL STDCALL IsValidCodePage(UINT codepage)
 {
    PCODEPAGE pcp;
  
-   //aprintf("IsValidCodePage( %u )\n", codepage);  
+   DPRINT("IsValidCodePage( %u )\n", codepage);  
    
    switch(codepage)
    {
@@ -70,7 +73,7 @@ WINBOOL GetCPInfo(UINT codepage, LPCPINFO pcpinfo)
 {
     PCODEPAGE pcp;
    
- //   aprintf("GetCPInfo( %u, 0x%lX )\n", codepage, (ULONG) pcpinfo);
+    DPRINT("GetCPInfo( %u, 0x%lX )\n", codepage, (ULONG) pcpinfo);
     
     pcp=__CPFirst;
     while((pcp)&&(pcp->Id!=codepage))
diff --git a/reactos/lib/kernel32/nls/mbtowc.c b/reactos/lib/kernel32/nls/mbtowc.c
index 378c2ec7c9a..5fa6c9e3d8e 100644
--- a/reactos/lib/kernel32/nls/mbtowc.c
+++ b/reactos/lib/kernel32/nls/mbtowc.c
@@ -19,6 +19,9 @@
 #include <wchar.h>
 #include <string.h>
 
+#define NDEBUG
+#include <kernel32/kernel32.h>
+
 extern PLOCALE	__TebLocale;
 
 #define GetTebLocale() __TebLocale
@@ -32,8 +35,8 @@ INT MultiByteToWideChar(UINT cpid, DWORD flags, LPCSTR src, int srclen,
    WCHAR     **atou;
    CHAR      c;  
   
-   //aprintf("MultiByteToWideChar( %u, 0x%lX, %s, %d, 0x%lX, %d )\n", 
-   //        cpid, flags, src, srclen, (ULONG) dest, destlen);
+   DPRINT("MultiByteToWideChar( %u, 0x%lX, %s, %d, 0x%lX, %d )\n", 
+          cpid, flags, src, srclen, (ULONG) dest, destlen);
     
    /* get codepage */
    switch(cpid)
diff --git a/reactos/lib/kernel32/nls/wctomb.c b/reactos/lib/kernel32/nls/wctomb.c
index 1842fd55008..c93826d706f 100644
--- a/reactos/lib/kernel32/nls/wctomb.c
+++ b/reactos/lib/kernel32/nls/wctomb.c
@@ -20,6 +20,9 @@
 #include <kernel32/thread.h>
 #include <wchar.h>
 
+#define NDEBUG
+#include <kernel32/kernel32.h>
+
 extern PLOCALE	__TebLocale;
 
 #define GetTebLocale() __TebLocale
@@ -37,7 +40,7 @@ INT WideCharToMultiByte(UINT cpid, DWORD flags, LPCWSTR src, int srclen,
    CHAR      d;
    WCHAR     c;  
   
- //  aprintf("WideCharToMultiByte()\n");
+   DPRINT("WideCharToMultiByte()\n");
     
    /* get codepage */
    switch(cpid)
diff --git a/reactos/lib/kernel32/process/proc.c b/reactos/lib/kernel32/process/proc.c
index 67d35f29fad..c1521d3198e 100644
--- a/reactos/lib/kernel32/process/proc.c
+++ b/reactos/lib/kernel32/process/proc.c
@@ -1,4 +1,4 @@
-/* $Id: proc.c,v 1.26 2000/01/11 17:30:46 ekohl Exp $
+/* $Id: proc.c,v 1.27 2000/01/20 22:56:49 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -56,7 +56,7 @@ GetProcessTimes (
 	LPFILETIME	lpUserTime
 	)
 {
-	dprintf("GetProcessTimes is unimplemented\n");
+	DPRINT("GetProcessTimes is unimplemented\n");
 	return FALSE;
 }
 
diff --git a/reactos/lib/kernel32/synch/event.c b/reactos/lib/kernel32/synch/event.c
index d64c35ed061..1535b6b4337 100644
--- a/reactos/lib/kernel32/synch/event.c
+++ b/reactos/lib/kernel32/synch/event.c
@@ -12,6 +12,8 @@
 #include <windows.h>
 #include <wchar.h>
 
+#define NDEBUG
+#include <kernel32/kernel32.h>
 
 WINBOOL STDCALL SetEvent(HANDLE hEvent)
 {
@@ -76,13 +78,13 @@ HANDLE STDCALL CreateEventW(LPSECURITY_ATTRIBUTES lpEventAttributes,
 	PtrObjectAttributes = NULL;
      }	
     
-   dprintf( "Calling NtCreateEvent\n" );
+   DPRINT( "Calling NtCreateEvent\n" );
    errCode = NtCreateEvent(&hEvent,
 			   STANDARD_RIGHTS_ALL|EVENT_READ_ACCESS|EVENT_WRITE_ACCESS,
 			   PtrObjectAttributes,
 			   bManualReset,
 			   bInitialState);
-   dprintf( "Called\n" );
+   DPRINT( "Called\n" );
    if (!NT_SUCCESS(errCode)) 
      {
 	SetLastError(RtlNtStatusToDosError(errCode));