From 60c0f160b33260f38aeb071c8dbcfc7252d29e47 Mon Sep 17 00:00:00 2001
From: Gustavo Jose de Sousa <gustavo.sousa@intel.com>
Date: Tue, 11 Aug 2015 16:28:41 +1000
Subject: [PATCH] APM_OBC: standardize inclusion of libaries headers

This commit changes the way libraries headers are included in source files:

 - If the header is in the same directory the source belongs to, so the
 notation '#include ""' is used with the path relative to the directory
 containing the source.

 - If the header is outside the directory containing the source, then we use
 the notation '#include <>' with the path relative to libraries folder.

Some of the advantages of such approach:

 - Only one search path for libraries headers.

 - OSs like Windows may have a better lookup time.
---
 libraries/APM_OBC/APM_OBC.cpp | 10 +++++-----
 libraries/APM_OBC/APM_OBC.h   | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

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>