diff --git a/bsp_hosted/fsfwconfig/tmtc/apid.h b/bsp_hosted/fsfwconfig/tmtc/apid.h
deleted file mode 100644
index 9d5c9ed5..00000000
--- a/bsp_hosted/fsfwconfig/tmtc/apid.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef FSFWCONFIG_TMTC_APID_H_
-#define FSFWCONFIG_TMTC_APID_H_
-
-#include <stdint.h>
-
-/**
- * Application Process Definition: entity, uniquely identified by an
- * application process ID (APID), capable of generating telemetry source
- * packets and receiving telecommand packets
- *
- * SOURCE APID: 0x73 / 115 / s
- * APID is a 11 bit number
- */
-namespace apid {
-static const uint16_t EIVE_OBSW = 0x65;
-}
-
-#endif /* FSFWCONFIG_TMTC_APID_H_ */
diff --git a/bsp_hosted/fsfwconfig/tmtc/pusIds.h b/bsp_hosted/fsfwconfig/tmtc/pusIds.h
deleted file mode 100644
index 37503786..00000000
--- a/bsp_hosted/fsfwconfig/tmtc/pusIds.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef CONFIG_TMTC_PUSIDS_HPP_
-#define CONFIG_TMTC_PUSIDS_HPP_
-
-namespace pus {
-enum Ids {
-  PUS_SERVICE_1 = 1,
-  PUS_SERVICE_2 = 2,
-  PUS_SERVICE_3 = 3,
-  PUS_SERVICE_3_PSB = 3,
-  PUS_SERVICE_5 = 5,
-  PUS_SERVICE_6 = 6,
-  PUS_SERVICE_8 = 8,
-  PUS_SERVICE_9 = 9,
-  PUS_SERVICE_17 = 17,
-  PUS_SERVICE_19 = 19,
-  PUS_SERVICE_20 = 20,
-  PUS_SERVICE_23 = 23,
-  PUS_SERVICE_200 = 200,
-  PUS_SERVICE_201 = 201,
-};
-};
-
-#endif /* CONFIG_TMTC_PUSIDS_HPP_ */
diff --git a/common/config/tmtc/pusIds.h b/common/config/tmtc/pusIds.h
index 75c40176..0891992d 100644
--- a/common/config/tmtc/pusIds.h
+++ b/common/config/tmtc/pusIds.h
@@ -1,5 +1,5 @@
-#ifndef CONFIG_TMTC_PUSIDS_H_
-#define CONFIG_TMTC_PUSIDS_H_
+#ifndef COMMON_CONFIG_TMTC_PUSIDS_H_
+#define COMMON_CONFIG_TMTC_PUSIDS_H_
 
 namespace pus {
 enum Ids {
@@ -21,4 +21,4 @@ enum Ids {
 };
 };
 
-#endif /* CONFIG_TMTC_PUSIDS_H_ */
+#endif /* COMMON_CONFIG_TMTC_PUSIDS_H_ */