diff --git a/libraries/APM_OBC/APM_OBC.cpp b/libraries/APM_OBC/APM_OBC.cpp
index d34d30e3f3..fc1b8d3951 100644
--- a/libraries/APM_OBC/APM_OBC.cpp
+++ b/libraries/APM_OBC/APM_OBC.cpp
@@ -20,11 +20,11 @@
     Outback Challenge Failsafe module
 
 */
-#include <AP_HAL.h>
-#include <APM_OBC.h>
-#include <RC_Channel.h>
-#include <RC_Channel_aux.h>
-#include <GCS.h>
+#include <AP_HAL/AP_HAL.h>
+#include "APM_OBC.h"
+#include <RC_Channel/RC_Channel.h>
+#include <RC_Channel/RC_Channel_aux.h>
+#include <GCS_MAVLink/GCS.h>
 
 extern const AP_HAL::HAL& hal;
 
diff --git a/libraries/APM_OBC/APM_OBC.h b/libraries/APM_OBC/APM_OBC.h
index 7a90a6be43..21478220e4 100644
--- a/libraries/APM_OBC/APM_OBC.h
+++ b/libraries/APM_OBC/APM_OBC.h
@@ -22,12 +22,12 @@
   Andrew Tridgell and CanberraUAV, August 2012
 */
 
-#include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Mission.h>
-#include <AP_Baro.h>
-#include <AP_GPS.h>
-#include <AP_RCMapper.h>
+#include <AP_Common/AP_Common.h>
+#include <AP_Param/AP_Param.h>
+#include <AP_Mission/AP_Mission.h>
+#include <AP_Baro/AP_Baro.h>
+#include <AP_GPS/AP_GPS.h>
+#include <AP_RCMapper/AP_RCMapper.h>
 #include <inttypes.h>