diff --git a/drivers/storage/classpnp/CMakeLists.txt b/drivers/storage/classpnp/CMakeLists.txt
index 57c6ab2c723..d4fc4a303d3 100644
--- a/drivers/storage/classpnp/CMakeLists.txt
+++ b/drivers/storage/classpnp/CMakeLists.txt
@@ -13,6 +13,9 @@ if(NOT MSVC)
     add_definitions(-mrtd -fno-builtin -w)
 endif()
 
+spec2def(classpnp.sys class.spec)
+
+list(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_BINARY_DIR}/class_stubs.c)
 list(APPEND SOURCE
     autorun.c
     class.c
@@ -31,8 +34,6 @@ list(APPEND SOURCE
     class.rc
     ${CMAKE_CURRENT_BINARY_DIR}/class.def)
 
-spec2def(classpnp.sys class.spec)
-
 add_library(classpnp SHARED ${SOURCE})
 target_link_libraries(classpnp ${PSEH_LIB} libcntpr)
 
diff --git a/gcc.cmake b/gcc.cmake
index a9b9e5bcabf..f02a2bad496 100644
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -173,14 +173,14 @@ macro(set_rc_compiler)
     get_directory_property(includes INCLUDE_DIRECTORIES)
 
     foreach(arg ${defines})
-        set(result_defs "${result_defs} -D${arg}")
+        set(rc_result_defs "${rc_result_defs} -D${arg}")
     endforeach(arg ${defines})
 
     foreach(arg ${includes})
-        set(result_incs "-I${arg} ${result_incs}")
+        set(rc_result_incs "-I${arg} ${rc_result_incs}")
     endforeach(arg ${includes})
 
-    set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${result_defs} ${result_incs} -i <SOURCE> -O coff -o <OBJECT>")
+    set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} ${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>")
 endmacro()
 
 #idl files support
@@ -206,6 +206,7 @@ macro(spec2def _dllname _spec_file)
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
         PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE)
+    list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c)
 endmacro()
 
 # Optional 3rd parameter: dllname
diff --git a/msc.cmake b/msc.cmake
index 45a4fe3140e..b08e9afda96 100644
--- a/msc.cmake
+++ b/msc.cmake
@@ -200,6 +200,7 @@ macro(spec2def _dllname _spec_file)
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c
         PROPERTIES GENERATED TRUE)
+    list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c)
 endmacro()
 
 # Optional 3rd parameter: dllname