diff --git a/conf/airframes/ENAC/fixed-wing/overview.xml b/conf/airframes/ENAC/fixed-wing/overview.xml
index 197e0d3785..eb26eb4613 100644
--- a/conf/airframes/ENAC/fixed-wing/overview.xml
+++ b/conf/airframes/ENAC/fixed-wing/overview.xml
@@ -96,10 +96,10 @@
   </section>
 
   <section name="CAM" prefix="CAM_">
-    <define name="TILT_MAX" value="45" unit="deg"/>
-    <define name="TILT_NEUTRAL" value="0" unit="deg"/>
-    <define name="TILT_MIN" value="-45" unit="deg"/>
-    <define name="TILT0" value="0" unit="deg"/>
+    <define name="TILT_MAX" value="45" unit="deg" code_unit="deg"/>
+    <define name="TILT_NEUTRAL" value="0" unit="deg" code_unit="deg"/>
+    <define name="TILT_MIN" value="-45" unit="deg" code_unit="deg"/>
+    <define name="TILT0" value="0" unit="deg" code_unit="deg"/>
   </section>
 
   <section name="MISC">
diff --git a/conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml b/conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
index 1682d2939d..7f6f6ea37c 100644
--- a/conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
+++ b/conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
@@ -59,14 +59,14 @@
   </section>
 
   <section name="PANTILT" prefix="CAM_">
-    <define name="PAN_MIN" value="-45"/>
-    <define name="PAN_NEUTRAL" value="33"/>
-    <define name="PAN_MAX" value="156"/>
-    <define name="PAN0" value="0"/>
-    <define name="TILT_MIN" value="-62"/>
-    <define name="TILT_NEUTRAL" value="47"/>
-    <define name="TILT_MAX" value="122"/>
-    <define name="TILT0" value="90"/>
+    <define name="PAN_MIN" value="-45" unit="deg" code_unit="deg"/>
+    <define name="PAN_NEUTRAL" value="33" unit="deg" code_unit="deg"/>
+    <define name="PAN_MAX" value="156" unit="deg" code_unit="deg"/>
+    <define name="PAN0" value="0" unit="deg" code_unit="deg"/>
+    <define name="TILT_MIN" value="-62" unit="deg" code_unit="deg"/>
+    <define name="TILT_NEUTRAL" value="47" unit="deg" code_unit="deg"/>
+    <define name="TILT_MAX" value="122" unit="deg" code_unit="deg"/>
+    <define name="TILT0" value="90" unit="deg" code_unit="deg"/>
     <define name="MODE0" value="1"/>
   </section>
 
diff --git a/conf/airframes/TU_Delft/MicrojetBR.xml b/conf/airframes/TU_Delft/MicrojetBR.xml
index 434a884ba8..ddf94c4484 100644
--- a/conf/airframes/TU_Delft/MicrojetBR.xml
+++ b/conf/airframes/TU_Delft/MicrojetBR.xml
@@ -191,15 +191,15 @@
   </section>
 
   <section name="CAM" prefix="CAM_">
-    <define name="TILT_MAX" value="30" unit="deg"/>
-    <define name="TILT_NEUTRAL" value="0" unit="deg"/>
-    <define name="TILT_MIN" value="-30" unit="deg"/>
-    <define name="TILT0" value="0" unit="deg"/>
+    <define name="TILT_MAX" value="30" unit="deg" code_unit="deg"/>
+    <define name="TILT_NEUTRAL" value="0" unit="deg" code_unit="deg"/>
+    <define name="TILT_MIN" value="-30" unit="deg" code_unit="deg"/>
+    <define name="TILT0" value="0" unit="deg" code_unit="deg"/>
 
-    <define name="PAN_MAX" value="45" unit="deg"/>
-    <define name="PAN_NEUTRAL" value="0" unit="deg"/>
-    <define name="PAN_MIN" value="-45" unit="deg"/>
-    <define name="PAN0" value="0" unit="deg"/>
+    <define name="PAN_MAX" value="45" unit="deg" code_unit="deg"/>
+    <define name="PAN_NEUTRAL" value="0" unit="deg" code_unit="deg"/>
+    <define name="PAN_MIN" value="-45" unit="deg" code_unit="deg"/>
+    <define name="PAN0" value="0" unit="deg" code_unit="deg"/>
   </section>
 
 <!--moet nog in tuning-->
diff --git a/conf/airframes/TU_Delft/MicrojetBRimu.xml b/conf/airframes/TU_Delft/MicrojetBRimu.xml
index 9d561274ce..b952175c80 100644
--- a/conf/airframes/TU_Delft/MicrojetBRimu.xml
+++ b/conf/airframes/TU_Delft/MicrojetBRimu.xml
@@ -227,15 +227,15 @@
   </section>
 
   <section name="CAM" prefix="CAM_">
-    <define name="TILT_MAX" value="30" unit="deg"/>
-    <define name="TILT_NEUTRAL" value="0" unit="deg"/>
-    <define name="TILT_MIN" value="-30" unit="deg"/>
-    <define name="TILT0" value="0" unit="deg"/>
+    <define name="TILT_MAX" value="30" unit="deg" code_unit="deg"/>
+    <define name="TILT_NEUTRAL" value="0" unit="deg" code_unit="deg"/>
+    <define name="TILT_MIN" value="-30" unit="deg" code_unit="deg"/>
+    <define name="TILT0" value="0" unit="deg" code_unit="deg"/>
 
