diff --git a/conf/airframes/twinjet_overo.xml b/conf/airframes/twinjet_overo.xml
index ef5b06badc..5ed5655242 100755
--- a/conf/airframes/twinjet_overo.xml
+++ b/conf/airframes/twinjet_overo.xml
@@ -13,7 +13,6 @@
   <firmware name="fixedwing">
     <target name="ap"           board="twog_1.0">
       <define name="UBX_EXTERNAL"/>
-      <define name="USE_ADC_GENERIC"/>
     </target>
 
     <target name="sim"          board="pc"/>
@@ -22,11 +21,6 @@
     <define name="ALT_KALMAN"/>
     <define name="AGR_CLIMB"/>
 
-    <subsystem name="adc" type="generic">
-      <param name="ADC_GENERIC1" value="ADC_3"/>
-      <param name="ADC_GENERIC2" value="ADC_5"/>
-    </subsystem>
-
     <subsystem name="radio_control" type="ppm"/>
     <subsystem name="telemetry"     type="transparent"/>
     <subsystem name="control"/>
@@ -44,6 +38,12 @@
 
   <modules>
     <load name="twog_extra_dl.xml"/>
+    <load name="adc_generic.xml">
+      <flag name="ADC_CHANNEL_GENERIC1" value="ADC_3"/>
+      <flag name="ADC_CHANNEL_GENERIC2" value="ADC_5"/>
+      <flag name="USE_ADC_3"/>
+      <flag name="USE_ADC_5"/>
+    </load>
   </modules>
 
   <servos>
diff --git a/conf/autopilot/subsystems/fixedwing/adc_generic.makefile b/conf/autopilot/subsystems/fixedwing/adc_generic.makefile
deleted file mode 100644
index 4ade7cbbe1..0000000000
--- a/conf/autopilot/subsystems/fixedwing/adc_generic.makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# generic ADC
-
-#
-# default values for tiny and twog are:
-# ADC_GENERIC_NB_SAMPLES = 16
-#
-# to change just redefine before including this file
-#
-# you have to set the params of the ADCs to use, eg.
-# <subsystem name"adc" type="generic">
-#   <param name="ADC_GENERIC1" value="ADC_3"/>
-#   <param name="ADC_GENERIC2" value="ADC_4"/>
-# </subsystem>
-#
-# if you only set one parameter only that one will be used
-
-ifdef ADC_GENERIC1
-  ap.CFLAGS += -DUSE_ADC_GENERIC -DADC_CHANNEL_GENERIC_NB_SAMPLES=$(ADC_GENERIC_NB_SAMPLES)
-  ap.CFLAGS += -DADC_CHANNEL_GENERIC1=$(ADC_GENERIC1) -DUSE_$(ADC_GENERIC1)
-  ifdef ADC_GENERIC2
-    ap.CFLAGS += -DADC_CHANNEL_GENERIC2=$(ADC_GENERIC2) -DUSE_$(ADC_GENERIC2)
-  endif
-  ap.srcs += $(SRC_FIXEDWING)/adc_generic.c
-else
-  ifdef ADC_GENERIC2
-    ap.CFLAGS += -DUSE_ADC_GENERIC -DADC_CHANNEL_GENERIC_NB_SAMPLES=$(ADC_GENERIC_NB_SAMPLES)
-    ap.CFLAGS += -DADC_CHANNEL_GENERIC2=$(ADC_GENERIC1) -DUSE_$(ADC_GENERIC2)
-    ap.srcs += $(SRC_FIXEDWING)/adc_generic.c
-  endif
-endif