diff --git a/reactos/baseaddress.xml b/reactos/baseaddress.xml
index 99a0fdd3161..cd44da4aa71 100644
--- a/reactos/baseaddress.xml
+++ b/reactos/baseaddress.xml
@@ -1,89 +1,100 @@
-<property name="BASEADDRESS_DINPUT8" value="0x00400000" />
-<property name="BASEADDRESS_DXDIAGN" value="0x00400000" />
 <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" />
-<property name="BASEADDRESS_SECURE32" value="0x10000000" />
 <property name="BASEADDRESS_DEVENUM" value="0x35680000" />
-<property name="BASEADDRESS_DSOUND" value="0x50000000" />
-<property name="BASEADDRESS_GLU32" value="0x50000000" />
-<property name="BASEADDRESS_OPENGL32" value="0x50000000" />
-<property name="BASEADDRESS_SLAYER" value="0x5C7E0000" />
 <property name="BASEADDRESS_DINPUT" value="0x5F580000" />
 <property name="BASEADDRESS_TIMEDATE" value="0x64DA0000" />
 <property name="BASEADDRESS_SYSDM" value="0x64DD0000" />
-<property name="BASEADDRESS_NCPL" value="0x64EA0000" />
 <property name="BASEADDRESS_MAIN" value="0x64F40000" />
 <property name="BASEADDRESS_INTL" value="0x64FB0000" />
 <property name="BASEADDRESS_DESK" value="0x65080000" />
 <property name="BASEADDRESS_APPWIZ" value="0x65100000" />
 <property name="BASEADDRESS_ACCESS" value="0x65180000" />
-<property name="BASEADDRESS_HID" value="0x688F0000" />
-<property name="BASEADDRESS_PSXDLL" value="0x68eb0000" />
 <property name="BASEADDRESS_PSAPI" value="0x68f70000" />
 <property name="BASEADDRESS_MSIMG32" value="0x69cc0000" />
-<property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" />
 <property name="BASEADDRESS_UNICODE" value="0x6b200000" />
-<property name="BASEADDRESS_DISPLAY" value="DISPLAY" />
+<property name="BASEADDRESS_ADVPACK" value="0x6b300000" />
+<property name="BASEADDRESS_CONTROL" value="0x6b310000" />
+<property name="BASEADDRESS_NCPA" value="0x6b320000" />
+<property name="BASEADDRESS_DBGHELP" value="0x6b330000" />
+<property name="BASEADDRESS_DINPUT8" value="0x6b340000" />
+<property name="BASEADDRESS_DXDIAGN" value="0x6b350000" />
+<property name="BASEADDRESS_DSOUND" value="0x6b360000" />
+<property name="BASEADDRESS_GLU32" value="0x6b370000" />
+<property name="BASEADDRESS_MESA32" value="0x6b380000" />
+<property name="BASEADDRESS_OPENGL32" value="0x6b390000" />
+<property name="BASEADDRESS_SECUR32" value="0x6b3A0000" />
+<property name="BASEADDRESS_SMDLL" value="0x6b3B0000" />
+<property name="BASEADDRESS_URLMON" value="0x6b3C0000" />
 <property name="BASEADDRESS_CARDS" value="0x701a0000" />
 <property name="BASEADDRESS_WININET" value="0x70200000" />
 <property name="BASEADDRESS_ACLUI" value="0x71550000" />
 <property name="BASEADDRESS_SHDOCVW" value="0x71700000" />
-<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" />
 <property name="BASEADDRESS_WSOCK32" value="0x71ab0000" />
 <property name="BASEADDRESS_ACLEDIT" value="0x71b70000" />
 <property name="BASEADDRESS_NETAPI32" value="0x71c00000" />
-<property name="BASEADDRESS_WINFAX" value="0x722C0000" />
-<property name="BASEADDRESS_DEVMGR" value="0x72a90000" />
-<property name="BASEADDRESS_WINSCARD" value="0x723D0000" />
-<property name="BASEADDRESS_COREDLL" value="0x73d80000" />
-<property name="BASEADDRESS_LZEXPAND" value="0x73d80000" />
+<property name="BASEADDRESS_LZ32" value="0x73d80000" />
 <property name="BASEADDRESS_USERENV" value="0x74850000" />
 <property name="BASEADDRESS_SYSSETUP" value="0x74a30000" />
-<property name="BASEADDRESS_OLEDLG" value="0x74d00000" />
 <property name="BASEADDRESS_SAMLIB" value="0x750C0000" />
 <property name="BASEADDRESS_CABINET" value="0x75120000" />
 <property name="BASEADDRESS_MSGINA" value="0x75970000" />
-<property name="BASEADDRESS_COMMCTRL" value="0x75e60000" />
 <property name="BASEADDRESS_IMM32" value="0x75e60000" />
 <property name="BASEADDRESS_RPCRT4" value="0x76000000" />
-<property name="BASEADDRESS_MIDIMAP" value="0x76600000" />
 <property name="BASEADDRESS_SHLWAPI" value="0x76120000" />
 <property name="BASEADDRESS_COMCTL32" value="0x76160000" />
 <property name="BASEADDRESS_COMDLG32" value="0x76200000" />
 <property name="BASEADDRESS_OLEAUT32" value="0x76260000" />
-<property name="BASEADDRESS_D3D8THK" value="0x76340000" />
-<property name="BASEADDRESS_RICHEDIT" value="0x76340000" />
+<property name="BASEADDRESS_RICHED32" value="0x76340000" />
 <property name="BASEADDRESS_TWAIN_32" value="0x76380000" />
-<property name="BASEADDRESS_LSASRV" value="0x76540000" />
+<property name="BASEADDRESS_MIDIMAP" value="0x76600000" />
 <property name="BASEADDRESS_MPR" value="0x76620000" />
-<property name="BASEADDRESS_ODBC32" value="0x76660000" />
 <property name="BASEADDRESS_SETUPAPI" value="0x76660000" />
 <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" />
 <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" />
 <property name="BASEADDRESS_FMIFS" value="0x76df0000" />
 <property name="BASEADDRESS_SHELL32" value="0x77260000" />
 <property name="BASEADDRESS_IPHLPAPI" value="0x77300000" />
