From 90ce7d8b37c31dc728e49ac352bfce125445886b Mon Sep 17 00:00:00 2001
From: Daniel Reimer <reimer.daniel@freenet.de>
Date: Sat, 20 Feb 2010 12:41:24 +0000
Subject: [PATCH] XML Compliance Patch for the RBUILD Files. By Samuel Serapion

svn path=/trunk/; revision=45631
---
 .../cmdutils/hostname/hostname.rbuild         |   2 +-
 .../applications/cmdutils/xcopy/xcopy.rbuild  |   2 +-
 .../base/applications/magnify/magnify.rbuild  |   2 +-
 reactos/base/applications/mstsc/mstsc.rbuild  |   2 +-
 reactos/base/services/rpcss/rpcss.rbuild      |   2 +
 reactos/boot/armllb/armllb.rbuild             | 125 +++++++++---------
 reactos/dll/directx/quartz/quartz.rbuild      |   3 +-
 .../normaliz_redist/normaliz_redist.rbuild    |   2 +
 reactos/dll/shellext/shellext.rbuild          |   2 +-
 reactos/dll/win32/iccvid/iccvid.rbuild        |   3 +
 reactos/dll/win32/jscript/jscript.rbuild      |   3 +
 reactos/dll/win32/msacm32/msacm32.rbuild      |   4 +
 .../dll/win32/mshtml.tlb/mshtml.tlb.rbuild    |   3 +
 reactos/dll/win32/msxml3/msxml3.rbuild        |   3 +
 reactos/dll/win32/rpcrt4/rpcrt4.rbuild        |   4 +
 reactos/dll/win32/shdocvw/shdocvw.rbuild      |   1 +
 reactos/dll/win32/sndblst/sndblst.rbuild      |   6 +-
 .../dll/win32/stdole32.tlb/stdole32.rbuild    |   3 +
 reactos/dll/win32/sti/sti.rbuild              |   1 +
 reactos/dll/win32/t2embed/t2embed.rbuild      |   3 +
 reactos/drivers/base/kddll/kddll.rbuild       |   3 +-
 reactos/drivers/directx/directory.rbuild      |   2 +-
 reactos/drivers/directx/dxapi/dxapi.rbuild    |   2 +-
 reactos/drivers/directx/dxg/dxg.rbuild        |   2 +-
 reactos/drivers/directx/dxgthk/dxgthk.rbuild  |   2 +-
 reactos/drivers/video/font/bmfd/bmfd.rbuild   |   2 +-
 reactos/drivers/video/font/directory.rbuild   |   2 +-
 reactos/drivers/video/font/ftfd/ftfd.rbuild   |   2 +-
 .../audio/filters/splitter/splitter.rbuild    |   2 +-
 reactos/hal/halarm/directory.rbuild           |   2 +-
 reactos/hal/halarm/hal_generic.rbuild         |   2 +-
 reactos/hal/halx86/directory.rbuild           |   2 +-
 reactos/hal/halx86/hal_generic.rbuild         |   2 +-
 reactos/hal/halx86/hal_generic_mp.rbuild      |   2 +-
 reactos/hal/halx86/hal_generic_up.rbuild      |   2 +-
 reactos/include/psdk/psdk.rbuild              |   4 +-
 reactos/include/reactos/mc/mc.rbuild          |   2 +-
 reactos/lib/3rdparty/icu4ros/icu4ros.rbuild   |   2 +-
 .../libsamplerate/libsamplerate.rbuild        |   2 +-
 reactos/lib/atl/atl.rbuild                    |   2 +-
 reactos/lib/dnslib/dnslib.rbuild              |   2 +-
 reactos/lib/sdk/crt/crt.rbuild                |   2 +
 reactos/lib/tdilib/tdilib.rbuild              |   2 +-
 reactos/media/vgafonts/vgafonts.rbuild        |   2 +-
 reactos/tools/geninc/geninc.rbuild            |   2 +
 45 files changed, 136 insertions(+), 93 deletions(-)

diff --git a/reactos/base/applications/cmdutils/hostname/hostname.rbuild b/reactos/base/applications/cmdutils/hostname/hostname.rbuild
index ed747aac6f7..76a3f4084d7 100644
--- a/reactos/base/applications/cmdutils/hostname/hostname.rbuild
+++ b/reactos/base/applications/cmdutils/hostname/hostname.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="hostname" type="win32cui" installbase="system32" installname="hostname.exe">
 	<file>hostname.c</file>
 	<file>hostname.rc</file>
