diff --git a/reactos/boot/freeldr/freeldr/freeldr.rbuild b/reactos/boot/freeldr/freeldr/freeldr.rbuild
index 7e843510d13..0c7f598cf5e 100644
--- a/reactos/boot/freeldr/freeldr/freeldr.rbuild
+++ b/reactos/boot/freeldr/freeldr/freeldr.rbuild
@@ -11,7 +11,7 @@
freeldr_main
rossym
cmlib
- rtl_kmode
+ rtl
libcntpr
-static
-lgcc
diff --git a/reactos/boot/freeldr/freeldr/setupldr.rbuild b/reactos/boot/freeldr/freeldr/setupldr.rbuild
index 9ecae2e2285..acd2166b655 100644
--- a/reactos/boot/freeldr/freeldr/setupldr.rbuild
+++ b/reactos/boot/freeldr/freeldr/setupldr.rbuild
@@ -9,7 +9,7 @@
setupldr_main
rossym
cmlib
- rtl_kmode
+ rtl
libcntpr
-nostartfiles
-nostdlib
diff --git a/reactos/dll/ntdll/ntdll.rbuild b/reactos/dll/ntdll/ntdll.rbuild
index 149c37c9f78..4ad11dfb570 100644
--- a/reactos/dll/ntdll/ntdll.rbuild
+++ b/reactos/dll/ntdll/ntdll.rbuild
@@ -11,7 +11,7 @@
- rtl_umode
+ rtl
ntdllsys
libcntpr
pseh
diff --git a/reactos/lib/rtl/rtl-common.rbuild b/reactos/lib/rtl/rtl-common.rbuild
deleted file mode 100644
index fa23fcb3f15..00000000000
--- a/reactos/lib/rtl/rtl-common.rbuild
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-.
-
-
-
-
-
-
-
- debug_asm.S
- except_asm.s
- except.c
- random_asm.S
- rtlswap.S
- rtlmem.s
- res_asm.s
- thread.c
-
-
-
-
- debug.c
- except.c
- interlocked.c
- rtlmem.s
- rtlswap.s
- thread.c
-
-
-
-
- debug_asm.S
-
- mem.c
- memgen.c
-
-
- avl.c
- tree.c
-
-
-access.c
-acl.c
-actctx.c
-atom.c
-bitmap.c
-bootdata.c
-compress.c
-condvar.c
-crc32.c
-critical.c
-dbgbuffer.c
-debug.c
-dos8dot3.c
-encode.c
-env.c
-error.c
-exception.c
-generictable.c
-handle.c
-heap.c
-image.c
-interlck.c
-message.c
-largeint.c
-luid.c
-network.c
-nls.c
-path.c
-ppb.c
-process.c
-propvar.c
-qsort.c
-random.c
-rangelist.c
-registry.c
-res.c
-resource.c
-sd.c
-security.c
-slist.c
-sid.c
-sprintf.c
-srw.c
-swprintf.c
-splaytree.c
-thread.c
-time.c
-timezone.c
-timerqueue.c
-unicode.c
-unicodeprefix.c
-vectoreh.c
-version.c
-wait.c
-workitem.c
-rtl.h
diff --git a/reactos/lib/rtl/rtl.rbuild b/reactos/lib/rtl/rtl.rbuild
index e3bb0219b12..10edd510749 100644
--- a/reactos/lib/rtl/rtl.rbuild
+++ b/reactos/lib/rtl/rtl.rbuild
@@ -1,15 +1,100 @@
+
+
+
+
+
+
+ .
+
+
+ debug_asm.S
+ except_asm.s
+ except.c
+ random_asm.S
+ rtlswap.S
+ rtlmem.s
+ res_asm.s
+ thread.c
+
+
+
+
+ debug.c
+ except.c
+ interlocked.c
+ rtlmem.s
+ rtlswap.s
+ thread.c
+
+
+
+
+ debug_asm.S
+
+ mem.c
+ memgen.c
+
+
+ avl.c
+ tree.c
+
-
-
-
-
-
-
-
-
-
-
-
-
+ access.c
+ acl.c
+ actctx.c
+ atom.c
+ bitmap.c
+ bootdata.c
+ compress.c
+ condvar.c
+ crc32.c
+ critical.c
+ dbgbuffer.c
+ debug.c
+ dos8dot3.c
+ encode.c
+ env.c
+ error.c
+ exception.c
+ generictable.c
+ handle.c
+ heap.c
+ image.c
+ interlck.c
+ message.c
+ largeint.c
+ luid.c
+ network.c
+ nls.c
+ path.c
+ ppb.c
+ process.c
+ propvar.c
+ qsort.c
+ random.c
+ rangelist.c
+ registry.c
+ res.c
+ resource.c
+ sd.c
+ security.c
+ slist.c
+ sid.c
+ sprintf.c
+ srw.c
+ swprintf.c
+ splaytree.c
+ thread.c
+ time.c
+ timezone.c
+ timerqueue.c
+ unicode.c
+ unicodeprefix.c
+ vectoreh.c
+ version.c
+ wait.c
+ workitem.c
+ rtl.h
+
diff --git a/reactos/ntoskrnl/ntoskrnl-generic.rbuild b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
index c72712df415..2387103809a 100644
--- a/reactos/ntoskrnl/ntoskrnl-generic.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
@@ -26,7 +26,7 @@
hal
pseh
cmlib
- rtl_kmode
+ rtl
rossym
libcntpr
kdcom