diff --git a/reactos/include/funcs.h b/reactos/include/funcs.h
index 80137f32201..24d73b73b25 100644
--- a/reactos/include/funcs.h
+++ b/reactos/include/funcs.h
@@ -2087,10 +2087,12 @@ NTSTATUS  STDCALL RtlWalkHeap( HANDLE heap, PVOID entry_ptr );
 NTSTATUS STDCALL LdrLockLoaderLock(ULONG flags, ULONG *result, ULONG *magic);
 NTSTATUS STDCALL LdrUnlockLoaderLock(ULONG flags, ULONG magic);
 
-NTSTATUS  STDCALL RtlDuplicateUnicodeString(
-    int add_nul,
-    const UNICODE_STRING *source,
-    UNICODE_STRING *destination);
+NTSTATUS STDCALL
+RtlDuplicateUnicodeString(
+   INT AddNull,
+   IN PUNICODE_STRING SourceString,
+   PUNICODE_STRING DestinationString);
+
 NTSTATUS  STDCALL RtlFindCharInUnicodeString(
     int flags,
     const UNICODE_STRING *main_str,
diff --git a/reactos/lib/rtl/access.c b/reactos/lib/rtl/access.c
index aecef3f376a..e97440a54df 100644
--- a/reactos/lib/rtl/access.c
+++ b/reactos/lib/rtl/access.c
@@ -9,8 +9,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/acl.c b/reactos/lib/rtl/acl.c
index 75b0e631a0a..15b40251739 100644
--- a/reactos/lib/rtl/acl.c
+++ b/reactos/lib/rtl/acl.c
@@ -11,8 +11,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/bit.c b/reactos/lib/rtl/bit.c
index d43d2278f23..b5aa88debe2 100644
--- a/reactos/lib/rtl/bit.c
+++ b/reactos/lib/rtl/bit.c
@@ -26,7 +26,10 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "rtl.h"
+
+#define NDEBUG
+#include <debug.h>
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/lib/rtl/bitmap.c b/reactos/lib/rtl/bitmap.c
index c98583e0e4b..da5f115ecf9 100644
--- a/reactos/lib/rtl/bitmap.c
+++ b/reactos/lib/rtl/bitmap.c
@@ -28,7 +28,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/bootdata.c b/reactos/lib/rtl/bootdata.c
index 79a2fe15455..1002b1f9de1 100644
--- a/reactos/lib/rtl/bootdata.c
+++ b/reactos/lib/rtl/bootdata.c
@@ -24,7 +24,7 @@
  * FILE:              lib/rtl/bootdata.c
  */
 
-#include <ddk/ntddk.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/compress.c b/reactos/lib/rtl/compress.c
index 438c5dd996e..ac22701db2d 100644
--- a/reactos/lib/rtl/compress.c
+++ b/reactos/lib/rtl/compress.c
@@ -27,12 +27,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* MACROS *******************************************************************/
 
 #define COMPRESSION_FORMAT_MASK  0x00FF
diff --git a/reactos/lib/rtl/dos8dot3.c b/reactos/lib/rtl/dos8dot3.c
index 8e9da5edb33..896b30d0070 100644
--- a/reactos/lib/rtl/dos8dot3.c
+++ b/reactos/lib/rtl/dos8dot3.c
@@ -27,8 +27,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntos/minmax.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/encode.c b/reactos/lib/rtl/encode.c
index c9aac07d711..3e66b6899a4 100644
--- a/reactos/lib/rtl/encode.c
+++ b/reactos/lib/rtl/encode.c
@@ -12,9 +12,10 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "rtl.h"
 
-#include <ntdll/ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* FUNCTIONS ***************************************************************/
 
diff --git a/reactos/lib/rtl/env.c b/reactos/lib/rtl/env.c
index b12b7186021..4438eb2fe39 100644
--- a/reactos/lib/rtl/env.c
+++ b/reactos/lib/rtl/env.c
@@ -11,14 +11,10 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <napi/teb.h>
-#include <ntos/minmax.h>
-#include <string.h>
+#include "rtl.h"
 
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <debug.h>
 
 PPEB STDCALL RtlpCurrentPeb(VOID);
 /* FUNCTIONS *****************************************************************/
diff --git a/reactos/lib/rtl/error.c b/reactos/lib/rtl/error.c
index 3e7541bc42b..e5477bf67a4 100644
--- a/reactos/lib/rtl/error.c
+++ b/reactos/lib/rtl/error.c
@@ -19,19 +19,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <winerror.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#ifndef HIWORD
-#define HIWORD(l) ((WORD)(((DWORD)(l) >> 16) & 0xFFFF))
-#endif
-#ifndef LOWORD
-#define LOWORD(l) ((WORD)(l))
-#endif
-
 /* TYPES *******************************************************************/
 
 typedef struct _ERROR_TABLE
diff --git a/reactos/lib/rtl/exception.c b/reactos/lib/rtl/exception.c
index 86a23208e0c..a7758b3bc9e 100644
--- a/reactos/lib/rtl/exception.c
+++ b/reactos/lib/rtl/exception.c
@@ -15,10 +15,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <string.h>
-#include <napi/teb.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/generictable.c b/reactos/lib/rtl/generictable.c
index c38c416d077..3fa4855eda2 100644
--- a/reactos/lib/rtl/generictable.c
+++ b/reactos/lib/rtl/generictable.c
@@ -24,7 +24,7 @@
  * FILE:              lib/rtl/genertictbl.c
  */
 
-#include <ddk/ntddk.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/heap.c b/reactos/lib/rtl/heap.c
index 9bd590d7eff..e2f38391bfa 100644
--- a/reactos/lib/rtl/heap.c
+++ b/reactos/lib/rtl/heap.c
@@ -12,11 +12,7 @@
  * require it.
  */
 
-#include <string.h>
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <ntos/heap.h>
-#include <ntos/minmax.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
@@ -29,7 +25,6 @@
 #define TRACE_ON(x) (1)
 #endif
 
-
 static RTL_CRITICAL_SECTION RtlpProcessHeapsListLock;
 
 
diff --git a/reactos/lib/rtl/image.c b/reactos/lib/rtl/image.c
index b7aa7453cfe..c1f5489aa79 100644
--- a/reactos/lib/rtl/image.c
+++ b/reactos/lib/rtl/image.c
@@ -9,11 +9,10 @@
  *                  17/03/2000 Created
  */
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"
 
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <debug.h>
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/lib/rtl/largeint.c b/reactos/lib/rtl/largeint.c
index e3acd16ba7e..8f8e13b54f8 100644
--- a/reactos/lib/rtl/largeint.c
+++ b/reactos/lib/rtl/largeint.c
@@ -11,7 +11,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/luid.c b/reactos/lib/rtl/luid.c
index 77b75db9a02..133b54018ca 100644
--- a/reactos/lib/rtl/luid.c
+++ b/reactos/lib/rtl/luid.c
@@ -11,8 +11,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/mem.c b/reactos/lib/rtl/mem.c
index 6b9ace31886..857ebb416d1 100644
--- a/reactos/lib/rtl/mem.c
+++ b/reactos/lib/rtl/mem.c
@@ -12,8 +12,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <string.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/network.c b/reactos/lib/rtl/network.c
index 310f2dc2dd3..c0b7bb9eb11 100644
--- a/reactos/lib/rtl/network.c
+++ b/reactos/lib/rtl/network.c
@@ -24,8 +24,7 @@
  * FILE:              lib/rtl/network.c
  */
 
-#include <ddk/ntddk.h>
-#include <stdio.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/nls.c b/reactos/lib/rtl/nls.c
index 59a11c2e238..05cfa83d16f 100644
--- a/reactos/lib/rtl/nls.c
+++ b/reactos/lib/rtl/nls.c
@@ -13,7 +13,7 @@
  */
 
 
-#include <ddk/ntddk.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/ppb.c b/reactos/lib/rtl/ppb.c
index c9232441534..a1aabe0871c 100644
--- a/reactos/lib/rtl/ppb.c
+++ b/reactos/lib/rtl/ppb.c
@@ -11,14 +11,10 @@
 
 /* INCLUDES ****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/ldr.h>
-#include <napi/teb.h>
-#include <ntdll/base.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"
 
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <debug.h>
 
 /* MACROS ****************************************************************/
 
diff --git a/reactos/lib/rtl/process.c b/reactos/lib/rtl/process.c
index ff27c211913..5c44ba9eebf 100644
--- a/reactos/lib/rtl/process.c
+++ b/reactos/lib/rtl/process.c
@@ -11,14 +11,10 @@
 
 /* INCLUDES ****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <napi/i386/segment.h>
-#include <ntdll/ldr.h>
-#include <ntdll/base.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"
 
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <debug.h>
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/lib/rtl/random.c b/reactos/lib/rtl/random.c
index f1aba625911..8134141a5b1 100644
--- a/reactos/lib/rtl/random.c
+++ b/reactos/lib/rtl/random.c
@@ -26,8 +26,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/registry.c b/reactos/lib/rtl/registry.c
index 934824e3d37..3f3f5e2ca44 100644
--- a/reactos/lib/rtl/registry.c
+++ b/reactos/lib/rtl/registry.c
@@ -18,12 +18,10 @@
 /* INCLUDES ****************************************************************/
 
 #define __NTDRIVER__
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <ntos/minmax.h>
+#include "rtl.h"
 
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <debug.h>
 
 
 /* FUNCTIONS ***************************************************************/
diff --git a/reactos/lib/rtl/rtl.h b/reactos/lib/rtl/rtl.h
new file mode 100644
index 00000000000..2abc9fd51a0
--- /dev/null
+++ b/reactos/lib/rtl/rtl.h
@@ -0,0 +1,33 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS System Libraries
+ * FILE:            lib/rtl/rtl.h
+ * PURPOSE:         Run-Time Libary Header
+ * PROGRAMMER:      Alex Ionescu
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <ddk/ntddk.h>
+#include <windows.h>
+#include <ntdll/rtl.h>
+#include <napi/teb.h>
+#include <ntos/minmax.h>
+#include <string.h>
+#include <napi/i386/segment.h>
+#include <ntdll/ldr.h>
+#include <ntdll/base.h>
+#include <ntdll/rtl.h>
+#include <rosrtl/thread.h>
+#include <winerror.h>
+#include <stdio.h>
+
+#define ROUNDUP(a,b)    ((((a)+(b)-1)/(b))*(b))
+#ifndef HIWORD
+#define HIWORD(l) ((WORD)(((DWORD)(l) >> 16) & 0xFFFF))
+#endif
+#ifndef LOWORD
+#define LOWORD(l) ((WORD)(l))
+#endif
+
+/* EOF */
diff --git a/reactos/lib/rtl/sd.c b/reactos/lib/rtl/sd.c
index 3ec3abbb62e..b18423ce65b 100644
--- a/reactos/lib/rtl/sd.c
+++ b/reactos/lib/rtl/sd.c
@@ -11,9 +11,10 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#include "rtl.h"
 
-#include <ntdll/ntdll.h>
+#define NDEBUG
+#include <debug.h>
 
 /* FUNCTIONS ***************************************************************/
 
diff --git a/reactos/lib/rtl/security.c b/reactos/lib/rtl/security.c
index c0183c2b1d1..fc199da11f7 100644
--- a/reactos/lib/rtl/security.c
+++ b/reactos/lib/rtl/security.c
@@ -9,8 +9,7 @@
  *                  21/11/2001 Created
  */
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/sid.c b/reactos/lib/rtl/sid.c
index 1194d3adcb7..6d70c1c6f6a 100644
--- a/reactos/lib/rtl/sid.c
+++ b/reactos/lib/rtl/sid.c
@@ -10,12 +10,8 @@
  */
 
 /* INCLUDES *****************************************************************/
-
 #define __NTDRIVER__
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <string.h>
-
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/splaytree.c b/reactos/lib/rtl/splaytree.c
index a466d6cf718..795bdd768b6 100644
--- a/reactos/lib/rtl/splaytree.c
+++ b/reactos/lib/rtl/splaytree.c
@@ -24,7 +24,7 @@
  * FILE:              lib/rtl/splaytree.c
  */
 
-#include <ddk/ntddk.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/thread.c b/reactos/lib/rtl/thread.c
index 50780f010c8..2f2314d0c23 100644
--- a/reactos/lib/rtl/thread.c
+++ b/reactos/lib/rtl/thread.c
@@ -18,10 +18,10 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ntos.h>
+#include "rtl.h"
 
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <debug.h>
 
 /* FUNCTIONS ***************************************************************/
 
diff --git a/reactos/lib/rtl/time.c b/reactos/lib/rtl/time.c
index 3e5d54364d8..3a57256c9ed 100644
--- a/reactos/lib/rtl/time.c
+++ b/reactos/lib/rtl/time.c
@@ -12,8 +12,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/timezone.c b/reactos/lib/rtl/timezone.c
index fc7fe0c3a2f..946c8d7df1c 100644
--- a/reactos/lib/rtl/timezone.c
+++ b/reactos/lib/rtl/timezone.c
@@ -11,15 +11,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntos/registry.h>
-#include <ntos/time.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/lib/rtl/unicode.c b/reactos/lib/rtl/unicode.c
index 483a5793dc9..b64d4893196 100644
--- a/reactos/lib/rtl/unicode.c
+++ b/reactos/lib/rtl/unicode.c
@@ -19,16 +19,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
-
 #define __NTDRIVER__
-#include <ddk/ntddk.h>
-
-#include <ntdll/rtl.h>
-
-#include <ntos/minmax.h>
-#define __NO_CTYPE_INLINES
-#include <ctype.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/unicodeprefix.c b/reactos/lib/rtl/unicodeprefix.c
index acb6f4e0508..b1db39042d0 100644
--- a/reactos/lib/rtl/unicodeprefix.c
+++ b/reactos/lib/rtl/unicodeprefix.c
@@ -24,7 +24,7 @@
  * FILE:              lib/rtl/unicodeprfx.c
  */
 
-#include <ddk/ntddk.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/rtl/version.c b/reactos/lib/rtl/version.c
index 49920db6bec..4ce738fd5dc 100644
--- a/reactos/lib/rtl/version.c
+++ b/reactos/lib/rtl/version.c
@@ -29,11 +29,8 @@
  */
 
 /* INCLUDES *****************************************************************/
-
 #define __USE_W32API
-
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"
 
 #define NDEBUG
 #include <debug.h>