diff --git a/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild b/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild
index 2e3e1a9809d..437fa46bf63 100644
--- a/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild
+++ b/reactos/base/applications/cmdutils/xcopy/xcopy.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="xcopy" type="win32cui" installbase="system32" installname="xcopy.exe" unicode="true">
 	<include base="xcopy">.</include>
 	<library>wine</library>
diff --git a/reactos/base/applications/magnify/magnify.rbuild b/reactos/base/applications/magnify/magnify.rbuild
index c891a1e14d1..995437d3826 100644
--- a/reactos/base/applications/magnify/magnify.rbuild
+++ b/reactos/base/applications/magnify/magnify.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<!DOCTYPE project SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="magnify" type="win32gui" installbase="system32" installname="magnify.exe">
 	<include base="magnify">.</include>
 	<library>user32</library>
diff --git a/reactos/base/applications/mstsc/mstsc.rbuild b/reactos/base/applications/mstsc/mstsc.rbuild
index e2000ef0951..c8ed8e3e571 100644
--- a/reactos/base/applications/mstsc/mstsc.rbuild
+++ b/reactos/base/applications/mstsc/mstsc.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="mstsc" type="win32gui" installbase="system32" installname="mstsc.exe" unicode="yes">
 	<include base="mstsc">.</include>
 	<library>user32</library>
diff --git a/reactos/base/services/rpcss/rpcss.rbuild b/reactos/base/services/rpcss/rpcss.rbuild
index 5d89e489222..04e42f81de9 100644
--- a/reactos/base/services/rpcss/rpcss.rbuild
+++ b/reactos/base/services/rpcss/rpcss.rbuild
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
 <module name="rpcss" type="win32cui" installbase="system32" installname="rpcss.exe" unicode="yes">
 	<include base="rpcss">.</include>
 	<include base="rpcss" root="intermediate">.</include>
@@ -23,3 +24,4 @@
 <module name="rpcss_irot_server" type="rpcserver">
 	<file>irot.idl</file>
 </module>
