diff --git a/mainloop.cpp b/mainloop.cpp
index 7af3096..34970b1 100644
--- a/mainloop.cpp
+++ b/mainloop.cpp
@@ -25,6 +25,7 @@
 #include "env.hpp"
 #include "thresholds.hpp"
 #include "targets.hpp"
+#include "fan_speed.hpp"
 
 // Initialization for Warning Objects
 decltype(Thresholds<WarningObject>::setLo) Thresholds<WarningObject>::setLo =
@@ -54,12 +55,6 @@
 decltype(Thresholds<CriticalObject>::alarmHi) Thresholds<CriticalObject>::alarmHi =
     &CriticalObject::criticalAlarmHigh;
 
-// Initialization for Target objects
-decltype(Targets<FanSpeedObject>::setTarget)
-    Targets<FanSpeedObject>::setTarget = &FanSpeedObject::target;
-decltype(Targets<FanSpeedObject>::getTarget)
-    Targets<FanSpeedObject>::getTarget = &FanSpeedObject::target;
-
 
 using namespace std::literals::chrono_literals;
 
@@ -247,7 +242,7 @@
         addThreshold<CriticalObject>(i.first, sensorValue, info);
         //TODO openbmc/openbmc#1347
         //     Handle application restarts to set/refresh fan speed values
-        addTarget<FanSpeedObject>(i.first, _hwmonRoot, _instance, info);
+        addTarget<hwmon::FanSpeed>(i.first, _hwmonRoot, _instance, info);
 
         // All the interfaces have been created.  Go ahead
         // and emit InterfacesAdded.