diff --git a/cmake/target/inc/target_config.h b/cmake/target/inc/target_config.h
index a256315bd..495036318 100644
--- a/cmake/target/inc/target_config.h
+++ b/cmake/target/inc/target_config.h
@@ -34,8 +34,8 @@
 #ifndef TARGET_CONFIG_H_
 #define TARGET_CONFIG_H_
 
-#include <common_types.h>
-#include <cfe_psp_configdata.h>
+#include "common_types.h"
+#include "cfe_psp_configdata.h"
 
 /**
  * Prototype for the main system entry function implemented in CFE ES
diff --git a/modules/cfe_assert/inc/cfe_assert.h b/modules/cfe_assert/inc/cfe_assert.h
index 8dde70a4f..89f0d3d6c 100644
--- a/modules/cfe_assert/inc/cfe_assert.h
+++ b/modules/cfe_assert/inc/cfe_assert.h
@@ -30,7 +30,7 @@
 /************************************************************************
 ** Includes
 *************************************************************************/
-#include <common_types.h>
+#include "common_types.h"
 
 /************************************************************************
 ** Type Definitions
diff --git a/modules/cfe_assert/src/cfe_assert_init.c b/modules/cfe_assert/src/cfe_assert_init.c
index d1923785a..e4c2fa59f 100644
--- a/modules/cfe_assert/src/cfe_assert_init.c
+++ b/modules/cfe_assert/src/cfe_assert_init.c
@@ -29,7 +29,7 @@
  * Includes
  */
 
-#include <cfe.h>
+#include "cfe.h"
 
 #include "cfe_assert.h"
 
diff --git a/modules/cfe_assert/src/cfe_assert_io.c b/modules/cfe_assert/src/cfe_assert_io.c
index 5c01213c3..cff4893a0 100644
--- a/modules/cfe_assert/src/cfe_assert_io.c
+++ b/modules/cfe_assert/src/cfe_assert_io.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include <cfe.h>
+#include "cfe.h"
 
 #include "utbsp.h"
 #include "uttest.h"
diff --git a/modules/cfe_testcase/src/cfe_test.h b/modules/cfe_testcase/src/cfe_test.h
index 45f98e890..efa2b2c82 100644
--- a/modules/cfe_testcase/src/cfe_test.h
+++ b/modules/cfe_testcase/src/cfe_test.h
@@ -33,7 +33,7 @@
  * Includes
  */
 
-#include <cfe.h>
+#include "cfe.h"
 
 #include "uttest.h"
 #include "utassert.h"
diff --git a/modules/cfe_testrunner/inc/cfe_testrunner.h b/modules/cfe_testrunner/inc/cfe_testrunner.h
index 8502714af..cfcaa6b64 100644
--- a/modules/cfe_testrunner/inc/cfe_testrunner.h
+++ b/modules/cfe_testrunner/inc/cfe_testrunner.h
@@ -30,7 +30,7 @@
 /************************************************************************
 ** Includes
 *************************************************************************/
-#include <common_types.h>
+#include "common_types.h"
 
 /************************************************************************
 ** Type Definitions
diff --git a/modules/cfe_testrunner/src/cfe_testrunner_main.c b/modules/cfe_testrunner/src/cfe_testrunner_main.c
index c12153a23..bd0c32416 100644
--- a/modules/cfe_testrunner/src/cfe_testrunner_main.c
+++ b/modules/cfe_testrunner/src/cfe_testrunner_main.c
@@ -29,7 +29,7 @@
  * Includes
  */
 
-#include <cfe.h>
+#include "cfe.h"
 
 #include "cfe_testrunner.h"
 
diff --git a/modules/core_api/fsw/inc/cfe_tbl_filedef.h b/modules/core_api/fsw/inc/cfe_tbl_filedef.h
index 4dd4d16a2..1bd32212b 100644
--- a/modules/core_api/fsw/inc/cfe_tbl_filedef.h
+++ b/modules/core_api/fsw/inc/cfe_tbl_filedef.h
@@ -49,8 +49,8 @@
 #ifndef _cfe_tbl_filedef_
 #define _cfe_tbl_filedef_
 
