diff --git a/libraries/AP_RCMapper/AP_RCMapper.cpp b/libraries/AP_RCMapper/AP_RCMapper.cpp
index 326d8ca1b7..99ad30ce66 100644
--- a/libraries/AP_RCMapper/AP_RCMapper.cpp
+++ b/libraries/AP_RCMapper/AP_RCMapper.cpp
@@ -1,7 +1,7 @@
 /// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 
-#include <AP_HAL.h>
-#include <AP_RCMapper.h>
+#include <AP_HAL/AP_HAL.h>
+#include "AP_RCMapper.h"
 
 const AP_Param::GroupInfo RCMapper::var_info[] PROGMEM = {
     // @Param: ROLL
diff --git a/libraries/AP_RCMapper/AP_RCMapper.h b/libraries/AP_RCMapper/AP_RCMapper.h
index e3f962ee72..dab038dea5 100644
--- a/libraries/AP_RCMapper/AP_RCMapper.h
+++ b/libraries/AP_RCMapper/AP_RCMapper.h
@@ -3,8 +3,8 @@
 #define AP_RCMAPPER_H
 
 #include <inttypes.h>
-#include <AP_Common.h>
-#include <AP_Param.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Param/AP_Param.h>
 
 class RCMapper
 {