-<property name="BASEADDRESS_MSACM" value="0x77400000" />
 <property name="BASEADDRESS_MMDRV" value="0x77500000" />
 <property name="BASEADDRESS_CRTDLL" value="0x77630000" />
-<property name="BASEADDRESS_PACKET" value="0x77780000" />
-<property name="BASEADDRESS_W2_32" value="0x77780000" />
 <property name="BASEADDRESS_MSAFD" value="0x777a0000" />
-<property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" />
 <property name="BASEADDRESS_SNMPAPI" value="0x777c0000" />
-<property name="BASEADDRESS_WINMM" value="0x777c0000" />
-<property name="BASEADDRESS_WS2HELP" value="0x777c0000" />
-<property name="BASEADDRESS_WSHIRDA" value="0x777c0000" />
-<property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" />
+<property name="BASEADDRESS_WINMM" value="0x777d0000" />
+<property name="BASEADDRESS_WS2HELP" value="0x777e0000" />
+<property name="BASEADDRESS_WSHIRDA" value="0x777f0000" />
 <property name="BASEADDRESS_WINSPOOL" value="0x77800000" />
-<property name="BASEADDRESS_OLE32" value="0x77a50000" />
-<property name="BASEADDRESS_OLEPRO32" value="0x77a50000" />
 <property name="BASEADDRESS_VERSION" value="0x77a90000" />
+<property name="BASEADDRESS_WS2_32" value="0x777aa000" />
+<property name="BASEADDRESS_OLE32" value="0x77a50000" />
+<property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" />
 <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" />
 <property name="BASEADDRESS_USER32" value="0x77e60000" />
 <property name="BASEADDRESS_GDI32" value="0x77ed0000" />
 <property name="BASEADDRESS_DNSAPI" value="0x77f00000" />
+<property name="BASEADDRESS_KERNEL32" value="0x77800000" />
 <property name="BASEADDRESS_MSVCRT" value="0x78000000" />
 <property name="BASEADDRESS_MSVCRT20" value="0x78500000" />
-<property name="BASEADDRESS_EXPAT" value="0x79000000" />
-<property name="BASEADDRESS_KERNEL32" value="0x7C800000" />
 <property name="BASEADDRESS_NTDLL" value="0x7C900000" />
+<property name="BASEADDRESS_FREETYPE" value="0x7F000000" />
+
+<property name="BASEADDRESS_SLAYER" value="0x5C7E0000" />
+<property name="BASEADDRESS_NCPL" value="0x64EA0000" />
+<property name="BASEADDRESS_HID" value="0x688F0000" />
+<property name="BASEADDRESS_PSXDLL" value="0x68eb0000" />
+<property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" />
+<property name="BASEADDRESS_DISPLAY" value="DISPLAY" />
+<property name="BASEADDRESS_ACLUI" value="0x71550000" />
+<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" />
+<property name="BASEADDRESS_WINFAX" value="0x722C0000" />
+<property name="BASEADDRESS_DEVMGR" value="0x72a90000" />
+<property name="BASEADDRESS_WINSCARD" value="0x723D0000" />
+<property name="BASEADDRESS_COREDLL" value="0x73d80000" />
+<property name="BASEADDRESS_OLEDLG" value="0x74d00000" />
+<property name="BASEADDRESS_COMMCTRL" value="0x75e60000" />
+<property name="BASEADDRESS_D3D8THK" value="0x76340000" />
+<property name="BASEADDRESS_LSASRV" value="0x76540000" />
+<property name="BASEADDRESS_ODBC32" value="0x76660000" />
+<property name="BASEADDRESS_MSACM" value="0x77400000" />
+<property name="BASEADDRESS_PACKET" value="0x77780000" />
+<property name="BASEADDRESS_W2_32" value="0x77780000" />
+<property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" />
+<property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" />
+<property name="BASEADDRESS_EXPAT" value="0x79000000" />
diff --git a/reactos/lib/acledit/acledit.xml b/reactos/lib/acledit/acledit.xml
index c897cf6f243..6403c93fc85 100644
--- a/reactos/lib/acledit/acledit.xml
+++ b/reactos/lib/acledit/acledit.xml
@@ -1,4 +1,4 @@
-<module name="acledit" type="win32dll">
+<module name="acledit" type="win32dll" baseaddress="${BASEADDRESS_ACLEDIT}">
 	<importlibrary definition="acledit.def" />
 	<include base="acledit">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/aclui/aclui.xml b/reactos/lib/aclui/aclui.xml
index ab7a25b825a..0bc4e85af95 100644
--- a/reactos/lib/aclui/aclui.xml
+++ b/reactos/lib/aclui/aclui.xml
@@ -1,4 +1,4 @@
-<module name="aclui" type="win32dll">
+<module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}">
 	<importlibrary definition="aclui.def" />
 	<include base="aclui">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/advapi32/advapi32.xml b/reactos/lib/advapi32/advapi32.xml
index 16b58fbff93..b6ca570b868 100644
--- a/reactos/lib/advapi32/advapi32.xml
+++ b/reactos/lib/advapi32/advapi32.xml
@@ -1,4 +1,4 @@
-<module name="advapi32" type="win32dll">
+<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}">
 	<importlibrary definition="advapi32.def" />
 	<include base="advapi32">.</include>
 	<define name="__USE_W32API" />
diff --git a/reactos/lib/advpack/advpack.xml b/reactos/lib/advpack/advpack.xml
index eb16f12aa80..351839bd434 100644
--- a/reactos/lib/advpack/advpack.xml
+++ b/reactos/lib/advpack/advpack.xml
@@ -1,4 +1,4 @@
-<module name="advpack" type="win32dll">
+<module name="advpack" type="win32dll" baseaddress="${BASEADDRESS_ADVPACK}">
 	<importlibrary definition="advpack.def" />
 	<include base="advpack">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/cabinet/cabinet.xml b/reactos/lib/cabinet/cabinet.xml
index a4c6178b4c9..cd7e758b738 100644
--- a/reactos/lib/cabinet/cabinet.xml
+++ b/reactos/lib/cabinet/cabinet.xml
@@ -1,4 +1,4 @@
-<module name="cabinet" type="win32dll">
+<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="cabinet.spec.def" />
 	<include base="cabinet">.</include>
