From 154f33ba61b038c3c3f75ca77027afb7ef38b20a Mon Sep 17 00:00:00 2001
From: Gustavo Jose de Sousa <gustavo.sousa@intel.com>
Date: Tue, 11 Aug 2015 16:28:45 +1000
Subject: [PATCH] AP_PerfMon: 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/AP_PerfMon/AP_PerfMon.h                |  4 ++--
 .../AP_PerfMon_test/AP_PerfMon_test.cpp          | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libraries/AP_PerfMon/AP_PerfMon.h b/libraries/AP_PerfMon/AP_PerfMon.h
index 0b438b2165..99843a381f 100644
--- a/libraries/AP_PerfMon/AP_PerfMon.h
+++ b/libraries/AP_PerfMon/AP_PerfMon.h
@@ -12,8 +12,8 @@
 #define PERFMON_MAX_FUNCTIONS 12
 #define PERFMON_FUNCTION_NAME_LENGTH 10
 
-#include <AP_HAL.h>
-#include <AP_Math.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_Math/AP_Math.h>
 
 class AP_PerfMon
 {
diff --git a/libraries/AP_PerfMon/AP_PerfMon_test/AP_PerfMon_test.cpp b/libraries/AP_PerfMon/AP_PerfMon_test/AP_PerfMon_test.cpp
index 303289e757..f6e40485d7 100644
--- a/libraries/AP_PerfMon/AP_PerfMon_test/AP_PerfMon_test.cpp
+++ b/libraries/AP_PerfMon/AP_PerfMon_test/AP_PerfMon_test.cpp
@@ -3,14 +3,14 @@
   Code by Randy Mackay
 */
 
-#include <AP_Common.h>
-#include <AP_Progmem.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
-#include <AP_HAL.h>
-#include <AP_HAL_AVR.h>
-#include <StorageManager.h>
-#include <AP_PerfMon.h>        // PerfMonitor library
+#include <AP_Common/AP_Common.h>
+#include <AP_Progmem/AP_Progmem.h>
+#include <AP_Param/AP_Param.h>
+#include <AP_Math/AP_Math.h>
+#include <AP_HAL/AP_HAL.h>
+#include <AP_HAL_AVR/AP_HAL_AVR.h>
+#include <StorageManager/StorageManager.h>
+#include <AP_PerfMon/AP_PerfMon.h>        // PerfMonitor library
 
 const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;