From 1c9f44b7ae791c3b109fc8d56c7b02be454b2e81 Mon Sep 17 00:00:00 2001
From: Joseph Hickey <joe@phlobus.net>
Date: Mon, 17 Jul 2023 16:40:25 -0400
Subject: [PATCH] Revert "Fix #2395, do not directly use cfe_test_msgids.h"

---
 modules/cfe_testcase/src/sb_sendrecv_test.c      | 1 +
 modules/cfe_testcase/src/sb_subscription_test.c  | 1 +
 modules/cfe_testcase/src/tbl_information_test.c  | 1 +
 modules/cfe_testcase/src/tbl_registration_test.c | 1 +
 modules/core_api/config/default_cfe_msgids.h     | 1 -
 5 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/cfe_testcase/src/sb_sendrecv_test.c b/modules/cfe_testcase/src/sb_sendrecv_test.c
index 0d34b25fd..4f8be7ac2 100644
--- a/modules/cfe_testcase/src/sb_sendrecv_test.c
+++ b/modules/cfe_testcase/src/sb_sendrecv_test.c
@@ -29,6 +29,7 @@
 
 #include "cfe_test.h"
 #include "cfe_msgids.h"
+#include "cfe_test_msgids.h"
 
 #define CFE_FT_STRINGBUF_SIZE 12
 
diff --git a/modules/cfe_testcase/src/sb_subscription_test.c b/modules/cfe_testcase/src/sb_subscription_test.c
index 491c8d526..a55c73716 100644
--- a/modules/cfe_testcase/src/sb_subscription_test.c
+++ b/modules/cfe_testcase/src/sb_subscription_test.c
@@ -29,6 +29,7 @@
 
 #include "cfe_test.h"
 #include "cfe_msgids.h"
+#include "cfe_test_msgids.h"
 
 /*
  * This test procedure should be agnostic to specific MID values, but it should
diff --git a/modules/cfe_testcase/src/tbl_information_test.c b/modules/cfe_testcase/src/tbl_information_test.c
index 750e7ba04..1d530688e 100644
--- a/modules/cfe_testcase/src/tbl_information_test.c
+++ b/modules/cfe_testcase/src/tbl_information_test.c
@@ -30,6 +30,7 @@
 #include "cfe_test.h"
 #include "cfe_test_table.h"
 #include "cfe_msgids.h"
+#include "cfe_test_msgids.h"
 
 void TestGetStatus(void)
 {
diff --git a/modules/cfe_testcase/src/tbl_registration_test.c b/modules/cfe_testcase/src/tbl_registration_test.c
index ad5d591b4..c4f237d4e 100644
--- a/modules/cfe_testcase/src/tbl_registration_test.c
+++ b/modules/cfe_testcase/src/tbl_registration_test.c
@@ -30,6 +30,7 @@
 #include "cfe_test.h"
 #include "cfe_test_table.h"
 #include "cfe_msgids.h"
+#include "cfe_test_msgids.h"
 
 int32 CallbackFunc(void *TblPtr)
 {
diff --git a/modules/core_api/config/default_cfe_msgids.h b/modules/core_api/config/default_cfe_msgids.h
index 300734644..e5759d437 100644
--- a/modules/core_api/config/default_cfe_msgids.h
+++ b/modules/core_api/config/default_cfe_msgids.h
@@ -37,6 +37,5 @@
 #include "cfe_sb_msgids.h"
 #include "cfe_tbl_msgids.h"
 #include "cfe_time_msgids.h"
-#include "cfe_test_msgids.h"
 
 #endif /* CFE_MSGIDS_H */