diff --git a/reactos/lib/cards/cards.xml b/reactos/lib/cards/cards.xml
index 9df8febc8d0..cc014ed7039 100644
--- a/reactos/lib/cards/cards.xml
+++ b/reactos/lib/cards/cards.xml
@@ -1,4 +1,4 @@
-<module name="cards" type="win32dll">
+<module name="cards" type="win32dll" baseaddress="${BASEADDRESS_CARDS}">
 	<importlibrary definition="cards.def" />
 	<include base="cards">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/comctl32/comctl32.xml b/reactos/lib/comctl32/comctl32.xml
index e41873f06ab..b331aaa75c2 100644
--- a/reactos/lib/comctl32/comctl32.xml
+++ b/reactos/lib/comctl32/comctl32.xml
@@ -1,4 +1,4 @@
-<module name="comctl32" type="win32dll">
+<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="comctl32.spec.def" />
 	<include base="comctl32">.</include>
diff --git a/reactos/lib/comdlg32/comdlg32.xml b/reactos/lib/comdlg32/comdlg32.xml
index 9377b709e22..096c4e72c4c 100644
--- a/reactos/lib/comdlg32/comdlg32.xml
+++ b/reactos/lib/comdlg32/comdlg32.xml
@@ -1,4 +1,4 @@
-<module name="comdlg32" type="win32dll">
+<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="comdlg32.spec.def" />
 	<include base="comdlg32">.</include>
diff --git a/reactos/lib/cpl/access/access.xml b/reactos/lib/cpl/access/access.xml
index fcefc572951..e41547b816b 100644
--- a/reactos/lib/cpl/access/access.xml
+++ b/reactos/lib/cpl/access/access.xml
@@ -1,4 +1,4 @@
-<module name="access" type="win32dll" extension=".cpl">
+<module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}">
 	<importlibrary definition="access.def" />
 	<include base="access">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/cpl/appwiz/appwiz.xml b/reactos/lib/cpl/appwiz/appwiz.xml
index 3e2f9da1a4f..c3048941659 100644
--- a/reactos/lib/cpl/appwiz/appwiz.xml
+++ b/reactos/lib/cpl/appwiz/appwiz.xml
@@ -1,4 +1,4 @@
-<module name="appwiz" type="win32dll" extension=".cpl">
+<module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}">
 	<importlibrary definition="appwiz.def" />
 	<include base="appwiz">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/cpl/control/control.xml b/reactos/lib/cpl/control/control.xml
index 52a83a560f6..df48c38ecb9 100644
--- a/reactos/lib/cpl/control/control.xml
+++ b/reactos/lib/cpl/control/control.xml
@@ -1,4 +1,4 @@
-<module name="control" type="win32gui">
+<module name="control" type="win32gui" baseaddress="${BASEADDRESS_CONTROL}">
 	<include base="control">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
diff --git a/reactos/lib/cpl/desk/desk.xml b/reactos/lib/cpl/desk/desk.xml
index bf3faf4bc26..b2440543e3b 100644
--- a/reactos/lib/cpl/desk/desk.xml
+++ b/reactos/lib/cpl/desk/desk.xml
@@ -1,4 +1,4 @@
-<module name="desk" type="win32dll" extension=".cpl">
+<module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}">
 	<importlibrary definition="desk.def" />
 	<include base="desk">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/cpl/intl/intl.xml b/reactos/lib/cpl/intl/intl.xml
index 1beb7517e92..23db082de4a 100644
--- a/reactos/lib/cpl/intl/intl.xml
+++ b/reactos/lib/cpl/intl/intl.xml
@@ -1,4 +1,4 @@
-<module name="intl" type="win32dll" extension=".cpl">
+<module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}">
 	<importlibrary definition="intl.def" />
 	<include base="intl">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/cpl/main/main.xml b/reactos/lib/cpl/main/main.xml
index 837ebe74a04..bb86c92c9bc 100644
--- a/reactos/lib/cpl/main/main.xml
+++ b/reactos/lib/cpl/main/main.xml
@@ -1,4 +1,4 @@
-<module name="main" type="win32dll" extension=".cpl">
+<module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}">
 	<importlibrary definition="main.def" />
 	<include base="main">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/cpl/ncpa/ncpa.xml b/reactos/lib/cpl/ncpa/ncpa.xml
index 7b0a3bb97ba..3284003120d 100644
--- a/reactos/lib/cpl/ncpa/ncpa.xml
+++ b/reactos/lib/cpl/ncpa/ncpa.xml
@@ -1,4 +1,4 @@
-<module name="ncpa" type="win32dll" extension=".cpl">
+<module name="ncpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_NCPA}">
 	<importlibrary definition="ncpa.def" />
 	<include base="ncpa">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/cpl/sysdm/sysdm.xml b/reactos/lib/cpl/sysdm/sysdm.xml
index e81bc41b9cc..4b676e48802 100644
--- a/reactos/lib/cpl/sysdm/sysdm.xml
+++ b/reactos/lib/cpl/sysdm/sysdm.xml
@@ -1,4 +1,4 @@
-<module name="sysdm" type="win32dll" extension=".cpl">
+<module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}">
 	<importlibrary definition="sysdm.def" />
 	<include base="sysdm">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/cpl/timedate/timedate.xml b/reactos/lib/cpl/timedate/timedate.xml
index ae8623cf243..293430547b5 100644
--- a/reactos/lib/cpl/timedate/timedate.xml
+++ b/reactos/lib/cpl/timedate/timedate.xml
@@ -1,4 +1,4 @@
-<module name="timedate" type="win32dll" extension=".cpl">
+<module name="timedate" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TIMEDATE}">
 	<importlibrary definition="timedate.def" />
 	<include base="timedate">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/crtdll/crtdll.xml b/reactos/lib/crtdll/crtdll.xml
index 31accdf9221..a3609d18e65 100644
--- a/reactos/lib/crtdll/crtdll.xml
+++ b/reactos/lib/crtdll/crtdll.xml
@@ -1,4 +1,4 @@
-<module name="crtdll" type="win32dll" mangledsymbols="true">
+<module name="crtdll" type="win32dll" baseaddress="${BASEADDRESS_CRTDLL}" mangledsymbols="true">
 	<linkerflag>-nostartfiles</linkerflag>
 	<linkerflag>-lgcc</linkerflag>
 	<importlibrary definition="crtdll.def" />
diff --git a/reactos/lib/dbghelp/dbghelp.xml b/reactos/lib/dbghelp/dbghelp.xml
index 992669b2c8c..7e9ee7e9396 100644
--- a/reactos/lib/dbghelp/dbghelp.xml
+++ b/reactos/lib/dbghelp/dbghelp.xml
@@ -1,4 +1,4 @@
-<module name="dbghelp" type="win32dll">
+<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="dbghelp.spec.def" />
 	<include base="dbghelp">.</include>
diff --git a/reactos/lib/devenum/devenum.xml b/reactos/lib/devenum/devenum.xml
index 68b5eedc4e1..20bb50d6026 100644
--- a/reactos/lib/devenum/devenum.xml
+++ b/reactos/lib/devenum/devenum.xml
@@ -1,4 +1,4 @@
-<module name="devenum" type="win32dll">
+<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="devenum.spec.def" />
 	<include base="devenum">.</include>
diff --git a/reactos/lib/dinput/dinput.xml b/reactos/lib/dinput/dinput.xml
index e18d940b0b7..ddc3cf3d269 100644
--- a/reactos/lib/dinput/dinput.xml
+++ b/reactos/lib/dinput/dinput.xml
@@ -1,4 +1,4 @@
-<module name="dinput" type="win32dll">
+<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="dinput.spec.def" />
 	<include base="dinput">.</include>
diff --git a/reactos/lib/dinput8/dinput8.xml b/reactos/lib/dinput8/dinput8.xml
index bb1fd88ec84..afa2428ff90 100644
--- a/reactos/lib/dinput8/dinput8.xml
+++ b/reactos/lib/dinput8/dinput8.xml
@@ -1,4 +1,4 @@
-<module name="dinput8" type="win32dll">
+<module name="dinput8" type="win32dll" baseaddress="${BASEADDRESS_DINPUT8}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="dinput8.spec.def" />
 	<include base="dinput8">.</include>
diff --git a/reactos/lib/dnsapi/dnsapi.xml b/reactos/lib/dnsapi/dnsapi.xml
index 0818f0205bb..84564b6cc42 100644
--- a/reactos/lib/dnsapi/dnsapi.xml
+++ b/reactos/lib/dnsapi/dnsapi.xml
@@ -1,4 +1,4 @@
-<module name="dnsapi" type="win32dll">
+<module name="dnsapi" type="win32dll" baseaddress="${BASEADDRESS_DNSAPI}">
 	<importlibrary definition="dnsapi.def" />
 	<include base="dnsapi">include</include>
 	<include base="adns">src</include>
diff --git a/reactos/lib/dsound/dsound.xml b/reactos/lib/dsound/dsound.xml
index e31a0c04461..a25adaa8f57 100644
--- a/reactos/lib/dsound/dsound.xml
+++ b/reactos/lib/dsound/dsound.xml
@@ -1,4 +1,4 @@
-<module name="dsound" type="win32dll">
+<module name="dsound" type="win32dll" baseaddress="${BASEADDRESS_DSOUND}">
 	<importlibrary definition="dsound.def" />
 	<include base="dsound">.</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/dxdiagn/dxdiagn.xml b/reactos/lib/dxdiagn/dxdiagn.xml
index 159ee7e2cb2..a68b758a7fa 100644
--- a/reactos/lib/dxdiagn/dxdiagn.xml
+++ b/reactos/lib/dxdiagn/dxdiagn.xml
@@ -1,4 +1,4 @@
-<module name="dxdiagn" type="win32dll">
+<module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="dxdiagn.spec.def" />
 	<include base="dxdiagn">.</include>
diff --git a/reactos/lib/fmifs/fmifs.xml b/reactos/lib/fmifs/fmifs.xml
index 67fb734bab5..36b6bc429dd 100644
--- a/reactos/lib/fmifs/fmifs.xml
+++ b/reactos/lib/fmifs/fmifs.xml
@@ -1,4 +1,4 @@
-<module name="fmifs" type="win32dll" entrypoint="_InitializeFmIfs@12">
+<module name="fmifs" type="win32dll" entrypoint="_InitializeFmIfs@12" baseaddress="${BASEADDRESS_FMIFS}">
 	<importlibrary definition="fmifs.def" />
 	<include base="fmifs">.</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/freetype/freetype.xml b/reactos/lib/freetype/freetype.xml
index f80a4cda319..130cdeb6fbd 100644
--- a/reactos/lib/freetype/freetype.xml
+++ b/reactos/lib/freetype/freetype.xml
@@ -1,4 +1,4 @@
-<module name="freetype" type="kernelmodedll">
+<module name="freetype" type="kernelmodedll" baseaddress="${BASEADDRESS_FREETYPE}">
 	<importlibrary definition="freetype.def" />
 	<include base="freetype">include</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/gdi32/gdi32.xml b/reactos/lib/gdi32/gdi32.xml
index fd058e785c3..2b67cc7af21 100644
--- a/reactos/lib/gdi32/gdi32.xml
+++ b/reactos/lib/gdi32/gdi32.xml
@@ -1,4 +1,4 @@
-<module name="gdi32" type="win32dll">
+<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}">
 	<importlibrary definition="gdi32.def" />
 	<include base="gdi32">include</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/gdiplus/gdiplus.xml b/reactos/lib/gdiplus/gdiplus.xml
index 5a61d1fd356..a41f8b10b6d 100644
--- a/reactos/lib/gdiplus/gdiplus.xml
+++ b/reactos/lib/gdiplus/gdiplus.xml
@@ -1,4 +1,4 @@
-<module name="gdiplus" type="win32dll">
+<module name="gdiplus" type="win32dll" baseaddress="${BASEADDRESS_GDIPLUS}">
 	<importlibrary definition="gdiplus.def" />
 	<include base="gdiplus">include</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/glu32/glu32.xml b/reactos/lib/glu32/glu32.xml
