diff --git a/modules/core_api/fsw/inc/cfe_es.h b/modules/core_api/fsw/inc/cfe_es.h
index 7e34b8308..75cada0db 100644
--- a/modules/core_api/fsw/inc/cfe_es.h
+++ b/modules/core_api/fsw/inc/cfe_es.h
@@ -41,6 +41,7 @@
 #include "common_types.h"
 #include "cfe_error.h"
 #include "cfe_es_api_typedefs.h"
+#include "cfe_resourceid_api_typedefs.h"
 
 /*
 ** The OS_PRINTF macro may be defined by OSAL to enable
diff --git a/modules/core_api/fsw/inc/cfe_tbl_api_typedefs.h b/modules/core_api/fsw/inc/cfe_tbl_api_typedefs.h
index 39931bdac..e06741210 100644
--- a/modules/core_api/fsw/inc/cfe_tbl_api_typedefs.h
+++ b/modules/core_api/fsw/inc/cfe_tbl_api_typedefs.h
@@ -40,6 +40,7 @@
 
 /********************* Include Files  ************************/
 #include "common_types.h" /* Basic Data Types */
+#include "cfe_mission_cfg.h"
 #include "cfe_tbl_extern_typedefs.h"
 #include "cfe_time_extern_typedefs.h"