diff --git a/config/common/definitions.h b/config/common/definitions.h
new file mode 100644
index 0000000..fa30d03
--- /dev/null
+++ b/config/common/definitions.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <cstdint>
+
+/**
+ * Enumerations for used PUS service IDs.
+ */
+namespace pus {
+enum ServiceIds: uint8_t {
+  PUS_SERVICE_1 = 1,
+  PUS_SERVICE_2 = 2,
+  PUS_SERVICE_3 = 3,
+  PUS_SERVICE_5 = 5,
+  PUS_SERVICE_8 = 8,
+  PUS_SERVICE_9 = 9,
+  PUS_SERVICE_11 = 11,
+  PUS_SERVICE_17 = 17,
+  PUS_SERVICE_20 = 20,
+  PUS_SERVICE_200 = 200
+};
+}
diff --git a/config/commonConfig.h.in b/config/commonConfig.h.in
index a0449da..2ab821a 100644
--- a/config/commonConfig.h.in
+++ b/config/commonConfig.h.in
@@ -47,23 +47,6 @@ static const uint16_t COMMON_APID = 0xEF;
 #include <fsfw/events/fwSubsystemIdRanges.h>
 #include <fsfw/returnvalues/FwClassIds.h>
 
-/**
- * Enumerations for used PUS service IDs.
- */
-namespace pus {
-enum ServiceIds: uint8_t {
-    PUS_SERVICE_1 = 1,
-    PUS_SERVICE_2 = 2,
-    PUS_SERVICE_3 = 3,
-    PUS_SERVICE_5 = 5,
-    PUS_SERVICE_8 = 8,
-    PUS_SERVICE_9 = 9,
-    PUS_SERVICE_17 = 17,
-    PUS_SERVICE_20 = 20,
-    PUS_SERVICE_200 = 200
-};
-}
-
 #endif /* __cplusplus */
 
 #endif /* COMMON_COMMONCONFIG_H_ */
diff --git a/example/core/GenericFactory.cpp b/example/core/GenericFactory.cpp
index 36be334..d48a254 100644
--- a/example/core/GenericFactory.cpp
+++ b/example/core/GenericFactory.cpp
@@ -1,6 +1,7 @@
 #include "GenericFactory.h"
 
 #include "OBSWConfig.h"
+#include "common/definitions.h"
 #include "example/test/FsfwExampleTask.h"
 #include "example/test/FsfwReaderTask.h"
 #include "example/utility/TmFunnel.h"
@@ -31,7 +32,6 @@
 #include "fsfw_tests/internal/InternalUnitTester.h"
 #include "objects/systemObjectList.h"
 #include "tmtc/apid.h"
-#include "tmtc/pusIds.h"
 
 void ObjectFactory::produceGenericObjects() {
 #if OBSW_ADD_CORE_COMPONENTS == 1