index b8cff2bdcc2..0b7fc0d81ae 100644
--- a/reactos/lib/glu32/glu32.xml
+++ b/reactos/lib/glu32/glu32.xml
@@ -1,4 +1,4 @@
-<module name="glu32" type="win32dll">
+<module name="glu32" type="win32dll" baseaddress="${BASEADDRESS_GLU32}">
 	<importlibrary definition="glu32.def" />
 	<include base="glu32">include</include>
 	<include base="glu32">libnurbs/internals</include>
diff --git a/reactos/lib/imagehlp/imagehlp.xml b/reactos/lib/imagehlp/imagehlp.xml
index c5742d50518..8a046a8c10b 100644
--- a/reactos/lib/imagehlp/imagehlp.xml
+++ b/reactos/lib/imagehlp/imagehlp.xml
@@ -1,4 +1,4 @@
-<module name="imagehlp" type="win32dll">
+<module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="imagehlp.def" />
 	<include base="imagehlp">.</include>
diff --git a/reactos/lib/imm32/imm32.xml b/reactos/lib/imm32/imm32.xml
index 067d9e37b23..428cf244cf0 100644
--- a/reactos/lib/imm32/imm32.xml
+++ b/reactos/lib/imm32/imm32.xml
@@ -1,4 +1,4 @@
-<module name="imm32" type="win32dll">
+<module name="imm32" type="win32dll" baseaddress="${BASEADDRESS_IMM32}">
 	<importlibrary definition="imm32.def" />
 	<include base="imm32">.</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/iphlpapi/iphlpapi.xml b/reactos/lib/iphlpapi/iphlpapi.xml
index d0b706b007f..9ed229e2333 100644
--- a/reactos/lib/iphlpapi/iphlpapi.xml
+++ b/reactos/lib/iphlpapi/iphlpapi.xml
@@ -1,4 +1,4 @@
-<module name="iphlpapi" type="win32dll">
+<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="iphlpapi.spec.def" />
 	<include base="iphlpapi">include</include>
diff --git a/reactos/lib/kernel32/kernel32.xml b/reactos/lib/kernel32/kernel32.xml
index 66db2c0e780..4f3b9cb30f2 100644
--- a/reactos/lib/kernel32/kernel32.xml
+++ b/reactos/lib/kernel32/kernel32.xml
@@ -1,4 +1,4 @@
-<module name="kernel32" type="win32dll">
+<module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}">
 	<importlibrary definition="kernel32.def" />
 	<include base="kernel32">.</include>
 	<include base="kernel32">include</include>
diff --git a/reactos/lib/lzexpand/lz32.xml b/reactos/lib/lzexpand/lz32.xml
index 616c46e507d..f51faa0aeb8 100644
--- a/reactos/lib/lzexpand/lz32.xml
+++ b/reactos/lib/lzexpand/lz32.xml
@@ -1,4 +1,4 @@
-<module name="lz32" type="win32dll">
+<module name="lz32" type="win32dll" baseaddress="${BASEADDRESS_LZ32}">
 	<importlibrary definition="lz32.def" />
 	<include base="lz32">.</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/mesa32/mesa32.xml b/reactos/lib/mesa32/mesa32.xml
index 5234e1613a3..182ae89c99e 100644
--- a/reactos/lib/mesa32/mesa32.xml
+++ b/reactos/lib/mesa32/mesa32.xml
@@ -1,4 +1,4 @@
-<module name="mesa32" type="win32dll">
+<module name="mesa32" type="win32dll" baseaddress="${BASEADDRESS_MESA32}">
 	<importlibrary definition="mesa32.def" />
 	<linkerflag>-Wl,--enable-stdcall-fixup</linkerflag>
 	<include base="mesa32">include</include>
diff --git a/reactos/lib/midimap/midimap.xml b/reactos/lib/midimap/midimap.xml
index 99f1fddc51e..dc451f53f9b 100644
--- a/reactos/lib/midimap/midimap.xml
+++ b/reactos/lib/midimap/midimap.xml
@@ -1,4 +1,4 @@
-<module name="midimap" type="win32dll">
+<module name="midimap" type="win32dll" baseaddress="${BASEADDRESS_MIDIMAP}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="midimap.spec.def" />
 	<include base="midimap">.</include>
diff --git a/reactos/lib/mmdrv/mmdrv.xml b/reactos/lib/mmdrv/mmdrv.xml
index ea32609df35..c923b705325 100644
--- a/reactos/lib/mmdrv/mmdrv.xml
+++ b/reactos/lib/mmdrv/mmdrv.xml
@@ -1,4 +1,4 @@
-<module name="mmdrv" type="win32dll">
+<module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}">
 	<importlibrary definition="mmdrv.def" />
 	<include base="mmdrv">.</include>
 	<define name="__USE_W32API" />
diff --git a/reactos/lib/mpr/mpr.xml b/reactos/lib/mpr/mpr.xml
index 33f7a7427a7..04a5f27743c 100644
--- a/reactos/lib/mpr/mpr.xml
+++ b/reactos/lib/mpr/mpr.xml
@@ -1,4 +1,4 @@
-<module name="mpr" type="win32dll">
+<module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="mpr.spec.def" />
 	<include base="mpr">.</include>
diff --git a/reactos/lib/msafd/msafd.xml b/reactos/lib/msafd/msafd.xml
index d615bdc11bd..eca61762848 100644
--- a/reactos/lib/msafd/msafd.xml
+++ b/reactos/lib/msafd/msafd.xml
@@ -1,4 +1,4 @@
-<module name="msafd" type="win32dll">
+<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}">
 	<importlibrary definition="msafd.def" />
 	<include base="msafd">include</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/msgina/msgina.xml b/reactos/lib/msgina/msgina.xml
index e5e383a0847..1ec948159d4 100644
--- a/reactos/lib/msgina/msgina.xml
+++ b/reactos/lib/msgina/msgina.xml
@@ -1,4 +1,4 @@
-<module name="msgina" type="win32dll">
+<module name="msgina" type="win32dll" baseaddress="${BASEADDRESS_MSGINA}">
 	<importlibrary definition="msgina.def" />
 	<include base="msgina">.</include>
 	<include base="msgina">include</include>
