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/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: