diff --git a/contrib/platform/win32/CMakeModules/check_mca_subdirs.cmake b/contrib/platform/win32/CMakeModules/check_mca_subdirs.cmake
index 71c0a14217..861bd921f8 100644
--- a/contrib/platform/win32/CMakeModules/check_mca_subdirs.cmake
+++ b/contrib/platform/win32/CMakeModules/check_mca_subdirs.cmake
@@ -121,8 +121,9 @@ FOREACH (MCA_FRAMEWORK ${MCA_FRAMEWORK_LIST})
 
       ELSEIF(EXISTS "${PROJECT_SOURCE_DIR}/mca/${MCA_FRAMEWORK}/${MCA_COMPONENT}/.windows")
 
-        SET(COMPONENT_FILES "")
-        SET(RESULT_SOURCE_FILES "")
+        UNSET(COMPONENT_FILES)
+        UNSET(APPEND_FILES)
+
         SET(CURRENT_PATH ${PROJECT_SOURCE_DIR}/mca/${MCA_FRAMEWORK}/${MCA_COMPONENT})
 
         # by default, build this component.
@@ -135,11 +136,14 @@ FOREACH (MCA_FRAMEWORK ${MCA_FRAMEWORK_LIST})
         SET(EXTRA_INCLUDE_PATH "")
         IF(NOT REQUIRED_CHECK STREQUAL "")
           STRING(REPLACE "required_check=" "" REQUIRED_CHECK ${REQUIRED_CHECK})
+          UNSET(RESULT_APPEND_FILES)
+          UNSET(RESULT_COMPONENT_FILES)
           UNSET(RESULT_INCLUDE_PATH)
           UNSET(RESULT_LINK_LIBRARIES)
           INCLUDE(${REQUIRED_CHECK})
           IF(RESULT)
-            SET(COMPONENT_FILES ${COMPONENT_FILES} ${RESULT_SOURCE_FILES})
+            SET(COMPONENT_FILES ${COMPONENT_FILES} ${RESULT_COMPONENT_FILES})
+            SET(APPEND_FILES ${RESULT_APPEND_FILES})
             SET(EXTRA_INCLUDE_PATH ${RESULT_INCLUDE_PATH})
             # these extra libraries will be set up in up layer, e.g. ompi
             SET(EXTRA_LINK_LIBRARIES ${EXTRA_LINK_LIBRARIES} ${RESULT_LINK_LIBRARIES})
@@ -173,6 +177,10 @@ FOREACH (MCA_FRAMEWORK ${MCA_FRAMEWORK_LIST})
             FILE(GLOB_RECURSE COMPONENT_FILES "${CURRENT_PATH}/*.C" "${CURRENT_PATH}/*.h")
           ENDIF(NOT COMPONENT_FILES)
 
+          IF(APPEND_FILES)
+            SET(COMPONENT_FILES ${COMPONENT_FILES} ${APPEND_FILES})
+          ENDIF(APPEND_FILES)
+
           # check the library build type
           FILE(STRINGS ${CURRENT_PATH}/.windows
                 VALUE REGEX "^not_single_shared_lib=")
diff --git a/contrib/platform/win32/CMakeModules/find_ofed_sdk.cmake b/contrib/platform/win32/CMakeModules/find_ofed_sdk.cmake
index 420294cddf..7bd1b108aa 100644
--- a/contrib/platform/win32/CMakeModules/find_ofed_sdk.cmake
+++ b/contrib/platform/win32/CMakeModules/find_ofed_sdk.cmake
@@ -31,7 +31,7 @@ ELSE(NOT OMPI_WANT_OFED)
   IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/mca/btl/openib/btl_openib_lex.c)
     ADD_FLEX_FILE(OPAL_SOURCE_FILES ./mca/btl/openib/btl_openib_lex.l
     btl_openib_ini_yy "${PROJECT_BINARY_DIR}/mca/btl/openib/")
-    SET(RESULT_SOURCE_FILES ${PROJECT_BINARY_DIR}/mca/btl/openib/btl_openib_lex.c)
+    SET(RESULT_APPEND_FILES ${PROJECT_BINARY_DIR}/mca/btl/openib/btl_openib_lex.c)
   ENDIF(NOT EXISTS ${PROJECT_SOURCE_DIR}/mca/btl/openib/btl_openib_lex.c)
 
   IF(NOT OFED_SDK_FOUND)
diff --git a/contrib/platform/win32/CMakeModules/opal_event_config.cmake b/contrib/platform/win32/CMakeModules/opal_event_config.cmake
index 8244a6ff18..9c3e19637c 100644
--- a/contrib/platform/win32/CMakeModules/opal_event_config.cmake
+++ b/contrib/platform/win32/CMakeModules/opal_event_config.cmake
@@ -43,8 +43,8 @@ ELSE(IN_USE STREQUAL "0")
       FILE(WRITE ${PROJECT_BINARY_DIR}/mca/event/libevent207/libevent/include/config.h
         " /* config.h.  Generated automatically by CMake. */ ")
 
-      SET(RESULT_SOURCE_FILES
-        ${RESULT_SOURCE_FILES}
+      SET(RESULT_COMPONENT_FILES
+        ${RESULT_COMPONENT_FILES}
         ${CURRENT_PATH}/libevent207_component.c
         ${CURRENT_PATH}/libevent207_module.c
         #system sources
@@ -104,8 +104,8 @@ ELSE(IN_USE STREQUAL "0")
       )
 
     ELSE(WIN32)
-      SET(RESULT_SOURCE_FILES
-        ${RESULT_SOURCE_FILES}
+      SET(RESULT_COMPONENT_FILES
+        ${RESULT_COMPONENT_FILES}
       )
     ENDIF(WIN32)