diff --git a/flight/CopterControl/Makefile b/flight/CopterControl/Makefile
index 33511ec19..3cc5c9f4a 100644
--- a/flight/CopterControl/Makefile
+++ b/flight/CopterControl/Makefile
@@ -57,7 +57,7 @@ FLASH_TOOL = OPENOCD
 USE_THUMB_MODE = YES
 
 # List of modules to include
-MODULES = Telemetry ManualControl Actuator CCAttitude #Stabilization
+MODULES = Telemetry ManualControl Actuator Attitude Stabilization FirmwareIAP
 #Actuator Telemetry ManualControl Stabilization FirmwareIAP
 
 #MODULES = Telemetry Example
@@ -185,6 +185,7 @@ SRC += $(OPUAVSYNTHDIR)/manualcontrolsettings.c
 SRC += $(OPUAVSYNTHDIR)/mixersettings.c
 SRC += $(OPUAVSYNTHDIR)/mixerstatus.c
 SRC += $(OPUAVSYNTHDIR)/ahrssettings.c
+SRC += $(OPUAVSYNTHDIR)/firmwareiapobj.c
 #${wildcard ${OBJ}/$(shell echo $(VAR) | tr A-Z a-z)/*.c}
 #SRC += ${foreach OBJ, ${UAVOBJECTS}, $(UAVOBJECTS)/$(OBJ).c}
 # Cant use until i can automatically generate list of UAVObjects
diff --git a/flight/Modules/FirmwareIAP/firmwareiap.c b/flight/Modules/FirmwareIAP/firmwareiap.c
index fdbbd88fd..23bcb4350 100644
--- a/flight/Modules/FirmwareIAP/firmwareiap.c
+++ b/flight/Modules/FirmwareIAP/firmwareiap.c
@@ -31,8 +31,6 @@
 #include "firmwareiap.h"
 #include "firmwareiapobj.h"
 
-#include "STM3210E_OP.h"
-
 // Private constants
 #define IAP_CMD_STEP_1      1122
 #define IAP_CMD_STEP_2      2233