diff --git a/reactos/ReactOS.rbuild b/reactos/ReactOS.rbuild
index 88b6b531fa5..ac3ecc28917 100644
--- a/reactos/ReactOS.rbuild
+++ b/reactos/ReactOS.rbuild
@@ -90,10 +90,8 @@
-
diff --git a/reactos/lib/lib.rbuild b/reactos/lib/lib.rbuild
index 2db8bf1b2f5..d0ef34d9016 100644
--- a/reactos/lib/lib.rbuild
+++ b/reactos/lib/lib.rbuild
@@ -1,6 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/reactos/subsys/subsys.rbuild b/reactos/subsys/subsys.rbuild
index eee2e6a5734..9dcb86926cd 100644
--- a/reactos/subsys/subsys.rbuild
+++ b/reactos/subsys/subsys.rbuild
@@ -1,19 +1,10 @@
-
-
-
-
-
-
-
-
-
diff --git a/reactos/subsys/system/directory.xml b/reactos/subsys/system/directory.xml
index b8c8b107f4f..a21fafb9092 100644
--- a/reactos/subsys/system/directory.xml
+++ b/reactos/subsys/system/directory.xml
@@ -1,10 +1,41 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/reactos/subsystems/subsystems.rbuild b/reactos/subsystems/subsystems.rbuild
new file mode 100644
index 00000000000..75d2fb36936
--- /dev/null
+++ b/reactos/subsystems/subsystems.rbuild
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/reactos/subsystems/win32/csrss/csrss.xml b/reactos/subsystems/win32/csrss/csrss.rbuild
similarity index 100%
rename from reactos/subsystems/win32/csrss/csrss.xml
rename to reactos/subsystems/win32/csrss/csrss.rbuild
diff --git a/reactos/subsystems/win32/win32.rbuild b/reactos/subsystems/win32/win32.rbuild
new file mode 100644
index 00000000000..cde93f78e98
--- /dev/null
+++ b/reactos/subsystems/win32/win32.rbuild
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/reactos/subsystems/win32/win32k/win32k.xml b/reactos/subsystems/win32/win32k/win32k.rbuild
similarity index 100%
rename from reactos/subsystems/win32/win32k/win32k.xml
rename to reactos/subsystems/win32/win32k/win32k.rbuild
diff --git a/reactos/tools/gendib/gendib.mak b/reactos/tools/gendib/gendib.mak
index 8eb27607960..697d8ba2821 100644
--- a/reactos/tools/gendib/gendib.mak
+++ b/reactos/tools/gendib/gendib.mak
@@ -41,7 +41,7 @@ gendib_clean:
-@$(rm) $(GENDIB_TARGET) $(GENDIB_OBJECTS) 2>$(NUL)
clean: gendib_clean
-GENDIB_DIB_DIR = subsys$(SEP)win32k$(SEP)dib
+GENDIB_DIB_DIR = subsystems$(SEP)win32$(SEP)win32k$(SEP)dib
GENDIB_DIB_FILES = \
$(GENDIB_DIB_DIR)$(SEP)dib32gen.c \
diff --git a/reactos/tools/nci/nci.mak b/reactos/tools/nci/nci.mak
index cc9db8a83a4..f98e801a519 100644
--- a/reactos/tools/nci/nci.mak
+++ b/reactos/tools/nci/nci.mak
@@ -43,7 +43,7 @@ clean: nci_clean
# WIN32K.SYS
WIN32K_SVC_DB = $(NCI_BASE_)w32ksvc.db
-WIN32K_SERVICE_TABLE = subsys$(SEP)win32k$(SEP)include$(SEP)napi.h
+WIN32K_SERVICE_TABLE = subsystems$(SEP)win32$(SEP)win32k$(SEP)include$(SEP)napi.h
WIN32K_GDI_STUBS = dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)win32k.S
WIN32K_USER_STUBS = dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)win32k.S