diff --git a/reactos/dll/win32/imm32/CMakeLists.txt b/reactos/dll/win32/imm32/CMakeLists.txt
index d22cbb688bd..545359be7a8 100644
--- a/reactos/dll/win32/imm32/CMakeLists.txt
+++ b/reactos/dll/win32/imm32/CMakeLists.txt
@@ -10,14 +10,17 @@ spec2def(imm32.dll imm32.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
     imm.c
-    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/imm32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/imm32.def)
 
-add_library(imm32 SHARED ${SOURCE})
+add_library(imm32 SHARED
+    ${SOURCE}
+    version.rc)
 
 if(MSVC)
-    add_target_compile_flags(imm32 "/FIwine/typeof.h")
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #add_target_compile_flags(imm32 "/FIwine/typeof.h")
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h")
 endif()
 
 set_module_type(imm32 win32dll)
diff --git a/reactos/drivers/video/miniport/vga_new/CMakeLists.txt b/reactos/drivers/video/miniport/vga_new/CMakeLists.txt
index 2998a3d8c5a..a5c76fb4766 100644
--- a/reactos/drivers/video/miniport/vga_new/CMakeLists.txt
+++ b/reactos/drivers/video/miniport/vga_new/CMakeLists.txt
@@ -12,10 +12,11 @@ add_library(vga SHARED
 
 target_link_libraries(vga libcntpr)
 
+# FIXME: http://www.cmake.org/Bug/view.php?id=12998
 if(MSVC)
-    add_target_compile_flags(vga "/Gz")
+    #add_target_compile_flags(vga "/Gz")
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz")
 else()
-    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
     #add_target_compile_flags(vga "-mrtd -fno-builtin")
     set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin")
 endif()