diff --git a/reactos/lib/msimg32/msimg32.xml b/reactos/lib/msimg32/msimg32.xml
index 0e228270d7f..9851fb74004 100644
--- a/reactos/lib/msimg32/msimg32.xml
+++ b/reactos/lib/msimg32/msimg32.xml
@@ -1,4 +1,4 @@
-<module name="msimg32" type="win32dll">
+<module name="msimg32" type="win32dll" baseaddress="${BASEADDRESS_MSIMG32}">
 	<importlibrary definition="msimg32.spec.def" />
 	<include base="msimg32">.</include>
 	<include base="msimg32">include</include>
diff --git a/reactos/lib/msvcrt/msvcrt.xml b/reactos/lib/msvcrt/msvcrt.xml
index a9bfbdc3819..4e23941c56d 100644
--- a/reactos/lib/msvcrt/msvcrt.xml
+++ b/reactos/lib/msvcrt/msvcrt.xml
@@ -1,4 +1,4 @@
-<module name="msvcrt" type="win32dll" mangledsymbols="true">
+<module name="msvcrt" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT}" mangledsymbols="true">
 	<linkerflag>-nostartfiles</linkerflag>
 	<linkerflag>--enable-stdcall-fixup</linkerflag>
 	<linkerflag>-lgcc</linkerflag>
diff --git a/reactos/lib/msvcrt20/msvcrt20.xml b/reactos/lib/msvcrt20/msvcrt20.xml
index 69781455a5a..a10da15ceb6 100644
--- a/reactos/lib/msvcrt20/msvcrt20.xml
+++ b/reactos/lib/msvcrt20/msvcrt20.xml
@@ -1,4 +1,4 @@
-<module name="msvcrt20" type="win32dll" mangledsymbols="yes">
+<module name="msvcrt20" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT20}" mangledsymbols="yes">
 	<importlibrary definition="msvcrt20.def" />
 	<include base="msvcrt20">.</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/netapi32/netapi32.xml b/reactos/lib/netapi32/netapi32.xml
index 8ce2e1d006e..cec71808546 100644
--- a/reactos/lib/netapi32/netapi32.xml
+++ b/reactos/lib/netapi32/netapi32.xml
@@ -1,4 +1,4 @@
-<module name="netapi32" type="win32dll">
+<module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="netapi32.spec.def" />
 	<include base="netapi32">.</include>
diff --git a/reactos/lib/ntdll/ntdll.xml b/reactos/lib/ntdll/ntdll.xml
index d6b672731ef..97ddb89ce52 100644
--- a/reactos/lib/ntdll/ntdll.xml
+++ b/reactos/lib/ntdll/ntdll.xml
@@ -1,4 +1,4 @@
-<module name="ntdll" type="nativedll">
+<module name="ntdll" type="nativedll" baseaddress="${BASEADDRESS_NTDLL}">
 	<importlibrary definition="def/ntdll.def" />
 	<define name="__NTDLL__" />
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/ole32/ole32.xml b/reactos/lib/ole32/ole32.xml
index b534d0d341f..e4c0e08494f 100644
--- a/reactos/lib/ole32/ole32.xml
+++ b/reactos/lib/ole32/ole32.xml
@@ -1,4 +1,4 @@
-<module name="ole32" type="win32dll">
+<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="ole32.spec.def" />
 	<include base="ole32">.</include>
diff --git a/reactos/lib/oleaut32/oleaut32.xml b/reactos/lib/oleaut32/oleaut32.xml
index 66d790a7b80..32720af1a25 100644
--- a/reactos/lib/oleaut32/oleaut32.xml
+++ b/reactos/lib/oleaut32/oleaut32.xml
@@ -1,4 +1,4 @@
-<module name="oleaut32" type="win32dll">
+<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="oleaut32.spec.def" />
 	<include base="oleaut32">.</include>
diff --git a/reactos/lib/olepro32/olepro32.xml b/reactos/lib/olepro32/olepro32.xml
index 551123d5c42..d46409e957c 100644
--- a/reactos/lib/olepro32/olepro32.xml
+++ b/reactos/lib/olepro32/olepro32.xml
@@ -1,4 +1,4 @@
-<module name="olepro32" type="win32dll">
+<module name="olepro32" type="win32dll" baseaddress="${BASEADDRESS_OLEPRO32}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="olepro32.spec.def" />
 	<include base="olepro32">.</include>
diff --git a/reactos/lib/opengl32/opengl32.xml b/reactos/lib/opengl32/opengl32.xml
index 3b96483bc67..42e5652cc67 100644
--- a/reactos/lib/opengl32/opengl32.xml
+++ b/reactos/lib/opengl32/opengl32.xml
@@ -1,4 +1,4 @@
-<module name="opengl32" type="win32dll">
+<module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}">
 	<importlibrary definition="opengl32.def" />
 	<include base="wsock32">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/psapi/psapi.xml b/reactos/lib/psapi/psapi.xml
index 84f5630fbe7..03328542b42 100644
--- a/reactos/lib/psapi/psapi.xml
+++ b/reactos/lib/psapi/psapi.xml
@@ -1,4 +1,4 @@
-<module name="psapi" type="win32dll">
+<module name="psapi" type="win32dll" baseaddress="${BASEADDRESS_PSAPI}">
 	<importlibrary definition="psapi.def" />
 	<include base="psapi">.</include>
 	<include base="psapi">include</include>
diff --git a/reactos/lib/richedit/riched32.xml b/reactos/lib/richedit/riched32.xml
index 5cb75ef6ba6..564958be0bf 100644
--- a/reactos/lib/richedit/riched32.xml
+++ b/reactos/lib/richedit/riched32.xml
@@ -1,4 +1,4 @@
-<module name="riched32" type="win32dll">
+<module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="riched32.spec.def" />
 	<include base="riched32">.</include>
diff --git a/reactos/lib/rpcrt4/rpcrt4.xml b/reactos/lib/rpcrt4/rpcrt4.xml
index ffc3963ed7c..0a190c56fae 100644
--- a/reactos/lib/rpcrt4/rpcrt4.xml
+++ b/reactos/lib/rpcrt4/rpcrt4.xml
@@ -1,4 +1,4 @@
-<module name="rpcrt4" type="win32dll">
+<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="rpcrt4.spec.def" />
 	<include base="rpcrt4">.</include>