-#include <cfe_mission_cfg.h>
-#include <common_types.h>
+#include "cfe_mission_cfg.h"
+#include "common_types.h"
 #include "cfe_tbl_extern_typedefs.h" /* for "CFE_TBL_FileHdr_t" definition */
 #include "cfe_fs_extern_typedefs.h"  /* for "CFE_FS_HDR_DESC_MAX_LEN" definition */
 
diff --git a/modules/core_private/fsw/inc/cfe_es_erlog_typedef.h b/modules/core_private/fsw/inc/cfe_es_erlog_typedef.h
index dbc240898..7d5813812 100644
--- a/modules/core_private/fsw/inc/cfe_es_erlog_typedef.h
+++ b/modules/core_private/fsw/inc/cfe_es_erlog_typedef.h
@@ -31,11 +31,11 @@
 #ifndef CFE_ES_ERLOG_TYPEDEF_H_
 #define CFE_ES_ERLOG_TYPEDEF_H_
 
-#include <common_types.h>
-#include <cfe_platform_cfg.h>
+#include "common_types.h"
+#include "cfe_platform_cfg.h"
 
-#include <cfe_time_extern_typedefs.h> /* Needed for CFE_TIME_SysTime_t */
-#include <cfe_es_extern_typedefs.h>   /* Needed for CFE_ES_AppId_t */
+#include "cfe_time_extern_typedefs.h" /* Needed for CFE_TIME_SysTime_t */
+#include "cfe_es_extern_typedefs.h"   /* Needed for CFE_ES_AppId_t */
 
 #define CFE_ES_ERLOG_DESCRIPTION_MAX_LENGTH 80
 
diff --git a/modules/core_private/fsw/inc/cfe_es_perfdata_typedef.h b/modules/core_private/fsw/inc/cfe_es_perfdata_typedef.h
index 795a7053c..44bf2f5a6 100644
--- a/modules/core_private/fsw/inc/cfe_es_perfdata_typedef.h
+++ b/modules/core_private/fsw/inc/cfe_es_perfdata_typedef.h
@@ -30,7 +30,7 @@
 #ifndef CFE_ES_PERFDATA_TYPEDEF_H_
 #define CFE_ES_PERFDATA_TYPEDEF_H_
 
-#include <common_types.h>
+#include "common_types.h"
 #include "cfe_mission_cfg.h"  /* Required for CFE_MISSION_ES_PERF_MAX_IDS */
 #include "cfe_platform_cfg.h" /* Required for CFE_PLATFORM_ES_PERF_DATA_BUFFER_SIZE */
 
diff --git a/modules/core_private/fsw/inc/cfe_es_resetdata_typedef.h b/modules/core_private/fsw/inc/cfe_es_resetdata_typedef.h
index 6bfc87041..9bd462adf 100644
--- a/modules/core_private/fsw/inc/cfe_es_resetdata_typedef.h
+++ b/modules/core_private/fsw/inc/cfe_es_resetdata_typedef.h
@@ -31,7 +31,7 @@
 #ifndef CFE_ES_RESETDATA_TYPEDEF_H_
 #define CFE_ES_RESETDATA_TYPEDEF_H_
 
-#include <common_types.h>
+#include "common_types.h"
 
 #include "cfe_time_resetvars_typedef.h" /* Required for CFE_TIME_ResetVars_t definition */
 #include "cfe_es_erlog_typedef.h"       /* Required for CFE_ES_ERLog_t definition */
diff --git a/modules/core_private/fsw/inc/cfe_evs_log_typedef.h b/modules/core_private/fsw/inc/cfe_evs_log_typedef.h
index 0cb4fa3d7..76cb28435 100644
--- a/modules/core_private/fsw/inc/cfe_evs_log_typedef.h
+++ b/modules/core_private/fsw/inc/cfe_evs_log_typedef.h
@@ -31,8 +31,8 @@
 #ifndef CFE_EVS_LOG_TYPEDEF_H_
 #define CFE_EVS_LOG_TYPEDEF_H_
 
-#include <common_types.h>
-#include <cfe_platform_cfg.h>
+#include "common_types.h"
+#include "cfe_platform_cfg.h"
 
 #include "cfe_evs_msg.h" /* Required for CFE_EVS_LongEventTlm_t definition */