diff --git a/base/applications/kbswitch/kbsdll/CMakeLists.txt b/base/applications/kbswitch/kbsdll/CMakeLists.txt
index 7f9df233a80..d46b9f54804 100644
--- a/base/applications/kbswitch/kbsdll/CMakeLists.txt
+++ b/base/applications/kbswitch/kbsdll/CMakeLists.txt
@@ -11,3 +11,4 @@ set_module_type(kbsdll win32dll)
 add_importlibs(kbsdll user32 comctl32 kernel32)
 
 add_dependencies(kbsdll kbsdll_def)
+add_livecd_target(kbsdll reactos/system32)
diff --git a/base/shell/explorer/notifyhook/CMakeLists.txt b/base/shell/explorer/notifyhook/CMakeLists.txt
index ad94a20c5aa..6042c0ba787 100644
--- a/base/shell/explorer/notifyhook/CMakeLists.txt
+++ b/base/shell/explorer/notifyhook/CMakeLists.txt
@@ -7,4 +7,6 @@ set_module_type(notifyhook win32dll)
 target_link_libraries(notifyhook 
     ${CMAKE_CURRENT_SOURCE_DIR}/notifyhook.def
     -lkernel32
-    -luser32)
\ No newline at end of file
+    -luser32)
+
+add_livecd_target(notifyhook reactos/system32)
\ No newline at end of file
diff --git a/dll/cpl/access/CMakeLists.txt b/dll/cpl/access/CMakeLists.txt
index fc11781fc09..03f75a604cb 100644
--- a/dll/cpl/access/CMakeLists.txt
+++ b/dll/cpl/access/CMakeLists.txt
@@ -25,3 +25,4 @@ add_importlibs(access
     kernel32)
 
 add_dependencies(access access_def)
+add_livecd_target(access reactos/system32)
diff --git a/dll/cpl/appwiz/CMakeLists.txt b/dll/cpl/appwiz/CMakeLists.txt
index 407b2b4ec4e..9f83a92ea7a 100644
--- a/dll/cpl/appwiz/CMakeLists.txt
+++ b/dll/cpl/appwiz/CMakeLists.txt
@@ -22,3 +22,4 @@ add_importlibs(appwiz
     kernel32)
 
 add_dependencies(appwiz appwiz_def)