diff --git a/reactos/lib/samlib/samlib.xml b/reactos/lib/samlib/samlib.xml
index f41ce583a02..643a073418c 100644
--- a/reactos/lib/samlib/samlib.xml
+++ b/reactos/lib/samlib/samlib.xml
@@ -1,4 +1,4 @@
-<module name="samlib" type="win32dll">
+<module name="samlib" type="win32dll" baseaddress="${BASEADDRESS_SAMLIB}">
 	<importlibrary definition="samlib.def" />
 	<include base="samlib">.</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/secur32/secur32.xml b/reactos/lib/secur32/secur32.xml
index 2b3b6909965..7d0dd2dbfd8 100644
--- a/reactos/lib/secur32/secur32.xml
+++ b/reactos/lib/secur32/secur32.xml
@@ -1,4 +1,4 @@
-<module name="secur32" type="win32dll">
+<module name="secur32" type="win32dll" baseaddress="${BASEADDRESS_SECUR32}">
 	<importlibrary definition="secur32.def" />
 	<include base="secur32">.</include>
 	<define name="__SECUR32__" />
diff --git a/reactos/lib/setupapi/setupapi.xml b/reactos/lib/setupapi/setupapi.xml
index 7e0c2aa066d..697ccb34c4a 100644
--- a/reactos/lib/setupapi/setupapi.xml
+++ b/reactos/lib/setupapi/setupapi.xml
@@ -1,4 +1,4 @@
-<module name="setupapi" type="win32dll">
+<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="setupapi.spec.def" />
 	<include base="setupapi">.</include>
diff --git a/reactos/lib/shdocvw/shdocvw.xml b/reactos/lib/shdocvw/shdocvw.xml
index 6a49e60fce9..31c21d2faf2 100644
--- a/reactos/lib/shdocvw/shdocvw.xml
+++ b/reactos/lib/shdocvw/shdocvw.xml
@@ -1,4 +1,4 @@
-<module name="shdocvw" type="win32dll">
+<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="shdocvw.spec.def" />
 	<include base="shdocvw">.</include>
diff --git a/reactos/lib/shell32/shell32.xml b/reactos/lib/shell32/shell32.xml
index 0ae38e812cb..4e8848a88a2 100644
--- a/reactos/lib/shell32/shell32.xml
+++ b/reactos/lib/shell32/shell32.xml
@@ -1,4 +1,4 @@
-<module name="shell32" type="win32dll">
+<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="shell32.spec.def" />
 	<include base="shell32">.</include>
diff --git a/reactos/lib/shlwapi/shlwapi.xml b/reactos/lib/shlwapi/shlwapi.xml
index 5a86ddbddb9..357e683c00d 100644
--- a/reactos/lib/shlwapi/shlwapi.xml
+++ b/reactos/lib/shlwapi/shlwapi.xml
@@ -1,4 +1,4 @@
-<module name="shlwapi" type="win32dll">
+<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="shlwapi.spec.def" />
 	<include base="shlwapi">.</include>
diff --git a/reactos/lib/smdll/smdll.xml b/reactos/lib/smdll/smdll.xml
index 93512330b29..4288a36f940 100644
--- a/reactos/lib/smdll/smdll.xml
+++ b/reactos/lib/smdll/smdll.xml
@@ -1,4 +1,4 @@
-<module name="smdll" type="win32dll">
+<module name="smdll" type="win32dll" baseaddress="${BASEADDRESS_SMDLL}">
 	<importlibrary definition="smdll.def" />
 	<include base="smdll">.</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/snmpapi/snmpapi.xml b/reactos/lib/snmpapi/snmpapi.xml
index f1193e608ba..9d7b63e8fd2 100644
--- a/reactos/lib/snmpapi/snmpapi.xml
+++ b/reactos/lib/snmpapi/snmpapi.xml
@@ -1,4 +1,4 @@
-<module name="snmpapi" type="win32dll">
+<module name="snmpapi" type="win32dll" baseaddress="${BASEADDRESS_SNMPAPI}">
 	<importlibrary definition="snmpapi.def" />
 	<include base="snmpapi">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/syssetup/syssetup.xml b/reactos/lib/syssetup/syssetup.xml
index b8e0c183e45..f1d5de5b9b5 100644
--- a/reactos/lib/syssetup/syssetup.xml
+++ b/reactos/lib/syssetup/syssetup.xml
@@ -1,4 +1,4 @@
-<module name="syssetup" type="win32dll">
+<module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}">
 	<importlibrary definition="syssetup.def" />
 	<include base="syssetup">.</include>
 	<define name="__USE_W32API" />
diff --git a/reactos/lib/twain/twain_32.xml b/reactos/lib/twain/twain_32.xml
index 8e32e1ea867..d9497d88c97 100644
--- a/reactos/lib/twain/twain_32.xml
+++ b/reactos/lib/twain/twain_32.xml
@@ -1,4 +1,4 @@
-<module name="twain_32" type="win32dll">
+<module name="twain_32" type="win32dll" baseaddress="${BASEADDRESS_TWAIN_32}">
 	<importlibrary definition="twain_32.def" />
 	<include base="twain_32">.</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/unicode/unicode.xml b/reactos/lib/unicode/unicode.xml
index 37459e59114..b9e78bef59a 100644
--- a/reactos/lib/unicode/unicode.xml
+++ b/reactos/lib/unicode/unicode.xml
@@ -1,4 +1,4 @@
-<module name="wine_unicode" type="win32dll">
+<module name="wine_unicode" type="win32dll" baseaddress="${BASEADDRESS_UNICODE}">
 	<importlibrary definition="wine_unicode.def" />
 	<include base="wine_unicode">.</include>
 	<include base="ReactOS">include/wine</include>
diff --git a/reactos/lib/urlmon/urlmon.xml b/reactos/lib/urlmon/urlmon.xml
index 85cba9f5792..f049e6493ea 100644
--- a/reactos/lib/urlmon/urlmon.xml
+++ b/reactos/lib/urlmon/urlmon.xml
@@ -1,4 +1,4 @@
-<module name="urlmon" type="win32dll">
+<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="urlmon.spec.def" />
 	<include base="urlmon">.</include>