+</group>
diff --git a/reactos/boot/armllb/armllb.rbuild b/reactos/boot/armllb/armllb.rbuild
index 5e254c43071..2566c788011 100644
--- a/reactos/boot/armllb/armllb.rbuild
+++ b/reactos/boot/armllb/armllb.rbuild
@@ -1,65 +1,66 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
-		<module name="armllb" type="bootloader" installbase=".." installname="armllb.bin">
-			<bootstrap installbase="loader" />
-			<library>libcntpr</library>
-			<library>rtl</library>
-			<include base="armllb">./inc</include>
-			<if property="SARCH" value="omap3">
-                <define name="_OMAP3_" />
-                <group linkerset="ld">
-                    <linkerflag>-Wl,--image-base=0x401FEFF8</linkerflag>
-    			</group>
-            </if>
-            <if property="SARCH" value="versatile">
-                <define name="_VERSATILE_" />
-                <group linkerset="ld">
-                    <linkerflag>-Wl,--image-base=0xF000</linkerflag>
-    			</group>
-            </if>
-            <file first="true">boot.s</file>
-            <file>main.c</file>
-            <file>crtsupp.c</file>
-	    <file>envir.c</file>
-	    <file>fw.c</file>
-            <directory name="hw">
-                <file>keyboard.c</file>
-                <file>serial.c</file>
-                <file>time.c</file>
-                <file>video.c</file>
-                <if property="SARCH" value="omap3">
-                    <directory name="omap3">
-                        <file>hwdata.c</file>
-                        <file>hwdss.c</file>
-                        <file>hwuart.c</file>
-                        <file>hwinfo.c</file>
-                        <file<hwinit.c</file>
-                    </directory>
-                </if>
-                <if property="SARCH" value="versatile">
-                    <directory name="versatile">
-                        <file>hwclcd.c</file>
-                        <file>hwkmi.c</file>
-                        <file>hwuart.c</file>
-                        <file>hwinfo.c</file>
-                        <file>hwinit.c</file>
-                    </directory>
-                </if>
-            </directory>
-            <directory name="os">
-                <file>loader.c</file>
-            </directory>
-            <group compilerset="gcc">
-                <compilerflag>-fms-extensions</compilerflag>
-                <compilerflag>-ffreestanding</compilerflag>
-    			<compilerflag>-fno-builtin</compilerflag>
-    			<compilerflag>-fno-inline</compilerflag>
-        		<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
-                <compilerflag>-Os</compilerflag>
-            </group>
-            <group linkerset="ld">
-                <linkerflag>-lgcc</linkerflag>
-            </group>
-		</module>
+<module name="armllb" type="bootloader" installbase=".." installname="armllb.bin">
+	<bootstrap installbase="loader" />
+	<library>libcntpr</library>
+	<library>rtl</library>
+	<include base="armllb">./inc</include>
+	<if property="SARCH" value="omap3">
+		<define name="_OMAP3_" />
+		<group linkerset="ld">
+			<linkerflag>-Wl,--image-base=0x401FEFF8</linkerflag>
+		</group>
+	</if>
+	<if property="SARCH" value="versatile">
+		<define name="_VERSATILE_" />
+		<group linkerset="ld">
+			<linkerflag>-Wl,--image-base=0xF000</linkerflag>
+		</group>
+	</if>
+	<file first="true">boot.s</file>
+	<file>main.c</file>
+	<file>crtsupp.c</file>
+	<file>envir.c</file>
+	<file>fw.c</file>
+	<directory name="hw">
+		<file>keyboard.c</file>
+		<file>serial.c</file>
+		<file>time.c</file>
+		<file>video.c</file>
+		<if property="SARCH" value="omap3">
+			<directory name="omap3">
+				<file>hwdata.c</file>
+				<file>hwdss.c</file>
+				<file>hwuart.c</file>
+				<file>hwinfo.c</file>
+				<file>hwinit.c</file>
+				</directory>
+		</if>
+		<if property="SARCH" value="versatile">
+			<directory name="versatile">
+				<file>hwclcd.c</file>
+				<file>hwkmi.c</file>
+				<file>hwuart.c</file>
+				<file>hwinfo.c</file>
+				<file>hwinit.c</file>
+			</directory>
+		</if>
+	</directory>
+	<directory name="os">
+		<file>loader.c</file>
+	</directory>
+	<group compilerset="gcc">
+		<compilerflag>-fms-extensions</compilerflag>
+		<compilerflag>-ffreestanding</compilerflag>
+		<compilerflag>-fno-builtin</compilerflag>
+		<compilerflag>-fno-inline</compilerflag>
+		<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+		<compilerflag>-Os</compilerflag>
+		
+	</group>
+	<group linkerset="ld">
+		<linkerflag>-lgcc</linkerflag>
+	</group>
+</module>
 </group>
diff --git a/reactos/dll/directx/quartz/quartz.rbuild b/reactos/dll/directx/quartz/quartz.rbuild
index 982a73dd425..b7097f6ff1f 100644
--- a/reactos/dll/directx/quartz/quartz.rbuild
+++ b/reactos/dll/directx/quartz/quartz.rbuild
@@ -60,4 +60,5 @@
 	<define name="REGISTER_PROXY_DLL"/>
 	<define name="PROXY_DELEGATION"/>
 	<file>quartz_strmif.idl</file>
-</module>
\ No newline at end of file
+</module>
+</group>
\ No newline at end of file
diff --git a/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild b/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
index 988e654da33..47d3958a939 100644
--- a/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
+++ b/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
 <module name="normaliz_redist_data" type="staticlibrary">
 	<include base="icu4ros">icu/source/common</include>
 	<directory name="data"><file>icudt38.c</file></directory>
@@ -16,3 +17,4 @@
 	<importlibrary definition="normaliz.def" />
 	<file>normaliz.cpp</file>
 </module>
+</group>
diff --git a/reactos/dll/shellext/shellext.rbuild b/reactos/dll/shellext/shellext.rbuild
index fc06870684d..95598f57bfc 100644
--- a/reactos/dll/shellext/shellext.rbuild
+++ b/reactos/dll/shellext/shellext.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<directory name="deskadp">
 		<xi:include href="deskadp/deskadp.rbuild" />
