diff --git a/bsp_hosted/ObjectFactory.cpp b/bsp_hosted/ObjectFactory.cpp
index 64092bad..6172f3ed 100644
--- a/bsp_hosted/ObjectFactory.cpp
+++ b/bsp_hosted/ObjectFactory.cpp
@@ -6,7 +6,7 @@
 #include <mission/core/GenericFactory.h>
 #include <mission/tmtc/TmFunnel.h>
 #include <objects/systemObjectList.h>
-#include <tmtc/apid.h>
+#include "eive/definitions.h"
 #include <tmtc/pusIds.h>
 
 #include "OBSWConfig.h"
diff --git a/bsp_hosted/fsfwconfig/events/subsystemIdRanges.h b/bsp_hosted/fsfwconfig/events/subsystemIdRanges.h
index 9dc50c50..592c3624 100644
--- a/bsp_hosted/fsfwconfig/events/subsystemIdRanges.h
+++ b/bsp_hosted/fsfwconfig/events/subsystemIdRanges.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_EVENTS_SUBSYSTEMIDRANGES_H_
 #define CONFIG_EVENTS_SUBSYSTEMIDRANGES_H_
 
-#include <common/config/commonSubsystemIds.h>
+#include "eive/eventSubsystemIds.h"
 
 #include <cstdint>
 
diff --git a/bsp_hosted/fsfwconfig/objects/systemObjectList.h b/bsp_hosted/fsfwconfig/objects/systemObjectList.h
index 4326c108..add077d4 100644
--- a/bsp_hosted/fsfwconfig/objects/systemObjectList.h
+++ b/bsp_hosted/fsfwconfig/objects/systemObjectList.h
@@ -1,7 +1,7 @@
 #ifndef HOSTED_CONFIG_OBJECTS_SYSTEMOBJECTLIST_H_
 #define HOSTED_CONFIG_OBJECTS_SYSTEMOBJECTLIST_H_
 
-#include <commonObjects.h>
+#include "eive/objects.h"
 
 #include <cstdint>
 
diff --git a/bsp_hosted/fsfwconfig/returnvalues/classIds.h b/bsp_hosted/fsfwconfig/returnvalues/classIds.h
index b50e8ac0..deedca6a 100644
--- a/bsp_hosted/fsfwconfig/returnvalues/classIds.h
+++ b/bsp_hosted/fsfwconfig/returnvalues/classIds.h
@@ -3,7 +3,7 @@
 
 #include <fsfw/returnvalues/FwClassIds.h>
 
-#include "commonClassIds.h"
+#include "eive/resultClassIds.h"
 
 /**
  * Source IDs starts at 73 for now