grlib: Move header files

Update #3678.

140 files changed, 315 insertions, 309 deletions

diff --git a/bsps/headers.am b/bsps/headers.am
index e217b9b965..7e3148e184 100644
--- a/bsps/headers.am
+++ b/bsps/headers.am
@@ -23,6 +23,70 @@ include_bsp_HEADERS += ../../bsps/include/bsp/u-boot.h
 include_bsp_HEADERS += ../../bsps/include/bsp/uart-output-char.h
 include_bsp_HEADERS += ../../bsps/include/bsp/utility.h
 
+include_grlibdir = $(includedir)/grlib
+include_grlib_HEADERS =
+include_grlib_HEADERS += ../../bsps/include/grlib/ahbstat.h
+include_grlib_HEADERS += ../../bsps/include/grlib/ambapp.h
+include_grlib_HEADERS += ../../bsps/include/grlib/ambapp_bus.h
+include_grlib_HEADERS += ../../bsps/include/grlib/ambapp_bus_grlib.h
+include_grlib_HEADERS += ../../bsps/include/grlib/ambapp_ids.h
+include_grlib_HEADERS += ../../bsps/include/grlib/apbuart.h
+include_grlib_HEADERS += ../../bsps/include/grlib/apbuart_cons.h
+include_grlib_HEADERS += ../../bsps/include/grlib/apbuart_termios.h
+include_grlib_HEADERS += ../../bsps/include/grlib/b1553brm.h
+include_grlib_HEADERS += ../../bsps/include/grlib/b1553rt.h
+include_grlib_HEADERS += ../../bsps/include/grlib/bspcommon.h
+include_grlib_HEADERS += ../../bsps/include/grlib/canmux.h
+include_grlib_HEADERS += ../../bsps/include/grlib/cons.h
+include_grlib_HEADERS += ../../bsps/include/grlib/debug_defs.h
+include_grlib_HEADERS += ../../bsps/include/grlib/genirq.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gpiolib.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gptimer.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr1553b.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr1553bc.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr1553bc_list.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr1553bm.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr1553rt.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr_701.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr_cpci_gr740.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr_rasta_adcdac.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr_rasta_io.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr_rasta_spw_router.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr_rasta_tmtc.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr_tmtc_1553.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gradcdac.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grascs.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grcan.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grctm.h
+include_grlib_HEADERS += ../../bsps/include/grlib/greth.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grgpio.h
+include_grlib_HEADERS += ../../bsps/include/grlib/griommu.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grlib.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grlib_impl.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grpci.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grpci2.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grpci2dma.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grpwm.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grslink.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grspw.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grspw_pkt.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grspw_router.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grtc.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grtm.h
+include_grlib_HEADERS += ../../bsps/include/grlib/i2cmst.h
+include_grlib_HEADERS += ../../bsps/include/grlib/l2c.h
+include_grlib_HEADERS += ../../bsps/include/grlib/l4stat.h
+include_grlib_HEADERS += ../../bsps/include/grlib/mctrl.h
+include_grlib_HEADERS += ../../bsps/include/grlib/memscrub.h
+include_grlib_HEADERS += ../../bsps/include/grlib/network_interface_add.h
+include_grlib_HEADERS += ../../bsps/include/grlib/occan.h
+include_grlib_HEADERS += ../../bsps/include/grlib/pcif.h
+include_grlib_HEADERS += ../../bsps/include/grlib/satcan.h
+include_grlib_HEADERS += ../../bsps/include/grlib/spictrl.h
+include_grlib_HEADERS += ../../bsps/include/grlib/spwcuc.h
+include_grlib_HEADERS += ../../bsps/include/grlib/spwtdp.h
+include_grlib_HEADERS += ../../bsps/include/grlib/tlib.h
+
 include_libchipdir = $(includedir)/libchip
 include_libchip_HEADERS =
 include_libchip_HEADERS += ../../bsps/include/libchip/am29lv160.h
diff --git a/bsps/sparc/include/bsp/ahbstat.h b/bsps/include/grlib/ahbstat.h
index 71e2330f69..71e2330f69 100644
--- a/bsps/sparc/include/bsp/ahbstat.h
+++ b/bsps/include/grlib/ahbstat.h
diff --git a/bsps/sparc/include/ambapp.h b/bsps/include/grlib/ambapp.h
index 338602e83d..5e5a649f53 100644
--- a/bsps/sparc/include/ambapp.h
+++ b/bsps/include/grlib/ambapp.h
@@ -19,7 +19,7 @@
 #define __AMBAPP_H__
 
 /* Include VENDOR and DEVICE definitions */
-#include <ambapp_ids.h>
+#include "ambapp_ids.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bsps/sparc/include/drvmgr/ambapp_bus.h b/bsps/include/grlib/ambapp_bus.h
index 94a7fe2216..87cd52bc69 100644
--- a/bsps/sparc/include/drvmgr/ambapp_bus.h
+++ b/bsps/include/grlib/ambapp_bus.h
@@ -17,7 +17,7 @@
 #define __AMBAPP_BUS_H__
 
 #include <drvmgr/drvmgr.h>
-#include <ambapp.h>
+#include "ambapp.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bsps/sparc/include/drvmgr/ambapp_bus_grlib.h b/bsps/include/grlib/ambapp_bus_grlib.h
index 2def4bc2b4..2def4bc2b4 100644
--- a/bsps/sparc/include/drvmgr/ambapp_bus_grlib.h
+++ b/bsps/include/grlib/ambapp_bus_grlib.h
diff --git a/bsps/sparc/include/ambapp_ids.h b/bsps/include/grlib/ambapp_ids.h
index c0c3547e94..c0c3547e94 100644
--- a/bsps/sparc/include/ambapp_ids.h
+++ b/bsps/include/grlib/ambapp_ids.h
diff --git a/bsps/sparc/include/bsp/apbuart.h b/bsps/include/grlib/apbuart.h
index 870e5408d8..d30ad0bcef 100644
--- a/bsps/sparc/include/bsp/apbuart.h
+++ b/bsps/include/grlib/apbuart.h
@@ -19,8 +19,8 @@
 #ifndef __APBUART_H__
 #define __APBUART_H__
 
-#include <ambapp.h>
-#include <grlib.h>
+#include "ambapp.h"
+#include "grlib.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bsps/sparc/include/bsp/apbuart_cons.h b/bsps/include/grlib/apbuart_cons.h
index d0ac9244af..d0ac9244af 100644
--- a/bsps/sparc/include/bsp/apbuart_cons.h
+++ b/bsps/include/grlib/apbuart_cons.h
diff --git a/bsps/sparc/include/bsp/apbuart_termios.h b/bsps/include/grlib/apbuart_termios.h
index 6554195d05..ca6b5d3b3e 100644
--- a/bsps/sparc/include/bsp/apbuart_termios.h
+++ b/bsps/include/grlib/apbuart_termios.h
@@ -15,7 +15,7 @@
 #define APBUART_TERMIOS_H
 
 #include <rtems/termiostypes.h>
-#include <grlib.h>
+#include "grlib.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bsps/sparc/include/bsp/b1553brm.h b/bsps/include/grlib/b1553brm.h
index eba0716f75..eba0716f75 100644
--- a/bsps/sparc/include/bsp/b1553brm.h
+++ b/bsps/include/grlib/b1553brm.h
diff --git a/bsps/sparc/include/bsp/b1553rt.h b/bsps/include/grlib/b1553rt.h
index fbe4b706de..fbe4b706de 100644
--- a/bsps/sparc/include/bsp/b1553rt.h
+++ b/bsps/include/grlib/b1553rt.h
diff --git a/bsps/sparc/include/drvmgr/bspcommon.h b/bsps/include/grlib/bspcommon.h
index d3470009f8..d3470009f8 100644
--- a/bsps/sparc/include/drvmgr/bspcommon.h
+++ b/bsps/include/grlib/bspcommon.h
diff --git a/bsps/sparc/include/bsp/canmux.h b/bsps/include/grlib/canmux.h
index 02727f44c7..02727f44c7 100644
--- a/bsps/sparc/include/bsp/canmux.h
+++ b/bsps/include/grlib/canmux.h
diff --git a/bsps/sparc/include/bsp/cons.h b/bsps/include/grlib/cons.h
index c30e41cf14..c30e41cf14 100644
--- a/bsps/sparc/include/bsp/cons.h
+++ b/bsps/include/grlib/cons.h
diff --git a/bsps/sparc/include/bsp/debug_defs.h b/bsps/include/grlib/debug_defs.h
index 58f7460f52..58f7460f52 100644
--- a/bsps/sparc/include/bsp/debug_defs.h
+++ b/bsps/include/grlib/debug_defs.h
diff --git a/bsps/sparc/include/bsp/genirq.h b/bsps/include/grlib/genirq.h
index 673be173b1..673be173b1 100644
--- a/bsps/sparc/include/bsp/genirq.h
+++ b/bsps/include/grlib/genirq.h
diff --git a/bsps/sparc/include/bsp/gpiolib.h b/bsps/include/grlib/gpiolib.h
index f82d4fa2c2..f82d4fa2c2 100644
--- a/bsps/sparc/include/bsp/gpiolib.h
+++ b/bsps/include/grlib/gpiolib.h
diff --git a/bsps/sparc/include/bsp/gptimer.h b/bsps/include/grlib/gptimer.h
index ee0120d2bd..ee0120d2bd 100644
--- a/bsps/sparc/include/bsp/gptimer.h
+++ b/bsps/include/grlib/gptimer.h
diff --git a/bsps/sparc/include/bsp/gr1553b.h b/bsps/include/grlib/gr1553b.h
index 006417b530..006417b530 100644
--- a/bsps/sparc/include/bsp/gr1553b.h
+++ b/bsps/include/grlib/gr1553b.h
diff --git a/bsps/sparc/include/bsp/gr1553bc.h b/bsps/include/grlib/gr1553bc.h
index ec766d2147..caf6f77722 100644
--- a/bsps/sparc/include/bsp/gr1553bc.h
+++ b/bsps/include/grlib/gr1553bc.h
@@ -40,7 +40,7 @@ struct gr1553bc_major_cfg;
 #endif
 
 #include <stdint.h>
