From caeaae2673b28cbe38a834437a5eb9c53aca6d4a Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Thu, 4 Jan 2018 08:50:56 +0100
Subject: bsp/gen5200: Use public include path

Update #3254.
---
 c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.c   | 10 +++++-----
 c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.c  | 14 +++++++-------
 c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.c      |  2 +-
 .../lib/libbsp/powerpc/gen5200/bestcomm/dma_image.reloc.c  |  2 +-
 c/src/lib/libbsp/powerpc/gen5200/bestcomm/load_task.c      | 10 +++++-----
 c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_ata.c  |  3 +--
 .../libbsp/powerpc/gen5200/bestcomm/tasksetup_bdtable.c    |  8 ++++----
 .../libbsp/powerpc/gen5200/bestcomm/tasksetup_crc16_dp_0.c |  3 +--
 .../libbsp/powerpc/gen5200/bestcomm/tasksetup_crc16_dp_1.c |  3 +--
 .../libbsp/powerpc/gen5200/bestcomm/tasksetup_fec_rx_bd.c  |  3 +--
 .../libbsp/powerpc/gen5200/bestcomm/tasksetup_fec_tx_bd.c  |  2 +-
 .../libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_0.c   |  3 +--
 .../libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_1.c   |  3 +--
 .../libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_2.c   |  3 +--
 .../libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_3.c   |  3 +--
 .../powerpc/gen5200/bestcomm/tasksetup_gen_dp_bd_0.c       |  3 +--
 .../powerpc/gen5200/bestcomm/tasksetup_gen_dp_bd_1.c       |  3 +--
 .../libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_rx_bd.c  |  3 +--
 .../libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_tx_bd.c  |  3 +--
 c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_lpc.c  |  3 +--
 .../lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_pci_rx.c |  3 +--
 .../lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_pci_tx.c |  3 +--
 c/src/lib/libbsp/powerpc/gen5200/console/console.c         |  2 +-
 c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.c         |  6 +++---
 c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.h         |  5 +++--
 c/src/lib/libbsp/powerpc/gen5200/ide/idecfg.c              |  2 +-
 c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c          |  2 +-
 c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c             |  2 +-
 c/src/lib/libbsp/powerpc/gen5200/mscan/mscan_int.h         |  2 +-
 c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.c             |  4 ++--
 c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c   |  4 ++--
 31 files changed, 54 insertions(+), 68 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.c
index 171882b803..ead2046275 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.c
@@ -39,11 +39,11 @@
  * inline in capi/bestcomm_api.h.
  */
 
-#include "include/ppctypes.h"
-#include "bestcomm_api.h"
-#include "task_api/bestcomm_cntrl.h"
-#include "task_api/bestcomm_api_mem.h"
-#include "task_api/tasksetup_bdtable.h"
+#include <bsp/bestcomm/include/ppctypes.h>
+#include <bsp/bestcomm/bestcomm_api.h>
+#include <bsp/bestcomm/task_api/bestcomm_cntrl.h>
+#include <bsp/bestcomm/task_api/bestcomm_api_mem.h>
+#include <bsp/bestcomm/task_api/tasksetup_bdtable.h>
 
 /***********************************************************************
  */
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.c
index c313771895..9e0d946ed0 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.c
@@ -20,13 +20,13 @@
 #include <rtems.h>
 #include <bsp.h>
 #include <bsp/irq.h>
-#include "../include/mpc5200.h"
-#include "include/ppctypes.h"			/* uint32, et. al.		   */
-#include "dma_image.h"
-#include "task_api/bestcomm_cntrl.h"
-#include "bestcomm_api.h"
-#include "bestcomm_glue.h"
-#include "include/mgt5200/sdma.h"
+#include <bsp/mpc5200.h>
+#include <bsp/bestcomm/include/ppctypes.h> /* uint32, et. al.		   */
+#include <bsp/bestcomm/dma_image.h>
+#include <bsp/bestcomm/task_api/bestcomm_cntrl.h>
+#include <bsp/bestcomm/bestcomm_api.h>
+#include <bsp/bestcomm/bestcomm_glue.h>
+#include <bsp/bestcomm/include/mgt5200/sdma.h>
 #include <rtems/score/heapimpl.h>
 
 extern const uint32 taskTableBytes;
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.c
index 60a0f55ac9..3ca468b800 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.c
@@ -22,7 +22,7 @@
 *
 ******************************************************************************/
 
