diff --git a/fsfw b/fsfw
index cf8fe7ea..bd594123 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit cf8fe7ea728bea077b9936bcf0db96845bc6419e
+Subproject commit bd594123a2a1579f505071f9c76d1249433c070e
diff --git a/linux/fsfwconfig/FSFWConfig.h.in b/linux/fsfwconfig/FSFWConfig.h.in
index 072c47c8..25772ce7 100644
--- a/linux/fsfwconfig/FSFWConfig.h.in
+++ b/linux/fsfwconfig/FSFWConfig.h.in
@@ -4,6 +4,10 @@
 #include <cstddef>
 #include <cstdint>
 
+// It is assumed the user has a subsystem and class ID list in some user header files.
+#include "events/subsystemIdRanges.h"
+#include "returnvalues/classIds.h"
+
 //! Used to determine whether C++ ostreams are used which can increase
 //! the binary size significantly. If this is disabled,
 //! the C stdio functions can be used alternatively
diff --git a/linux/obc/PtmeConfig.h b/linux/obc/PtmeConfig.h
index 06aff2e2..aa5c663a 100644
--- a/linux/obc/PtmeConfig.h
+++ b/linux/obc/PtmeConfig.h
@@ -4,6 +4,7 @@
 #include "AxiPtmeConfig.h"
 #include "fsfw/objectmanager/SystemObject.h"
 #include "fsfw/returnvalues/returnvalue.h"
+#include "returnvalues/classIds.h"
 #include "linux/obc/PtmeConfig.h"
 
 /**
diff --git a/mission/devices/HeaterHandler.h b/mission/devices/HeaterHandler.h
index 75badf91..b63f4dfe 100644
--- a/mission/devices/HeaterHandler.h
+++ b/mission/devices/HeaterHandler.h
@@ -18,6 +18,8 @@
 #include <vector>
 
 #include "devices/heaterSwitcherList.h"
+#include "events/subsystemIdRanges.h"
+#include "returnvalues/classIds.h"
 
 class PowerSwitchIF;
 class HealthTableIF;
diff --git a/mission/devices/IMTQHandler.h b/mission/devices/IMTQHandler.h
index 481d554c..5102b2e0 100644
--- a/mission/devices/IMTQHandler.h
+++ b/mission/devices/IMTQHandler.h
@@ -5,6 +5,9 @@
 #include <mission/devices/devicedefinitions/IMTQHandlerDefinitions.h>
 #include <string.h>
 
+#include "events/subsystemIdRanges.h"
+#include "returnvalues/classIds.h"
+
 /**
  * @brief	This is the device handler for the ISIS Magnetorquer iMTQ.
  *
diff --git a/mission/devices/RwHandler.h b/mission/devices/RwHandler.h
index 008d5746..f9f66bd5 100644
--- a/mission/devices/RwHandler.h
+++ b/mission/devices/RwHandler.h
@@ -6,6 +6,9 @@
 #include <mission/devices/devicedefinitions/RwDefinitions.h>
 #include <string.h>
 
+#include "events/subsystemIdRanges.h"
+#include "returnvalues/classIds.h"
+
 class GpioIF;
 
 /**
diff --git a/mission/devices/SolarArrayDeploymentHandler.h b/mission/devices/SolarArrayDeploymentHandler.h
index 691bdf77..89be12a6 100644
--- a/mission/devices/SolarArrayDeploymentHandler.h
+++ b/mission/devices/SolarArrayDeploymentHandler.h
@@ -14,6 +14,9 @@
 
 #include <unordered_map>
 
+#include "events/subsystemIdRanges.h"
+#include "returnvalues/classIds.h"
+
 /**
  * @brief	This class is used to control the solar array deployment.
  *
diff --git a/mission/devices/SusHandler.h b/mission/devices/SusHandler.h
index c1fc08c4..94673c40 100644
--- a/mission/devices/SusHandler.h
+++ b/mission/devices/SusHandler.h
@@ -7,6 +7,9 @@
 #include "fsfw/globalfunctions/PeriodicOperationDivider.h"
 #include "mission/devices/max1227.h"
 
+#include "events/subsystemIdRanges.h"
+#include "returnvalues/classIds.h"
+
 /**
  * @brief	This is the device handler class for the SUS sensor based on the MAX1227 ADC.
  *
diff --git a/mission/devices/SyrlinksHkHandler.h b/mission/devices/SyrlinksHkHandler.h
index 44b154f6..a3bf0a67 100644
--- a/mission/devices/SyrlinksHkHandler.h
+++ b/mission/devices/SyrlinksHkHandler.h
@@ -8,6 +8,7 @@
 #include "fsfw/timemanager/Countdown.h"
 #include "fsfw_hal/linux/gpio/Gpio.h"
 #include "mission/devices/devicedefinitions/SyrlinksDefinitions.h"
+#include "returnvalues/classIds.h"
 
 /**
  * @brief	This is the device handler for the syrlinks transceiver. It handles the command
diff --git a/mission/devices/devicedefinitions/RwDefinitions.h b/mission/devices/devicedefinitions/RwDefinitions.h
index d6a43622..2923b41b 100644
--- a/mission/devices/devicedefinitions/RwDefinitions.h
+++ b/mission/devices/devicedefinitions/RwDefinitions.h
@@ -5,6 +5,7 @@
 #include <fsfw/datapoollocal/StaticLocalDataSet.h>
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 
+#include "events/subsystemIdRanges.h"
 #include "objects/systemObjectList.h"
 
 namespace RwDefinitions {
diff --git a/mission/memory/NVMParameterBase.h b/mission/memory/NVMParameterBase.h
index 4f644fcc..dd02fffe 100644
--- a/mission/memory/NVMParameterBase.h
+++ b/mission/memory/NVMParameterBase.h
@@ -6,6 +6,7 @@
 #include <string>
 
 #include "fsfw/returnvalues/returnvalue.h"
+#include "returnvalues/classIds.h"
 
 class NVMParameterBase {
  public:
diff --git a/mission/system/SusAssembly.h b/mission/system/SusAssembly.h
index b9216072..3cce9d86 100644
--- a/mission/system/SusAssembly.h
+++ b/mission/system/SusAssembly.h
@@ -5,6 +5,8 @@
 #include <fsfw/devicehandlers/AssemblyBase.h>
 
 #include "DualLaneAssemblyBase.h"
+#include "events/subsystemIdRanges.h"
+#include "returnvalues/classIds.h"
 
 struct SusAssHelper {
  public:
diff --git a/mission/system/TcsBoardAssembly.h b/mission/system/TcsBoardAssembly.h
index 10b451b2..6042abaa 100644
--- a/mission/system/TcsBoardAssembly.h
+++ b/mission/system/TcsBoardAssembly.h
@@ -5,6 +5,9 @@
 #include <fsfw/devicehandlers/AssemblyBase.h>
 #include <fsfw/power/PowerSwitcher.h>
 
+#include "events/subsystemIdRanges.h"
+#include "returnvalues/classIds.h"
+
 struct TcsBoardHelper {
   TcsBoardHelper(std::array<std::pair<object_id_t, std::string>, 16> rtdInfos)
       : rtdInfos(std::move(rtdInfos)) {}