-    <define name="PAN_MAX" value="45" unit="deg"/>
-    <define name="PAN_NEUTRAL" value="0" unit="deg"/>
-    <define name="PAN_MIN" value="-45" unit="deg"/>
-    <define name="PAN0" value="0" unit="deg"/>
+    <define name="PAN_MAX" value="45" unit="deg" code_unit="deg"/>
+    <define name="PAN_NEUTRAL" value="0" unit="deg" code_unit="deg"/>
+    <define name="PAN_MIN" value="-45" unit="deg" code_unit="deg"/>
+    <define name="PAN0" value="0" unit="deg" code_unit="deg"/>
   </section>
 
 <!--moet nog in tuning-->
diff --git a/conf/airframes/mm/hangar/black_one.xml b/conf/airframes/mm/hangar/black_one.xml
index c41a331d0f..a62b36d2f8 100644
--- a/conf/airframes/mm/hangar/black_one.xml
+++ b/conf/airframes/mm/hangar/black_one.xml
@@ -207,7 +207,7 @@
 </section>
 
 <section name="CAM" prefix="CAM_">
-  <define name="PHI0" value="-45" unit="deg"/>
+  <define name="PHI0" value="-45" unit="deg" code_unit="deg"/>
 </section>
 
  <makefile>
diff --git a/conf/airframes/mm/hangar/red_one.xml b/conf/airframes/mm/hangar/red_one.xml
index 67cb29d626..2d4caa9b33 100644
--- a/conf/airframes/mm/hangar/red_one.xml
+++ b/conf/airframes/mm/hangar/red_one.xml
@@ -206,14 +206,14 @@
 </section>
 
 <section name="CAM" prefix="CAM_">
-  <define name="PHI0"          value="0" unit="deg"/>
-  <define name="ROLL_MAX"      value="90" unit="deg"/>
-  <define name="ROLL_NEUTRAL"  value="45" unit="deg"/>
-  <define name="ROLL_MIN"      value="0"  unit="deg"/>
-  <define name="THETA0"        value="45" unit="deg"/>
-  <define name="PITCH_MAX"     value="90" unit="deg"/>
-  <define name="PITCH_NEUTRAL" value="45" unit="deg"/>
-  <define name="PITCH_MIN"     value="0"  unit="deg"/>
+  <define name="PHI0"          value="0" unit="deg" code_unit="deg"/>
+  <define name="ROLL_MAX"      value="90" unit="deg" code_unit="deg"/>
+  <define name="ROLL_NEUTRAL"  value="45" unit="deg" code_unit="deg"/>
+  <define name="ROLL_MIN"      value="0"  unit="deg" code_unit="deg"/>
+  <define name="THETA0"        value="45" unit="deg" code_unit="deg"/>
+  <define name="PITCH_MAX"     value="90" unit="deg" code_unit="deg"/>
+  <define name="PITCH_NEUTRAL" value="45" unit="deg" code_unit="deg"/>
+  <define name="PITCH_MIN"     value="0"  unit="deg" code_unit="deg"/>
 </section>
 
   <section name="DATALINK" prefix="DATALINK_">
diff --git a/conf/airframes/obsolete/slicer1.xml b/conf/airframes/obsolete/slicer1.xml
index fb77560d57..de8a3474ca 100644
--- a/conf/airframes/obsolete/slicer1.xml
+++ b/conf/airframes/obsolete/slicer1.xml
@@ -169,15 +169,15 @@
   </section>
 
   <section name="CAM" prefix="CAM_">
-    <define name="TILT_MAX"      value="30" unit="deg"/>
-    <define name="TILT_NEUTRAL"  value="0" unit="deg"/>
-    <define name="TILT_MIN"      value="-30"  unit="deg"/>
-    <define name="TILT0"        value="0" unit="deg"/>
+    <define name="TILT_MAX"      value="30" unit="deg" code_unit="deg"/>
+    <define name="TILT_NEUTRAL"  value="0" unit="deg" code_unit="deg"/>
+    <define name="TILT_MIN"      value="-30"  unit="deg" code_unit="deg"/>
+    <define name="TILT0"        value="0" unit="deg" code_unit="deg"/>
 
-    <define name="PAN_MAX"     value="45" unit="deg"/>
-    <define name="PAN_NEUTRAL" value="0" unit="deg"/>
-    <define name="PAN_MIN"     value="-45"  unit="deg"/>
-    <define name="PAN0"          value="0" unit="deg"/>
+    <define name="PAN_MAX"     value="45" unit="deg" code_unit="deg"/>
+    <define name="PAN_NEUTRAL" value="0" unit="deg" code_unit="deg"/>
+    <define name="PAN_MIN"     value="-45"  unit="deg" code_unit="deg"/>
+    <define name="PAN0"          value="0" unit="deg" code_unit="deg"/>
   </section>
 
  <makefile>