-#include <bsp/gr1553bc_list.h>
+#include "gr1553bc_list.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bsps/sparc/include/bsp/gr1553bc_list.h b/bsps/include/grlib/gr1553bc_list.h
index a89ddf58cf..5024923968 100644
--- a/bsps/sparc/include/bsp/gr1553bc_list.h
+++ b/bsps/include/grlib/gr1553bc_list.h
@@ -193,7 +193,7 @@
  */
 
 #include <stdint.h>
-#include <bsp/gr1553bc.h>
+#include "gr1553bc.h"
 
 /**** CONFIGURATION OPTIONS ****/
 
diff --git a/bsps/sparc/include/bsp/gr1553bm.h b/bsps/include/grlib/gr1553bm.h
index 058bc59a45..058bc59a45 100644
--- a/bsps/sparc/include/bsp/gr1553bm.h
+++ b/bsps/include/grlib/gr1553bm.h
diff --git a/bsps/sparc/include/bsp/gr1553rt.h b/bsps/include/grlib/gr1553rt.h
index 5d52e84c11..5d52e84c11 100644
--- a/bsps/sparc/include/bsp/gr1553rt.h
+++ b/bsps/include/grlib/gr1553rt.h
diff --git a/bsps/sparc/include/bsp/gr_701.h b/bsps/include/grlib/gr_701.h
index acfd9237a2..acfd9237a2 100644
--- a/bsps/sparc/include/bsp/gr_701.h
+++ b/bsps/include/grlib/gr_701.h
diff --git a/bsps/sparc/include/bsp/gr_cpci_gr740.h b/bsps/include/grlib/gr_cpci_gr740.h
index 55c28acb4c..55c28acb4c 100644
--- a/bsps/sparc/include/bsp/gr_cpci_gr740.h
+++ b/bsps/include/grlib/gr_cpci_gr740.h
diff --git a/bsps/sparc/include/bsp/gr_rasta_adcdac.h b/bsps/include/grlib/gr_rasta_adcdac.h
index 9e16cab96b..9e16cab96b 100644
--- a/bsps/sparc/include/bsp/gr_rasta_adcdac.h
+++ b/bsps/include/grlib/gr_rasta_adcdac.h
diff --git a/bsps/sparc/include/bsp/gr_rasta_io.h b/bsps/include/grlib/gr_rasta_io.h
index 72a44f5151..72a44f5151 100644
--- a/bsps/sparc/include/bsp/gr_rasta_io.h
+++ b/bsps/include/grlib/gr_rasta_io.h
diff --git a/bsps/sparc/include/bsp/gr_rasta_spw_router.h b/bsps/include/grlib/gr_rasta_spw_router.h
index 1cc9e41979..1cc9e41979 100644
--- a/bsps/sparc/include/bsp/gr_rasta_spw_router.h
+++ b/bsps/include/grlib/gr_rasta_spw_router.h
diff --git a/bsps/sparc/include/bsp/gr_rasta_tmtc.h b/bsps/include/grlib/gr_rasta_tmtc.h
index 2b10ce2df3..2b10ce2df3 100644
--- a/bsps/sparc/include/bsp/gr_rasta_tmtc.h
+++ b/bsps/include/grlib/gr_rasta_tmtc.h
diff --git a/bsps/sparc/include/bsp/gr_tmtc_1553.h b/bsps/include/grlib/gr_tmtc_1553.h
index b6ac43da00..b6ac43da00 100644
--- a/bsps/sparc/include/bsp/gr_tmtc_1553.h
+++ b/bsps/include/grlib/gr_tmtc_1553.h
diff --git a/bsps/sparc/include/bsp/gradcdac.h b/bsps/include/grlib/gradcdac.h
index 31facc2e51..31facc2e51 100644
--- a/bsps/sparc/include/bsp/gradcdac.h
+++ b/bsps/include/grlib/gradcdac.h
diff --git a/bsps/sparc/include/bsp/grascs.h b/bsps/include/grlib/grascs.h
index b393e77888..b393e77888 100644
--- a/bsps/sparc/include/bsp/grascs.h
+++ b/bsps/include/grlib/grascs.h
diff --git a/bsps/sparc/include/bsp/grcan.h b/bsps/include/grlib/grcan.h
index 5cdbad4b01..5cdbad4b01 100644
--- a/bsps/sparc/include/bsp/grcan.h
+++ b/bsps/include/grlib/grcan.h
diff --git a/bsps/sparc/include/bsp/grctm.h b/bsps/include/grlib/grctm.h
index 5ff81559aa..5ff81559aa 100644
--- a/bsps/sparc/include/bsp/grctm.h
+++ b/bsps/include/grlib/grctm.h
diff --git a/bsps/sparc/include/bsp/greth.h b/bsps/include/grlib/greth.h
index 1c42c99ddc..1c42c99ddc 100644
--- a/bsps/sparc/include/bsp/greth.h
+++ b/bsps/include/grlib/greth.h
diff --git a/bsps/sparc/include/bsp/grgpio.h b/bsps/include/grlib/grgpio.h
index c49054548c..c49054548c 100644
--- a/bsps/sparc/include/bsp/grgpio.h
+++ b/bsps/include/grlib/grgpio.h
diff --git a/bsps/sparc/include/bsp/griommu.h b/bsps/include/grlib/griommu.h
index 2bafe4c513..2bafe4c513 100644
--- a/bsps/sparc/include/bsp/griommu.h
+++ b/bsps/include/grlib/griommu.h
diff --git a/bsps/sparc/include/grlib.h b/bsps/include/grlib/grlib.h
index a2d0877fb8..a2d0877fb8 100644
--- a/bsps/sparc/include/grlib.h
+++ b/bsps/include/grlib/grlib.h
diff --git a/bsps/sparc/include/grlib_impl.h b/bsps/include/grlib/grlib_impl.h
index 755f635911..9a7fa15a5e 100644
--- a/bsps/sparc/include/grlib_impl.h
+++ b/bsps/include/grlib/grlib_impl.h
@@ -90,6 +90,8 @@ RTEMS_INLINE_ROUTINE void *grlib_calloc(size_t nelem, size_t elsize)
 
 #endif
 
+extern struct ambapp_bus ambapp_plb;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/bsps/sparc/include/bsp/grpci.h b/bsps/include/grlib/grpci.h
index 2321706200..2321706200 100644
--- a/bsps/sparc/include/bsp/grpci.h
+++ b/bsps/include/grlib/grpci.h
diff --git a/bsps/sparc/include/bsp/grpci2.h b/bsps/include/grlib/grpci2.h
index c356b5641f..c356b5641f 100644
--- a/bsps/sparc/include/bsp/grpci2.h
+++ b/bsps/include/grlib/grpci2.h
diff --git a/bsps/sparc/include/bsp/grpci2dma.h b/bsps/include/grlib/grpci2dma.h
index c1a2663a86..c1a2663a86 100644
--- a/bsps/sparc/include/bsp/grpci2dma.h
+++ b/bsps/include/grlib/grpci2dma.h
diff --git a/bsps/sparc/include/bsp/grpwm.h b/bsps/include/grlib/grpwm.h
index 6898f8ac2e..6898f8ac2e 100644
--- a/bsps/sparc/include/bsp/grpwm.h
+++ b/bsps/include/grlib/grpwm.h
diff --git a/bsps/sparc/include/bsp/grslink.h b/bsps/include/grlib/grslink.h
index 575a24aee4..575a24aee4 100644
--- a/bsps/sparc/include/bsp/grslink.h
+++ b/bsps/include/grlib/grslink.h
diff --git a/bsps/sparc/include/bsp/grspw.h b/bsps/include/grlib/grspw.h
index 3270e8a5a2..70a9e0b100 100644
--- a/bsps/sparc/include/bsp/grspw.h
+++ b/bsps/include/grlib/grspw.h
@@ -18,7 +18,7 @@
 #ifndef __GRSPW_H__
 #define __GRSPW_H__
 
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bsps/sparc/include/bsp/grspw_pkt.h b/bsps/include/grlib/grspw_pkt.h
index 595625b838..595625b838 100644
--- a/bsps/sparc/include/bsp/grspw_pkt.h
+++ b/bsps/include/grlib/grspw_pkt.h
diff --git a/bsps/sparc/include/bsp/grspw_router.h b/bsps/include/grlib/grspw_router.h
index 2fab8d5f6c..2fab8d5f6c 100644
--- a/bsps/sparc/include/bsp/grspw_router.h
+++ b/bsps/include/grlib/grspw_router.h
diff --git a/bsps/sparc/include/bsp/grtc.h b/bsps/include/grlib/grtc.h
index 3ee1fa547c..3ee1fa547c 100644
--- a/bsps/sparc/include/bsp/grtc.h
+++ b/bsps/include/grlib/grtc.h
diff --git a/bsps/sparc/include/bsp/grtm.h b/bsps/include/grlib/grtm.h
index 625f8389b7..625f8389b7 100644
--- a/bsps/sparc/include/bsp/grtm.h
+++ b/bsps/include/grlib/grtm.h
diff --git a/bsps/sparc/include/bsp/i2cmst.h b/bsps/include/grlib/i2cmst.h
index 3eee717524..a06117f0dc 100644
--- a/bsps/sparc/include/bsp/i2cmst.h
+++ b/bsps/include/grlib/i2cmst.h
@@ -19,7 +19,7 @@
 #define _I2CMST_H
 
 #include <rtems/libi2c.h>