diff --git a/reactos/lib/user32/user32.xml b/reactos/lib/user32/user32.xml
index 50fe1c1a350..bc0d7533c67 100644
--- a/reactos/lib/user32/user32.xml
+++ b/reactos/lib/user32/user32.xml
@@ -1,4 +1,4 @@
-<module name="user32" type="win32dll">
+<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}">
 	<importlibrary definition="user32.def" />
 	<include base="user32">.</include>
 	<include base="user32">include</include>
diff --git a/reactos/lib/userenv/userenv.xml b/reactos/lib/userenv/userenv.xml
index 38db6dafba6..77e4b36c41a 100644
--- a/reactos/lib/userenv/userenv.xml
+++ b/reactos/lib/userenv/userenv.xml
@@ -1,4 +1,4 @@
-<module name="userenv" type="win32dll">
+<module name="userenv" type="win32dll" baseaddress="${BASEADDRESS_USERENV}">
 	<importlibrary definition="userenv.def" />
 	<include base="userenv">.</include>
 	<define name="__USE_W32API" />
diff --git a/reactos/lib/version/version.xml b/reactos/lib/version/version.xml
index 1adfb2df555..8481de44098 100644
--- a/reactos/lib/version/version.xml
+++ b/reactos/lib/version/version.xml
@@ -1,4 +1,4 @@
-<module name="version" type="win32dll">
+<module name="version" type="win32dll" baseaddress="${BASEADDRESS_VERSION}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="version.def" />
 	<include base="ReactOS">include/wine</include>
diff --git a/reactos/lib/wininet/wininet.xml b/reactos/lib/wininet/wininet.xml
index 4232ab65d30..bc83eff8d24 100644
--- a/reactos/lib/wininet/wininet.xml
+++ b/reactos/lib/wininet/wininet.xml
@@ -1,4 +1,4 @@
-<module name="wininet" type="win32dll">
+<module name="wininet" type="win32dll" baseaddress="${BASEADDRESS_WININET}">
 	<importlibrary definition="wininet.def" />
 	<include base="wininet">.</include>
 	<library>ntdll</library>
diff --git a/reactos/lib/winmm/winmm.xml b/reactos/lib/winmm/winmm.xml
index 24fc786dcb2..b8c1ce2c33e 100644
--- a/reactos/lib/winmm/winmm.xml
+++ b/reactos/lib/winmm/winmm.xml
@@ -1,4 +1,4 @@
-<module name="winmm" type="win32dll">
+<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}">
 	<dependency>winebuild</dependency>
 	<importlibrary definition="winmm.spec.def" />
 	<include base="winmm">.</include>
diff --git a/reactos/lib/winspool/winspool.xml b/reactos/lib/winspool/winspool.xml
index 510ef81fe69..9cb6d1522df 100644
--- a/reactos/lib/winspool/winspool.xml
+++ b/reactos/lib/winspool/winspool.xml
@@ -1,4 +1,4 @@
-<module name="winspool" type="win32dll" extension=".drv">
+<module name="winspool" type="win32dll" extension=".drv" baseaddress="${BASEADDRESS_WINSPOOL}">
 	<importlibrary definition="winspool.def" />
 	<include base="winspool">.</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/ws2_32/ws2_32.xml b/reactos/lib/ws2_32/ws2_32.xml
index 09e54a95323..446fee5220a 100644
--- a/reactos/lib/ws2_32/ws2_32.xml
+++ b/reactos/lib/ws2_32/ws2_32.xml
@@ -1,4 +1,4 @@
-<module name="ws2_32" type="win32dll">
+<module name="ws2_32" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}">
 	<importlibrary definition="ws2_32.def" />
 	<include base="ws2_32">include</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/lib/ws2help/ws2help.xml b/reactos/lib/ws2help/ws2help.xml
index 96f3bfbda14..0b664c7331d 100644
--- a/reactos/lib/ws2help/ws2help.xml
+++ b/reactos/lib/ws2help/ws2help.xml
@@ -1,4 +1,4 @@
-<module name="ws2help" type="win32dll">
+<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}">
 	<importlibrary definition="ws2help.def" />
 	<include base="ws2help">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/wshirda/wshirda.xml b/reactos/lib/wshirda/wshirda.xml
index 6ea732b14b9..e8f74ad45c0 100644
--- a/reactos/lib/wshirda/wshirda.xml
+++ b/reactos/lib/wshirda/wshirda.xml
@@ -1,4 +1,4 @@
-<module name="wshirda" type="win32dll">
+<module name="wshirda" type="win32dll" baseaddress="${BASEADDRESS_WSHIRDA}">
 	<importlibrary definition="wshirda.def" />
 	<include base="wshirda">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/lib/wsock32/wsock32.xml b/reactos/lib/wsock32/wsock32.xml
index 1c09cc1a592..8ce40599c28 100644
--- a/reactos/lib/wsock32/wsock32.xml
+++ b/reactos/lib/wsock32/wsock32.xml
@@ -1,4 +1,4 @@
-<module name="wsock32" type="win32dll">
+<module name="wsock32" type="win32dll" baseaddress="${BASEADDRESS_WSOCK32}">
 	<importlibrary definition="wsock32.def" />
 	<include base="wsock32">.</include>
 	<define name="UNICODE" />
diff --git a/reactos/subsys/system/explorer/notifyhook/notifyhook.xml b/reactos/subsys/system/explorer/notifyhook/notifyhook.xml
index cbcedcff3ba..c40ae32a374 100644
--- a/reactos/subsys/system/explorer/notifyhook/notifyhook.xml
+++ b/reactos/subsys/system/explorer/notifyhook/notifyhook.xml
@@ -1,4 +1,4 @@
-<module name="notifyhook" type="win32dll">
+<module name="notifyhook" type="win32dll" baseaddress="${BASEADDRESS_NOTIFYHOOK}">
 	<importlibrary definition="notifyhook.def" />
 	<include base="notifyhook">.</include>
 	<define name="__USE_W32API" />