+add_livecd_target(appwiz reactos/system32)
diff --git a/dll/cpl/console/CMakeLists.txt b/dll/cpl/console/CMakeLists.txt
index 25d21efbdc3..d341d904dca 100644
--- a/dll/cpl/console/CMakeLists.txt
+++ b/dll/cpl/console/CMakeLists.txt
@@ -26,3 +26,4 @@ add_importlibs(console
 
 add_pch(console ${CMAKE_CURRENT_SOURCE_DIR}/console.h ${SOURCE})
 add_dependencies(console console_def)
+add_livecd_target(console reactos/system32)
diff --git a/dll/cpl/desk/CMakeLists.txt b/dll/cpl/desk/CMakeLists.txt
index 593491f9b96..78fcca43278 100644
--- a/dll/cpl/desk/CMakeLists.txt
+++ b/dll/cpl/desk/CMakeLists.txt
@@ -45,3 +45,4 @@ add_importlibs(desk
     ntdll)
 
 add_dependencies(desk desk_def)
+add_livecd_target(desk reactos/system32)
diff --git a/dll/cpl/hdwwiz/CMakeLists.txt b/dll/cpl/hdwwiz/CMakeLists.txt
index 9d2a868a4d0..c3fbdfb9d04 100644
--- a/dll/cpl/hdwwiz/CMakeLists.txt
+++ b/dll/cpl/hdwwiz/CMakeLists.txt
@@ -22,3 +22,4 @@ add_importlibs(hdwwiz
     ntdll)
 
 add_dependencies(hdwwiz hdwwiz_def)
+add_livecd_target(hdwwiz reactos/system32)
diff --git a/dll/cpl/input/CMakeLists.txt b/dll/cpl/input/CMakeLists.txt
index bcc4dd887fc..6bbfa47b5b7 100644
--- a/dll/cpl/input/CMakeLists.txt
+++ b/dll/cpl/input/CMakeLists.txt
@@ -24,3 +24,4 @@ add_importlibs(input
     kernel32)
 
 add_dependencies(input input_def)
+add_livecd_target(input reactos/system32)
diff --git a/dll/cpl/intl/CMakeLists.txt b/dll/cpl/intl/CMakeLists.txt
index 68e3029b2ca..bdb8603afce 100644
--- a/dll/cpl/intl/CMakeLists.txt
+++ b/dll/cpl/intl/CMakeLists.txt
@@ -34,3 +34,4 @@ add_importlibs(intl
     kernel32)
 
 add_dependencies(intl intl_def)
+add_livecd_target(intl reactos/system32)
diff --git a/dll/cpl/joy/CMakeLists.txt b/dll/cpl/joy/CMakeLists.txt
index 152153fea80..de64c73fdfd 100644
--- a/dll/cpl/joy/CMakeLists.txt
+++ b/dll/cpl/joy/CMakeLists.txt
@@ -16,3 +16,4 @@ add_importlibs(joy
     shell32)
 
 add_dependencies(joy joy_def)
+add_livecd_target(joy reactos/system32)
diff --git a/dll/cpl/main/CMakeLists.txt b/dll/cpl/main/CMakeLists.txt
index 487bff26f90..0ae0a629d92 100644
--- a/dll/cpl/main/CMakeLists.txt
+++ b/dll/cpl/main/CMakeLists.txt
@@ -27,3 +27,4 @@ add_importlibs(main
     kernel32)
 
 add_dependencies(main main_def)
+add_livecd_target(main reactos/system32)
diff --git a/dll/cpl/mmsys/CMakeLists.txt b/dll/cpl/mmsys/CMakeLists.txt
index 0c15d5c0def..0063f799f54 100644
--- a/dll/cpl/mmsys/CMakeLists.txt
+++ b/dll/cpl/mmsys/CMakeLists.txt
@@ -32,3 +32,4 @@ add_importlibs(mmsys
     kernel32)
 
 add_dependencies(mmsys mmsys_def)
+add_livecd_target(mmsys reactos/system32)
diff --git a/dll/cpl/ncpa/CMakeLists.txt b/dll/cpl/ncpa/CMakeLists.txt
index 6d5e32f0867..9fb7fa24bf4 100644
--- a/dll/cpl/ncpa/CMakeLists.txt
+++ b/dll/cpl/ncpa/CMakeLists.txt
@@ -15,3 +15,4 @@ add_importlibs(ncpa
     shell32)
 
 add_dependencies(ncpa ncpa_def)
+add_livecd_target(ncpa reactos/system32)
diff --git a/dll/cpl/odbccp32/CMakeLists.txt b/dll/cpl/odbccp32/CMakeLists.txt
index f68e629088c..fa64e9c79e1 100644
--- a/dll/cpl/odbccp32/CMakeLists.txt
+++ b/dll/cpl/odbccp32/CMakeLists.txt
@@ -11,3 +11,4 @@ target_link_libraries(odbccp32i ${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def)
 
 add_importlibs(odbccp32i user32 comctl32 kernel32)
 add_dependencies(odbccp32i odbccp32i_def)
+add_livecd_target(odbccp32i reactos/system32)
diff --git a/dll/cpl/powercfg/CMakeLists.txt b/dll/cpl/powercfg/CMakeLists.txt
index a9ef13a383c..c7a176672a7 100644
--- a/dll/cpl/powercfg/CMakeLists.txt
+++ b/dll/cpl/powercfg/CMakeLists.txt
@@ -26,3 +26,4 @@ add_importlibs(powercfg
     kernel32)
 
 add_dependencies(powercfg powercfg_def)
+add_livecd_target(powercfg reactos/system32)
diff --git a/dll/cpl/sysdm/CMakeLists.txt b/dll/cpl/sysdm/CMakeLists.txt
index 780aa0f32d6..200ca691ab2 100644
--- a/dll/cpl/sysdm/CMakeLists.txt
+++ b/dll/cpl/sysdm/CMakeLists.txt
@@ -38,3 +38,4 @@ add_importlibs(sysdm
 
 add_pch(sysdm ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(sysdm sysdm_def)
+add_livecd_target(sysdm reactos/system32)
diff --git a/dll/cpl/telephon/CMakeLists.txt b/dll/cpl/telephon/CMakeLists.txt
index eb40f4da631..bc7c9e4eaa0 100644
--- a/dll/cpl/telephon/CMakeLists.txt
+++ b/dll/cpl/telephon/CMakeLists.txt
@@ -18,3 +18,4 @@ add_importlibs(telephon
     kernel32)
 
 add_dependencies(telephon telephon_def)
+add_livecd_target(telephon reactos/system32)
diff --git a/dll/cpl/timedate/CMakeLists.txt b/dll/cpl/timedate/CMakeLists.txt
index 45f6434b34a..e7e629a0b58 100644
--- a/dll/cpl/timedate/CMakeLists.txt
+++ b/dll/cpl/timedate/CMakeLists.txt
@@ -26,3 +26,4 @@ add_importlibs(timedate
     iphlpapi)
 
 add_dependencies(timedate timedate_def)
+add_livecd_target(timedate reactos/system32)
diff --git a/dll/cpl/usrmgr/CMakeLists.txt b/dll/cpl/usrmgr/CMakeLists.txt
index de1fd37e2f2..089fe2e161c 100644
--- a/dll/cpl/usrmgr/CMakeLists.txt
+++ b/dll/cpl/usrmgr/CMakeLists.txt
@@ -29,3 +29,4 @@ add_importlibs(usrmgr
     ntdll)
 
 add_dependencies(usrmgr usrmgr_def)
+add_livecd_target(usrmgr reactos/system32)
diff --git a/dll/directx/amstream/CMakeLists.txt b/dll/directx/amstream/CMakeLists.txt
index 05958014859..287fa573e4a 100644
--- a/dll/directx/amstream/CMakeLists.txt
+++ b/dll/directx/amstream/CMakeLists.txt
@@ -30,3 +30,4 @@ add_importlibs(amstream
     ntdll)
 
 add_dependencies(amstream amstream_def dxsdk)
+add_livecd_target(amstream reactos/system32)
diff --git a/dll/directx/devenum/CMakeLists.txt b/dll/directx/devenum/CMakeLists.txt
index 04b2e94832b..253c9b1abb1 100644
--- a/dll/directx/devenum/CMakeLists.txt
+++ b/dll/directx/devenum/CMakeLists.txt
@@ -34,3 +34,4 @@ add_importlibs(devenum
     ntdll)
 
 add_dependencies(devenum devenum_def)
+add_livecd_target(devenum reactos/system32)
diff --git a/dll/directx/dinput/CMakeLists.txt b/dll/directx/dinput/CMakeLists.txt
index 85f6e214b91..2899bec544b 100644
--- a/dll/directx/dinput/CMakeLists.txt
+++ b/dll/directx/dinput/CMakeLists.txt
@@ -36,3 +36,4 @@ add_importlibs(dinput
     ntdll)
 
 add_dependencies(dinput dinput_def)
+add_livecd_target(dinput reactos/system32)
diff --git a/dll/directx/dsound/CMakeLists.txt b/dll/directx/dsound/CMakeLists.txt
index 76640471f40..900bd586d87 100644
--- a/dll/directx/dsound/CMakeLists.txt
+++ b/dll/directx/dsound/CMakeLists.txt
@@ -37,3 +37,4 @@ add_importlibs(dsound
     ntdll)
 
 add_dependencies(dsound dsound_def)
+add_livecd_target(dsound reactos/system32)
diff --git a/dll/directx/dxdiagn/CMakeLists.txt b/dll/directx/dxdiagn/CMakeLists.txt
index 671088bdd9e..2309660cfb4 100644
--- a/dll/directx/dxdiagn/CMakeLists.txt
+++ b/dll/directx/dxdiagn/CMakeLists.txt
@@ -27,3 +27,4 @@ add_importlibs(dxdiagn
     ntdll)
 
 add_dependencies(dxdiagn dxdiagn_def)
+add_livecd_target(dxdiagn reactos/system32)
diff --git a/dll/directx/ksuser/CMakeLists.txt b/dll/directx/ksuser/CMakeLists.txt
index 8160b830cfd..fc6196f2ef8 100644
--- a/dll/directx/ksuser/CMakeLists.txt
+++ b/dll/directx/ksuser/CMakeLists.txt
@@ -9,3 +9,4 @@ target_link_libraries(ksuser ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def)
 
 add_importlibs(ksuser advapi32 kernel32 ntdll)
 add_dependencies(ksuser ksuser_def psdk bugcodes)
+add_livecd_target(ksuser reactos/system32)
diff --git a/dll/directx/qedit/CMakeLists.txt b/dll/directx/qedit/CMakeLists.txt
index 51adb7712bb..b6d50467891 100644
--- a/dll/directx/qedit/CMakeLists.txt
+++ b/dll/directx/qedit/CMakeLists.txt
@@ -32,3 +32,4 @@ add_importlibs(qedit
     ntdll)
 
 add_dependencies(qedit qedit_def)
+add_livecd_target(qedit reactos/system32)
diff --git a/dll/directx/wine/d3d8/CMakeLists.txt b/dll/directx/wine/d3d8/CMakeLists.txt
index e213775c9d1..aa3bcd9f014 100644
--- a/dll/directx/wine/d3d8/CMakeLists.txt
+++ b/dll/directx/wine/d3d8/CMakeLists.txt
@@ -38,3 +38,4 @@ add_importlibs(d3d8
     wined3d)
 
 add_dependencies(d3d8 d3d8_def wineheaders)
+add_livecd_target(d3d8 reactos/system32)
diff --git a/dll/directx/wine/d3d9/CMakeLists.txt b/dll/directx/wine/d3d9/CMakeLists.txt
index fe017a5e634..0752a354bfd 100644
--- a/dll/directx/wine/d3d9/CMakeLists.txt
+++ b/dll/directx/wine/d3d9/CMakeLists.txt
@@ -40,3 +40,4 @@ add_importlibs(d3d9
     wined3d)
 
 add_dependencies(d3d9 d3d9_def wineheaders)
+add_livecd_target(d3d9 reactos/system32)
diff --git a/dll/keyboard/kbdus/CMakeLists.txt b/dll/keyboard/kbdus/CMakeLists.txt
index 36e3ef379db..f7ab64a2030 100644
--- a/dll/keyboard/kbdus/CMakeLists.txt
+++ b/dll/keyboard/kbdus/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
 spec2def(kbdus ${CMAKE_CURRENT_SOURCE_DIR}/kbdus.spec ${CMAKE_CURRENT_BINARY_DIR}/kbdus.def)
@@ -10,3 +9,4 @@ set_entrypoint(kbdus 0)
 target_link_libraries(kbdus ${CMAKE_CURRENT_BINARY_DIR}/kbdus.def)
 
 add_dependencies(kbdus kbdus_def psdk buildno_header)
+add_livecd_target(kbdus reactos/system32)
\ No newline at end of file
diff --git a/dll/shellext/deskadp/CMakeLists.txt b/dll/shellext/deskadp/CMakeLists.txt
index a624401aadd..8a6ee6e0399 100644
--- a/dll/shellext/deskadp/CMakeLists.txt
+++ b/dll/shellext/deskadp/CMakeLists.txt
@@ -24,3 +24,4 @@ add_importlibs(deskadp
 
 add_pch(deskadp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(deskadp deskadp_def)
+add_livecd_target(deskadp reactos/system32)
diff --git a/dll/shellext/deskmon/CMakeLists.txt b/dll/shellext/deskmon/CMakeLists.txt
index 4f23c22d187..c4d555b6c9c 100644
--- a/dll/shellext/deskmon/CMakeLists.txt
+++ b/dll/shellext/deskmon/CMakeLists.txt
@@ -24,3 +24,4 @@ add_importlibs(deskmon
 
 add_pch(deskmon ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(deskmon deskmon_def)
+add_livecd_target(deskmon reactos/system32)
diff --git a/dll/shellext/devcpux/CMakeLists.txt b/dll/shellext/devcpux/CMakeLists.txt
index 96568f4c59d..8f77431d737 100644
--- a/dll/shellext/devcpux/CMakeLists.txt
+++ b/dll/shellext/devcpux/CMakeLists.txt
@@ -17,3 +17,4 @@ add_importlibs(devcpux
     ntdll)
 
 add_dependencies(devcpux devcpux_def)
+add_livecd_target(devcpux reactos/system32)
diff --git a/dll/shellext/fontext/CMakeLists.txt b/dll/shellext/fontext/CMakeLists.txt
index b4ca5c0a00f..950b39cdf20 100644
--- a/dll/shellext/fontext/CMakeLists.txt
+++ b/dll/shellext/fontext/CMakeLists.txt
@@ -24,3 +24,4 @@ add_importlibs(fontext
     ntdll)
 
 add_dependencies(fontext fontext_def)
+add_livecd_target(fontext reactos/system32)
diff --git a/dll/shellext/slayer/CMakeLists.txt b/dll/shellext/slayer/CMakeLists.txt
index cfb0c4e0bff..feeda200d5f 100644
--- a/dll/shellext/slayer/CMakeLists.txt
+++ b/dll/shellext/slayer/CMakeLists.txt
@@ -22,3 +22,4 @@ add_importlibs(slayer
 
 add_pch(slayer ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(slayer slayer_def)
+add_livecd_target(slayer reactos/system32)
diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt
index 78ad61794e3..fa10f980e81 100644
--- a/dll/win32/CMakeLists.txt
+++ b/dll/win32/CMakeLists.txt
@@ -122,9 +122,9 @@ add_subdirectory(ntprint)
 add_subdirectory(objsel)
 add_subdirectory(odbc32)
 add_subdirectory(odbccp32)
-#add_subdirectory(ole32)
+add_subdirectory(ole32)
 add_subdirectory(oleacc)
-#add_subdirectory(oleaut32)
+add_subdirectory(oleaut32)
 add_subdirectory(olecli32)
 add_subdirectory(oledlg)
 add_subdirectory(olepro32)
@@ -147,7 +147,7 @@ add_subdirectory(rasman)
 add_subdirectory(resutils)
 add_subdirectory(riched20)
 add_subdirectory(riched32)
-#add_subdirectory(rpcrt4)
+add_subdirectory(rpcrt4)
 add_subdirectory(rsabase)
 add_subdirectory(rsaenh)
 add_subdirectory(samlib)
@@ -163,7 +163,7 @@ add_subdirectory(sfc)
 add_subdirectory(sfc_os)
 add_subdirectory(shdoclc)
 #add_subdirectory(shdocvw)
-#add_subdirectory(shell32)
+add_subdirectory(shell32)
 add_subdirectory(shfolder)
 add_subdirectory(shimgvw)
 add_subdirectory(shlwapi)
@@ -190,7 +190,7 @@ add_subdirectory(ufatx)
 add_subdirectory(untfs)
 add_subdirectory(updspapi)
 add_subdirectory(url)
-#add_subdirectory(urlmon)
+add_subdirectory(urlmon)
 add_subdirectory(user32)
 add_subdirectory(userenv)
 add_subdirectory(usp10)
diff --git a/dll/win32/acledit/CMakeLists.txt b/dll/win32/acledit/CMakeLists.txt
index abd37c6a013..26d75b3a5c8 100644
--- a/dll/win32/acledit/CMakeLists.txt
+++ b/dll/win32/acledit/CMakeLists.txt
@@ -16,3 +16,4 @@ target_link_libraries(acledit ${CMAKE_CURRENT_BINARY_DIR}/acledit.def)
 add_importlibs(acledit ntdll)
 
 add_dependencies(acledit acledit_def)
+add_livecd_target(acledit reactos/system32)
diff --git a/dll/win32/aclui/CMakeLists.txt b/dll/win32/aclui/CMakeLists.txt
index 3dcabb4ecb6..d6421693803 100644
--- a/dll/win32/aclui/CMakeLists.txt
+++ b/dll/win32/aclui/CMakeLists.txt
@@ -24,3 +24,4 @@ add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme kerne
 
 add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(aclui aclui_def)
+add_livecd_target(aclui reactos/system32)
diff --git a/dll/win32/activeds/CMakeLists.txt b/dll/win32/activeds/CMakeLists.txt
index 3ff192a6ec8..d227e9cafa0 100644
--- a/dll/win32/activeds/CMakeLists.txt
+++ b/dll/win32/activeds/CMakeLists.txt
@@ -16,3 +16,4 @@ target_link_libraries(activeds
 add_importlibs(activeds kernel32 ntdll)
 
 add_dependencies(activeds activeds_def)
+add_livecd_target(activeds reactos/system32)
diff --git a/dll/win32/advapi32/CMakeLists.txt b/dll/win32/advapi32/CMakeLists.txt
index c7fd3a5c7ec..922e989ec7d 100644
--- a/dll/win32/advapi32/CMakeLists.txt
+++ b/dll/win32/advapi32/CMakeLists.txt
@@ -58,3 +58,4 @@ target_link_libraries(advapi32
 add_importlibs(advapi32 rpcrt4 kernel32 ntdll)
 
 add_pch(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.h ${SOURCE})
+add_livecd_target(advapi32 reactos/system32)
diff --git a/dll/win32/advpack/CMakeLists.txt b/dll/win32/advpack/CMakeLists.txt
index de5205aa91d..ddbf38d6980 100644
--- a/dll/win32/advpack/CMakeLists.txt
+++ b/dll/win32/advpack/CMakeLists.txt
@@ -21,3 +21,4 @@ target_link_libraries(advpack
 
 add_importlibs(advpack ole32 setupapi version advapi32 kernel32 ntdll)
 add_dependencies(advpack advpack_def)
+add_livecd_target(advpack reactos/system32)
diff --git a/dll/win32/authz/CMakeLists.txt b/dll/win32/authz/CMakeLists.txt
index cfcb235c0e8..0505643a8df 100644
--- a/dll/win32/authz/CMakeLists.txt
+++ b/dll/win32/authz/CMakeLists.txt
@@ -20,3 +20,4 @@ target_link_libraries(authz ${CMAKE_CURRENT_BINARY_DIR}/authz.def)
 add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_importlibs(authz advapi32 kernel32 ntdll)
 add_dependencies(authz authz_def)
+add_livecd_target(authz reactos/system32)
diff --git a/dll/win32/avicap32/CMakeLists.txt b/dll/win32/avicap32/CMakeLists.txt
index dd20d85051e..bef0a501af8 100644
--- a/dll/win32/avicap32/CMakeLists.txt
+++ b/dll/win32/avicap32/CMakeLists.txt
@@ -13,3 +13,4 @@ target_link_libraries(avicap32
 
 add_importlibs(avicap32 advapi32 user32 version kernel32 ntdll)
 add_dependencies(avicap32 avicap32_def)
+add_livecd_target(avicap32 reactos/system32)
diff --git a/dll/win32/avifil32/CMakeLists.txt b/dll/win32/avifil32/CMakeLists.txt
index 02aa70a3735..c9c16a852ca 100644
--- a/dll/win32/avifil32/CMakeLists.txt
+++ b/dll/win32/avifil32/CMakeLists.txt
@@ -40,3 +40,4 @@ add_importlibs(avifil32
     ntdll)
 
 add_dependencies(avifil32 avifil32_def)
+add_livecd_target(avifil32 reactos/system32)
diff --git a/dll/win32/batt/CMakeLists.txt b/dll/win32/batt/CMakeLists.txt
index e28756a6790..8dcec8b04e1 100644
--- a/dll/win32/batt/CMakeLists.txt
+++ b/dll/win32/batt/CMakeLists.txt
@@ -11,3 +11,4 @@ target_link_libraries(batt ${CMAKE_CURRENT_BINARY_DIR}/batt.def)
 
 add_importlibs(batt kernel32)
 add_dependencies(batt batt_def)
+add_livecd_target(batt reactos/system32)
diff --git a/dll/win32/bcrypt/CMakeLists.txt b/dll/win32/bcrypt/CMakeLists.txt
index 3683b2bdbf4..fec7b3aa5d7 100644
--- a/dll/win32/bcrypt/CMakeLists.txt
+++ b/dll/win32/bcrypt/CMakeLists.txt
@@ -17,3 +17,4 @@ target_link_libraries(bcrypt
 add_importlibs(bcrypt kernel32 ntdll)
 
 add_dependencies(bcrypt bcrypt_def)
+add_livecd_target(bcrypt reactos/system32)
diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt
index 872dc3dd305..72bfc3540bf 100644
--- a/dll/win32/browseui/CMakeLists.txt
+++ b/dll/win32/browseui/CMakeLists.txt
@@ -52,3 +52,4 @@ add_importlibs(browseui
     ntdll)
 
 add_dependencies(browseui browseui_def)
+add_livecd_target(browseui reactos/system32)
diff --git a/dll/win32/cards/CMakeLists.txt b/dll/win32/cards/CMakeLists.txt
index 0ee0b5ff231..bfad4cf3c70 100644
--- a/dll/win32/cards/CMakeLists.txt
+++ b/dll/win32/cards/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(cards ${CMAKE_CURRENT_BINARY_DIR}/cards.def)
 
 add_importlibs(cards user32 gdi32)
 add_dependencies(cards cards_def)
+add_livecd_target(cards reactos/system32)
diff --git a/dll/win32/clusapi/CMakeLists.txt b/dll/win32/clusapi/CMakeLists.txt
index cf787306955..4795dbc9763 100644
--- a/dll/win32/clusapi/CMakeLists.txt
+++ b/dll/win32/clusapi/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(clusapi
 
 add_importlibs(clusapi kernel32 ntdll)
 add_dependencies(clusapi clusapi_def)
+add_livecd_target(clusapi reactos/system32)
diff --git a/dll/win32/comctl32/CMakeLists.txt b/dll/win32/comctl32/CMakeLists.txt
index e32db17165d..14f7337a9dd 100644
--- a/dll/win32/comctl32/CMakeLists.txt
+++ b/dll/win32/comctl32/CMakeLists.txt
@@ -67,3 +67,4 @@ add_importlibs(comctl32
     ntdll)
 
 add_dependencies(comctl32 comctl32_def)
+add_livecd_target(comctl32 reactos/system32)
diff --git a/dll/win32/comdlg32/CMakeLists.txt b/dll/win32/comdlg32/CMakeLists.txt
index 2ea01002bbf..d951be182b3 100644
--- a/dll/win32/comdlg32/CMakeLists.txt
+++ b/dll/win32/comdlg32/CMakeLists.txt
@@ -38,3 +38,4 @@ add_importlibs(comdlg32
     ntdll)
 
 add_dependencies(comdlg32 comdlg32_def)
+add_livecd_target(comdlg32 reactos/system32)
diff --git a/dll/win32/compstui/CMakeLists.txt b/dll/win32/compstui/CMakeLists.txt
index 6d2b561d98c..f6e8ae89010 100644
--- a/dll/win32/compstui/CMakeLists.txt
+++ b/dll/win32/compstui/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(compstui
 
 add_importlibs(compstui kernel32 ntdll)
 add_dependencies(compstui compstui_def)
+add_livecd_target(compstui reactos/system32)
diff --git a/dll/win32/credui/CMakeLists.txt b/dll/win32/credui/CMakeLists.txt
index 2cca55f3323..9616413aae3 100644
--- a/dll/win32/credui/CMakeLists.txt
+++ b/dll/win32/credui/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(credui
 
 add_importlibs(credui advapi32 user32 comctl32 kernel32 ntdll)
 add_dependencies(credui credui_def)
+add_livecd_target(credui reactos/system32)
diff --git a/dll/win32/crtdll/CMakeLists.txt b/dll/win32/crtdll/CMakeLists.txt
index 6119e827a22..a09786490b3 100644
--- a/dll/win32/crtdll/CMakeLists.txt
+++ b/dll/win32/crtdll/CMakeLists.txt
@@ -28,3 +28,4 @@ target_link_libraries(crtdll
 add_importlibs(crtdll kernel32 ntdll)
 add_pch(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(crtdll crtdll_def)
+add_livecd_target(crtdll reactos/system32)
diff --git a/dll/win32/crypt32/CMakeLists.txt b/dll/win32/crypt32/CMakeLists.txt
index 47e2662a0e0..3b0c4cf232a 100644
--- a/dll/win32/crypt32/CMakeLists.txt
+++ b/dll/win32/crypt32/CMakeLists.txt
@@ -50,3 +50,4 @@ target_link_libraries(crypt32
 
 add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll)
 add_dependencies(crypt32 crypt32_def)
+add_livecd_target(crypt32 reactos/system32)
diff --git a/dll/win32/cryptdlg/CMakeLists.txt b/dll/win32/cryptdlg/CMakeLists.txt
index e0e6c6de4b9..3ac2f9969be 100644
--- a/dll/win32/cryptdlg/CMakeLists.txt
+++ b/dll/win32/cryptdlg/CMakeLists.txt
@@ -22,3 +22,4 @@ add_importlibs(cryptdlg
     ntdll)
 
 add_dependencies(cryptdlg cryptdlg_def)
+add_livecd_target(cryptdlg reactos/system32)
diff --git a/dll/win32/cryptdll/CMakeLists.txt b/dll/win32/cryptdll/CMakeLists.txt
index 03c9c21f6db..1e814478077 100644
--- a/dll/win32/cryptdll/CMakeLists.txt
+++ b/dll/win32/cryptdll/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(cryptdll
 
 add_importlibs(cryptdll kernel32 ntdll)
 add_dependencies(cryptdll cryptdll_def)
+add_livecd_target(cryptdll reactos/system32)
diff --git a/dll/win32/cryptnet/CMakeLists.txt b/dll/win32/cryptnet/CMakeLists.txt
index 50b4d2b6f73..eeec16dd615 100644
--- a/dll/win32/cryptnet/CMakeLists.txt
+++ b/dll/win32/cryptnet/CMakeLists.txt
@@ -19,3 +19,4 @@ add_importlibs(cryptnet
     ntdll)
 
 add_dependencies(cryptnet cryptnet_def)
+add_livecd_target(cryptnet reactos/system32)
diff --git a/dll/win32/cryptui/CMakeLists.txt b/dll/win32/cryptui/CMakeLists.txt
index b36d8cc33ea..a332758f7b2 100644
--- a/dll/win32/cryptui/CMakeLists.txt
+++ b/dll/win32/cryptui/CMakeLists.txt
@@ -28,3 +28,4 @@ add_importlibs(cryptui
     ntdll)
 
 add_dependencies(cryptui cryptui_def)
+add_livecd_target(cryptui reactos/system32)
diff --git a/dll/win32/dbghelp/CMakeLists.txt b/dll/win32/dbghelp/CMakeLists.txt
index 41873d4e7f2..244181eacd6 100644
--- a/dll/win32/dbghelp/CMakeLists.txt
+++ b/dll/win32/dbghelp/CMakeLists.txt
@@ -51,3 +51,4 @@ target_link_libraries(dbghelp
 
 add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll)
 add_dependencies(dbghelp dbghelp_def)
+add_livecd_target(dbghelp reactos/system32)
diff --git a/dll/win32/dciman32/CMakeLists.txt b/dll/win32/dciman32/CMakeLists.txt
index 97d1481e3b2..ece88788a6e 100644
--- a/dll/win32/dciman32/CMakeLists.txt
+++ b/dll/win32/dciman32/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(dciman32
 
 add_importlibs(dciman32 kernel32 ntdll)
 add_dependencies(dciman32 dciman32_def)
+add_livecd_target(dciman32 reactos/system32)
diff --git a/dll/win32/devmgr/CMakeLists.txt b/dll/win32/devmgr/CMakeLists.txt
index 32795d0300a..f331ffff2a6 100644
--- a/dll/win32/devmgr/CMakeLists.txt
+++ b/dll/win32/devmgr/CMakeLists.txt
@@ -30,3 +30,4 @@ add_importlibs(devmgr
 
 add_pch(devmgr ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(devmgr devmgr_def)
+add_livecd_target(devmgr reactos/system32)
diff --git a/dll/win32/dhcpcsvc/CMakeLists.txt b/dll/win32/dhcpcsvc/CMakeLists.txt
index 5e7920df637..58a8cd87894 100644
--- a/dll/win32/dhcpcsvc/CMakeLists.txt
+++ b/dll/win32/dhcpcsvc/CMakeLists.txt
@@ -32,3 +32,4 @@ target_link_libraries(dhcpcsvc ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc.def)
 add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll)
 add_pch(dhcpcsvc ${CMAKE_CURRENT_SOURCE_DIR}/include/rosdhcp.h ${SOURCE})
 add_dependencies(dhcpcsvc dhcpcsvc_def)
+add_livecd_target(dhcpcsvc reactos/system32)
diff --git a/dll/win32/dwmapi/CMakeLists.txt b/dll/win32/dwmapi/CMakeLists.txt
index 51c0d79fd2c..8238a767db9 100644
--- a/dll/win32/dwmapi/CMakeLists.txt
+++ b/dll/win32/dwmapi/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(dwmapi
 
 add_importlibs(dwmapi kernel32 ntdll)
 add_dependencies(dwmapi dwmapi_def)
+add_livecd_target(dwmapi reactos/system32)
diff --git a/dll/win32/faultrep/CMakeLists.txt b/dll/win32/faultrep/CMakeLists.txt
index d5352a21110..e969c3db3b2 100644
--- a/dll/win32/faultrep/CMakeLists.txt
+++ b/dll/win32/faultrep/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(faultrep
 
 add_importlibs(faultrep advapi32 kernel32 ntdll)
 add_dependencies(faultrep faultrep_def)
+add_livecd_target(faultrep reactos/system32)
diff --git a/dll/win32/fmifs/CMakeLists.txt b/dll/win32/fmifs/CMakeLists.txt
index e2829b18394..22a14a9b87b 100644
--- a/dll/win32/fmifs/CMakeLists.txt
+++ b/dll/win32/fmifs/CMakeLists.txt
@@ -12,12 +12,13 @@ list(APPEND SOURCE
     query.c
     fmifs.rc)
 
-add_library(fmifs SHARED ${SOURCE})
+add_pch(fmifs ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
+add_library(fmifs SHARED ${CMAKE_CURRENT_BINARY_DIR}/fmifs_precomp.h.gch ${SOURCE})
 
 set_entrypoint(fmifs InitializeFmIfs@12)
 
 target_link_libraries(fmifs ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def)
 
 add_importlibs(fmifs kernel32 ntdll)
-add_pch(fmifs ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(fmifs fmifs_def psdk buildno_header)
+add_livecd_target(fmifs reactos/system32)
diff --git a/dll/win32/fusion/CMakeLists.txt b/dll/win32/fusion/CMakeLists.txt
index fc78ba653fe..3b8d80e8f8b 100644
--- a/dll/win32/fusion/CMakeLists.txt
+++ b/dll/win32/fusion/CMakeLists.txt
@@ -21,3 +21,4 @@ target_link_libraries(fusion
 
 add_importlibs(fusion shlwapi advapi32 dbghelp user32 kernel32 ntdll)
 add_dependencies(fusion fusion_def)
+add_livecd_target(fusion reactos/system32)
diff --git a/dll/win32/gdi32/CMakeLists.txt b/dll/win32/gdi32/CMakeLists.txt
index e0ad13dc579..f783cd2dc5c 100644
--- a/dll/win32/gdi32/CMakeLists.txt
+++ b/dll/win32/gdi32/CMakeLists.txt
@@ -52,3 +52,4 @@ target_link_libraries(gdi32
 
 add_importlibs(gdi32 user32 advapi32 kernel32 ntdll)
 add_pch(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE})
+add_livecd_target(gdi32 reactos/system32)
diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt
index 3285e6151fc..db7966cc535 100644
--- a/dll/win32/gdiplus/CMakeLists.txt
+++ b/dll/win32/gdiplus/CMakeLists.txt
@@ -43,3 +43,4 @@ target_link_libraries(gdiplus crt)
 endif(ARCH MATCHES amd64)
 
 add_dependencies(gdiplus gdiplus_def)
+add_livecd_target(gdiplus reactos/system32)
diff --git a/dll/win32/getuname/CMakeLists.txt b/dll/win32/getuname/CMakeLists.txt
index 24864b96e92..3847d12d524 100644
--- a/dll/win32/getuname/CMakeLists.txt
+++ b/dll/win32/getuname/CMakeLists.txt
@@ -13,3 +13,4 @@ target_link_libraries(getuname ${CMAKE_CURRENT_BINARY_DIR}/getuname.def)
 
 add_importlibs(getuname kernel32 ntdll)
 add_dependencies(getuname getuname_def)
+add_livecd_target(getuname reactos/system32)
diff --git a/dll/win32/hid/CMakeLists.txt b/dll/win32/hid/CMakeLists.txt
index 3183ee09b86..c0cceffc86b 100644
--- a/dll/win32/hid/CMakeLists.txt
+++ b/dll/win32/hid/CMakeLists.txt
@@ -16,3 +16,4 @@ target_link_libraries(hid ${CMAKE_CURRENT_BINARY_DIR}/hid.def)
 add_importlibs(hid kernel32 ntdll)
 add_pch(hid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(hid hid_def)
+add_livecd_target(hid reactos/system32)
diff --git a/dll/win32/hlink/CMakeLists.txt b/dll/win32/hlink/CMakeLists.txt
index 32f61629aca..8f40be8ab90 100644
--- a/dll/win32/hlink/CMakeLists.txt
+++ b/dll/win32/hlink/CMakeLists.txt
@@ -26,3 +26,4 @@ add_importlibs(hlink
     ntdll)
 
 add_dependencies(hlink hlink_def)
+add_livecd_target(hlink reactos/system32)
diff --git a/dll/win32/hnetcfg/CMakeLists.txt b/dll/win32/hnetcfg/CMakeLists.txt
index 7711f73e9cc..3d4d72b1a93 100644
--- a/dll/win32/hnetcfg/CMakeLists.txt
+++ b/dll/win32/hnetcfg/CMakeLists.txt
@@ -29,3 +29,4 @@ add_importlibs(hnetcfg
     ntdll)
 
 add_dependencies(hnetcfg hnetcfg_def)
+add_livecd_target(hnetcfg reactos/system32)
diff --git a/dll/win32/httpapi/CMakeLists.txt b/dll/win32/httpapi/CMakeLists.txt
index 623d1b87837..4ce2a0f8965 100644
--- a/dll/win32/httpapi/CMakeLists.txt
+++ b/dll/win32/httpapi/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(httpapi
 
 add_importlibs(httpapi kernel32 ntdll)
 add_dependencies(httpapi httpapi_def)
+add_livecd_target(httpapi reactos/system32)
diff --git a/dll/win32/iccvid/CMakeLists.txt b/dll/win32/iccvid/CMakeLists.txt
index 29a67d161b7..222c2fb658d 100644
--- a/dll/win32/iccvid/CMakeLists.txt
+++ b/dll/win32/iccvid/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(iccvid
 
 add_importlibs(iccvid user32 kernel32 ntdll)
 add_dependencies(iccvid iccvid_def)
+add_livecd_target(iccvid reactos/system32)
diff --git a/dll/win32/icmp/CMakeLists.txt b/dll/win32/icmp/CMakeLists.txt
index d146560bab1..0e78997f3e9 100644
--- a/dll/win32/icmp/CMakeLists.txt
+++ b/dll/win32/icmp/CMakeLists.txt
@@ -13,3 +13,4 @@ target_link_libraries(icmp
 
 add_importlibs(icmp ws2_32 kernel32 ntdll)
 add_dependencies(icmp icmp_def psdk)
+add_livecd_target(icmp reactos/system32)
diff --git a/dll/win32/imagehlp/CMakeLists.txt b/dll/win32/imagehlp/CMakeLists.txt
index 4929c67dfcd..efc548ad64b 100644
--- a/dll/win32/imagehlp/CMakeLists.txt
+++ b/dll/win32/imagehlp/CMakeLists.txt
@@ -26,3 +26,4 @@ target_link_libraries(imagehlp
 add_importlibs(imagehlp dbghelp kernel32 ntdll)
 add_pch(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(imagehlp imagehlp_def)
+add_livecd_target(imagehlp reactos/system32)
diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt
index d3db4c7cfeb..5ee585bf86e 100644
--- a/dll/win32/imm32/CMakeLists.txt
+++ b/dll/win32/imm32/CMakeLists.txt
@@ -18,3 +18,4 @@ target_link_libraries(imm32
 
 add_importlibs(imm32 advapi32 user32 kernel32 ntdll)
 add_dependencies(imm32 imm32_def)
+add_livecd_target(imm32 reactos/system32)
diff --git a/dll/win32/inetcomm/CMakeLists.txt b/dll/win32/inetcomm/CMakeLists.txt
index ca62b4d641f..30481427e0d 100644
--- a/dll/win32/inetcomm/CMakeLists.txt
+++ b/dll/win32/inetcomm/CMakeLists.txt
@@ -33,3 +33,4 @@ add_importlibs(inetcomm
     ntdll)
 
 add_dependencies(inetcomm inetcomm_def)
+add_livecd_target(inetcomm reactos/system32)
diff --git a/dll/win32/inetmib1/CMakeLists.txt b/dll/win32/inetmib1/CMakeLists.txt
index 9bcdc81403b..28eb7215662 100644
--- a/dll/win32/inetmib1/CMakeLists.txt
+++ b/dll/win32/inetmib1/CMakeLists.txt
@@ -21,3 +21,4 @@ add_importlibs(inetmib1
     ntdll)
 
 add_dependencies(inetmib1 inetmib1_def)
+add_livecd_target(inetmib1 reactos/system32)
diff --git a/dll/win32/initpki/CMakeLists.txt b/dll/win32/initpki/CMakeLists.txt
index bdf573b9bd4..7a051ecb24f 100644
--- a/dll/win32/initpki/CMakeLists.txt
+++ b/dll/win32/initpki/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(initpki
 
 add_importlibs(initpki kernel32 ntdll)
 add_dependencies(initpki initpki_def)
+add_livecd_target(initpki reactos/system32)
diff --git a/dll/win32/inseng/CMakeLists.txt b/dll/win32/inseng/CMakeLists.txt
index cad559298f8..39f0e7ac707 100644
--- a/dll/win32/inseng/CMakeLists.txt
+++ b/dll/win32/inseng/CMakeLists.txt
@@ -22,3 +22,4 @@ add_importlibs(inseng
     ntdll)
 
 add_dependencies(inseng inseng_def)
+add_livecd_target(inseng reactos/system32)
diff --git a/dll/win32/iphlpapi/CMakeLists.txt b/dll/win32/iphlpapi/CMakeLists.txt
index f9aba7a97c9..796edb2ae98 100644
--- a/dll/win32/iphlpapi/CMakeLists.txt
+++ b/dll/win32/iphlpapi/CMakeLists.txt
@@ -30,3 +30,4 @@ target_link_libraries(iphlpapi
 
 add_importlibs(iphlpapi dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll)
 add_dependencies(iphlpapi iphlpapi_def)
+add_livecd_target(iphlpapi reactos/system32)
diff --git a/dll/win32/itircl/CMakeLists.txt b/dll/win32/itircl/CMakeLists.txt
index 12e2b6e940f..bce57cb129c 100644
--- a/dll/win32/itircl/CMakeLists.txt
+++ b/dll/win32/itircl/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(itircl
 
 add_importlibs(itircl kernel32 ntdll)
 add_dependencies(itircl itircl_def psdk)
+add_livecd_target(itircl reactos/system32)
diff --git a/dll/win32/itss/CMakeLists.txt b/dll/win32/itss/CMakeLists.txt
index a791dfe73e7..e740748fba9 100644
--- a/dll/win32/itss/CMakeLists.txt
+++ b/dll/win32/itss/CMakeLists.txt
@@ -28,3 +28,4 @@ add_importlibs(itss
     ntdll)
 
 add_dependencies(itss itss_def wineheaders)
+add_livecd_target(itss reactos/system32)
diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt
index ddcff4e3e47..d8fcfdc201c 100644
--- a/dll/win32/kernel32/CMakeLists.txt
+++ b/dll/win32/kernel32/CMakeLists.txt
@@ -117,3 +117,4 @@ target_link_libraries(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/kernel32.def
 add_importlibs(kernel32 ntdll)
 add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE})
 add_dependencies(kernel32 errcodes)
+add_livecd_target(kernel32 reactos/system32)
diff --git a/dll/win32/loadperf/CMakeLists.txt b/dll/win32/loadperf/CMakeLists.txt
index 1e266a62409..b17f239d501 100644
--- a/dll/win32/loadperf/CMakeLists.txt
+++ b/dll/win32/loadperf/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(loadperf
 
 add_importlibs(loadperf kernel32 ntdll)
 add_dependencies(loadperf loadperf_def)
+add_livecd_target(loadperf reactos/system32)
diff --git a/dll/win32/localspl/CMakeLists.txt b/dll/win32/localspl/CMakeLists.txt
index ffbd9b2c323..7f0d943eaa8 100644
--- a/dll/win32/localspl/CMakeLists.txt
+++ b/dll/win32/localspl/CMakeLists.txt
@@ -26,3 +26,4 @@ add_importlibs(localspl
     ntdll)
 
 add_dependencies(localspl localspl_def)
+add_livecd_target(localspl reactos/system32)
diff --git a/dll/win32/localui/CMakeLists.txt b/dll/win32/localui/CMakeLists.txt
index 0177a9eb2c5..7abed8c1b8a 100644
--- a/dll/win32/localui/CMakeLists.txt
+++ b/dll/win32/localui/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(localui
 
 add_importlibs(localui winspool user32 kernel32 ntdll)
 add_dependencies(localui localui_def)
+add_livecd_target(localui reactos/system32)
diff --git a/dll/win32/lpk/CMakeLists.txt b/dll/win32/lpk/CMakeLists.txt
index 90f44a91595..aadb9ea28ef 100644
--- a/dll/win32/lpk/CMakeLists.txt
+++ b/dll/win32/lpk/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(lpk ${CMAKE_CURRENT_BINARY_DIR}/lpk.def)
 
 add_importlibs(lpk user32 usp10 kernel32 ntdll)
 add_dependencies(lpk lpk_def)
+add_livecd_target(lpk reactos/system32)
diff --git a/dll/win32/mapi32/CMakeLists.txt b/dll/win32/mapi32/CMakeLists.txt
index 37483788d11..01f90543ac5 100644
--- a/dll/win32/mapi32/CMakeLists.txt
+++ b/dll/win32/mapi32/CMakeLists.txt
@@ -21,3 +21,4 @@ target_link_libraries(mapi32
 
 add_importlibs(mapi32 shlwapi shell32 user32 advapi32 kernel32 ntdll)
 add_dependencies(mapi32 mapi32_def)
+add_livecd_target(mapi32 reactos/system32)
diff --git a/dll/win32/mciavi32/CMakeLists.txt b/dll/win32/mciavi32/CMakeLists.txt
index 0afa7bd73e3..e508cf3d044 100644
--- a/dll/win32/mciavi32/CMakeLists.txt
+++ b/dll/win32/mciavi32/CMakeLists.txt
@@ -19,3 +19,4 @@ target_link_libraries(mciavi32
 
 add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 kernel32 ntdll)
 add_dependencies(mciavi32 mciavi32_def)
+add_livecd_target(mciavi32 reactos/system32)
diff --git a/dll/win32/mciqtz32/CMakeLists.txt b/dll/win32/mciqtz32/CMakeLists.txt
index d82756e1fba..71c47aa3dbf 100644
--- a/dll/win32/mciqtz32/CMakeLists.txt
+++ b/dll/win32/mciqtz32/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(mciqtz32
 
 add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 kernel32 ntdll)
 add_dependencies(mciqtz32 mciqtz32_def)
+add_livecd_target(mciqtz32 reactos/system32)
diff --git a/dll/win32/modemui/CMakeLists.txt b/dll/win32/modemui/CMakeLists.txt
index ce1fe4e9d47..07c2e5b8855 100644
--- a/dll/win32/modemui/CMakeLists.txt
+++ b/dll/win32/modemui/CMakeLists.txt
@@ -11,3 +11,4 @@ target_link_libraries(modemui ${CMAKE_CURRENT_BINARY_DIR}/modemui.def)
 
 add_importlibs(modemui kernel32)
 add_dependencies(modemui modemui_def)
+add_livecd_target(modemui reactos/system32)
diff --git a/dll/win32/mpr/CMakeLists.txt b/dll/win32/mpr/CMakeLists.txt
index fa1d99eed91..f40e9f72035 100644
--- a/dll/win32/mpr/CMakeLists.txt
+++ b/dll/win32/mpr/CMakeLists.txt
@@ -23,3 +23,4 @@ target_link_libraries(mpr
 
 add_importlibs(mpr advapi32 user32 kernel32 ntdll)
 add_dependencies(mpr mpr_def)
+add_livecd_target(mpr reactos/system32)
diff --git a/dll/win32/mprapi/CMakeLists.txt b/dll/win32/mprapi/CMakeLists.txt
index b759171ec80..2c4b653b181 100644
--- a/dll/win32/mprapi/CMakeLists.txt
+++ b/dll/win32/mprapi/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(mprapi
 
 add_importlibs(mprapi kernel32 ntdll)
 add_dependencies(mprapi mprapi_def)
+add_livecd_target(mprapi reactos/system32)
diff --git a/dll/win32/msacm32/CMakeLists.txt b/dll/win32/msacm32/CMakeLists.txt
index 59b3522f543..0bd6304a18c 100644
--- a/dll/win32/msacm32/CMakeLists.txt
+++ b/dll/win32/msacm32/CMakeLists.txt
@@ -25,3 +25,4 @@ add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll)
 add_dependencies(msacm32 msacm32_def)
 
 add_subdirectory(msacm32.drv)
+add_livecd_target(msacm32 reactos/system32)
diff --git a/dll/win32/msafd/CMakeLists.txt b/dll/win32/msafd/CMakeLists.txt
index 95857fd01e2..1ab57f582da 100644
--- a/dll/win32/msafd/CMakeLists.txt
+++ b/dll/win32/msafd/CMakeLists.txt
@@ -26,3 +26,4 @@ add_pch(msafd ${CMAKE_CURRENT_SOURCE_DIR}/msafd.h ${SOURCE})
 
 add_importlibs(msafd advapi32 kernel32 ntdll)
 add_dependencies(msafd msafd_def)
+add_livecd_target(msafd reactos/system32)
diff --git a/dll/win32/mscat32/CMakeLists.txt b/dll/win32/mscat32/CMakeLists.txt
index b73f8142341..de2f8da234b 100644
--- a/dll/win32/mscat32/CMakeLists.txt
+++ b/dll/win32/mscat32/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(mscat32
 
 add_importlibs(mscat32 wintrust kernel32 ntdll)
 add_dependencies(mscat32 mscat32_def)
+add_livecd_target(mscat32 reactos/system32)
diff --git a/dll/win32/mscms/CMakeLists.txt b/dll/win32/mscms/CMakeLists.txt
index 63d5ce32b4b..07e50d97ca5 100644
--- a/dll/win32/mscms/CMakeLists.txt
+++ b/dll/win32/mscms/CMakeLists.txt
@@ -21,3 +21,4 @@ target_link_libraries(mscms
 
 add_importlibs(mscms kernel32 ntdll)
 add_dependencies(mscms mscms_def)
+add_livecd_target(mscms reactos/system32)
diff --git a/dll/win32/mscoree/CMakeLists.txt b/dll/win32/mscoree/CMakeLists.txt
index d966a9e986c..29c4296a1da 100644
--- a/dll/win32/mscoree/CMakeLists.txt
+++ b/dll/win32/mscoree/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(mscoree
 
 add_importlibs(mscoree advapi32 shell32 kernel32 ntdll)
 add_dependencies(mscoree mscoree_def)
+add_livecd_target(mscoree reactos/system32)
diff --git a/dll/win32/msctf/CMakeLists.txt b/dll/win32/msctf/CMakeLists.txt
index 5c433889a65..d4a0a167659 100644
--- a/dll/win32/msctf/CMakeLists.txt
+++ b/dll/win32/msctf/CMakeLists.txt
@@ -30,3 +30,4 @@ target_link_libraries(msctf
 
 add_importlibs(msctf ole32 oleaut32 user32 advapi32 kernel32 ntdll)
 add_dependencies(msctf msctf_def)
+add_livecd_target(msctf reactos/system32)
diff --git a/dll/win32/msftedit/CMakeLists.txt b/dll/win32/msftedit/CMakeLists.txt
index b35fe2b6663..46339981855 100644
--- a/dll/win32/msftedit/CMakeLists.txt
+++ b/dll/win32/msftedit/CMakeLists.txt
@@ -18,3 +18,4 @@ target_link_libraries(msftedit
 add_importlibs(msftedit riched20 kernel32 ntdll)
 
 add_dependencies(msftedit msftedit_def)
+add_livecd_target(msftedit reactos/system32)
diff --git a/dll/win32/msgina/CMakeLists.txt b/dll/win32/msgina/CMakeLists.txt
index 2a54bf3239c..1c8bfbb0610 100644
--- a/dll/win32/msgina/CMakeLists.txt
+++ b/dll/win32/msgina/CMakeLists.txt
@@ -19,3 +19,4 @@ target_link_libraries(msgina
 
 add_importlibs(msgina advapi32 user32 gdi32 userenv kernel32 ntdll)
 add_dependencies(msgina msgina_def)
+add_livecd_target(msgina reactos/system32)
diff --git a/dll/win32/msimg32/CMakeLists.txt b/dll/win32/msimg32/CMakeLists.txt
index c816a4440e1..1b1ab0939ed 100644
--- a/dll/win32/msimg32/CMakeLists.txt
+++ b/dll/win32/msimg32/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(msimg32
 
 add_importlibs(msimg32 gdi32 kernel32 ntdll)
 add_dependencies(msimg32 msimg32_def)
+add_livecd_target(msimg32 reactos/system32)
diff --git a/dll/win32/msimtf/CMakeLists.txt b/dll/win32/msimtf/CMakeLists.txt
index 39519706805..1ce009654f5 100644
--- a/dll/win32/msimtf/CMakeLists.txt
+++ b/dll/win32/msimtf/CMakeLists.txt
@@ -18,3 +18,4 @@ target_link_libraries(msimtf
 
 add_importlibs(msimtf msvcrt imm32 kernel32 ntdll)
 add_dependencies(msimtf msimtf_def)
+add_livecd_target(msimtf reactos/system32)
diff --git a/dll/win32/msisip/CMakeLists.txt b/dll/win32/msisip/CMakeLists.txt
index 1bb99df448e..efca2f3839e 100644
--- a/dll/win32/msisip/CMakeLists.txt
+++ b/dll/win32/msisip/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(msisip
 
 add_importlibs(msisip crypt32 ole32 kernel32 ntdll)
 add_dependencies(msisip msisip_def)
+add_livecd_target(msisip reactos/system32)
diff --git a/dll/win32/msnet32/CMakeLists.txt b/dll/win32/msnet32/CMakeLists.txt
index 3ed7508d0f4..d2884ce74fa 100644
--- a/dll/win32/msnet32/CMakeLists.txt
+++ b/dll/win32/msnet32/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(msnet32
 
 add_importlibs(msnet32 kernel32 ntdll)
 add_dependencies(msnet32 msnet32_def)
+add_livecd_target(msnet32 reactos/system32)
diff --git a/dll/win32/msrle32/CMakeLists.txt b/dll/win32/msrle32/CMakeLists.txt
index bb90043d97b..659cb8a6f26 100644
--- a/dll/win32/msrle32/CMakeLists.txt
+++ b/dll/win32/msrle32/CMakeLists.txt
@@ -16,3 +16,4 @@ target_link_libraries(msrle32
 
 add_importlibs(msrle32 msvcrt winmm user32 kernel32 ntdll)
 add_dependencies(msrle32 msrle32_def)
+add_livecd_target(msrle32 reactos/system32)
diff --git a/dll/win32/mssign32/CMakeLists.txt b/dll/win32/mssign32/CMakeLists.txt
index 3cce8a89feb..1f291eaf749 100644
--- a/dll/win32/mssign32/CMakeLists.txt
+++ b/dll/win32/mssign32/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(mssign32
 
 add_importlibs(mssign32 kernel32 ntdll)
 add_dependencies(mssign32 mssign32_def)
+add_livecd_target(mssign32 reactos/system32)
diff --git a/dll/win32/mssip32/CMakeLists.txt b/dll/win32/mssip32/CMakeLists.txt
index a86e62bde98..81bd6ca7a8b 100644
--- a/dll/win32/mssip32/CMakeLists.txt
+++ b/dll/win32/mssip32/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(mssip32
 
 add_importlibs(mssip32 kernel32 ntdll)
 add_dependencies(mssip32 mssip32_def)
+add_livecd_target(mssip32 reactos/system32)
diff --git a/dll/win32/mstask/CMakeLists.txt b/dll/win32/mstask/CMakeLists.txt
index 10aaefaccb4..b60eae15aeb 100644
--- a/dll/win32/mstask/CMakeLists.txt
+++ b/dll/win32/mstask/CMakeLists.txt
@@ -29,3 +29,4 @@ target_link_libraries(mstask
 
 add_importlibs(mstask ole32 ntdll)
 add_dependencies(mstask mstask_def)
+add_livecd_target(mstask reactos/system32)
diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt
index 681f14efda2..4d8f6ef7e0b 100644
--- a/dll/win32/msvcrt/CMakeLists.txt
+++ b/dll/win32/msvcrt/CMakeLists.txt
@@ -28,3 +28,4 @@ target_link_libraries(msvcrt
 
 add_pch(msvcrt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_importlibs(msvcrt kernel32 ntdll)
+add_livecd_target(msvcrt reactos/system32)
diff --git a/dll/win32/msvcrt40/CMakeLists.txt b/dll/win32/msvcrt40/CMakeLists.txt
index cd55d5f5a83..b1c5f2fc077 100644
--- a/dll/win32/msvcrt40/CMakeLists.txt
+++ b/dll/win32/msvcrt40/CMakeLists.txt
@@ -16,3 +16,4 @@ target_link_libraries(msvcrt40
 
 add_importlibs(msvcrt40 msvcrt kernel32 ntdll)
 add_dependencies(msvcrt40 msvcrt40_def)
+add_livecd_target(msvcrt40 reactos/system32)
diff --git a/dll/win32/msvfw32/CMakeLists.txt b/dll/win32/msvfw32/CMakeLists.txt
index 0154bbfaa75..5c50be397f6 100644
--- a/dll/win32/msvfw32/CMakeLists.txt
+++ b/dll/win32/msvfw32/CMakeLists.txt
@@ -20,3 +20,4 @@ target_link_libraries(msvfw32
 
 add_importlibs(msvfw32 winmm version comctl32 user32 gdi32 advapi32 kernel32 ntdll)
 add_dependencies(msvfw32 msvfw32_def)
+add_livecd_target(msvfw32 reactos/system32)
diff --git a/dll/win32/msvidc32/CMakeLists.txt b/dll/win32/msvidc32/CMakeLists.txt
index 46755ba2ec3..e3cdc908dfe 100644
--- a/dll/win32/msvidc32/CMakeLists.txt
+++ b/dll/win32/msvidc32/CMakeLists.txt
@@ -16,3 +16,4 @@ target_link_libraries(msvidc32
 
 add_importlibs(msvidc32 user32 kernel32 ntdll)
 add_dependencies(msvidc32 msvidc32_def)
+add_livecd_target(msvidc32 reactos/system32)
diff --git a/dll/win32/mswsock/CMakeLists.txt b/dll/win32/mswsock/CMakeLists.txt
index a14b739cf4b..a08d0c8b76e 100644
--- a/dll/win32/mswsock/CMakeLists.txt
+++ b/dll/win32/mswsock/CMakeLists.txt
@@ -17,3 +17,4 @@ target_link_libraries(mswsock ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def)
 
 add_importlibs(mswsock ws2_32 kernel32)
 add_dependencies(mswsock mswsock_def)
+add_livecd_target(mswsock reactos/system32)
diff --git a/dll/win32/msxml3/CMakeLists.txt b/dll/win32/msxml3/CMakeLists.txt
index e4ec195beba..4701ead3394 100644
--- a/dll/win32/msxml3/CMakeLists.txt
+++ b/dll/win32/msxml3/CMakeLists.txt
@@ -23,3 +23,4 @@ target_link_libraries(netcfgx
 
 add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi ole32 user32 comctl32 ws2_32 ntdll)
 add_dependencies(netcfgx netcfgx_def)
+add_livecd_target(msxml3 reactos/system32)
diff --git a/dll/win32/netapi32/CMakeLists.txt b/dll/win32/netapi32/CMakeLists.txt
index f21b5889e36..76ac6f81bbf 100644
--- a/dll/win32/netapi32/CMakeLists.txt
+++ b/dll/win32/netapi32/CMakeLists.txt
@@ -26,3 +26,4 @@ target_link_libraries(netapi32
 
 add_importlibs(netapi32 iphlpapi ws2_32 advapi32 kernel32 ntdll)
 add_dependencies(netapi32 netapi32_def)
+add_livecd_target(netapi32 reactos/system32)
diff --git a/dll/win32/netcfgx/CMakeLists.txt b/dll/win32/netcfgx/CMakeLists.txt
index 5d65f436116..c9b2b97ed61 100644
--- a/dll/win32/netcfgx/CMakeLists.txt
+++ b/dll/win32/netcfgx/CMakeLists.txt
@@ -21,3 +21,4 @@ target_link_libraries(netcfgx
 
 add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi ole32 user32 comctl32 ws2_32 kernel32 ntdll)
 add_dependencies(netcfgx netcfgx_def)
+add_livecd_target(netcfgx reactos/system32)
diff --git a/dll/win32/netevent/CMakeLists.txt b/dll/win32/netevent/CMakeLists.txt
index 56104980158..bc7a5e8957d 100644
--- a/dll/win32/netevent/CMakeLists.txt
+++ b/dll/win32/netevent/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(netevent
 add_importlibs(netevent kernel32)
 
 add_dependencies(netevent netevent_def neteventmsg)
+add_livecd_target(netevent reactos/system32)
diff --git a/dll/win32/netid/CMakeLists.txt b/dll/win32/netid/CMakeLists.txt
index 20187c1626d..b546ebd3619 100644
--- a/dll/win32/netid/CMakeLists.txt
+++ b/dll/win32/netid/CMakeLists.txt
@@ -10,3 +10,4 @@ target_link_libraries(netid
 
 add_importlibs(netid user32 gdi32 comctl32 advapi32 netapi32 kernel32 ntdll)
 add_dependencies(netid netid_def)
+add_livecd_target(netid reactos/system32)
diff --git a/dll/win32/netshell/CMakeLists.txt b/dll/win32/netshell/CMakeLists.txt
index 65ebe5efa3e..2ee1d3d4488 100644
--- a/dll/win32/netshell/CMakeLists.txt
+++ b/dll/win32/netshell/CMakeLists.txt
@@ -42,3 +42,4 @@ add_importlibs(netshell
 
 add_pch(netshell ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(netshell netshell_def)
+add_livecd_target(netshell reactos/system32)
diff --git a/dll/win32/newdev/CMakeLists.txt b/dll/win32/newdev/CMakeLists.txt
index 46beca2b04e..debeba6077f 100644
--- a/dll/win32/newdev/CMakeLists.txt
+++ b/dll/win32/newdev/CMakeLists.txt
@@ -17,3 +17,4 @@ target_link_libraries(newdev
 
 add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 kernel32 ntdll)
 add_dependencies(newdev newdev_def)
+add_livecd_target(newdev reactos/system32)
diff --git a/dll/win32/ntlanman/CMakeLists.txt b/dll/win32/ntlanman/CMakeLists.txt
index 06116cc364f..6d03b54c65b 100644
--- a/dll/win32/ntlanman/CMakeLists.txt
+++ b/dll/win32/ntlanman/CMakeLists.txt
@@ -13,3 +13,4 @@ target_link_libraries(ntlanman
 
 add_importlibs(ntlanman netapi32 kernel32 ntdll)
 add_dependencies(ntlanman ntlanman_def)
+add_livecd_target(ntlanman reactos/system32)
diff --git a/dll/win32/ntmarta/CMakeLists.txt b/dll/win32/ntmarta/CMakeLists.txt
index 764706003f0..b8d01f02864 100644
--- a/dll/win32/ntmarta/CMakeLists.txt
+++ b/dll/win32/ntmarta/CMakeLists.txt
@@ -21,3 +21,4 @@ add_importlibs(ntmarta
     ntdll)
 
 add_dependencies(ntmarta ntmarta_def)
+add_livecd_target(ntmarta reactos/system32)
diff --git a/dll/win32/ntprint/CMakeLists.txt b/dll/win32/ntprint/CMakeLists.txt
index e4b844e39a2..16f9b13636c 100644
--- a/dll/win32/ntprint/CMakeLists.txt
+++ b/dll/win32/ntprint/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(ntprint
 
 add_importlibs(ntprint winspool kernel32 ntdll)
 add_dependencies(ntprint ntprint_def psdk)
+add_livecd_target(ntprint reactos/system32)
diff --git a/dll/win32/objsel/CMakeLists.txt b/dll/win32/objsel/CMakeLists.txt
index 709c87534bd..6447ed65d8c 100644
--- a/dll/win32/objsel/CMakeLists.txt
+++ b/dll/win32/objsel/CMakeLists.txt
@@ -29,3 +29,4 @@ add_importlibs(objsel
     ntdll)
 
 add_dependencies(objsel objsel_def)
+add_livecd_target(objsel reactos/system32)
diff --git a/dll/win32/odbc32/CMakeLists.txt b/dll/win32/odbc32/CMakeLists.txt
index 601fd066c37..954e449fba6 100644
--- a/dll/win32/odbc32/CMakeLists.txt
+++ b/dll/win32/odbc32/CMakeLists.txt
@@ -21,3 +21,4 @@ add_importlibs(odbc32
     ntdll)
 
 add_dependencies(odbc32 odbc32_def)
+add_livecd_target(odbc32 reactos/system32)
diff --git a/dll/win32/ole32/CMakeLists.txt b/dll/win32/ole32/CMakeLists.txt
index d31698d5023..b62c181f008 100644
--- a/dll/win32/ole32/CMakeLists.txt
+++ b/dll/win32/ole32/CMakeLists.txt
@@ -72,4 +72,5 @@ target_link_libraries(ole32
     
 add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll)
     
-add_dependencies(ole32 ole32_def ole32idl)
\ No newline at end of file
+add_dependencies(ole32 ole32_def ole32idl)
+add_livecd_target(ole32 reactos/system32)
\ No newline at end of file
diff --git a/dll/win32/oleaut32/CMakeLists.txt b/dll/win32/oleaut32/CMakeLists.txt
index 7854983009b..fcf8179ac9f 100644
--- a/dll/win32/oleaut32/CMakeLists.txt
+++ b/dll/win32/oleaut32/CMakeLists.txt
@@ -23,7 +23,10 @@ list(APPEND SOURCE
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 add_definitions(-D__WINESRC__)
+#FIXME: this should be quotes enclosed
 add_definitions(-DPROXY_CLSID_IS={0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}})
+#add_definitions(-DPROXY_CLSID_IS="{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}")
+
 add_definitions(-DCOM_NO_WINDOWS_H)
 add_definitions(-D_OLEAUT32_)
 add_definitions(-DPROXY_DELEGATION)
@@ -57,3 +60,4 @@ add_dependencies(oleaut32 oleaut32_def)
 
 rpcproxy(oleaut32 oleaut32_oaidl.idl oleaut32_ocidl.idl)
 
+add_livecd_target(oleaut32 reactos/system32)
diff --git a/dll/win32/oledlg/CMakeLists.txt b/dll/win32/oledlg/CMakeLists.txt
index cc5ab3a23cb..7eec53b10aa 100644
--- a/dll/win32/oledlg/CMakeLists.txt
+++ b/dll/win32/oledlg/CMakeLists.txt
@@ -18,3 +18,4 @@ target_link_libraries(oledlg
 
 add_importlibs(oledlg ole32 comdlg32 user32 advapi32 kernel32 ntdll)
 add_dependencies(oledlg oledlg_def)
+add_livecd_target(oledlg reactos/system32)
diff --git a/dll/win32/olethk32/CMakeLists.txt b/dll/win32/olethk32/CMakeLists.txt
index aba389cae2c..efa94e8410e 100644
--- a/dll/win32/olethk32/CMakeLists.txt
+++ b/dll/win32/olethk32/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(olethk32
 
 add_importlibs(olethk32 kernel32 ntdll)
 add_dependencies(olethk32 olethk32_def psdk)
+add_livecd_target(olethk32 reactos/system32)
diff --git a/dll/win32/opengl32/CMakeLists.txt b/dll/win32/opengl32/CMakeLists.txt
index 9dfb7bcd142..f01d21b08fc 100644
--- a/dll/win32/opengl32/CMakeLists.txt
+++ b/dll/win32/opengl32/CMakeLists.txt
@@ -31,3 +31,4 @@ add_importlibs(opengl32
 
 add_pch(opengl32 ${CMAKE_CURRENT_SOURCE_DIR}/opengl32.h ${SOURCE})
 add_dependencies(opengl32 opengl32_def)
+add_livecd_target(opengl32 reactos/system32)
diff --git a/dll/win32/pidgen/CMakeLists.txt b/dll/win32/pidgen/CMakeLists.txt
index 067becae4e5..dd46911ca8c 100644
--- a/dll/win32/pidgen/CMakeLists.txt
+++ b/dll/win32/pidgen/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(pidgen
 
 add_importlibs(pidgen kernel32 ntdll)
 add_dependencies(pidgen pidgen_def)
+add_livecd_target(pidgen reactos/system32)
diff --git a/dll/win32/powrprof/CMakeLists.txt b/dll/win32/powrprof/CMakeLists.txt
index 1a8cdf3a8fa..e0a7222f5b8 100644
--- a/dll/win32/powrprof/CMakeLists.txt
+++ b/dll/win32/powrprof/CMakeLists.txt
@@ -13,3 +13,4 @@ target_link_libraries(powrprof
 
 add_importlibs(powrprof advapi32 user32 comctl32 kernel32 ntdll)
 add_dependencies(powrprof powrprof_def)
+add_livecd_target(powrprof reactos/system32)
diff --git a/dll/win32/psapi/CMakeLists.txt b/dll/win32/psapi/CMakeLists.txt
index bb1bdda1103..0ae4c6becfe 100644
--- a/dll/win32/psapi/CMakeLists.txt
+++ b/dll/win32/psapi/CMakeLists.txt
@@ -20,3 +20,4 @@ target_link_libraries(psapi
 add_importlibs(psapi kernel32 ntdll)
 add_pch(psapi ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(psapi psapi_def)
+add_livecd_target(psapi reactos/system32)
diff --git a/dll/win32/query/CMakeLists.txt b/dll/win32/query/CMakeLists.txt
index 5076114c012..4682fcdddf4 100644
--- a/dll/win32/query/CMakeLists.txt
+++ b/dll/win32/query/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(query
 
 add_importlibs(query kernel32 ntdll)
 add_dependencies(query query_def)
+add_livecd_target(query reactos/system32)
diff --git a/dll/win32/rasadhlp/CMakeLists.txt b/dll/win32/rasadhlp/CMakeLists.txt
index e528c09689e..091bbe1b7b8 100644
--- a/dll/win32/rasadhlp/CMakeLists.txt
+++ b/dll/win32/rasadhlp/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(rasadhlp ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp.def)
 add_importlibs(rasadhlp ws2_32 kernel32 ntdll)
 
 add_dependencies(rasadhlp rasadhlp_def)
+add_livecd_target(rasadhlp reactos/system32)
diff --git a/dll/win32/rasdlg/CMakeLists.txt b/dll/win32/rasdlg/CMakeLists.txt
index 20ae5cf3d92..5b224494f8e 100644
--- a/dll/win32/rasdlg/CMakeLists.txt
+++ b/dll/win32/rasdlg/CMakeLists.txt
@@ -12,3 +12,4 @@ target_link_libraries(rasdlg
 
 add_importlibs(rasdlg kernel32 ntdll)
 add_dependencies(rasdlg rasdlg_def)
+add_livecd_target(rasdlg reactos/system32)
diff --git a/dll/win32/rasman/CMakeLists.txt b/dll/win32/rasman/CMakeLists.txt
index cb306d41fc0..aaec332a810 100644
--- a/dll/win32/rasman/CMakeLists.txt
+++ b/dll/win32/rasman/CMakeLists.txt
@@ -12,3 +12,4 @@ target_link_libraries(rasman
 
 add_importlibs(rasman kernel32 ntdll)
 add_dependencies(rasman rasman_def)
+add_livecd_target(rasman reactos/system32)
diff --git a/dll/win32/resutils/CMakeLists.txt b/dll/win32/resutils/CMakeLists.txt
index 3f69fe28047..5c09f36deaf 100644
--- a/dll/win32/resutils/CMakeLists.txt
+++ b/dll/win32/resutils/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(resutils
 
 add_importlibs(resutils kernel32 ntdll)
 add_dependencies(resutils resutils_def)
+add_livecd_target(resutils reactos/system32)
diff --git a/dll/win32/riched20/CMakeLists.txt b/dll/win32/riched20/CMakeLists.txt
index 94c1a91690e..627507e3544 100644
--- a/dll/win32/riched20/CMakeLists.txt
+++ b/dll/win32/riched20/CMakeLists.txt
@@ -50,3 +50,4 @@ add_importlibs(riched20
     ntdll)
 
 add_dependencies(riched20 riched20_def)
+add_livecd_target(riched20 reactos/system32)
diff --git a/dll/win32/riched32/CMakeLists.txt b/dll/win32/riched32/CMakeLists.txt
index 8a40afc8bb9..d62d8581677 100644
--- a/dll/win32/riched32/CMakeLists.txt
+++ b/dll/win32/riched32/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(riched32
 
 add_importlibs(riched32 riched20 user32 kernel32 ntdll)
 add_dependencies(riched32 riched32_def)
+add_livecd_target(riched32 reactos/system32)
diff --git a/dll/win32/rpcrt4/CMakeLists.txt b/dll/win32/rpcrt4/CMakeLists.txt
index 394810479c8..4523907d11a 100644
--- a/dll/win32/rpcrt4/CMakeLists.txt
+++ b/dll/win32/rpcrt4/CMakeLists.txt
@@ -44,3 +44,4 @@ target_link_libraries(rpcrt4
 
 add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 ntdll)
 add_dependencies(rpcrt4 rpcrt4_def winesdk)
+add_livecd_target(rpcrt4 reactos/system32)
diff --git a/dll/win32/rsaenh/CMakeLists.txt b/dll/win32/rsaenh/CMakeLists.txt
index 8d6cab752e7..d5ae0ae8e94 100644
--- a/dll/win32/rsaenh/CMakeLists.txt
+++ b/dll/win32/rsaenh/CMakeLists.txt
@@ -29,3 +29,4 @@ target_link_libraries(rsaenh
 add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll)
 
 add_dependencies(rsaenh rsaenh_def)
+add_livecd_target(rsaenh reactos/system32)
diff --git a/dll/win32/samlib/CMakeLists.txt b/dll/win32/samlib/CMakeLists.txt
index b3e88f70618..c0343f62194 100644
--- a/dll/win32/samlib/CMakeLists.txt
+++ b/dll/win32/samlib/CMakeLists.txt
@@ -12,3 +12,4 @@ target_link_libraries(samlib ${CMAKE_CURRENT_BINARY_DIR}/samlib.def)
 
 add_importlibs(samlib advapi32 kernel32 ntdll)
 add_dependencies(samlib samlib_def)
+add_livecd_target(samlib reactos/system32)
diff --git a/dll/win32/sccbase/CMakeLists.txt b/dll/win32/sccbase/CMakeLists.txt
index 1781ebcd6ac..08905ef373b 100644
--- a/dll/win32/sccbase/CMakeLists.txt
+++ b/dll/win32/sccbase/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(sccbase
 
 add_importlibs(sccbase kernel32 ntdll)
 add_dependencies(sccbase sccbase_def)
+add_livecd_target(sccbase reactos/system32)
diff --git a/dll/win32/schannel/CMakeLists.txt b/dll/win32/schannel/CMakeLists.txt
index 90fe8819a12..01bd0946e80 100644
--- a/dll/win32/schannel/CMakeLists.txt
+++ b/dll/win32/schannel/CMakeLists.txt
@@ -18,3 +18,4 @@ target_link_libraries(schannel
 
 add_importlibs(schannel secur32 kernel32 ntdll)
 add_dependencies(schannel schannel_def)
+add_livecd_target(schannel reactos/system32)
diff --git a/dll/win32/secur32/CMakeLists.txt b/dll/win32/secur32/CMakeLists.txt
index 093601f3d4c..ea38c3759e7 100644
--- a/dll/win32/secur32/CMakeLists.txt
+++ b/dll/win32/secur32/CMakeLists.txt
@@ -23,3 +23,4 @@ target_link_libraries(secur32
 add_importlibs(secur32 advapi32 kernel32 ntdll)
 add_pch(secur32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(secur32 secur32_def)
+add_livecd_target(secur32 reactos/system32)
diff --git a/dll/win32/sensapi/CMakeLists.txt b/dll/win32/sensapi/CMakeLists.txt
index 533ba25f4ba..51a8714d396 100644
--- a/dll/win32/sensapi/CMakeLists.txt
+++ b/dll/win32/sensapi/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(sensapi
 
 add_importlibs(sensapi kernel32 ntdll)
 add_dependencies(sensapi sensapi_def)
+add_livecd_target(sensapi reactos/system32)
diff --git a/dll/win32/serialui/CMakeLists.txt b/dll/win32/serialui/CMakeLists.txt
index 9dbfe7cfb7b..8b6b6d48bec 100644
--- a/dll/win32/serialui/CMakeLists.txt
+++ b/dll/win32/serialui/CMakeLists.txt
@@ -11,3 +11,4 @@ target_link_libraries(serialui ${CMAKE_CURRENT_BINARY_DIR}/serialui.def)
 
 add_importlibs(serialui user32 shlwapi kernel32)
 add_dependencies(serialui serialui_def)
+add_livecd_target(serialui reactos/system32)
diff --git a/dll/win32/setupapi/CMakeLists.txt b/dll/win32/setupapi/CMakeLists.txt
index 52054e22c30..ba83ce58b01 100644
--- a/dll/win32/setupapi/CMakeLists.txt
+++ b/dll/win32/setupapi/CMakeLists.txt
@@ -55,3 +55,4 @@ add_importlibs(setupapi
     ntdll)
 
 add_dependencies(setupapi setupapi_def)
+add_livecd_target(setupapi reactos/system32)
diff --git a/dll/win32/sfc/CMakeLists.txt b/dll/win32/sfc/CMakeLists.txt
index 4022baa8a73..c4ca65084c5 100644
--- a/dll/win32/sfc/CMakeLists.txt
+++ b/dll/win32/sfc/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(sfc ${CMAKE_CURRENT_BINARY_DIR}/sfc.def)
 add_importlibs(sfc kernel32)
 add_pch(sfc ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(sfc sfc_def)
+add_livecd_target(sfc reactos/system32)
diff --git a/dll/win32/sfc_os/CMakeLists.txt b/dll/win32/sfc_os/CMakeLists.txt
index 2c23c650624..62a912204bf 100644
--- a/dll/win32/sfc_os/CMakeLists.txt
+++ b/dll/win32/sfc_os/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(sfc_os ${CMAKE_CURRENT_BINARY_DIR}/sfc_os.def)
 add_importlibs(sfc_os kernel32 ntdll)
 add_pch(sfc_os ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(sfc_os sfc_os_def)
+add_livecd_target(sfc_os reactos/system32)
diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt
index 1f7cc434924..1b9386dbc07 100644
--- a/dll/win32/shell32/CMakeLists.txt
+++ b/dll/win32/shell32/CMakeLists.txt
@@ -93,4 +93,5 @@ add_importlibs(shell32
     msvcrt
     ntdll)
 
-add_dependencies(shell32 shell32_def)
\ No newline at end of file
+add_dependencies(shell32 shell32_def)
+add_livecd_target(shell32 reactos/system32)
\ No newline at end of file
diff --git a/dll/win32/shimgvw/CMakeLists.txt b/dll/win32/shimgvw/CMakeLists.txt
index 39d79269746..dc4a42b7fc9 100644
--- a/dll/win32/shimgvw/CMakeLists.txt
+++ b/dll/win32/shimgvw/CMakeLists.txt
@@ -19,3 +19,4 @@ add_importlibs(shimgvw
     ntdll)
 
 add_dependencies(shimgvw shimgvw_def)
+add_livecd_target(shimgvw reactos/system32)
diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt
index b7abf5618e9..43366dfc083 100644
--- a/dll/win32/shlwapi/CMakeLists.txt
+++ b/dll/win32/shlwapi/CMakeLists.txt
@@ -49,3 +49,4 @@ add_importlibs(shlwapi
     ntdll)
 
 add_dependencies(shlwapi shlwapi_def)
+add_livecd_target(shlwapi reactos/system32)
diff --git a/dll/win32/slbcsp/CMakeLists.txt b/dll/win32/slbcsp/CMakeLists.txt
index 5113a490bf3..bcbda6b62f0 100644
--- a/dll/win32/slbcsp/CMakeLists.txt
+++ b/dll/win32/slbcsp/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(slbcsp
 
 add_importlibs(slbcsp kernel32 ntdll)
 add_dependencies(slbcsp slbcsp_def)
+add_livecd_target(slbcsp reactos/system32)
diff --git a/dll/win32/smdll/CMakeLists.txt b/dll/win32/smdll/CMakeLists.txt
index 14ddfbdf73e..e5bf69f1401 100644
--- a/dll/win32/smdll/CMakeLists.txt
+++ b/dll/win32/smdll/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(smdll
 
 add_importlibs(smdll ntdll)
 add_dependencies(smdll smdll_def psdk buildno_header)
+add_livecd_target(smdll reactos/system32)
\ No newline at end of file
diff --git a/dll/win32/sndblst/CMakeLists.txt b/dll/win32/sndblst/CMakeLists.txt
index fdffaa0dbf8..451339b0d90 100644
--- a/dll/win32/sndblst/CMakeLists.txt
+++ b/dll/win32/sndblst/CMakeLists.txt
@@ -17,3 +17,4 @@ target_link_libraries(sndblst
 
 add_importlibs(sndblst user32 winmm advapi32 kernel32 ntdll)
 add_dependencies(sndblst sndblst_def)
+add_livecd_target(sndblst reactos/system32)
diff --git a/dll/win32/snmpapi/CMakeLists.txt b/dll/win32/snmpapi/CMakeLists.txt
index c2f9e77c4a9..735ae05f212 100644
--- a/dll/win32/snmpapi/CMakeLists.txt
+++ b/dll/win32/snmpapi/CMakeLists.txt
@@ -17,3 +17,4 @@ target_link_libraries(snmpapi
 
 add_importlibs(snmpapi kernel32 ntdll)
 add_dependencies(snmpapi snmpapi_def)
+add_livecd_target(snmpapi reactos/system32)
diff --git a/dll/win32/spoolss/CMakeLists.txt b/dll/win32/spoolss/CMakeLists.txt
index a225f02af44..a0fd8bb6b1c 100644
--- a/dll/win32/spoolss/CMakeLists.txt
+++ b/dll/win32/spoolss/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(spoolss
 
 add_importlibs(spoolss winspool kernel32 ntdll)
 add_dependencies(spoolss spoolss_def)
+add_livecd_target(spoolss reactos/system32)
diff --git a/dll/win32/syssetup/CMakeLists.txt b/dll/win32/syssetup/CMakeLists.txt
index a192a77a111..da97bf7277d 100644
--- a/dll/win32/syssetup/CMakeLists.txt
+++ b/dll/win32/syssetup/CMakeLists.txt
@@ -36,3 +36,4 @@ add_importlibs(syssetup
     ntdll)
 
 add_dependencies(syssetup syssetup_def)
+add_livecd_target(syssetup reactos/system32)
diff --git a/dll/win32/t2embed/CMakeLists.txt b/dll/win32/t2embed/CMakeLists.txt
index ff16a5c7b2f..f114553d0f2 100644
--- a/dll/win32/t2embed/CMakeLists.txt
+++ b/dll/win32/t2embed/CMakeLists.txt
@@ -16,3 +16,4 @@ target_link_libraries(t2embed
 add_importlibs(t2embed gdi32 user32 advapi32 version kernel32 ntdll)
 
 add_dependencies(t2embed t2embed_def)
+add_livecd_target(t2embed reactos/system32)
diff --git a/dll/win32/traffic/CMakeLists.txt b/dll/win32/traffic/CMakeLists.txt
index 0bf4ad7376c..e0b1732f55b 100644
--- a/dll/win32/traffic/CMakeLists.txt
+++ b/dll/win32/traffic/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(traffic
 
 add_importlibs(traffic kernel32 ntdll)
 add_dependencies(traffic traffic_def psdk buildno_header)
+add_livecd_target(traffic reactos/system32)
diff --git a/dll/win32/twain_32/CMakeLists.txt b/dll/win32/twain_32/CMakeLists.txt
index c992a3f989a..2cd0d615583 100644
--- a/dll/win32/twain_32/CMakeLists.txt
+++ b/dll/win32/twain_32/CMakeLists.txt
@@ -20,3 +20,4 @@ target_link_libraries(twain_32
 
 add_importlibs(twain_32 msvcrt kernel32 ntdll)
 add_dependencies(twain_32 twain_32_def)
+add_livecd_target(twain_32 reactos/system32)
diff --git a/dll/win32/uext2/CMakeLists.txt b/dll/win32/uext2/CMakeLists.txt
index 39787fda11b..ab1d402920e 100644
--- a/dll/win32/uext2/CMakeLists.txt
+++ b/dll/win32/uext2/CMakeLists.txt
@@ -11,3 +11,4 @@ target_link_libraries(uext2
 
 add_importlibs(uext2 kernel32 ntdll)
 add_dependencies(uext2 uext2_def)
+add_livecd_target(uext2 reactos/system32)
diff --git a/dll/win32/ufat/CMakeLists.txt b/dll/win32/ufat/CMakeLists.txt
index 8927264365d..d1e5f94af5e 100644
--- a/dll/win32/ufat/CMakeLists.txt
+++ b/dll/win32/ufat/CMakeLists.txt
@@ -11,3 +11,4 @@ target_link_libraries(ufat
 
 add_importlibs(ufat kernel32 ntdll)
 add_dependencies(ufat ufat_def)
+add_livecd_target(ufat reactos/system32)
diff --git a/dll/win32/ufatx/CMakeLists.txt b/dll/win32/ufatx/CMakeLists.txt
index 157dbddee2d..b6c32fec073 100644
--- a/dll/win32/ufatx/CMakeLists.txt
+++ b/dll/win32/ufatx/CMakeLists.txt
@@ -11,3 +11,4 @@ target_link_libraries(ufatx
 
 add_importlibs(ufatx gcc kernel32 ntdll)
 add_dependencies(ufatx ufatx_def psdk buildno_header)
+add_livecd_target(ufatx reactos/system32)
\ No newline at end of file
diff --git a/dll/win32/untfs/CMakeLists.txt b/dll/win32/untfs/CMakeLists.txt
index f7d2b3f4e72..26f8dc9c9a8 100644
--- a/dll/win32/untfs/CMakeLists.txt
+++ b/dll/win32/untfs/CMakeLists.txt
@@ -11,3 +11,4 @@ target_link_libraries(untfs
 
 add_importlibs(untfs kernel32 ntdll)
 add_dependencies(untfs untfs_def)
+add_livecd_target(untfs reactos/system32)
diff --git a/dll/win32/url/CMakeLists.txt b/dll/win32/url/CMakeLists.txt
index 7458ddee70b..46c2e7baba0 100644
--- a/dll/win32/url/CMakeLists.txt
+++ b/dll/win32/url/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(url
 
 add_importlibs(url shell32 shlwapi kernel32 ntdll)
 add_dependencies(url url_def)
+add_livecd_target(url reactos/system32)
diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt
index ced869bbd0a..b5bf0cff06a 100644
--- a/dll/win32/urlmon/CMakeLists.txt
+++ b/dll/win32/urlmon/CMakeLists.txt
@@ -65,3 +65,4 @@ add_definitions(-DPROXY_CLSID_IS={0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,
 #add_definitions(-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}")
 
 rpcproxy(urlmon urlmon_urlmon.idl)
+add_livecd_target(urlmon reactos/system32)
diff --git a/dll/win32/user32/CMakeLists.txt b/dll/win32/user32/CMakeLists.txt
index d90fe914788..2fb3d3abd15 100644
--- a/dll/win32/user32/CMakeLists.txt
+++ b/dll/win32/user32/CMakeLists.txt
@@ -79,3 +79,4 @@ target_link_libraries(user32
                       
 add_pch(user32 ${CMAKE_CURRENT_SOURCE_DIR}/include/user32.h ${SOURCE})
 add_importlibs(user32 gdi32 advapi32 imm32 kernel32 ntdll)
+add_livecd_target(user32 reactos/system32)
diff --git a/dll/win32/userenv/CMakeLists.txt b/dll/win32/userenv/CMakeLists.txt
index 538788c5897..0d333dcef09 100644
--- a/dll/win32/userenv/CMakeLists.txt
+++ b/dll/win32/userenv/CMakeLists.txt
@@ -26,3 +26,4 @@ target_link_libraries(userenv
 add_importlibs(userenv advapi32 user32 kernel32 ntdll)
 add_pch(userenv ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(userenv userenv_def)
+add_livecd_target(userenv reactos/system32)
diff --git a/dll/win32/usp10/CMakeLists.txt b/dll/win32/usp10/CMakeLists.txt
index 0e5a2f54b91..b4af94b1b02 100644
--- a/dll/win32/usp10/CMakeLists.txt
+++ b/dll/win32/usp10/CMakeLists.txt
@@ -19,3 +19,4 @@ target_link_libraries(usp10
 
 add_importlibs(usp10 gdi32 kernel32 ntdll)
 add_dependencies(usp10 usp10_def)
+add_livecd_target(usp10 reactos/system32)
diff --git a/dll/win32/uxtheme/CMakeLists.txt b/dll/win32/uxtheme/CMakeLists.txt
index d0a931ce569..78cf67cb371 100644
--- a/dll/win32/uxtheme/CMakeLists.txt
+++ b/dll/win32/uxtheme/CMakeLists.txt
@@ -24,3 +24,4 @@ target_link_libraries(uxtheme
 
 add_importlibs(uxtheme user32 advapi32 gdi32 msimg32 kernel32 ntdll)
 add_dependencies(uxtheme uxtheme_def)
+add_livecd_target(uxtheme reactos/system32)
diff --git a/dll/win32/vdmdbg/CMakeLists.txt b/dll/win32/vdmdbg/CMakeLists.txt
index 98e1d29e6c7..1748d91e057 100644
--- a/dll/win32/vdmdbg/CMakeLists.txt
+++ b/dll/win32/vdmdbg/CMakeLists.txt
@@ -16,3 +16,4 @@ target_link_libraries(vdmdbg ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def)
 add_importlibs(vdmdbg kernel32 ntdll)
 add_pch(vdmdbg ${CMAKE_CURRENT_SOURCE_DIR}/vdmdbg.h ${SOURCE})
 add_dependencies(vdmdbg vdmdbg_def)
+add_livecd_target(vdmdbg reactos/system32)
diff --git a/dll/win32/windowscodecs/CMakeLists.txt b/dll/win32/windowscodecs/CMakeLists.txt
index 98cf7a66296..9cf2cc0da5f 100644
--- a/dll/win32/windowscodecs/CMakeLists.txt
+++ b/dll/win32/windowscodecs/CMakeLists.txt
@@ -42,3 +42,4 @@ target_link_libraries(windowscodecs
 
 add_importlibs(windowscodecs uuid ole32 shlwapi advapi32 msvcrt kernel32 ntdll)
 add_dependencies(windowscodecs windowscodecs_def)
+add_livecd_target(windowscodecs reactos/system32)
diff --git a/dll/win32/winhttp/CMakeLists.txt b/dll/win32/winhttp/CMakeLists.txt
index 3307e385a7a..7cc6e9eddcf 100644
--- a/dll/win32/winhttp/CMakeLists.txt
+++ b/dll/win32/winhttp/CMakeLists.txt
@@ -21,3 +21,4 @@ target_link_libraries(winhttp
 
 add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt kernel32 ntdll)
 add_dependencies(winhttp winhttp_def)
+add_livecd_target(winhttp reactos/system32)
diff --git a/dll/win32/wininet/CMakeLists.txt b/dll/win32/wininet/CMakeLists.txt
index da75d7ca676..455c91f9b4b 100644
--- a/dll/win32/wininet/CMakeLists.txt
+++ b/dll/win32/wininet/CMakeLists.txt
@@ -34,3 +34,4 @@ target_link_libraries(wininet
 
 add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll)
 add_dependencies(wininet wininet_def)
+add_livecd_target(wininet reactos/system32)
diff --git a/dll/win32/winmm/CMakeLists.txt b/dll/win32/winmm/CMakeLists.txt
index d6c035a5fcc..da1ef004e1c 100644
--- a/dll/win32/winmm/CMakeLists.txt
+++ b/dll/win32/winmm/CMakeLists.txt
@@ -29,3 +29,4 @@ add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll)
 add_dependencies(winmm winmm_def)
 
 add_subdirectory(midimap)
+add_livecd_target(winmm reactos/system32)
diff --git a/dll/win32/winspool/CMakeLists.txt b/dll/win32/winspool/CMakeLists.txt
index 8476e15d443..e87b09fbeae 100644
--- a/dll/win32/winspool/CMakeLists.txt
+++ b/dll/win32/winspool/CMakeLists.txt
@@ -20,3 +20,4 @@ target_link_libraries(winspool
 add_importlibs(winspool advapi32 shlwapi kernel32 ntdll)
 add_dependencies(winspool winspool_def)
 #add_livecd_target(winspool reactos/system32 winspool.drv)
+add_livecd_target(winspool reactos/system32)
diff --git a/dll/win32/winsta/CMakeLists.txt b/dll/win32/winsta/CMakeLists.txt
index df63e67171b..fce7f8fed19 100644
--- a/dll/win32/winsta/CMakeLists.txt
+++ b/dll/win32/winsta/CMakeLists.txt
@@ -24,3 +24,4 @@ target_link_libraries(winsta
 add_importlibs(winsta kernel32 ntdll)
 add_pch(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.h ${SOURCE})
 add_dependencies(winsta winsta_def)
+add_livecd_target(winsta reactos/system32)
diff --git a/dll/win32/wintrust/CMakeLists.txt b/dll/win32/wintrust/CMakeLists.txt
index 0544a54606a..772f350bf6c 100644
--- a/dll/win32/wintrust/CMakeLists.txt
+++ b/dll/win32/wintrust/CMakeLists.txt
@@ -21,3 +21,4 @@ target_link_libraries(wintrust
 
 add_importlibs(wintrust crypt32 cryptui user32 advapi32 imagehlp msvcrt kernel32 ntdll)
 add_dependencies(wintrust wintrust_def)
+add_livecd_target(wintrust reactos/system32)
diff --git a/dll/win32/wldap32/CMakeLists.txt b/dll/win32/wldap32/CMakeLists.txt
index 84e1bc8091a..b1b9c351807 100644
--- a/dll/win32/wldap32/CMakeLists.txt
+++ b/dll/win32/wldap32/CMakeLists.txt
@@ -35,3 +35,4 @@ target_link_libraries(wldap32
 
 add_importlibs(wldap32 user32 kernel32 ntdll)
 add_dependencies(wldap32 wldap32_def)
+add_livecd_target(wldap32 reactos/system32)
diff --git a/dll/win32/ws2_32/CMakeLists.txt b/dll/win32/ws2_32/CMakeLists.txt
index 8b1d7352d58..c42327a6a04 100644
--- a/dll/win32/ws2_32/CMakeLists.txt
+++ b/dll/win32/ws2_32/CMakeLists.txt
@@ -33,3 +33,4 @@ target_link_libraries(ws2_32
 add_importlibs(ws2_32 user32 advapi32 dnsapi ws2help kernel32 ntdll)
 add_pch(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/include/ws2_32.h ${SOURCE})
 add_dependencies(ws2_32 ws2_32_def)
+add_livecd_target(ws2_32 reactos/system32)
diff --git a/dll/win32/ws2_32_new/CMakeLists.txt b/dll/win32/ws2_32_new/CMakeLists.txt
index c48293cb0b3..569e03d2d5c 100644
--- a/dll/win32/ws2_32_new/CMakeLists.txt
+++ b/dll/win32/ws2_32_new/CMakeLists.txt
@@ -53,3 +53,4 @@ target_link_libraries(ws2_32_new
 
 add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help kernel32 ntdll)
 add_dependencies(ws2_32_new ws2_32_new_def)
+add_livecd_target(ws2_32_new reactos/system32)
diff --git a/dll/win32/ws2help/CMakeLists.txt b/dll/win32/ws2help/CMakeLists.txt
index a54ac1ae150..2dee2360b72 100644
--- a/dll/win32/ws2help/CMakeLists.txt
+++ b/dll/win32/ws2help/CMakeLists.txt
@@ -15,3 +15,4 @@ set_module_type(ws2help win32dll)
 target_link_libraries(ws2help ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def)
 add_importlibs(ws2help advapi32 ws2_32 kernel32 ntdll)
 add_dependencies(ws2help ws2help_def)
+add_livecd_target(ws2help reactos/system32)
diff --git a/dll/win32/wshirda/CMakeLists.txt b/dll/win32/wshirda/CMakeLists.txt
index 9ddf8b892e2..7c9f59c13a9 100644
--- a/dll/win32/wshirda/CMakeLists.txt
+++ b/dll/win32/wshirda/CMakeLists.txt
@@ -10,3 +10,4 @@ set_module_type(wshirda win32dll)
 target_link_libraries(wshirda ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def)
 add_importlibs(wshirda ws2_32 kernel32 ntdll)
 add_dependencies(wshirda wshirda_def)
+add_livecd_target(wshirda reactos/system32)
diff --git a/dll/win32/wsock32/CMakeLists.txt b/dll/win32/wsock32/CMakeLists.txt
index 4016198e902..43ae8afe827 100644
--- a/dll/win32/wsock32/CMakeLists.txt
+++ b/dll/win32/wsock32/CMakeLists.txt
@@ -7,3 +7,4 @@ set_module_type(wsock32 win32dll)
 
 target_link_libraries(wsock32 ${CMAKE_CURRENT_SOURCE_DIR}/wsock32.def)
 add_importlibs(wsock32 ws2_32 kernel32 ntdll)
+add_livecd_target(wsock32 reactos/system32)
diff --git a/dll/win32/wtsapi32/CMakeLists.txt b/dll/win32/wtsapi32/CMakeLists.txt
index c85c554f8e2..f59373c317f 100644
--- a/dll/win32/wtsapi32/CMakeLists.txt
+++ b/dll/win32/wtsapi32/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(wtsapi32
 
 add_importlibs(wtsapi32 advapi32 kernel32 ntdll)
 add_dependencies(wtsapi32 wtsapi32_def)
+add_livecd_target(wtsapi32 reactos/system32)
diff --git a/dll/win32/wuapi/CMakeLists.txt b/dll/win32/wuapi/CMakeLists.txt
index 31708ec9bc1..3d6809f79b7 100644
--- a/dll/win32/wuapi/CMakeLists.txt
+++ b/dll/win32/wuapi/CMakeLists.txt
@@ -26,3 +26,4 @@ target_link_libraries(wuapi
 
 add_importlibs(wuapi ole32 advapi32 kernel32 ntdll)
 add_dependencies(wuapi wuapi_def)
+add_livecd_target(wuapi reactos/system32)
diff --git a/dll/win32/xinput1_1/CMakeLists.txt b/dll/win32/xinput1_1/CMakeLists.txt
index 98134c9b747..d6d1ca79cf9 100644
--- a/dll/win32/xinput1_1/CMakeLists.txt
+++ b/dll/win32/xinput1_1/CMakeLists.txt
@@ -11,3 +11,4 @@ set_module_type(xinput1_1 win32dll)
 target_link_libraries(xinput1_1 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def)
 add_importlibs(xinput1_1 kernel32)
 add_dependencies(xinput1_1 xinput1_1_def)
+add_livecd_target(xinput1_1 reactos/system32)
diff --git a/dll/win32/xinput1_2/CMakeLists.txt b/dll/win32/xinput1_2/CMakeLists.txt
index 5fece8e728a..2f985923ec3 100644
--- a/dll/win32/xinput1_2/CMakeLists.txt
+++ b/dll/win32/xinput1_2/CMakeLists.txt
@@ -11,3 +11,4 @@ add_importlibs(xinput1_2 kernel32)
 set_module_type(xinput1_2 win32dll)
 target_link_libraries(xinput1_2 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def)
 add_dependencies(xinput1_2 xinput1_2_def)
+add_livecd_target(xinput1_2 reactos/system32)
diff --git a/dll/win32/xinput1_3/CMakeLists.txt b/dll/win32/xinput1_3/CMakeLists.txt
index 0c6da0c3c14..ad161ef479a 100644
--- a/dll/win32/xinput1_3/CMakeLists.txt
+++ b/dll/win32/xinput1_3/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(xinput1_3
 add_importlibs(xinput1_3 msvcrt kernel32 ntdll)
 
 add_dependencies(xinput1_3 xinput1_3_def)
+add_livecd_target(xinput1_3 reactos/system32)
diff --git a/dll/win32/xinput9_1_0/CMakeLists.txt b/dll/win32/xinput9_1_0/CMakeLists.txt
index b7b968c3b38..edee3c3c523 100644
--- a/dll/win32/xinput9_1_0/CMakeLists.txt
+++ b/dll/win32/xinput9_1_0/CMakeLists.txt
@@ -11,3 +11,4 @@ add_importlibs(xinput9_1_0 kernel32)
 set_module_type(xinput9_1_0 win32dll)
 target_link_libraries(xinput9_1_0 ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def)
 add_dependencies(xinput9_1_0 xinput9_1_0_def)
+add_livecd_target(xinput9_1_0 reactos/system32)
diff --git a/dll/win32/xmllite/CMakeLists.txt b/dll/win32/xmllite/CMakeLists.txt
index 971ac832f5f..f94df56f5f2 100644
--- a/dll/win32/xmllite/CMakeLists.txt
+++ b/dll/win32/xmllite/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(xmllite
 add_importlibs(xmllite kernel32 ntdll)
 
 add_dependencies(xmllite xmllite_def)
+add_livecd_target(xmllite reactos/system32)
diff --git a/gcc.cmake b/gcc.cmake
index efec8469032..dae30adedc9 100644
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -96,8 +96,6 @@ macro(set_module_type MODULE TYPE)
     endif()
     if(${TYPE} MATCHES win32dll)
         set_entrypoint(${MODULE} DllMain@12)
-        # temporary, will have to be done in each dll cmake file instead
-        add_livecd_target(${MODULE} reactos/system32)
     endif()
     if(${TYPE} MATCHES win32ocx)
         set_entrypoint(${MODULE} DllMain@12)
diff --git a/subsystems/win32/csrss/win32csr/CMakeLists.txt b/subsystems/win32/csrss/win32csr/CMakeLists.txt
index 8ae0773eab4..ffb76765ad5 100644
--- a/subsystems/win32/csrss/win32csr/CMakeLists.txt
+++ b/subsystems/win32/csrss/win32csr/CMakeLists.txt
@@ -40,3 +40,4 @@ add_importlibs(win32csr user32 gdi32 advapi32 psapi kernel32 ntdll)
 add_pch(win32csr ${CMAKE_CURRENT_SOURCE_DIR}/w32csr.h ${SOURCE})
 
 add_dependencies(win32csr win32csr_def bugcodes)
+add_livecd_target(win32csr reactos/system32)