-#include <ambapp.h>
+#include "ambapp.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bsps/sparc/include/bsp/l2c.h b/bsps/include/grlib/l2c.h
index 52473ddf2a..52473ddf2a 100644
--- a/bsps/sparc/include/bsp/l2c.h
+++ b/bsps/include/grlib/l2c.h
diff --git a/bsps/sparc/include/bsp/l4stat.h b/bsps/include/grlib/l4stat.h
index 94fbe4b095..94fbe4b095 100644
--- a/bsps/sparc/include/bsp/l4stat.h
+++ b/bsps/include/grlib/l4stat.h
diff --git a/bsps/sparc/include/bsp/mctrl.h b/bsps/include/grlib/mctrl.h
index db449cb11a..db449cb11a 100644
--- a/bsps/sparc/include/bsp/mctrl.h
+++ b/bsps/include/grlib/mctrl.h
diff --git a/bsps/sparc/include/bsp/memscrub.h b/bsps/include/grlib/memscrub.h
index 1e55d8e127..1e55d8e127 100644
--- a/bsps/sparc/include/bsp/memscrub.h
+++ b/bsps/include/grlib/memscrub.h
diff --git a/bsps/sparc/include/bsp/network_interface_add.h b/bsps/include/grlib/network_interface_add.h
index b04a96f003..b04a96f003 100644
--- a/bsps/sparc/include/bsp/network_interface_add.h
+++ b/bsps/include/grlib/network_interface_add.h
diff --git a/bsps/sparc/include/bsp/occan.h b/bsps/include/grlib/occan.h
index 0bf34dee48..0bf34dee48 100644
--- a/bsps/sparc/include/bsp/occan.h
+++ b/bsps/include/grlib/occan.h
diff --git a/bsps/sparc/include/bsp/pcif.h b/bsps/include/grlib/pcif.h
index 0221fcdd50..0221fcdd50 100644
--- a/bsps/sparc/include/bsp/pcif.h
+++ b/bsps/include/grlib/pcif.h
diff --git a/bsps/sparc/include/bsp/satcan.h b/bsps/include/grlib/satcan.h
index ab9f5e0cd4..ab9f5e0cd4 100644
--- a/bsps/sparc/include/bsp/satcan.h
+++ b/bsps/include/grlib/satcan.h
diff --git a/bsps/sparc/include/bsp/spictrl.h b/bsps/include/grlib/spictrl.h
index 98922fbd30..98922fbd30 100644
--- a/bsps/sparc/include/bsp/spictrl.h
+++ b/bsps/include/grlib/spictrl.h
diff --git a/bsps/sparc/include/bsp/spwcuc.h b/bsps/include/grlib/spwcuc.h
index e420367640..e420367640 100644
--- a/bsps/sparc/include/bsp/spwcuc.h
+++ b/bsps/include/grlib/spwcuc.h
diff --git a/bsps/sparc/include/bsp/spwtdp.h b/bsps/include/grlib/spwtdp.h
index b2fa29889f..b2fa29889f 100644
--- a/bsps/sparc/include/bsp/spwtdp.h
+++ b/bsps/include/grlib/spwtdp.h
diff --git a/bsps/sparc/include/bsp/tlib.h b/bsps/include/grlib/tlib.h
index debb8c8215..debb8c8215 100644
--- a/bsps/sparc/include/bsp/tlib.h
+++ b/bsps/include/grlib/tlib.h
diff --git a/bsps/sparc/headers.am b/bsps/sparc/headers.am
index 14d92f741c..92c9b254f3 100644
--- a/bsps/sparc/headers.am
+++ b/bsps/sparc/headers.am
@@ -1,73 +1,10 @@
 ## This file was generated by "./boostrap -H".
 
-include_HEADERS =
-include_HEADERS += ../../../../../bsps/sparc/include/ambapp.h
-include_HEADERS += ../../../../../bsps/sparc/include/ambapp_ids.h
-include_HEADERS += ../../../../../bsps/sparc/include/grlib.h
-include_HEADERS += ../../../../../bsps/sparc/include/grlib_impl.h
-
 include_bspdir = $(includedir)/bsp
 include_bsp_HEADERS =
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/ahbstat.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/apbuart.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/apbuart_cons.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/apbuart_termios.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/b1553brm.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/b1553rt.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/canmux.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/cons.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/debug_defs.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/genirq.h
 include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gnatcommon.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gpiolib.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gptimer.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553b.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553bc.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553bc_list.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553bm.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553rt.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_701.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_cpci_gr740.h
 include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_leon4_n2x.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_rasta_adcdac.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_rasta_io.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_rasta_spw_router.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_rasta_tmtc.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_tmtc_1553.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gradcdac.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grascs.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grcan.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grctm.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/greth.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grgpio.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/griommu.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpci.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpci2.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpci2dma.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpwm.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grslink.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grspw.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grspw_pkt.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grspw_router.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grtc.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grtm.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/i2cmst.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/l2c.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/l4stat.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/mctrl.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/memscrub.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/network_interface_add.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/occan.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/pcif.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/satcan.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/spictrl.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/spwcuc.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/spwtdp.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/tlib.h
 
 include_drvmgrdir = $(includedir)/drvmgr
 include_drvmgr_HEADERS =
-include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/ambapp_bus.h
-include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/ambapp_bus_grlib.h
-include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/bspcommon.h
 include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/leon2_amba_bus.h