diff --git a/reactos/dll/win32/iccvid/iccvid.rbuild b/reactos/dll/win32/iccvid/iccvid.rbuild
index f780f8821a1..f27d0b02b59 100644
--- a/reactos/dll/win32/iccvid/iccvid.rbuild
+++ b/reactos/dll/win32/iccvid/iccvid.rbuild
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="iccvid" type="win32dll" baseaddress="${BASEADDRESS_ICCVID}" installbase="system32" installname="iccvid.dll" allowwarnings="true">
 	<importlibrary definition="iccvid.spec" />
 	<include base="iccvid">.</include>
@@ -8,3 +10,4 @@
 	<library>wine</library>
 	<library>user32</library>
 	<library>ntdll</library>
+</module>
diff --git a/reactos/dll/win32/jscript/jscript.rbuild b/reactos/dll/win32/jscript/jscript.rbuild
index 13c57540e60..f61a869af0b 100644
--- a/reactos/dll/win32/jscript/jscript.rbuild
+++ b/reactos/dll/win32/jscript/jscript.rbuild
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="jscript" type="win32dll" baseaddress="${BASEADDRESS_JSCRIPT}" installbase="system32" installname="jscript.dll" allowwarnings="true" crt="msvcrt">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
@@ -38,3 +40,4 @@
 	<dependency>stdole2</dependency>
 	<file>jsglobal.idl</file>
 </module>
+</group>
diff --git a/reactos/dll/win32/msacm32/msacm32.rbuild b/reactos/dll/win32/msacm32/msacm32.rbuild
index 656fc34ecc6..df9cb0340ef 100644
--- a/reactos/dll/win32/msacm32/msacm32.rbuild
+++ b/reactos/dll/win32/msacm32/msacm32.rbuild
@@ -1,3 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
 <module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes">
 	<importlibrary definition="msacm32.spec" />
 	<include base="msacm32">.</include>
@@ -18,3 +21,4 @@
 <directory name="msacm32.drv">
 	<xi:include href="msacm32.drv/msacm32.drv.rbuild" />
 </directory>
+</group>
diff --git a/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild b/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
index baa0154f7e9..f4567236801 100644
--- a/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
+++ b/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mshtml_tlb" type="embeddedtypelib">
 	<dependency>stdole2</dependency>
@@ -10,3 +12,4 @@
 	<define name="__WINESRC__" />
 	<file>rsrc.rc</file>
 </module>
+</group>
diff --git a/reactos/dll/win32/msxml3/msxml3.rbuild b/reactos/dll/win32/msxml3/msxml3.rbuild
index a62b849b5d5..165815e47bc 100644
--- a/reactos/dll/win32/msxml3/msxml3.rbuild
+++ b/reactos/dll/win32/msxml3/msxml3.rbuild
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msxml3" type="win32dll" baseaddress="${BASEADDRESS_MSXML3}" installbase="system32" installname="msxml3.dll" allowwarnings="true" crt="msvcrt">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
@@ -62,3 +64,4 @@
 	<dependency>stdole2</dependency>
 	<file>msxml3_v1.idl</file>
 </module>
+</group>
diff --git a/reactos/dll/win32/rpcrt4/rpcrt4.rbuild b/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
index ad1008bed48..10d83df2f6f 100644
--- a/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
+++ b/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
@@ -1,3 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
 <module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32" installname="rpcrt4.dll" allowwarnings="true" crt="msvcrt">
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="rpcrt4.spec" />
@@ -43,3 +46,4 @@
 <module name="rpcrt4_epm_client" type="rpcclient">
 	<file>epm.idl</file>
 </module>
+</group>
diff --git a/reactos/dll/win32/shdocvw/shdocvw.rbuild b/reactos/dll/win32/shdocvw/shdocvw.rbuild
index 1649a5d125d..47c57a97d25 100644
--- a/reactos/dll/win32/shdocvw/shdocvw.rbuild
+++ b/reactos/dll/win32/shdocvw/shdocvw.rbuild
@@ -45,3 +45,4 @@
 	<dependency>stdole2</dependency>
 	<file>shdocvw_v1.idl</file>
 </module>
+</group>
diff --git a/reactos/dll/win32/sndblst/sndblst.rbuild b/reactos/dll/win32/sndblst/sndblst.rbuild
index 877b9564026..b613c17d87a 100644
--- a/reactos/dll/win32/sndblst/sndblst.rbuild
+++ b/reactos/dll/win32/sndblst/sndblst.rbuild
@@ -1,5 +1,7 @@
-<!-- Temporarily compiling as a CUI app for testing purposes */
-<!--module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes"-->
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!-- Temporarily compiling as a CUI app for testing purposes */ -->
+<!-- module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes"-->
 <module name="sndblst" type="win32dll" installbase="system32" installname="sndblst.dll" unicode="yes">
 	<importlibrary definition="sndblst.spec" />
     <include base="ReactOS">include/reactos/libs/sound</include>
