diff --git a/reactos/baseaddress.xml b/reactos/baseaddress.xml
index 6186610c094..482d9d5b077 100644
--- a/reactos/baseaddress.xml
+++ b/reactos/baseaddress.xml
@@ -5,17 +5,22 @@
 <property name="BASEADDRESS_UXTHEME" value="0x5AD70000" />
 <property name="BASEADDRESS_VDMDBG" value="0x5B0D0000" />
 <property name="BASEADDRESS_OBJSEL" value="0x5B400000" />
+<property name="BASEADDRESS_SLAYER" value="0x5C7E0000" />
 <property name="BASEADDRESS_DINPUT" value="0x5F580000" />
 <property name="BASEADDRESS_HDWWIZ" value="0x64D40000" />
 <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_ADVPACK" value="0x6b300000" />
 <property name="BASEADDRESS_CONTROL" value="0x6b310000" />
@@ -28,7 +33,6 @@
 <property name="BASEADDRESS_MESA32" value="0x6b380000" />
 <property name="BASEADDRESS_OPENGL32" value="0x6b390000" />
 <property name="BASEADDRESS_SECUR32" value="0x6b3A0000" />
-<property name="BASEADDRESS_SECURITY" value="0x71F10000" />
 <property name="BASEADDRESS_SMDLL" value="0x6b3B0000" />
 <property name="BASEADDRESS_URLMON" value="0x6b3C0000" />
 <property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" />
@@ -37,27 +41,37 @@
 <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_SECURITY" value="0x71F10000" />
+<property name="BASEADDRESS_WINFAX" value="0x722C0000" />
+<property name="BASEADDRESS_WINSCARD" value="0x723D0000" />
+<property name="BASEADDRESS_DEVMGR" value="0x72a90000" />
 <property name="BASEADDRESS_LZ32" value="0x73d80000" />
+<property name="BASEADDRESS_COREDLL" value="0x73d80000" />
 <property name="BASEADDRESS_USERENV" value="0x74850000" />
 <property name="BASEADDRESS_SYSSETUP" value="0x74a30000" />
+<property name="BASEADDRESS_OLEDLG" value="0x74d00000" />
 <property name="BASEADDRESS_SAMSRV" value="0x74f30000" />
 <property name="BASEADDRESS_SAMLIB" value="0x750C0000" />
 <property name="BASEADDRESS_CABINET" value="0x75120000" />
 <property name="BASEADDRESS_MSGINA" value="0x75970000" />
 <property name="BASEADDRESS_IMM32" value="0x75e60000" />
+<property name="BASEADDRESS_COMMCTRL" value="0x75e60000" />
 <property name="BASEADDRESS_RPCRT4" value="0x76000000" />
 <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_RICHED32" value="0x76340000" />
+<property name="BASEADDRESS_D3D8THK" value="0x76340000" />
 <property name="BASEADDRESS_RICHED20" value="0x76360000" />
 <property name="BASEADDRESS_TWAIN_32" value="0x76380000" />
 <property name="BASEADDRESS_LSASRV" value="0x76540000" />
 <property name="BASEADDRESS_MIDIMAP" value="0x76600000" />
+<property name="BASEADDRESS_ODBC32" value="0x76660000" />
 <property name="BASEADDRESS_WAVEMAP" value="0x76610000" />
 <property name="BASEADDRESS_MPR" value="0x76620000" />
 <property name="BASEADDRESS_SETUPAPI" value="0x76660000" />
@@ -68,49 +82,33 @@
 <property name="BASEADDRESS_FMIFS" value="0x76df0000" />
 <property name="BASEADDRESS_SHELL32" value="0x77260000" />
 <property name="BASEADDRESS_IPHLPAPI" value="0x77400000" />
+<property name="BASEADDRESS_MSVFW32" value="0x77400000" />
+<property name="BASEADDRESS_MSACM32" value="0x77400000" />
 <property name="BASEADDRESS_MMDRV" value="0x77530000" />
 <property name="BASEADDRESS_CRTDLL" value="0x77630000" />
+<property name="BASEADDRESS_AUTHZ" value="0x77690000" />
 <property name="BASEADDRESS_CFGMGR32" value="0x77700000" />
+<property name="BASEADDRESS_PACKET" value="0x77780000" />
 <property name="BASEADDRESS_MSAFD" value="0x777a0000" />
 <property name="BASEADDRESS_MSI" value="0x777b0000" />
 <property name="BASEADDRESS_SNMPAPI" value="0x777c0000" />
+<property name="BASEADDRESS_IPRTPRIO" 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_VERSION" value="0x77a90000" />
-<property name="BASEADDRESS_WS2_32" value="0x77aa0000" />
+<property name="BASEADDRESS_VERSION" value="0x77a40000" />
 <property name="BASEADDRESS_OLE32" value="0x77a50000" />
+<property name="BASEADDRESS_WS2_32" value="0x77aa0000" />
 <property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" />
 <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" />
 <property name="BASEADDRESS_USER32" value="0x77e50000" />
-<property name="BASEADDRESS_GDI32" value="0x77ee0000" />
-<property name="BASEADDRESS_DNSAPI" value="0x77f00000" />
+<property name="BASEADDRESS_GDI32" value="0x77f10000" />
+<property name="BASEADDRESS_DNSAPI" value="0x77f30000" />
 <property name="BASEADDRESS_MSVCRT" value="0x78000000" />
 <property name="BASEADDRESS_MSVCRT20" value="0x78500000" />
-<property name="BASEADDRESS_MSVFW32" value="0x77400000" />
-<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" />
 <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_ACLUI" value="0x71550000" />
-<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_ODBC32" value="0x76660000" />
-<property name="BASEADDRESS_MSACM32" value="0x77400000" />
-<property name="BASEADDRESS_PACKET" value="0x77780000" />
-<property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" />
-<property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" />
-<property name="BASEADDRESS_AUTHZ" value="0x77690000" />
 </group>