diff --git a/bsps/sparc/include/drvmgr/leon2_amba_bus.h b/bsps/sparc/include/drvmgr/leon2_amba_bus.h
index ebb3a08486..1b35413c30 100644
--- a/bsps/sparc/include/drvmgr/leon2_amba_bus.h
+++ b/bsps/sparc/include/drvmgr/leon2_amba_bus.h
@@ -22,7 +22,7 @@
 /*** Cores location and IRQs hardcoded ***/
 
 #include <drvmgr/drvmgr.h>
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bsps/sparc/leon2/include/leon.h b/bsps/sparc/leon2/include/leon.h
index 7ec6b1dcf9..bba06e56c6 100644
--- a/bsps/sparc/leon2/include/leon.h
+++ b/bsps/sparc/leon2/include/leon.h
@@ -266,6 +266,7 @@ typedef struct {
 #define LEON_REG_UART_CTRL_PE     0x00000020 /* Parity enable */
 #define LEON_REG_UART_CTRL_FL     0x00000040 /* Flow control enable */
 #define LEON_REG_UART_CTRL_LB     0x00000080 /* Loop Back enable */
+#define LEON_REG_UART_CTRL_DB     0x00000800 /* Debug FIFO enable */
 
 #ifndef ASM
 
diff --git a/bsps/sparc/leon3/btimer/watchdog.c b/bsps/sparc/leon3/btimer/watchdog.c
index 5ce8e32354..4e8f428f78 100644
--- a/bsps/sparc/leon3/btimer/watchdog.c
+++ b/bsps/sparc/leon3/btimer/watchdog.c
@@ -12,7 +12,7 @@
 
 #include <bsp.h>
 #include <bsp/watchdog.h>
-#include <grlib.h>
+#include <grlib/grlib.h>
 
 extern volatile struct gptimer_regs *LEON3_Timer_Regs;
 
diff --git a/bsps/sparc/leon3/clock/ckinit.c b/bsps/sparc/leon3/clock/ckinit.c
index fecbf32c1b..ad233ddb90 100644
--- a/bsps/sparc/leon3/clock/ckinit.c
+++ b/bsps/sparc/leon3/clock/ckinit.c
@@ -25,7 +25,7 @@
 #include <bspopts.h>
 #include <bsp/fatal.h>
 #include <rtems/rtems/intr.h>
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 #include <rtems/score/profiling.h>
 #include <rtems/score/sparcimpl.h>
 #include <rtems/timecounter.h>
diff --git a/bsps/sparc/leon3/console/console.c b/bsps/sparc/leon3/console/console.c
index acab893399..3522dc7529 100644
--- a/bsps/sparc/leon3/console/console.c
+++ b/bsps/sparc/leon3/console/console.c
@@ -28,7 +28,7 @@
 
 #include <bsp.h>
 #include <bsp/fatal.h>
-#include <bsp/apbuart_termios.h>
+#include <grlib/apbuart_termios.h>
 #include <rtems/console.h>
 #include <string.h>
 
diff --git a/bsps/sparc/leon3/console/printk_support.c b/bsps/sparc/leon3/console/printk_support.c
index aa9441a87d..c7811687f3 100644
--- a/bsps/sparc/leon3/console/printk_support.c
+++ b/bsps/sparc/leon3/console/printk_support.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <stdio.h>
-#include <bsp/apbuart.h>
+#include <grlib/apbuart.h>
 
 int leon3_debug_uart_index __attribute__((weak)) = 0;
 struct apbuart_regs *leon3_debug_uart = NULL;
diff --git a/bsps/sparc/leon3/include/amba.h b/bsps/sparc/leon3/include/amba.h
index 059b28ca07..2d11096034 100644
--- a/bsps/sparc/leon3/include/amba.h
+++ b/bsps/sparc/leon3/include/amba.h
@@ -31,8 +31,8 @@
 #define LEON3_AHB_SLAVES 64
 #define LEON3_APB_SLAVES 16
 
-#include <ambapp.h>
-#include <grlib.h>
+#include <grlib/ambapp.h>
+#include <grlib/grlib.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bsps/sparc/leon3/net/leon_smc91111.c b/bsps/sparc/leon3/net/leon_smc91111.c
index 5111f4936a..70b2dcc109 100644
--- a/bsps/sparc/leon3/net/leon_smc91111.c
+++ b/bsps/sparc/leon3/net/leon_smc91111.c
@@ -18,7 +18,7 @@
 #include <bsp.h>
 #include <libchip/smc91111exp.h>
 #include <rtems/bspIo.h>
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 
 #define SMC91111_BASE_ADDR (void*)0x20000300
 #define SMC91111_BASE_IRQ  4
diff --git a/bsps/sparc/leon3/start/amba.c b/bsps/sparc/leon3/start/amba.c
index 4b55a49f35..e7ff29808c 100644
--- a/bsps/sparc/leon3/start/amba.c
+++ b/bsps/sparc/leon3/start/amba.c
@@ -14,7 +14,7 @@
 #include <bsp.h>
 #include <bsp/fatal.h>
 #include <leon.h>
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 #include <rtems/sysinit.h>
 
 unsigned int leon3_timer_prescaler __attribute__((weak)) = 0;
@@ -32,7 +32,7 @@ struct ambapp_bus ambapp_plb;
  */
 #ifdef RTEMS_DRVMGR_STARTUP
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus_grlib.h>
+#include <grlib/ambapp_bus_grlib.h>
 
 extern void gptimer_register_drv (void);
 extern void apbuart_cons_register_drv(void);
diff --git a/bsps/sparc/shared/1553/b1553brm.c b/bsps/sparc/shared/1553/b1553brm.c
index 216397b334..5575abb525 100644
--- a/bsps/sparc/shared/1553/b1553brm.c
+++ b/bsps/sparc/shared/1553/b1553brm.c
@@ -27,11 +27,11 @@
 #include <rtems/bspIo.h>
 
 #include <drvmgr/drvmgr.h>
-#include <bsp/b1553brm.h>
-#include <ambapp.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/b1553brm.h>
+#include <grlib/ambapp.h>
+#include <grlib/ambapp_bus.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* Uncomment for debug output */
 /*#define DEBUG 1
diff --git a/bsps/sparc/shared/1553/b1553rt.c b/bsps/sparc/shared/1553/b1553rt.c
index 9d2a22d70b..35afd901c8 100644
--- a/bsps/sparc/shared/1553/b1553rt.c
+++ b/bsps/sparc/shared/1553/b1553rt.c
@@ -19,11 +19,11 @@
 #include <rtems/bspIo.h>
 
 #include <drvmgr/drvmgr.h>
-#include <bsp/b1553rt.h>
-#include <ambapp.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/b1553rt.h>
+#include <grlib/ambapp.h>
+#include <grlib/ambapp_bus.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* Uncomment for debug output */
 /*#define DEBUG 1*/
diff --git a/bsps/sparc/shared/1553/gr1553b.c b/bsps/sparc/shared/1553/gr1553b.c
index ba75398f63..777b6dc743 100644
--- a/bsps/sparc/shared/1553/gr1553b.c
+++ b/bsps/sparc/shared/1553/gr1553b.c
@@ -9,11 +9,11 @@
  */
 
 #include <stdlib.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 
-#include <bsp/gr1553b.h>
+#include <grlib/gr1553b.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* Driver Manager interface for BC, RT, BM, BRM, BC-BM and RT-BM */
 
diff --git a/bsps/sparc/shared/1553/gr1553bc.c b/bsps/sparc/shared/1553/gr1553bc.c
index c7faba436d..a22e2d8007 100644
--- a/bsps/sparc/shared/1553/gr1553bc.c
+++ b/bsps/sparc/shared/1553/gr1553bc.c
@@ -12,12 +12,12 @@
 #include <string.h>
 #include <rtems.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 
-#include <bsp/gr1553b.h>
-#include <bsp/gr1553bc.h>
+#include <grlib/gr1553b.h>
+#include <grlib/gr1553bc.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 #define GR1553BC_WRITE_MEM(adr, val) *(volatile uint32_t *)(adr) = (uint32_t)(val)
 #define GR1553BC_READ_MEM(adr) (*(volatile uint32_t *)(adr))
diff --git a/bsps/sparc/shared/1553/gr1553bm.c b/bsps/sparc/shared/1553/gr1553bm.c
index 1897a16f79..482e574d78 100644
--- a/bsps/sparc/shared/1553/gr1553bm.c
+++ b/bsps/sparc/shared/1553/gr1553bm.c
@@ -11,12 +11,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 
-#include <bsp/gr1553b.h>
-#include <bsp/gr1553bm.h>
+#include <grlib/gr1553b.h>
+#include <grlib/gr1553bm.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 #define GR1553BM_WRITE_MEM(adr, val) *(volatile uint32_t *)(adr) = (uint32_t)(val)
 #define GR1553BM_READ_MEM(adr) (*(volatile uint32_t *)(adr))
diff --git a/bsps/sparc/shared/1553/gr1553rt.c b/bsps/sparc/shared/1553/gr1553rt.c
index 8a869c9152..339e856c76 100644
--- a/bsps/sparc/shared/1553/gr1553rt.c
+++ b/bsps/sparc/shared/1553/gr1553rt.c
@@ -13,13 +13,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <bsp/gr1553b.h>
-#include <bsp/gr1553rt.h>
+#include <grlib/gr1553b.h>
+#include <grlib/gr1553rt.h>
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 #define GR1553RT_WRITE_MEM(adr, val) *(volatile uint32_t *)(adr) = (uint32_t)(val)
 #define GR1553RT_READ_MEM(adr) (*(volatile uint32_t *)(adr))
diff --git a/bsps/sparc/shared/amba/ahbstat.c b/bsps/sparc/shared/amba/ahbstat.c
index 4e4cd72525..af3d778feb 100644
--- a/bsps/sparc/shared/amba/ahbstat.c
+++ b/bsps/sparc/shared/amba/ahbstat.c
@@ -13,11 +13,11 @@
 #include <rtems.h>
 #include <rtems/bspIo.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 
-#include <bsp/ahbstat.h>
+#include <grlib/ahbstat.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 #define REG_WRITE(addr, val) (*(volatile uint32_t *)(addr) = (uint32_t)(val))
 #define REG_READ(addr) (*(volatile uint32_t *)(addr))
diff --git a/bsps/sparc/shared/amba/ambapp.c b/bsps/sparc/shared/amba/ambapp.c
index 4fb8405103..69018f47e7 100644
--- a/bsps/sparc/shared/amba/ambapp.c
+++ b/bsps/sparc/shared/amba/ambapp.c
@@ -13,10 +13,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 #include <bsp.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 #define AMBA_CONF_AREA 0xff000
 #define AMBA_AHB_SLAVE_CONF_AREA (1 << 11)
diff --git a/bsps/sparc/shared/amba/ambapp_alloc.c b/bsps/sparc/shared/amba/ambapp_alloc.c
index 2357f697b9..96fcb7961b 100644
--- a/bsps/sparc/shared/amba/ambapp_alloc.c
+++ b/bsps/sparc/shared/amba/ambapp_alloc.c
@@ -9,7 +9,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 
 int ambapp_alloc_dev(struct ambapp_dev *dev, void *owner)
 {
diff --git a/bsps/sparc/shared/amba/ambapp_count.c b/bsps/sparc/shared/amba/ambapp_count.c
index 4e3a1dc102..9da4d93a19 100644
--- a/bsps/sparc/shared/amba/ambapp_count.c
+++ b/bsps/sparc/shared/amba/ambapp_count.c
@@ -9,7 +9,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 
 /* Get number of devices matching search options */
 int ambapp_dev_count(struct ambapp_bus *abus, unsigned int options,
diff --git a/bsps/sparc/shared/amba/ambapp_depth.c b/bsps/sparc/shared/amba/ambapp_depth.c
index 8a96afbee6..2fe0b142e9 100644
--- a/bsps/sparc/shared/amba/ambapp_depth.c
+++ b/bsps/sparc/shared/amba/ambapp_depth.c
@@ -9,7 +9,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 
 /* Get bus depth a device is located at */
 int ambapp_depth(struct ambapp_dev *dev)
diff --git a/bsps/sparc/shared/amba/ambapp_find_by_idx.c b/bsps/sparc/shared/amba/ambapp_find_by_idx.c
index 6b2d28824c..55d9022881 100644
--- a/bsps/sparc/shared/amba/ambapp_find_by_idx.c
+++ b/bsps/sparc/shared/amba/ambapp_find_by_idx.c
@@ -9,7 +9,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 
 /* AMBAPP helper routine to find a device by index. The function is given to
  * ambapp_for_each, the argument may be NULL (find first device) or a pointer
diff --git a/bsps/sparc/shared/amba/ambapp_freq.c b/bsps/sparc/shared/amba/ambapp_freq.c
index 59db15f865..9e6e9c1765 100644
--- a/bsps/sparc/shared/amba/ambapp_freq.c
+++ b/bsps/sparc/shared/amba/ambapp_freq.c
@@ -9,7 +9,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 
 /* Calculate AHB Bus frequency of
  *   - Bus[0] (inverse=1), relative to the frequency of Bus[ahbidx]
diff --git a/bsps/sparc/shared/amba/ambapp_names.c b/bsps/sparc/shared/amba/ambapp_names.c
index 5539d3c489..8d168f283b 100644
--- a/bsps/sparc/shared/amba/ambapp_names.c
+++ b/bsps/sparc/shared/amba/ambapp_names.c
@@ -12,8 +12,8 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <ambapp.h>
-#include <ambapp_ids.h>
+#include <grlib/ambapp.h>
+#include <grlib/ambapp_ids.h>
 #include <string.h>
 
 #ifndef NULL
diff --git a/bsps/sparc/shared/amba/ambapp_old.c b/bsps/sparc/shared/amba/ambapp_old.c
index 2be77a484f..a51e692fbf 100644
--- a/bsps/sparc/shared/amba/ambapp_old.c
+++ b/bsps/sparc/shared/amba/ambapp_old.c
@@ -9,7 +9,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 
 struct ambapp_dev_find_match_arg {
   int      index;
diff --git a/bsps/sparc/shared/amba/ambapp_parent.c b/bsps/sparc/shared/amba/ambapp_parent.c
index 6064b4a165..b77b6eec68 100644
--- a/bsps/sparc/shared/amba/ambapp_parent.c
+++ b/bsps/sparc/shared/amba/ambapp_parent.c
@@ -10,7 +10,7 @@
  */
 
 #include <stdlib.h>
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 
 struct ambapp_dev *ambapp_find_parent(struct ambapp_dev *dev)
 {
diff --git a/bsps/sparc/shared/amba/ambapp_show.c b/bsps/sparc/shared/amba/ambapp_show.c
index 1ed15c643e..12cefa2c0f 100644
--- a/bsps/sparc/shared/amba/ambapp_show.c
+++ b/bsps/sparc/shared/amba/ambapp_show.c
@@ -10,7 +10,7 @@
  */
 
 #include <stdio.h>
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 
 struct ambapp_dev_print_arg {
   int show_depth;
diff --git a/bsps/sparc/shared/analog/gradcdac.c b/bsps/sparc/shared/analog/gradcdac.c
index bbe6620060..02939e58f0 100644
--- a/bsps/sparc/shared/analog/gradcdac.c
+++ b/bsps/sparc/shared/analog/gradcdac.c
@@ -13,8 +13,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <bsp/gradcdac.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/gradcdac.h>
 
 /****************** DEBUG Definitions ********************/
 #define DBG_IOCTRL 1
@@ -27,9 +27,9 @@
 #define DEBUG
 #define DEBUGFUNCS
 */
-#include <bsp/debug_defs.h>
+#include <grlib/debug_defs.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 struct gradcdac_priv {
 	struct gradcdac_regs *regs;	/* Must be first */
diff --git a/bsps/sparc/shared/ascs/grascs.c b/bsps/sparc/shared/ascs/grascs.c
index 1c7599575e..1d9541ce85 100644
--- a/bsps/sparc/shared/ascs/grascs.c
+++ b/bsps/sparc/shared/ascs/grascs.c
@@ -10,10 +10,11 @@
 
 #include <stdlib.h>
 #include <bsp.h>
-#include <ambapp.h>
-#include <bsp/grascs.h>
+#include <grlib/ambapp.h>
+#include <grlib/grascs.h>
+#include <grlib/grlib.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 #ifndef GAISLER_ASCS
 #define GAISLER_ASCS 0x043
diff --git a/bsps/sparc/shared/btimer/gptimer.c b/bsps/sparc/shared/btimer/gptimer.c
index 6174acc007..4b3ec8c4b8 100644
--- a/bsps/sparc/shared/btimer/gptimer.c
+++ b/bsps/sparc/shared/btimer/gptimer.c
@@ -36,10 +36,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <grlib.h>
-#include <bsp/gptimer.h>
-#include <bsp/tlib.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/grlib.h>
+#include <grlib/gptimer.h>
+#include <grlib/tlib.h>
 
 #if defined(LEON3)
 #include <leon.h>
@@ -54,7 +54,7 @@
 #include <rtems/score/smpimpl.h>
 #endif
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* GPTIMER Core Configuration Register (READ-ONLY) */
 #define GPTIMER_CFG_TIMERS_BIT	0
diff --git a/bsps/sparc/shared/btimer/tlib.c b/bsps/sparc/shared/btimer/tlib.c
index a0525d072d..d66a472fe9 100644
--- a/bsps/sparc/shared/btimer/tlib.c
+++ b/bsps/sparc/shared/btimer/tlib.c
@@ -10,7 +10,7 @@
  */
 
 #include <rtems.h>
-#include <bsp/tlib.h>
+#include <grlib/tlib.h>
 
 struct tlib_dev *tlib_dev_head = NULL;
 struct tlib_dev *tlib_dev_tail = NULL;
diff --git a/bsps/sparc/shared/btimer/tlib_ckinit.c b/bsps/sparc/shared/btimer/tlib_ckinit.c
index 66433359fe..e43c8fdd8e 100644
--- a/bsps/sparc/shared/btimer/tlib_ckinit.c
+++ b/bsps/sparc/shared/btimer/tlib_ckinit.c
@@ -22,7 +22,7 @@
 #include <rtems/clockdrv.h>
 #include <stdlib.h>
 #include <bsp.h>
-#include <bsp/tlib.h>
+#include <grlib/tlib.h>
 
 #ifdef RTEMS_DRVMGR_STARTUP
 
diff --git a/bsps/sparc/shared/can/canmux.c b/bsps/sparc/shared/can/canmux.c
index ca2125aefd..369cb3dd0a 100644
--- a/bsps/sparc/shared/can/canmux.c
+++ b/bsps/sparc/shared/can/canmux.c
@@ -16,10 +16,10 @@
 #include <bsp.h>
 #include <rtems/bspIo.h> /* printk */
 
-#include <bsp/canmux.h>
-#include <ambapp.h>
+#include <grlib/canmux.h>
+#include <grlib/ambapp.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 #ifndef GAISLER_CANMUX
 #define GAISLER_CANMUX 0x081
diff --git a/bsps/sparc/shared/can/grcan.c b/bsps/sparc/shared/can/grcan.c
index 03faec915c..55154d823a 100644
--- a/bsps/sparc/shared/can/grcan.c
+++ b/bsps/sparc/shared/can/grcan.c
@@ -17,12 +17,12 @@
 #include <ctype.h>
 #include <rtems/bspIo.h>
 
-#include <bsp/grcan.h>
+#include <grlib/grcan.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <ambapp.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/ambapp.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* Maximum number of GRCAN devices supported by driver */
 #define GRCAN_COUNT_MAX 8
@@ -77,7 +77,7 @@
 #define DEBUG
 #define DEBUGFUNCS
 */
-#include <bsp/debug_defs.h>
+#include <grlib/debug_defs.h>
 
 /*********************************************************/
 
diff --git a/bsps/sparc/shared/can/occan.c b/bsps/sparc/shared/can/occan.c
index c0bc315db1..59b4f234f6 100644
--- a/bsps/sparc/shared/can/occan.c
+++ b/bsps/sparc/shared/can/occan.c
@@ -17,10 +17,10 @@
 #include <rtems/bspIo.h> /* printk */
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <bsp/occan.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/occan.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* RTEMS -> ERRNO decoding table
 
diff --git a/bsps/sparc/shared/can/satcan.c b/bsps/sparc/shared/can/satcan.c
index 9cc27fc0dc..c6d58aaed4 100644
--- a/bsps/sparc/shared/can/satcan.c
+++ b/bsps/sparc/shared/can/satcan.c
@@ -16,10 +16,10 @@
 #include <bsp.h>
 #include <rtems/bspIo.h> /* printk */
 
-#include <bsp/satcan.h>
-#include <ambapp.h>
+#include <grlib/satcan.h>
+#include <grlib/ambapp.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 #ifndef GAISLER_SATCAN
 #define GAISLER_SATCAN 0x080
diff --git a/bsps/sparc/shared/drvmgr/ambapp_bus.c b/bsps/sparc/shared/drvmgr/ambapp_bus.c
index 3787660a15..931d5d2a61 100644
--- a/bsps/sparc/shared/drvmgr/ambapp_bus.c
+++ b/bsps/sparc/shared/drvmgr/ambapp_bus.c
@@ -21,10 +21,10 @@
 #include <string.h>
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 
 #include <bsp.h>
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 #include <rtems/bspIo.h>
 
 /*#define DEBUG 1*/
diff --git a/bsps/sparc/shared/drvmgr/ambapp_bus_grlib.c b/bsps/sparc/shared/drvmgr/ambapp_bus_grlib.c
index 1db0d06aeb..9e8c37daf2 100644
--- a/bsps/sparc/shared/drvmgr/ambapp_bus_grlib.c
+++ b/bsps/sparc/shared/drvmgr/ambapp_bus_grlib.c
@@ -17,14 +17,14 @@
 #include <stdint.h>
 #include <libcpu/access.h>
 
-#include <drvmgr/ambapp_bus.h>
-#include <drvmgr/ambapp_bus_grlib.h>
-#include <bsp/genirq.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/ambapp_bus_grlib.h>
+#include <grlib/genirq.h>
 
 #include <bsp.h>
 #include <bsp/irq.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 #define DBG(args...)
 /*#define DBG(args...) printk(args)*/
diff --git a/bsps/sparc/shared/drvmgr/ambapp_bus_leon2.c b/bsps/sparc/shared/drvmgr/ambapp_bus_leon2.c
index a2351377f7..1a60f23b22 100644
--- a/bsps/sparc/shared/drvmgr/ambapp_bus_leon2.c
+++ b/bsps/sparc/shared/drvmgr/ambapp_bus_leon2.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <libcpu/access.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 #include <drvmgr/leon2_amba_bus.h>
 
 #define DBG(args...)
diff --git a/bsps/sparc/shared/drvmgr/get_resarray_count.c b/bsps/sparc/shared/drvmgr/get_resarray_count.c
index 4099fa6b0d..7b5850d982 100644
--- a/bsps/sparc/shared/drvmgr/get_resarray_count.c
+++ b/bsps/sparc/shared/drvmgr/get_resarray_count.c
@@ -9,7 +9,7 @@
  */
 
 #include <stdlib.h>
-#include <drvmgr/bspcommon.h>
+#include <grlib/bspcommon.h>
 
 int get_resarray_count(struct drvmgr_bus_res **array)
 {
diff --git a/bsps/sparc/shared/gpio/gpiolib.c b/bsps/sparc/shared/gpio/gpiolib.c
index 700f27a266..cf0038c5bb 100644
--- a/bsps/sparc/shared/gpio/gpiolib.c
+++ b/bsps/sparc/shared/gpio/gpiolib.c
@@ -12,9 +12,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <bsp/gpiolib.h>
+#include <grlib/gpiolib.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 struct gpiolib_port;
 
diff --git a/bsps/sparc/shared/gpio/grgpio.c b/bsps/sparc/shared/gpio/grgpio.c
index b235ba273d..05504ef020 100644
--- a/bsps/sparc/shared/gpio/grgpio.c
+++ b/bsps/sparc/shared/gpio/grgpio.c
@@ -17,12 +17,12 @@
 #include <stdio.h>
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <bsp/grgpio.h>
-#include <bsp/gpiolib.h>
-#include <ambapp.h>
-#include <grlib.h>
-#include <grlib_impl.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/grgpio.h>
+#include <grlib/gpiolib.h>
+#include <grlib/ambapp.h>
+#include <grlib/grlib.h>
+#include <grlib/grlib_impl.h>
 
 /*#define DEBUG 1*/
 
diff --git a/bsps/sparc/shared/i2c/i2cmst.c b/bsps/sparc/shared/i2c/i2cmst.c
index 3f11d879aa..fad0937df2 100644
--- a/bsps/sparc/shared/i2c/i2cmst.c
+++ b/bsps/sparc/shared/i2c/i2cmst.c
@@ -15,14 +15,14 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 #include <rtems/libi2c.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 
-#include <bsp/i2cmst.h>
+#include <grlib/i2cmst.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* Enable debug printks? */
 /*#define DEBUG*/
diff --git a/bsps/sparc/shared/iommu/griommu.c b/bsps/sparc/shared/iommu/griommu.c
index 69d8672057..d0d22723ca 100644
--- a/bsps/sparc/shared/iommu/griommu.c
+++ b/bsps/sparc/shared/iommu/griommu.c
@@ -12,14 +12,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <ambapp.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/ambapp.h>
 #include <rtems.h>
 #include <rtems/bspIo.h>
 #include <bsp.h>
-#include <bsp/griommu.h>
+#include <grlib/griommu.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /*#define STATIC*/
 #define STATIC static
diff --git a/bsps/sparc/shared/irq/genirq.c b/bsps/sparc/shared/irq/genirq.c
index 6ddd442f73..285416b0d3 100644
--- a/bsps/sparc/shared/irq/genirq.c
+++ b/bsps/sparc/shared/irq/genirq.c
@@ -13,9 +13,9 @@
 #include <rtems/bspIo.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bsp/genirq.h>
+#include <grlib/genirq.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 struct genirq_handler_entry {
 	struct genirq_handler_entry	*next;		/* Next ISR entry for this IRQ number */
diff --git a/bsps/sparc/shared/l2c/l2c.c b/bsps/sparc/shared/l2c/l2c.c
index 89b0f40444..ddef0ada5c 100644
--- a/bsps/sparc/shared/l2c/l2c.c
+++ b/bsps/sparc/shared/l2c/l2c.c
@@ -12,13 +12,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <ambapp.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/ambapp.h>
 #include <rtems.h>
 #include <rtems/bspIo.h>
-#include <grlib.h>
+#include <grlib/grlib.h>
 #include <bsp.h>
-#include <bsp/l2c.h>
+#include <grlib/l2c.h>
 
 /*#define STATIC*/
 #define STATIC static
diff --git a/bsps/sparc/shared/mem/mctrl.c b/bsps/sparc/shared/mem/mctrl.c
index 47422a7ee2..a384547de8 100644
--- a/bsps/sparc/shared/mem/mctrl.c
+++ b/bsps/sparc/shared/mem/mctrl.c
@@ -18,11 +18,11 @@
 #include <stdio.h>
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 
-#include <bsp/mctrl.h>
+#include <grlib/mctrl.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 #define MEMSET(priv, start, c, length) memset((void *)start, c, length)
 
diff --git a/bsps/sparc/shared/net/greth.c b/bsps/sparc/shared/net/greth.c
index a927ddfee6..30eb4cc8a9 100644
--- a/bsps/sparc/shared/net/greth.c
+++ b/bsps/sparc/shared/net/greth.c
@@ -29,10 +29,10 @@
 #include <rtems/error.h>
 #include <rtems/rtems_bsdnet.h>
 
-#include <bsp/greth.h>
+#include <grlib/greth.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <ambapp.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/ambapp.h>
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
@@ -50,7 +50,7 @@
 #undef free
 #endif
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 #if defined(__m68k__)
 extern m68k_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int );
diff --git a/bsps/sparc/shared/net/network_interface_add.c b/bsps/sparc/shared/net/network_interface_add.c
index e434e27b8f..011137404f 100644
--- a/bsps/sparc/shared/net/network_interface_add.c
+++ b/bsps/sparc/shared/net/network_interface_add.c
@@ -17,7 +17,7 @@
 #include <rtems/rtems_bsdnet.h>
 #include <stdio.h>
 
-#include <bsp/network_interface_add.h>
+#include <grlib/network_interface_add.h>
 
 extern struct rtems_bsdnet_config rtems_bsdnet_config;
 
diff --git a/bsps/sparc/shared/pci/gr_701.c b/bsps/sparc/shared/pci/gr_701.c
index b0070fd9dd..c9ac0db0f2 100644
--- a/bsps/sparc/shared/pci/gr_701.c
+++ b/bsps/sparc/shared/pci/gr_701.c
@@ -27,18 +27,18 @@
 #include <pci.h>
 #include <pci/access.h>
 
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
-#include <drvmgr/bspcommon.h>
-#include <bsp/genirq.h>
+#include <grlib/bspcommon.h>
+#include <grlib/genirq.h>
 
-#include <bsp/gr_701.h>
+#include <grlib/gr_701.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* Offset from 0x80000000 (dual bus version) */
 #define AHB1_BASE_ADDR 0x80000000
diff --git a/bsps/sparc/shared/pci/gr_cpci_gr740.c b/bsps/sparc/shared/pci/gr_cpci_gr740.c
index a9a614996c..95f5b9492e 100644
--- a/bsps/sparc/shared/pci/gr_cpci_gr740.c
+++ b/bsps/sparc/shared/pci/gr_cpci_gr740.c
@@ -36,17 +36,17 @@
 #include <rtems/bspIo.h>
 #include <pci.h>
 
-#include <ambapp.h>
-#include <grlib.h>
+#include <grlib/ambapp.h>
+#include <grlib/grlib.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
-#include <drvmgr/bspcommon.h>
-#include <bsp/genirq.h>
+#include <grlib/bspcommon.h>
+#include <grlib/genirq.h>
 
-#include <bsp/gr_cpci_gr740.h>
+#include <grlib/gr_cpci_gr740.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* Determines which PCI address the AHB masters on the GR740 board will
  * access when accessing the AHB to PCI window, it should be set so that the
diff --git a/bsps/sparc/shared/pci/gr_leon4_n2x.c b/bsps/sparc/shared/pci/gr_leon4_n2x.c
index 4dd9005f67..9baf73e2e0 100644
--- a/bsps/sparc/shared/pci/gr_leon4_n2x.c
+++ b/bsps/sparc/shared/pci/gr_leon4_n2x.c
@@ -35,17 +35,17 @@
 #include <rtems/bspIo.h>
 #include <pci.h>
 
-#include <ambapp.h>
-#include <grlib.h>
+#include <grlib/ambapp.h>
+#include <grlib/grlib.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
-#include <drvmgr/bspcommon.h>
-#include <bsp/genirq.h>
+#include <grlib/bspcommon.h>
+#include <grlib/genirq.h>
 
 #include <bsp/gr_leon4_n2x.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* Determines which PCI address the AHB masters on the LEON-N2X board will
  * access when accessing the AHB to PCI window, it should be set so that the
diff --git a/bsps/sparc/shared/pci/gr_rasta_adcdac.c b/bsps/sparc/shared/pci/gr_rasta_adcdac.c
index bea58328d4..12e35acbc5 100644
--- a/bsps/sparc/shared/pci/gr_rasta_adcdac.c
+++ b/bsps/sparc/shared/pci/gr_rasta_adcdac.c
@@ -26,17 +26,17 @@
 #include <rtems/bspIo.h>
 #include <pci.h>
 
-#include <ambapp.h>
-#include <grlib.h>
+#include <grlib/ambapp.h>
+#include <grlib/grlib.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
-#include <drvmgr/bspcommon.h>
-#include <bsp/genirq.h>
+#include <grlib/bspcommon.h>
+#include <grlib/genirq.h>
 
-#include <bsp/gr_rasta_adcdac.h>
+#include <grlib/gr_rasta_adcdac.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /*#define DEBUG 1*/
 
diff --git a/bsps/sparc/shared/pci/gr_rasta_io.c b/bsps/sparc/shared/pci/gr_rasta_io.c
index 63299c10a7..f4c9d50a7b 100644
--- a/bsps/sparc/shared/pci/gr_rasta_io.c
+++ b/bsps/sparc/shared/pci/gr_rasta_io.c
@@ -26,17 +26,17 @@
 #include <rtems/bspIo.h>
 #include <pci.h>
 
-#include <ambapp.h>
-#include <grlib.h>
+#include <grlib/ambapp.h>
+#include <grlib/grlib.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
-#include <drvmgr/bspcommon.h>
-#include <bsp/genirq.h>
+#include <grlib/bspcommon.h>
+#include <grlib/genirq.h>
 
-#include <bsp/gr_rasta_io.h>
+#include <grlib/gr_rasta_io.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* Determines which PCI address the AHB masters will access, it should be
  * set so that the masters can access the CPU RAM. Default is base of CPU RAM,
diff --git a/bsps/sparc/shared/pci/gr_rasta_spw_router.c b/bsps/sparc/shared/pci/gr_rasta_spw_router.c
index 0bfc645dc2..6efbaa463d 100644
--- a/bsps/sparc/shared/pci/gr_rasta_spw_router.c
+++ b/bsps/sparc/shared/pci/gr_rasta_spw_router.c
@@ -24,16 +24,16 @@
 #include <rtems/bspIo.h>
 #include <pci.h>
 
-#include <ambapp.h>
-#include <grlib.h>
+#include <grlib/ambapp.h>
+#include <grlib/grlib.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
-#include <drvmgr/bspcommon.h>
-#include <bsp/genirq.h>
-#include <bsp/gr_rasta_spw_router.h>
+#include <grlib/bspcommon.h>
+#include <grlib/genirq.h>
+#include <grlib/gr_rasta_spw_router.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* Determines which PCI address the AHB masters will access, it should be
  * set so that the masters can access the CPU RAM. Default is base of CPU RAM,
diff --git a/bsps/sparc/shared/pci/gr_rasta_tmtc.c b/bsps/sparc/shared/pci/gr_rasta_tmtc.c
index b243259d96..bef2927926 100644
--- a/bsps/sparc/shared/pci/gr_rasta_tmtc.c
+++ b/bsps/sparc/shared/pci/gr_rasta_tmtc.c
@@ -26,17 +26,17 @@
 #include <rtems/bspIo.h>
 #include <pci.h>
 
-#include <ambapp.h>
-#include <grlib.h>
+#include <grlib/ambapp.h>
+#include <grlib/grlib.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
-#include <drvmgr/bspcommon.h>
-#include <bsp/genirq.h>
+#include <grlib/bspcommon.h>
+#include <grlib/genirq.h>
 
-#include <bsp/gr_rasta_tmtc.h>
+#include <grlib/gr_rasta_tmtc.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* Determines which PCI address the AHB masters will access, it should be
  * set so that the masters can access the CPU RAM. Default is base of CPU RAM,
diff --git a/bsps/sparc/shared/pci/gr_tmtc_1553.c b/bsps/sparc/shared/pci/gr_tmtc_1553.c
index 2a497fe7de..ce02b8a256 100644
--- a/bsps/sparc/shared/pci/gr_tmtc_1553.c
+++ b/bsps/sparc/shared/pci/gr_tmtc_1553.c
@@ -27,17 +27,17 @@
 #include <pci.h>
 #include <pci/access.h>
 
-#include <ambapp.h>
-#include <grlib.h>
+#include <grlib/ambapp.h>
+#include <grlib/grlib.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
-#include <drvmgr/bspcommon.h>
-#include <bsp/genirq.h>
+#include <grlib/bspcommon.h>
+#include <grlib/genirq.h>
 
-#include <bsp/gr_tmtc_1553.h>
+#include <grlib/gr_tmtc_1553.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /*#define DEBUG 1 */
 
diff --git a/bsps/sparc/shared/pci/grpci.c b/bsps/sparc/shared/pci/grpci.c
index 6e35b44132..fc2f06a063 100644
--- a/bsps/sparc/shared/pci/grpci.c
+++ b/bsps/sparc/shared/pci/grpci.c
@@ -26,10 +26,10 @@
 #include <pci/cfg.h>
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <ambapp.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/ambapp.h>
 #include <drvmgr/pci_bus.h>
-#include <bsp/grpci.h>
+#include <grlib/grpci.h>
 
 #define DMAPCI_ADDR 0x80000500
 
diff --git a/bsps/sparc/shared/pci/grpci2.c b/bsps/sparc/shared/pci/grpci2.c
index 9bb479c110..21c09f47a5 100644
--- a/bsps/sparc/shared/pci/grpci2.c
+++ b/bsps/sparc/shared/pci/grpci2.c
@@ -38,12 +38,12 @@
 #include <pci/cfg.h>
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <ambapp.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/ambapp.h>
 #include <drvmgr/pci_bus.h>
-#include <bsp/grpci2.h>
+#include <grlib/grpci2.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* If defined to 1 - byte twisting is enabled by default */
 #define DEFAULT_BT_ENABLED 0
diff --git a/bsps/sparc/shared/pci/grpci2dma.c b/bsps/sparc/shared/pci/grpci2dma.c
index 0bc06ff50d..7e39ca691d 100644
--- a/bsps/sparc/shared/pci/grpci2dma.c
+++ b/bsps/sparc/shared/pci/grpci2dma.c
@@ -16,9 +16,9 @@
 #include <rtems.h>
 #include <rtems/bspIo.h>  /* for printk */
 #include <bsp.h>
-#include <bsp/grpci2dma.h>
+#include <grlib/grpci2dma.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* This driver has been prepared for SMP operation
  */
diff --git a/bsps/sparc/shared/pci/pcif.c b/bsps/sparc/shared/pci/pcif.c
index 8603c990e2..17708a9c0b 100644
--- a/bsps/sparc/shared/pci/pcif.c
+++ b/bsps/sparc/shared/pci/pcif.c
@@ -26,10 +26,10 @@
 #include <pci/cfg.h>
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <ambapp.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/ambapp.h>
 #include <drvmgr/pci_bus.h>
-#include <bsp/pcif.h>
+#include <grlib/pcif.h>
 
 
 /* Configuration options */
diff --git a/bsps/sparc/shared/pwm/grpwm.c b/bsps/sparc/shared/pwm/grpwm.c
index 87e40663c5..a824201795 100644
--- a/bsps/sparc/shared/pwm/grpwm.c
+++ b/bsps/sparc/shared/pwm/grpwm.c
@@ -18,11 +18,11 @@
 #include <stdio.h>
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <bsp/grpwm.h>
-#include <ambapp.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/grpwm.h>
+#include <grlib/ambapp.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* #define DEBUG 1 */
 
diff --git a/bsps/sparc/shared/scrub/memscrub.c b/bsps/sparc/shared/scrub/memscrub.c
index 2e4dfeeb0c..7c6ceb43e0 100644
--- a/bsps/sparc/shared/scrub/memscrub.c
+++ b/bsps/sparc/shared/scrub/memscrub.c
@@ -14,9 +14,9 @@
 #include <string.h>
 #include <rtems/bspIo.h>
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 
-#include <bsp/memscrub.h>
+#include <grlib/memscrub.h>
 
 /*#define STATIC*/
 #define STATIC static
diff --git a/bsps/sparc/shared/slink/grslink.c b/bsps/sparc/shared/slink/grslink.c
index 07335786e5..5a3b5b5ea6 100644
--- a/bsps/sparc/shared/slink/grslink.c
+++ b/bsps/sparc/shared/slink/grslink.c
@@ -23,10 +23,11 @@
 #include <stdlib.h>
 
 #include <bsp.h>
-#include <bsp/grslink.h>
-#include <ambapp.h>
+#include <grlib/grslink.h>
+#include <grlib/ambapp.h>
+#include <grlib/grlib.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 #ifndef GAISLER_SLINK
 #define GAISLER_SLINK 0x02F
diff --git a/bsps/sparc/shared/spi/spictrl.c b/bsps/sparc/shared/spi/spictrl.c
index 6f5ffefe25..0c9f88c10f 100644
--- a/bsps/sparc/shared/spi/spictrl.c
+++ b/bsps/sparc/shared/spi/spictrl.c
@@ -18,13 +18,13 @@
 #include <stdio.h>
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <bsp/spictrl.h>
-#include <ambapp.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/spictrl.h>
+#include <grlib/ambapp.h>
 
 #include <rtems/libi2c.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /*#define DEBUG 1*/
 
diff --git a/bsps/sparc/shared/spw/grspw.c b/bsps/sparc/shared/spw/grspw.c
index 846af8c6b5..ca0f63edd8 100644
--- a/bsps/sparc/shared/spw/grspw.c
+++ b/bsps/sparc/shared/spw/grspw.c
@@ -17,13 +17,13 @@
 #include <assert.h>
 #include <ctype.h>
 #include <rtems/bspIo.h>
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <bsp/grspw.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/grspw.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 #define DBGSPW_IOCALLS 1
 #define DBGSPW_TX 2
diff --git a/bsps/sparc/shared/spw/grspw_pkt.c b/bsps/sparc/shared/spw/grspw_pkt.c
index ce8478de65..208f5a14f7 100644
--- a/bsps/sparc/shared/spw/grspw_pkt.c
+++ b/bsps/sparc/shared/spw/grspw_pkt.c
@@ -23,11 +23,11 @@
 #include <rtems/bspIo.h>
 
 #include <drvmgr/drvmgr.h>
-#include <ambapp.h>
-#include <drvmgr/ambapp_bus.h>
-#include <bsp/grspw_pkt.h>
+#include <grlib/ambapp.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/grspw_pkt.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /*#define STATIC*/
 #define STATIC static
diff --git a/bsps/sparc/shared/spw/grspw_router.c b/bsps/sparc/shared/spw/grspw_router.c
index 41ecfb823a..d8ba8feef3 100644
--- a/bsps/sparc/shared/spw/grspw_router.c
+++ b/bsps/sparc/shared/spw/grspw_router.c
@@ -15,10 +15,10 @@
 #include <bsp.h>
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <bsp/grspw_router.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/grspw_router.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 //#define STATIC
 #define STATIC static
diff --git a/bsps/sparc/shared/spw/spwtdp.c b/bsps/sparc/shared/spw/spwtdp.c
index 679a5b79c5..df74675355 100644
--- a/bsps/sparc/shared/spw/spwtdp.c
+++ b/bsps/sparc/shared/spw/spwtdp.c
@@ -16,12 +16,12 @@
 #include <rtems.h>
 #include <rtems/bspIo.h>
 #include <drvmgr/drvmgr.h>
-#include <ambapp.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp.h>
+#include <grlib/ambapp_bus.h>
 #include <bsp.h>
-#include <bsp/spwtdp.h>
+#include <grlib/spwtdp.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /*#define STATIC*/
 #define STATIC static
diff --git a/bsps/sparc/shared/stat/l4stat.c b/bsps/sparc/shared/stat/l4stat.c
index a7621feb00..ee4ae7d6a4 100644
--- a/bsps/sparc/shared/stat/l4stat.c
+++ b/bsps/sparc/shared/stat/l4stat.c
@@ -15,8 +15,8 @@
 #include <rtems/bspIo.h> /* printk */
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <bsp/l4stat.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/l4stat.h>
 
 /*#define STATIC*/
 #define STATIC static
diff --git a/bsps/sparc/shared/time/grctm.c b/bsps/sparc/shared/time/grctm.c
index e740f7a7d5..038c3ddf34 100644
--- a/bsps/sparc/shared/time/grctm.c
+++ b/bsps/sparc/shared/time/grctm.c
@@ -9,13 +9,13 @@
  */
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <bsp/grctm.h>
+#include <grlib/grctm.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* Private structure of GRCTM driver */
 struct grctm_priv {
diff --git a/bsps/sparc/shared/time/spwcuc.c b/bsps/sparc/shared/time/spwcuc.c
index 354322910e..d742f2d225 100644
--- a/bsps/sparc/shared/time/spwcuc.c
+++ b/bsps/sparc/shared/time/spwcuc.c
@@ -10,13 +10,13 @@
  */
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <bsp/spwcuc.h>
+#include <grlib/spwcuc.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /* Private structure of SPWCUC driver. */
 struct spwcuc_priv {
diff --git a/bsps/sparc/shared/tmtc/grtc.c b/bsps/sparc/shared/tmtc/grtc.c
index 35f67f6a4c..44e9685c3a 100644
--- a/bsps/sparc/shared/tmtc/grtc.c
+++ b/bsps/sparc/shared/tmtc/grtc.c
@@ -18,18 +18,18 @@
 #include <rtems/bspIo.h>
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <ambapp.h>
-#include <bsp/grtc.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/ambapp.h>
+#include <grlib/grtc.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /*
 #define DEBUG
 #define DEBUGFUNCS
 */
 
-#include <bsp/debug_defs.h>
+#include <grlib/debug_defs.h>
 
 #ifdef DEBUG_ERROR
 #define DEBUG_ERR_LOG(device,error) grtc_log_error(device,error)
diff --git a/bsps/sparc/shared/tmtc/grtm.c b/bsps/sparc/shared/tmtc/grtm.c
index a7f7889dc5..43476aaaad 100644
--- a/bsps/sparc/shared/tmtc/grtm.c
+++ b/bsps/sparc/shared/tmtc/grtm.c
@@ -18,18 +18,18 @@
 #include <rtems/bspIo.h>
 
 #include <drvmgr/drvmgr.h>
-#include <ambapp.h>
-#include <drvmgr/ambapp_bus.h>
-#include <bsp/grtm.h>
+#include <grlib/ambapp.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/grtm.h>
 
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
 
 /*
 #define DEBUG
 #define DEBUGFUNCS
 */
 
-#include <bsp/debug_defs.h>
+#include <grlib/debug_defs.h>
 
 /* GRTM register map */
 struct grtm_regs {
diff --git a/bsps/sparc/shared/uart/apbuart_cons.c b/bsps/sparc/shared/uart/apbuart_cons.c
index a54c222935..8cd8a1ebf0 100644
--- a/bsps/sparc/shared/uart/apbuart_cons.c
+++ b/bsps/sparc/shared/uart/apbuart_cons.c
@@ -25,13 +25,13 @@
 #include <stdio.h>
 
 #include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
-#include <bsp/apbuart.h>
-#include <ambapp.h>
-#include <grlib.h>
-#include <bsp/cons.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/apbuart.h>
+#include <grlib/ambapp.h>
+#include <grlib/grlib.h>
+#include <grlib/cons.h>
 #include <rtems/termiostypes.h>
-#include <bsp/apbuart_cons.h>
+#include <grlib/apbuart_cons.h>
 
 /*#define DEBUG 1  */
 
diff --git a/bsps/sparc/shared/uart/apbuart_polled.c b/bsps/sparc/shared/uart/apbuart_polled.c
index 4a4402712a..0fbfbc51ba 100644
--- a/bsps/sparc/shared/uart/apbuart_polled.c
+++ b/bsps/sparc/shared/uart/apbuart_polled.c
@@ -7,7 +7,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <bsp/apbuart.h>
+#include <grlib/apbuart.h>
 
 void apbuart_outbyte_polled(
   struct apbuart_regs *regs,
diff --git a/bsps/sparc/shared/uart/apbuart_termios.c b/bsps/sparc/shared/uart/apbuart_termios.c
index a4ecc749ce..81df89c171 100644
--- a/bsps/sparc/shared/uart/apbuart_termios.c
+++ b/bsps/sparc/shared/uart/apbuart_termios.c
@@ -11,8 +11,8 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <bsp/apbuart_termios.h>
-#include <bsp/apbuart.h>
+#include <grlib/apbuart_termios.h>
+#include <grlib/apbuart.h>
 #include <bsp.h>
 
 static void apbuart_isr(void *arg)
diff --git a/bsps/sparc/shared/uart/cons.c b/bsps/sparc/shared/uart/cons.c
index 410d6e231f..5fa41e6914 100644
--- a/bsps/sparc/shared/uart/cons.c
+++ b/bsps/sparc/shared/uart/cons.c
@@ -15,7 +15,7 @@
 #include <bsp.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bsp/cons.h>
+#include <grlib/cons.h>
 #include <rtems/console.h>
 
 #ifdef RTEMS_DRVMGR_STARTUP