diff --git a/baseaddress.cmake b/baseaddress.cmake
index 0c886c172fd..9c787c78e44 100644
--- a/baseaddress.cmake
+++ b/baseaddress.cmake
@@ -84,7 +84,7 @@ set(baseaddress_getuname		0x69110000)
 set(baseaddress_oleacc			0x69640000)
 set(baseaddress_winmm			0x697d0000)
 set(baseaddress_msimg32			0x69cc0000)
-set(baseaddress_browseui		0x69cd0000)
+
 set(baseaddress_netplwiz		0x6a240000)
 set(baseaddress_shell32			0x6a360000)
 set(baseaddress_unicode			0x6b200000)
@@ -94,7 +94,6 @@ set(baseaddress_ncpa			0x6b320000)
 set(baseaddress_dbghelp			0x6b330000)
 set(baseaddress_dinput8			0x6b340000)
 set(baseaddress_dxdiagn			0x6b350000)
-set(baseaddress_dsound			0x6b360000)
 set(baseaddress_glu32			0x6b370000)
 set(baseaddress_mesa32			0x6b380000)
 set(baseaddress_opengl32		0x6b390000)
@@ -162,7 +161,6 @@ set(baseaddress_spoolss			0x742a0000)
 set(baseaddress_msimtf			0x746b0000)
 set(baseaddress_msctf			0x746e0000)
 set(baseaddress_kbsdll			0x74720000)
-set(baseaddress_quartz			0x747d0000)
 set(baseaddress_userenv			0x74850000)
 set(baseaddress_powrprof		0x74ad0000)
 set(baseaddress_msxml3			0x74ae0000)
@@ -194,13 +192,11 @@ set(baseaddress_lsasrv			0x76540000)
 set(baseaddress_midimap			0x76600000)
 set(baseaddress_wavemap			0x76610000)
 set(baseaddress_mpr				0x76620000)
-set(baseaddress_mshtml			0x76650000)
 set(baseaddress_odbc32			0x76710000)
 set(baseaddress_setupapi		0x76730000)
 set(baseaddress_cryptdll		0x768f0000)
 set(baseaddress_shfolder		0x76900000)
 set(baseaddress_ntdsapi			0x76910000)
-set(baseaddress_ntmarta			0x76920000)
 set(baseaddress_rasdlg			0x76930000)
 set(baseaddress_gdiplus			0x76a70000)
 set(baseaddress_atl				0x76ac0000)
@@ -218,7 +214,6 @@ set(baseaddress_tapi32			0x76e60000)
 set(baseaddress_rasman			0x76e90000)
 set(baseaddress_rasapi32		0x76ee0000)
 set(baseaddress_wtsapi32		0x76f50000)
-set(baseaddress_msvfw32			0x76f60000)
 set(baseaddress_msacm32			0x77400000)
 set(baseaddress_crtdll			0x77630000)
 set(baseaddress_authz			0x77690000)
@@ -253,8 +248,14 @@ set(baseaddress_shlwapi			0x7d110000)
 set(baseaddress_urlmon			0x7d1e0000)
 set(baseaddress_ws2_32			0x7d2f0000)
 set(baseaddress_syssetup		0x7d340000)
-set(baseaddress_query			0x7d9a0000)
-set(baseaddress_hhctrl			0x7e410000)
-set(baseaddress_sxs				0x7e690000)
-set(baseaddress_beepmidi		0x7ef00000)
+set(baseaddress_browseui		0x7d410000)
+set(baseaddress_dsound			0x7d530000)
+set(baseaddress_quartz			0x7d5e0000)
+set(baseaddress_msvfw32			0x7d7a0000)
+set(baseaddress_mshtml			0x7d7f0000)
+set(baseaddress_query			0x7da30000)
+set(baseaddress_hhctrl			0x7da60000)
+set(baseaddress_sxs				0x7dad0000)
+set(baseaddress_beepmidi		0x7db00000)
+set(baseaddress_ntmarta			0x7db20000)
 set(baseaddress_ftfd			0x7f000000)