diff --git a/cmake/mission_build.cmake b/cmake/mission_build.cmake
index 786d98cab..6e39a4765 100644
--- a/cmake/mission_build.cmake
+++ b/cmake/mission_build.cmake
@@ -127,7 +127,7 @@ function(prepare)
   # so this is run in a loop until the list of unfound apps is empty
   string(REPLACE ":" ";" CFS_APP_PATH "$ENV{CFS_APP_PATH}")
   list(APPEND CFS_APP_PATH "apps" "apps/CFS" "libs" "psp/fsw/modules")
-  set(MISSION_DEPS "cfe-core" "osal")
+  set(MISSION_DEPS "cfe-core" "osal" ${MISSION_CORE_MODULES})
   set(APP_MISSING_COUNT 0)
   
   # Set the search path of those dependency components which are fixed
diff --git a/cmake/target/CMakeLists.txt b/cmake/target/CMakeLists.txt
index d7b30c6f9..903b9a45c 100644
--- a/cmake/target/CMakeLists.txt
+++ b/cmake/target/CMakeLists.txt
@@ -110,6 +110,7 @@ endif (TGT${TGTID}_APPLIST)
 # This depends on whether any special features are included or not
 set(CFE_LINK_WHOLE_LIBS
     ${CFE_CORE_TARGET}
+    ${MISSION_CORE_MODULES}
     psp-${CFE_SYSTEM_PSPNAME} 
     osal
 )