-#include "dma_image.h"
+#include <bsp/bestcomm/dma_image.h>
 
 TASK_PCI_TX_api_t  TASK_PCI_TX_storage;
 TASK_PCI_TX_api_t *TASK_PCI_TX_api=&TASK_PCI_TX_storage;
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.reloc.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.reloc.c
index 8e4aa8c470..ca02c2193d 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.reloc.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.reloc.c
@@ -23,7 +23,7 @@
 ******************************************************************************/
 
 
-#include "include/ppctypes.h"
+#include <bsp/bestcomm/include/ppctypes.h>
 
 uint32 taskTableBytes = 0x00001500;  /* Number of bytes in image */
 
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/load_task.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/load_task.c
index c6632955ff..c9bbb2dc83 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/load_task.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/load_task.c
@@ -26,12 +26,12 @@
 #include <string.h>
 #endif
 
-#include "include/ppctypes.h"
-#include "include/mgt5200/sdma.h"
-#include "include/mgt5200/mgt5200.h"
+#include <bsp/bestcomm/include/ppctypes.h>
+#include <bsp/bestcomm/include/mgt5200/sdma.h>
+#include <bsp/bestcomm/include/mgt5200/mgt5200.h>
 
-#include "dma_image.h"
-#include "bestcomm_api.h"
+#include <bsp/bestcomm/dma_image.h>
+#include <bsp/bestcomm/bestcomm_api.h>
 
 #ifdef __MWERKS__
 __declspec(section ".text") extern const uint32 taskTable;
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_ata.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_ata.c
index 6b5bea197e..47744c199b 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_ata.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_ata.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_bdtable.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_bdtable.c
index ee8e0939d9..035422de41 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_bdtable.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_bdtable.c
@@ -24,10 +24,10 @@
 
 #include <assert.h>
 
-#include "bestcomm_api.h"
-#include "bestcomm_glue.h"
-#include "task_api/tasksetup_bdtable.h"
-#include "include/mgt5200/mgt5200.h"
+#include <bsp/bestcomm/bestcomm_api.h>
+#include <bsp/bestcomm/bestcomm_glue.h>
+#include <bsp/bestcomm/task_api/tasksetup_bdtable.h>
+#include <bsp/bestcomm/include/mgt5200/mgt5200.h>
 
 #ifdef __MWERKS__
 __declspec(section ".text") extern const uint32 taskTable;
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_crc16_dp_0.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_crc16_dp_0.c
index dea2412394..5a6c23847e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_crc16_dp_0.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_crc16_dp_0.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_crc16_dp_1.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_crc16_dp_1.c
index d9635b0607..8c79247508 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_crc16_dp_1.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_crc16_dp_1.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_fec_rx_bd.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_fec_rx_bd.c
index 38c0759b6f..0105f7f294 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_fec_rx_bd.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_fec_rx_bd.c
@@ -34,5 +34,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_fec_tx_bd.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_fec_tx_bd.c
index 6335b96c02..9bf5c3726b 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_fec_tx_bd.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_fec_tx_bd.c
@@ -35,4 +35,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_0.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_0.c
index 9ad82fd16f..12d5537521 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_0.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_0.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_1.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_1.c
index 1b6c5da20a..139104f541 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_1.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_1.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_2.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_2.c
index adeda49352..17612b341e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_2.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_2.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_3.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_3.c
index 7f13b41faa..8f96f5a12f 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_3.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_3.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_bd_0.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_bd_0.c
index ab309bf805..b05db10bb3 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_bd_0.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_bd_0.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_bd_1.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_bd_1.c
index 742261b81e..f5e0109956 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_bd_1.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_bd_1.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_rx_bd.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_rx_bd.c
index 83a71cc90b..dc81ad639b 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_rx_bd.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_rx_bd.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_tx_bd.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_tx_bd.c
index 341873b3bb..2ca073e9f2 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_tx_bd.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_tx_bd.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_lpc.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_lpc.c
index eff8a27fb6..725080ac19 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_lpc.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_lpc.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_pci_rx.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_pci_rx.c
index ecf017d2a9..80f20b9118 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_pci_rx.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_pci_rx.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_pci_tx.c b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_pci_tx.c
index 4b13319f23..37db9a6241 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_pci_tx.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_pci_tx.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T
 
