diff --git a/reactos/ReactOS-i386.rbuild b/reactos/ReactOS-i386.rbuild
index 897fadbfa2e..59f428471f4 100644
--- a/reactos/ReactOS-i386.rbuild
+++ b/reactos/ReactOS-i386.rbuild
@@ -36,15 +36,18 @@
 		<linkerflag>-section-alignment=0x1000</linkerflag>
 	</group>
 
-	<directory name="base">
-		<xi:include href="base/base.rbuild" />
-	</directory>
+	<if property="USERMODE" value="1">
+		<directory name="base">
+			<xi:include href="base/base.rbuild" />
+		</directory>
+		<directory name="dll">
+			<xi:include href="dll/dll.rbuild" />
+		</directory>
+	</if>
+
 	<directory name="boot">
 		<xi:include href="boot/boot.rbuild" />
 	</directory>
-	<directory name="dll">
-		<xi:include href="dll/dll.rbuild" />
-	</directory>
 	<directory name="drivers">
 		<xi:include href="drivers/drivers.rbuild" />
 	</directory>
diff --git a/reactos/subsystems/subsystems.rbuild b/reactos/subsystems/subsystems.rbuild
index 07933c920eb..64e61fe0712 100644
--- a/reactos/subsystems/subsystems.rbuild
+++ b/reactos/subsystems/subsystems.rbuild
@@ -1,11 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-<if property="ARCH" value="i386">
-	<directory name="ntvdm">
-		<xi:include href="ntvdm/ntvdm.rbuild" />
-	</directory>
-</if>
+	<if property="USERMODE" value="1">
+		<if property="ARCH" value="i386">
+			<directory name="ntvdm">
+			<xi:include href="ntvdm/ntvdm.rbuild" />
+			</directory>
+		</if>
+	</if>
+
 <directory name="win32">
 	<xi:include href="win32/win32.rbuild" />
 </directory>