diff --git a/flight/targets/boards/revonano/firmware/Makefile b/flight/targets/boards/revonano/firmware/Makefile
index 67d01fac7..1abf5b82a 100644
--- a/flight/targets/boards/revonano/firmware/Makefile
+++ b/flight/targets/boards/revonano/firmware/Makefile
@@ -42,6 +42,7 @@ MODULES += Actuator
 MODULES += GPS
 MODULES += TxPID
 MODULES += CameraStab
+MODULES += CameraControl
 MODULES += Battery
 MODULES += FirmwareIAP
 MODULES += PathPlanner
diff --git a/flight/targets/boards/revonano/firmware/UAVObjects.inc b/flight/targets/boards/revonano/firmware/UAVObjects.inc
index 6100c4750..5774e7ae4 100644
--- a/flight/targets/boards/revonano/firmware/UAVObjects.inc
+++ b/flight/targets/boards/revonano/firmware/UAVObjects.inc
@@ -112,6 +112,8 @@ UAVOBJSRCFILENAMES += receiveractivity
 UAVOBJSRCFILENAMES += receiverstatus
 UAVOBJSRCFILENAMES += cameradesired
 UAVOBJSRCFILENAMES += camerastabsettings
+UAVOBJSRCFILENAMES += cameracontrolsettings
+UAVOBJSRCFILENAMES += cameracontrolactivity
 UAVOBJSRCFILENAMES += altitudeholdsettings
 UAVOBJSRCFILENAMES += oplinksettings
 UAVOBJSRCFILENAMES += oplinkstatus
diff --git a/flight/targets/boards/revoproto/firmware/Makefile b/flight/targets/boards/revoproto/firmware/Makefile
index 809fda826..d8d5124c0 100644
--- a/flight/targets/boards/revoproto/firmware/Makefile
+++ b/flight/targets/boards/revoproto/firmware/Makefile
@@ -42,6 +42,7 @@ MODULES += Actuator
 MODULES += GPS
 MODULES += TxPID
 MODULES += CameraStab
+MODULES += CameraControl
 MODULES += Battery
 MODULES += FirmwareIAP
 MODULES += PathPlanner
diff --git a/flight/targets/boards/revoproto/firmware/UAVObjects.inc b/flight/targets/boards/revoproto/firmware/UAVObjects.inc
index cba723f6b..5774e7ae4 100644
--- a/flight/targets/boards/revoproto/firmware/UAVObjects.inc
+++ b/flight/targets/boards/revoproto/firmware/UAVObjects.inc
@@ -21,9 +21,9 @@
 # (all architectures)
 UAVOBJSRCFILENAMES =
 UAVOBJSRCFILENAMES += statusgrounddrive
-UAVOBJSRCFILENAMES += statusvtolland
 UAVOBJSRCFILENAMES += statusvtolautotakeoff
 UAVOBJSRCFILENAMES += pidstatus
+UAVOBJSRCFILENAMES += statusvtolland
 UAVOBJSRCFILENAMES += vtolselftuningstats
 UAVOBJSRCFILENAMES += accelgyrosettings
 UAVOBJSRCFILENAMES += accessorydesired
@@ -112,6 +112,8 @@ UAVOBJSRCFILENAMES += receiveractivity
 UAVOBJSRCFILENAMES += receiverstatus
 UAVOBJSRCFILENAMES += cameradesired
 UAVOBJSRCFILENAMES += camerastabsettings
+UAVOBJSRCFILENAMES += cameracontrolsettings
+UAVOBJSRCFILENAMES += cameracontrolactivity
 UAVOBJSRCFILENAMES += altitudeholdsettings
 UAVOBJSRCFILENAMES += oplinksettings
 UAVOBJSRCFILENAMES += oplinkstatus
@@ -125,7 +127,7 @@ UAVOBJSRCFILENAMES += mpugyroaccelsettings
 UAVOBJSRCFILENAMES += txpidsettings
 UAVOBJSRCFILENAMES += txpidstatus
 UAVOBJSRCFILENAMES += takeofflocation
-# UAVOBJSRCFILENAMES += perfcounter
+UAVOBJSRCFILENAMES += perfcounter
 UAVOBJSRCFILENAMES += systemidentsettings
 UAVOBJSRCFILENAMES += systemidentstate
 
diff --git a/flight/targets/boards/sparky2/firmware/Makefile b/flight/targets/boards/sparky2/firmware/Makefile
index 7ee3837a4..45c7f2891 100644
--- a/flight/targets/boards/sparky2/firmware/Makefile
+++ b/flight/targets/boards/sparky2/firmware/Makefile
@@ -42,6 +42,7 @@ MODULES += Actuator
 MODULES += GPS
 MODULES += TxPID
 MODULES += CameraStab
+MODULES += CameraControl
 MODULES += Battery
 MODULES += FirmwareIAP
 MODULES += Radio
diff --git a/flight/targets/boards/sparky2/firmware/UAVObjects.inc b/flight/targets/boards/sparky2/firmware/UAVObjects.inc
index 4835fa649..5774e7ae4 100644
--- a/flight/targets/boards/sparky2/firmware/UAVObjects.inc
+++ b/flight/targets/boards/sparky2/firmware/UAVObjects.inc
@@ -17,7 +17,7 @@
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-# These are the UAVObjects supposed to be build as part of the target
+# These are the UAVObjects supposed to be build as part of the OpenPilot target
 # (all architectures)
 UAVOBJSRCFILENAMES =
 UAVOBJSRCFILENAMES += statusgrounddrive
@@ -112,6 +112,8 @@ UAVOBJSRCFILENAMES += receiveractivity
 UAVOBJSRCFILENAMES += receiverstatus
 UAVOBJSRCFILENAMES += cameradesired
 UAVOBJSRCFILENAMES += camerastabsettings
+UAVOBJSRCFILENAMES += cameracontrolsettings
+UAVOBJSRCFILENAMES += cameracontrolactivity
 UAVOBJSRCFILENAMES += altitudeholdsettings
 UAVOBJSRCFILENAMES += oplinksettings
 UAVOBJSRCFILENAMES += oplinkstatus