diff --git a/conf/airframes/FLIXR/flixr_lisa_mx.xml b/conf/airframes/FLIXR/flixr_lisa_mx.xml
index 8b43115b0f..7f838f559e 100644
--- a/conf/airframes/FLIXR/flixr_lisa_mx.xml
+++ b/conf/airframes/FLIXR/flixr_lisa_mx.xml
@@ -96,6 +96,7 @@
       <module name="ahrs" type="int_cmpl_quat"/>
     </target>
     <target name="test_module" board="lisa_mx_2.0">
+      <module name="usb_serial_stm32_example1"/>
     </target>
   </firmware>
 
diff --git a/conf/modules/usb_serial_stm32_example1.xml b/conf/modules/usb_serial_stm32_example1.xml
index 463e29677b..2c7dd7fe8f 100644
--- a/conf/modules/usb_serial_stm32_example1.xml
+++ b/conf/modules/usb_serial_stm32_example1.xml
@@ -17,10 +17,8 @@
   <init fun="init_usb_serial()"/>
   <event fun="event_usb_serial()"/>
 
-  <makefile target="ap">
-    <raw>
-      ap.srcs += $(SRC_ARCH)/usb_ser_hw.c
-    </raw>
+  <makefile target="!nps|sim">
+    <file_arch name="usb_ser_hw.c" dir=""/>
     <define name="USE_USB_SERIAL"/>
     <file name="usb_serial_stm32_example1.c"/>
   </makefile>
diff --git a/conf/modules/usb_serial_stm32_example2.xml b/conf/modules/usb_serial_stm32_example2.xml
index c92642f4e9..df0a3b4276 100644
--- a/conf/modules/usb_serial_stm32_example2.xml
+++ b/conf/modules/usb_serial_stm32_example2.xml
@@ -1,17 +1,17 @@
- <!DOCTYPE module SYSTEM "module.dtd">
+<!DOCTYPE module SYSTEM "module.dtd">
 
- <module name="usb_serial_stm32_example1" dir="com">
+<module name="usb_serial_stm32_example1" dir="com">
   <doc>
-   <description>
-     STM32 USB-serial example.
-     Example of USB-serial module on STM32 architecture, using libopencm3 library.
-     This example tests the capability of USB-serial port by sending a lots of data.
-     To be used with Lisa M/MX 2.1
-   </description>
+    <description>
+      STM32 USB-serial example.
+      Example of USB-serial module on STM32 architecture, using libopencm3 library.
+      This example tests the capability of USB-serial port by sending a lots of data.
+      To be used with Lisa M/MX 2.1
+    </description>
   </doc>
 
   <header>
-   <file name="usb_serial_stm32.h"/>
+    <file name="usb_serial_stm32.h"/>
   </header>
 
   <init fun="init_usb_serial()"/>
@@ -20,11 +20,9 @@
 
   <event fun="event_usb_serial()"/>
 
-  <makefile target="ap">
-   <raw>
-   ap.srcs += $(SRC_ARCH)/usb_ser_hw.c
-   </raw>
-   <define name="USE_USB_SERIAL"/>
-   <file name="usb_serial_stm32_example2.c"/>
+  <makefile target="!nps|sim">
+    <file_arch name="usb_ser_hw.c" dir=""/>
+    <define name="USE_USB_SERIAL"/>
+    <file name="usb_serial_stm32_example2.c"/>
   </makefile>
- </module>
+</module>