diff --git a/reactos/include/ntdll/rtl.h b/reactos/include/ntdll/rtl.h
index 5bd2b069136..e041ca2493b 100644
--- a/reactos/include/ntdll/rtl.h
+++ b/reactos/include/ntdll/rtl.h
@@ -1,4 +1,4 @@
-/* $Id: rtl.h,v 1.37 2003/03/31 22:30:48 hyperion Exp $
+/* $Id: rtl.h,v 1.38 2003/04/02 00:05:59 hyperion Exp $
  *
  */
 
@@ -578,6 +578,19 @@ RtlpNtSetValueKey (
 	IN	ULONG	DataLength
 	);
 
+
+VOID NTAPI RtlRunDecodeUnicodeString
+(
+ IN UCHAR hash,
+ IN OUT PUNICODE_STRING uString
+);
+
+VOID NTAPI RtlRunEncodeUnicodeString
+(
+ IN OUT PUCHAR hash,
+ IN OUT PUNICODE_STRING uString
+);
+
 #ifndef __NTDRIVER__
 
 #ifndef __INTERLOCKED_DECLARED
diff --git a/reactos/lib/kernel32/debug/debugger.c b/reactos/lib/kernel32/debug/debugger.c
index 0640c974d74..5b67e5c24e4 100644
--- a/reactos/lib/kernel32/debug/debugger.c
+++ b/reactos/lib/kernel32/debug/debugger.c
@@ -1,4 +1,4 @@
-/* $Id: debugger.c,v 1.1 2003/03/31 22:28:59 hyperion Exp $
+/* $Id: debugger.c,v 1.2 2003/04/02 00:06:00 hyperion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -68,6 +68,8 @@ BOOL WINAPI IsDebuggerPresent(VOID)
 
 BOOL WINAPI WaitForDebugEvent(LPDEBUG_EVENT lpDebugEvent, DWORD dwMilliseconds)
 {
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return FALSE;
 }
 
 /* EOF */
diff --git a/reactos/lib/kernel32/kernel32.edf b/reactos/lib/kernel32/kernel32.edf
index c0237f36f87..554f134770a 100644
--- a/reactos/lib/kernel32/kernel32.edf
+++ b/reactos/lib/kernel32/kernel32.edf
@@ -1,4 +1,4 @@
-; $Id: kernel32.edf,v 1.21 2003/01/15 20:05:51 robd Exp $
+; $Id: kernel32.edf,v 1.22 2003/04/02 00:06:00 hyperion Exp $
 ;
 ; kernel32.edf
 ;
@@ -108,7 +108,7 @@ CreateVirtualBuffer=CreateVirtualBuffer@12
 CreateWaitableTimerA=CreateWaitableTimerA@12
 CreateWaitableTimerW=CreateWaitableTimerW@12
 DebugActiveProcess=DebugActiveProcess@4
-DebugBreak=DebugBreak@0
+DebugBreak=NTDLL.DbgBreakPoint
 DefineDosDeviceA=DefineDosDeviceA@12
 DefineDosDeviceW=DefineDosDeviceW@12
 DeleteAtom=DeleteAtom@4
diff --git a/reactos/lib/ntdll/def/ntdll.def b/reactos/lib/ntdll/def/ntdll.def
index fc78d0df2e7..bc18bebd871 100644
--- a/reactos/lib/ntdll/def/ntdll.def
+++ b/reactos/lib/ntdll/def/ntdll.def
@@ -1,4 +1,4 @@
-; $Id: ntdll.def,v 1.95 2003/03/31 22:32:18 hyperion Exp $
+; $Id: ntdll.def,v 1.96 2003/04/02 00:06:00 hyperion Exp $
 ;
 ; ReactOS Operating System
 ;
@@ -527,8 +527,8 @@ RtlReleasePebLock@0
 RtlReleaseResource@4
 ;RtlRemoteCall
 ;RtlResetRtlTranslations
-;RtlRunDecodeUnicodeString
-;RtlRunEncodeUnicodeString
+RtlRunDecodeUnicodeString@8
+RtlRunEncodeUnicodeString@8
 RtlSecondsSince1970ToTime@8
 RtlSecondsSince1980ToTime@8
 RtlSelfRelativeToAbsoluteSD@44
diff --git a/reactos/lib/ntdll/def/ntdll.edf b/reactos/lib/ntdll/def/ntdll.edf
index fe584f14991..d6fbcc622a1 100644
--- a/reactos/lib/ntdll/def/ntdll.edf
+++ b/reactos/lib/ntdll/def/ntdll.edf
@@ -1,4 +1,4 @@
-; $Id: ntdll.edf,v 1.84 2003/03/31 22:32:18 hyperion Exp $
+; $Id: ntdll.edf,v 1.85 2003/04/02 00:06:00 hyperion Exp $
 ;
 ; ReactOS Operating System
 ;
@@ -526,8 +526,8 @@ RtlReleasePebLock=RtlReleasePebLock@0
 RtlReleaseResource=RtlReleaseResource@4
 ;RtlRemoteCall
 ;RtlResetRtlTranslations
-;RtlRunDecodeUnicodeString
-;RtlRunEncodeUnicodeString
+RtlRunDecodeUnicodeString=RtlRunDecodeUnicodeString@8
+RtlRunEncodeUnicodeString=RtlRunEncodeUnicodeString@8
 RtlSecondsSince1970ToTime=RtlSecondsSince1970ToTime@8
 RtlSecondsSince1980ToTime=RtlSecondsSince1980ToTime@8
 RtlSelfRelativeToAbsoluteSD=RtlSelfRelativeToAbsoluteSD@44
diff --git a/reactos/lib/ntdll/makefile b/reactos/lib/ntdll/makefile
index 920893c7983..73fb70f531f 100644
--- a/reactos/lib/ntdll/makefile
+++ b/reactos/lib/ntdll/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.77 2003/01/08 19:50:39 robd Exp $
+# $Id: makefile,v 1.78 2003/04/02 00:06:00 hyperion Exp $
 
 PATH_TO_TOP = ../..
 
@@ -35,7 +35,8 @@ RTL_OBJECTS = rtl/critical.o rtl/error.o rtl/heap.o rtl/largeint.o \
               rtl/access.o rtl/apc.o rtl/callback.o rtl/luid.o rtl/misc.o \
               rtl/registry.o rtl/exception.o rtl/intrlck.o rtl/resource.o \
               rtl/handle.o rtl/atom.o rtl/message.o rtl/timezone.o \
-      	      rtl/propvar.o rtl/security.o rtl/dos8dot3.o rtl/compress.o
+      	      rtl/propvar.o rtl/security.o rtl/dos8dot3.o rtl/compress.o \
+              rtl/encode.o
 
 STDIO_OBJECTS = stdio/sprintf.o stdio/swprintf.o