diff --git a/reactos/dll/win32/stdole32.tlb/stdole32.rbuild b/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
index 8dab92c98ca..5d4c0018851 100644
--- a/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
+++ b/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="std_ole_v1" type="embeddedtypelib">
 	<include base="std_ole_v1">.</include>
@@ -14,3 +16,4 @@
 	<define name="__WINESRC__" />
 	<file>rsrc.rc</file>
 </module>
+</group>
diff --git a/reactos/dll/win32/sti/sti.rbuild b/reactos/dll/win32/sti/sti.rbuild
index d38e7b2863f..592c5f123af 100644
--- a/reactos/dll/win32/sti/sti.rbuild
+++ b/reactos/dll/win32/sti/sti.rbuild
@@ -15,3 +15,4 @@
 	<library>ole32</library>
 	<library>ntdll</library>
 </module>
+</group>
diff --git a/reactos/dll/win32/t2embed/t2embed.rbuild b/reactos/dll/win32/t2embed/t2embed.rbuild
index 76d948055d8..86709f67ea9 100644
--- a/reactos/dll/win32/t2embed/t2embed.rbuild
+++ b/reactos/dll/win32/t2embed/t2embed.rbuild
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="t2embed" type="win32dll" baseaddress="${BASEADDRESS_T2EMBED}" installbase="system32" installname="t2embed.dll" unicode="yes">
 	<importlibrary definition="t2embed.spec" />
 	<include base="t2embed">.</include>
@@ -9,3 +11,4 @@
 	<library>wine</library>
 	<file>t2embed.c</file>
 	<file>t2embed.rc</file>
+</module>
diff --git a/reactos/drivers/base/kddll/kddll.rbuild b/reactos/drivers/base/kddll/kddll.rbuild
index 3fca485e8e7..6e01f2fa2b3 100644
--- a/reactos/drivers/base/kddll/kddll.rbuild
+++ b/reactos/drivers/base/kddll/kddll.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-
+<group>
 <module name="kdlib" type="staticlibrary">
 	<include base="kdlib">.</include>
 	<library>ntoskrnl</library>
@@ -22,3 +22,4 @@
 	<library>kdserial</library>
 	<file>kdcom.c</file>
 </module>
+</group>
diff --git a/reactos/drivers/directx/directory.rbuild b/reactos/drivers/directx/directory.rbuild
index 850deb34bf1..04d6ae9e340 100644
--- a/reactos/drivers/directx/directory.rbuild
+++ b/reactos/drivers/directx/directory.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 <directory name="dxapi">
 	<xi:include href="dxapi/dxapi.rbuild" />
diff --git a/reactos/drivers/directx/dxapi/dxapi.rbuild b/reactos/drivers/directx/dxapi/dxapi.rbuild
index b7bd1d029f7..010702c2193 100644
--- a/reactos/drivers/directx/dxapi/dxapi.rbuild
+++ b/reactos/drivers/directx/dxapi/dxapi.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dxapi" type="kernelmodedriver"
 installbase="system32/drivers" installname="dxapi.sys">
 	<importlibrary definition="dxapi.spec" />
diff --git a/reactos/drivers/directx/dxg/dxg.rbuild b/reactos/drivers/directx/dxg/dxg.rbuild
index 9f0cd8181ef..3303dc5d488 100644
--- a/reactos/drivers/directx/dxg/dxg.rbuild
+++ b/reactos/drivers/directx/dxg/dxg.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dxg" type="kernelmodedriver" installbase="system32/drivers" installname="dxg.sys">
 	<importlibrary definition="dxg.spec" />
 	<include base="dxg">.</include>
diff --git a/reactos/drivers/directx/dxgthk/dxgthk.rbuild b/reactos/drivers/directx/dxgthk/dxgthk.rbuild
index 4bf33cbac9a..924c3c94bde 100644
--- a/reactos/drivers/directx/dxgthk/dxgthk.rbuild
+++ b/reactos/drivers/directx/dxgthk/dxgthk.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dxgthk" type="kernelmodedriver"
 installbase="system32/drivers" installname="dxgthk.sys">
 	<importlibrary definition="dxgthk.spec" />
