diff --git a/Makefile b/Makefile
index efa2aa1..55cff5e 100644
--- a/Makefile
+++ b/Makefile
@@ -18,14 +18,14 @@
 %.o: objects/pflash/%.c
 	$(CC) -c -o obj/$@ $< -I$(HOME) -I$(HOME)/objects/pflash $(CFLAGS)
 
-power_control: power_control.o power_control_obj.o gpio.o
-	$(CC) -o bin/$@.exe obj/gpio.o obj/power_control.o obj/power_control_obj.o $(CFLAGS)
+power_control: control.o power_control_obj.o gpio.o
+	$(CC) -o bin/$@.exe obj/gpio.o obj/control.o obj/power_control_obj.o $(CFLAGS)
 
 chassis_identify: led.o chassis_identify_obj.o gpio.o
 	$(CC) -o bin/$@.exe obj/gpio.o obj/led.o obj/chassis_identify_obj.o $(CFLAGS)
 
-sensor_ambient: sensor2.o sensor_temperature_ambient_obj.o sensor_threshold.o
-	$(CC) -o bin/$@.exe obj/openbmc_utilities.o obj/sensor2.o obj/sensor_temperature_ambient_obj.o $(CFLAGS)
+sensor_ambient: sensor2.o sensor_threshold.o sensor_temperature_ambient_obj.o
+	$(CC) -o bin/$@.exe obj/sensor_threshold.o obj/sensor2.o obj/sensor_temperature_ambient_obj.o $(CFLAGS)
 
 button_power: button.o button_power_obj.o gpio.o
 	$(CC) -o bin/$@.exe obj/button.o obj/button_power_obj.o $(CFLAGS)
@@ -33,9 +33,17 @@
 sensor_host_status: sensor.o sensor_host_status_obj.o
 	$(CC) -o bin/$@.exe obj/sensor.o obj/sensor_host_status_obj.o $(CFLAGS)
 
-control_host: control_host.o control_host_obj.o gpio.o
-	$(CC) -o bin/$@.exe obj/gpio.o obj/control_host.o obj/control_host_obj.o $(CFLAGS)
+control_host: control.o control_host_obj.o gpio.o
+	$(CC) -o bin/$@.exe obj/gpio.o obj/control.o obj/control_host_obj.o $(CFLAGS)
 
 flash_bios: pflash.o flash.o flash_bios_obj.o
 	$(CC) -o bin/$@.exe obj/flash.o obj/flash_bios_obj.o  $(OBJS)  $(CFLAGS)
 
+fan: fru.o fan_generic_obj.o gpio.o
+	$(CC) -o bin/$@.exe obj/gpio.o obj/fru.o obj/fan_generic_obj.o $(CFLAGS)
+
+fru_generic: fru.o fru_generic_obj.o
+	$(CC) -o bin/$@.exe obj/fru.o obj/fru_generic_obj.o $(CFLAGS)
+
+
+