diff --git a/fsw/src/to_lab_app.c b/fsw/src/to_lab_app.c
index 8f0d423..0573374 100644
--- a/fsw/src/to_lab_app.c
+++ b/fsw/src/to_lab_app.c
@@ -34,7 +34,6 @@
 #include "to_lab_perfids.h"
 #include "to_lab_version.h"
 #include "to_lab_sub_table.h"
-#include "cfe_msg_api.h"
 
 /*
 ** Global Data Section
diff --git a/fsw/src/to_lab_app.h b/fsw/src/to_lab_app.h
index 1e2aa84..9e6e4e5 100644
--- a/fsw/src/to_lab_app.h
+++ b/fsw/src/to_lab_app.h
@@ -30,13 +30,7 @@
 #ifndef _to_lab_app_h_
 #define _to_lab_app_h_
 
-#include "cfe_error.h"
-#include "cfe_sb.h"
-#include "cfe_time.h"
-#include "cfe_evs.h"
-#include "cfe_sb.h"
-#include "cfe_es.h"
-#include "cfe_tbl.h"
+#include "cfe.h"
 
 #include <errno.h>
 #include <string.h>