diff --git a/reactos/drivers/video/font/bmfd/bmfd.rbuild b/reactos/drivers/video/font/bmfd/bmfd.rbuild
index 964548b57c1..2f424df95b8 100644
--- a/reactos/drivers/video/font/bmfd/bmfd.rbuild
+++ b/reactos/drivers/video/font/bmfd/bmfd.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="bmfd" type="kernelmodedriver" entrypoint="BmfdEnableDriver@12" installbase="system32" installname="bmfd.dll" crt="static">
 	<library>win32k</library>
 	<library>libcntpr</library>
diff --git a/reactos/drivers/video/font/directory.rbuild b/reactos/drivers/video/font/directory.rbuild
index f7e7f3cef04..2ed97e32ca0 100644
--- a/reactos/drivers/video/font/directory.rbuild
+++ b/reactos/drivers/video/font/directory.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<directory name="bmfd">
 		<xi:include href="bmfd/bmfd.rbuild" />
diff --git a/reactos/drivers/video/font/ftfd/ftfd.rbuild b/reactos/drivers/video/font/ftfd/ftfd.rbuild
index 869964c701f..34d822af2a7 100644
--- a/reactos/drivers/video/font/ftfd/ftfd.rbuild
+++ b/reactos/drivers/video/font/ftfd/ftfd.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="ftfd" type="kernelmodedll" entrypoint="FtfdEnableDriver@12" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="ftfd.dll" crt="libcntpr">
 	<importlibrary definition="freetype.def" />
 	<include base="freetype">include</include>
diff --git a/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild b/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild
index 635ff0070f7..299df5e68e7 100644
--- a/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild
+++ b/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../../../tools/rbuild/project.dtd">
 <module name="splitter" type="kernelmodedriver" installbase="system32/drivers" installname="splitter.sys">
 	<library>ntoskrnl</library>
 	<library>ks</library>
diff --git a/reactos/hal/halarm/directory.rbuild b/reactos/hal/halarm/directory.rbuild
index 72cfe7e742c..62b91a39624 100644
--- a/reactos/hal/halarm/directory.rbuild
+++ b/reactos/hal/halarm/directory.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 
 	<xi:include href="hal_generic.rbuild" />
diff --git a/reactos/hal/halarm/hal_generic.rbuild b/reactos/hal/halarm/hal_generic.rbuild
index b46c036742e..b8619077e38 100644
--- a/reactos/hal/halarm/hal_generic.rbuild
+++ b/reactos/hal/halarm/hal_generic.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
 	<module name="hal_generic" type="objectlibrary">
 		<include>include</include>
diff --git a/reactos/hal/halx86/directory.rbuild b/reactos/hal/halx86/directory.rbuild
index e10afdc1dc9..81a989facea 100644
--- a/reactos/hal/halx86/directory.rbuild
+++ b/reactos/hal/halx86/directory.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 
 	<xi:include href="hal_generic.rbuild" />
diff --git a/reactos/hal/halx86/hal_generic.rbuild b/reactos/hal/halx86/hal_generic.rbuild
index a8c64ac7bbb..484f1ea5362 100644
--- a/reactos/hal/halx86/hal_generic.rbuild
+++ b/reactos/hal/halx86/hal_generic.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
 	<module name="hal_generic" type="objectlibrary">
 		<include>include</include>
diff --git a/reactos/hal/halx86/hal_generic_mp.rbuild b/reactos/hal/halx86/hal_generic_mp.rbuild
index 78675743521..63c39120ee5 100644
--- a/reactos/hal/halx86/hal_generic_mp.rbuild
+++ b/reactos/hal/halx86/hal_generic_mp.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
 	<module name="hal_generic_mp" type="objectlibrary">
 		<include>include</include>
diff --git a/reactos/hal/halx86/hal_generic_up.rbuild b/reactos/hal/halx86/hal_generic_up.rbuild
index eb48c9e895a..b2f605aea47 100644
--- a/reactos/hal/halx86/hal_generic_up.rbuild
+++ b/reactos/hal/halx86/hal_generic_up.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
 	<module name="hal_generic_up" type="objectlibrary">
 		<include>include</include>
