diff --git a/include/core/common/factory.h b/include/core/common/factory.h
index 25c819a9c28d85b3d78fc235faa39aab96291a3b..4a760ddc025c4ee68c48d7da03c50efae4a58ccd 100644
--- a/include/core/common/factory.h
+++ b/include/core/common/factory.h
@@ -314,26 +314,6 @@ namespace wolf
 // Some specializations
 //======================
 
-// Intrinsics
-struct IntrinsicsBase;
-typedef Factory<IntrinsicsBase,
-        const std::string&> IntrinsicsFactory;
-template<>
-inline std::string IntrinsicsFactory::getClass()
-{
-    return "IntrinsicsFactory";
-}
-
-// ProcessorParams
-struct ProcessorParamsBase;
-typedef Factory<ProcessorParamsBase,
-        const std::string&> ProcessorParamsFactory;
-template<>
-inline std::string ProcessorParamsFactory::getClass()
-{
-    return "ProcessorParamsFactory";
-}
-
 // Landmarks from YAML
 class LandmarkBase;
 typedef Factory<LandmarkBase,
diff --git a/include/core/processor/processor_factory.h b/include/core/processor/processor_factory.h
index c5068dc0e17833b372c38b37b9dd35bafb4671ad..1f1d8606c449f9b57625bac9c12f8f9207322d0b 100644
--- a/include/core/processor/processor_factory.h
+++ b/include/core/processor/processor_factory.h
@@ -165,6 +165,17 @@ namespace wolf
  * You can also check the code in the example file ````src/examples/test_wolf_factories.cpp````.
  */
 
+// ProcessorParams factory
+struct ProcessorParamsBase;
+typedef Factory<ProcessorParamsBase,
+        const std::string&> ProcessorParamsFactory;
+template<>
+inline std::string ProcessorParamsFactory::getClass()
+{
+    return "ProcessorParamsFactory";
+}
+
+// Processor factory
 typedef Factory<ProcessorBase,
         const std::string&,
         const ProcessorParamsBasePtr> ProcessorFactory;
diff --git a/include/core/sensor/sensor_factory.h b/include/core/sensor/sensor_factory.h
index 4e4c8306a9efcf4e43d0837dbc4d98ee088e46fd..3c74b0fd7ad1d32d5b3d8dc8cf867699ea832f80 100644
--- a/include/core/sensor/sensor_factory.h
+++ b/include/core/sensor/sensor_factory.h
@@ -209,6 +209,17 @@ namespace wolf
  * You can also check the code in the example file ````src/examples/test_wolf_factories.cpp````.
  */
 
+// Intrinsics factory
+struct IntrinsicsBase;
+typedef Factory<IntrinsicsBase,
+        const std::string&> IntrinsicsFactory;
+template<>
+inline std::string IntrinsicsFactory::getClass()
+{
+    return "IntrinsicsFactory";
+}
+
+// Sensor factory
 typedef Factory<SensorBase,
                 const std::string&,
                 const Eigen::VectorXs&, const IntrinsicsBasePtr> SensorFactory;