-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/console/console.c b/c/src/lib/libbsp/powerpc/gen5200/console/console.c
index 76dcc0c852..d7325032c4 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/console/console.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/console/console.c
@@ -99,7 +99,7 @@
 #include <string.h>
 
 #include <rtems.h>
-#include "../include/mpc5200.h"
+#include <bsp/mpc5200.h>
 #include <bsp.h>
 #include <bsp/irq.h>
 
diff --git a/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.c b/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.c
index cfb4cd0141..d0202062cf 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.c
@@ -30,10 +30,10 @@
  *
  * http://www.rtems.org/license/LICENSE.
  */
-#include "mpc5200mbus.h"
-#include "../include/mpc5200.h"
+#include "../i2c/mpc5200mbus.h"
+#include <bsp/mpc5200.h>
 #include <bsp/irq.h>
-#include "../include/i2c.h"
+#include <i2c.h>
 
 /* Events of I2C machine */
 typedef enum i2c_event {
diff --git a/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.h b/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.h
index 9a586815ed..fb3c214d60 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.h
+++ b/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.h
@@ -34,8 +34,9 @@
 #ifndef __MPC5200BSP_MPC5200MBUS_H__
 #define __MPC5200BSP_MPC5200MBUS_H__
 
-#include "../include/mpc5200.h"
-#include "../include/i2c.h"
+#include <bsp/mpc5200.h>
+#include <i2c.h>
+
 
 /* States of I2C machine */
 typedef enum mpc5200mbus_i2c_state {
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/idecfg.c b/c/src/lib/libbsp/powerpc/gen5200/ide/idecfg.c
index 428cea6cea..8cd26beef3 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ide/idecfg.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/ide/idecfg.c
@@ -19,7 +19,7 @@
 #include <rtems.h>
 #include <bsp.h>
 #include <bsp/irq.h>
-#include "../include/mpc5200.h"
+#include <bsp/mpc5200.h>
 #include "./pcmcia_ide.h"
 
 #include <libchip/ide_ctrl.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c b/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c
index e1e9e7d8f6..9683ae383c 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c
@@ -81,7 +81,7 @@
 #include <rtems/score/sysstate.h>
 #include <bsp.h>
 #include <bsp/irq.h>
-#include "../include/mpc5200.h"
+#include <bsp/mpc5200.h>
 #include "./pcmcia_ide.h"
 
 #include <libchip/ide_ctrl.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c b/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c
index ae85c10188..e36b6224cc 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c
@@ -24,7 +24,7 @@
 #include <rtems/libio.h>
 #include <string.h>
 
-#include "../include/bsp.h"
+#include <bsp.h>
 #include <bsp/fatal.h>
 #include <bsp/irq.h>
 #include "../mscan/mscan_int.h"
diff --git a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan_int.h b/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan_int.h
index 8cb93d332a..7bac194f86 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan_int.h
+++ b/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan_int.h
@@ -28,7 +28,7 @@ extern "C" {
 
 #include <bsp/mscan-base.h>
 
-#include "../mscan/mscan.h"
+#include <bsp/mscan.h>
 
 #define MSCAN_RX_BUFF_NUM        4
 #define MSCAN_TX_BUFF_NUM        3
diff --git a/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.c b/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.c
index 8e174203e8..99192ac3c4 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.c
@@ -83,8 +83,8 @@
 #include <string.h>
 #include <stdio.h>
 #include <bsp.h>
-#include "../include/mpc5200.h"
-#include "nvram.h"
+#include <bsp/mpc5200.h>
+#include <bsp/nvram.h>
 #include "m93cxx.h"
 
 /*
diff --git a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c b/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c
index 396059ca9d..adbd70602b 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c
@@ -107,8 +107,8 @@
 #include <rtems/libio.h>
 
 #include <bsp/irq.h>
-#include "../include/mpc5200.h"
-#include "../slicetimer/slicetimer.h"
+#include <bsp/mpc5200.h>
+#include <bsp/slicetimer.h>
 #include <stdio.h>
 
 uint32_t value0 = 0;
-- 
cgit v1.2.3