diff --git a/reactos/include/psdk/psdk.rbuild b/reactos/include/psdk/psdk.rbuild
index 3be7924f692..5f83162a129 100644
--- a/reactos/include/psdk/psdk.rbuild
+++ b/reactos/include/psdk/psdk.rbuild
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
+<group>
 <module name="psdk" type="idlheader">
 	<file>activaut.idl</file>
 	<file>activdbg.idl</file>
@@ -66,4 +67,5 @@
 </module>
 <module name="stdole2" type="embeddedtypelib">
 	<file>stdole2.idl</file>
-</module>
\ No newline at end of file
+</module>
+</group>
\ No newline at end of file
diff --git a/reactos/include/reactos/mc/mc.rbuild b/reactos/include/reactos/mc/mc.rbuild
index 406e9e67864..eb06ec499ca 100644
--- a/reactos/include/reactos/mc/mc.rbuild
+++ b/reactos/include/reactos/mc/mc.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 	<module name="ntstatus" type="messageheader">
 		<file>ntstatus.mc</file>
diff --git a/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild b/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild
index 93e7cd8d94d..4a2cc237168 100644
--- a/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild
+++ b/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="icu4ros" type="staticlibrary">
 	<define name="U_STATIC_IMPLEMENTATION" />
 	<define name="U_HAVE_INTTYPES_H" />
diff --git a/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild b/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild
index 1e71ddc1b12..ce52f5871dd 100644
--- a/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild
+++ b/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="libsamplerate" type="staticlibrary" allowwarnings="true">
 	<define name="HAVE_LRINT" />
 	<define name="HAVE_LRINTF" />
diff --git a/reactos/lib/atl/atl.rbuild b/reactos/lib/atl/atl.rbuild
index 33eb6a54492..7193d4cbe4c 100644
--- a/reactos/lib/atl/atl.rbuild
+++ b/reactos/lib/atl/atl.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="atlnew" type="staticlibrary">
 	<include base="atlnew">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/dnslib/dnslib.rbuild b/reactos/lib/dnslib/dnslib.rbuild
index 77806231ca6..6186055c04f 100644
--- a/reactos/lib/dnslib/dnslib.rbuild
+++ b/reactos/lib/dnslib/dnslib.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="dnslib" type="staticlibrary" unicode="yes">
 	<include base="dnslib">inc</include>
 	<file>addr.c</file>
diff --git a/reactos/lib/sdk/crt/crt.rbuild b/reactos/lib/sdk/crt/crt.rbuild
index 73a88a029e4..7a6026cfc3d 100644
--- a/reactos/lib/sdk/crt/crt.rbuild
+++ b/reactos/lib/sdk/crt/crt.rbuild
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
 <module name="chkstk" type="staticlibrary">
 	<directory name="except">
 		<if property="ARCH" value="i386">
@@ -490,3 +491,4 @@
 		<file>undname.c</file>
 	</directory>
 </module>
+</group>
diff --git a/reactos/lib/tdilib/tdilib.rbuild b/reactos/lib/tdilib/tdilib.rbuild
index 6c8cc60c99d..ec06f02285e 100644
--- a/reactos/lib/tdilib/tdilib.rbuild
+++ b/reactos/lib/tdilib/tdilib.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="tdilib" type="staticlibrary">
 	<include base="iphlpapi">.</include>
 	<include base="tdilib">.</include>
diff --git a/reactos/media/vgafonts/vgafonts.rbuild b/reactos/media/vgafonts/vgafonts.rbuild
index 983ea860c00..cae138aa26f 100644
--- a/reactos/media/vgafonts/vgafonts.rbuild
+++ b/reactos/media/vgafonts/vgafonts.rbuild
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="vgafonts" type="cabinet">
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<file>437-8x8.bin</file>
diff --git a/reactos/tools/geninc/geninc.rbuild b/reactos/tools/geninc/geninc.rbuild
index f152a7be116..9d2be75348d 100644
--- a/reactos/tools/geninc/geninc.rbuild
+++ b/reactos/tools/geninc/geninc.rbuild
@@ -1,8 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
+<group>
 <module name="geninc" type="buildtool">
 	<file>geninc.c</file>
 </module>
 <module name="geninc_data" type="bootloader" installname="geninc_data.bin">
 	<file>data.c</file>
 </module>
+</group>