LEON: move driver headers to bsp/ directory

58 files changed, 432 insertions, 432 deletions

diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index 79f2d6a767..66c491defc 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -8,7 +8,7 @@ dist_project_lib_DATA = bsp_specs
 
 include_HEADERS = include/bsp.h
 include_HEADERS += include/tm27.h
-include_HEADERS += ../../sparc/shared/include/debug_defs.h
+include_bsp_HEADERS = ../../sparc/shared/include/debug_defs.h
 
 nodist_include_HEADERS = include/bspopts.h
 nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
@@ -51,14 +51,14 @@ libbsp_a_SOURCES += ../../sparc/shared/cpu.c
 libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
 # gnatsupp
 libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
-include_bsp_HEADERS = ../shared/include/gnatcommon.h
+include_bsp_HEADERS += ../shared/include/gnatcommon.h
 # console
 libbsp_a_SOURCES += console/console.c console/debugputs.c
 # clock
 libbsp_a_SOURCES += clock/ckinit.c
 libbsp_a_SOURCES += ../../shared/clockdrv_shell.h
 # IRQ
-include_HEADERS += ../../sparc/shared/include/genirq.h
+include_bsp_HEADERS += ../../sparc/shared/include/genirq.h
 libbsp_a_SOURCES += ../../sparc/shared/irq/genirq.c
 include_bsp_HEADERS += \
     ../../shared/include/irq-generic.h \
@@ -78,7 +78,7 @@ libbsp_a_SOURCES += \
 include_HEADERS += ../../sparc/shared/include/ambapp.h
 include_HEADERS += ../../sparc/shared/include/ambapp_ids.h
 include_HEADERS += ../../sparc/shared/include/grlib.h
-include_HEADERS += ../../sparc/shared/include/ahbstat.h
+include_bsp_HEADERS += ../../sparc/shared/include/ahbstat.h
 libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c
 libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_alloc.c
 libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_count.c
@@ -92,16 +92,16 @@ libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_show.c
 libbsp_a_SOURCES += ../../sparc/shared/amba/ahbstat.c
 
 # Clock Driver and Timer Library
-include_HEADERS += ../../sparc/shared/include/gptimer.h
-include_HEADERS += ../../sparc/shared/include/tlib.h
+include_bsp_HEADERS += ../../sparc/shared/include/gptimer.h
+include_bsp_HEADERS += ../../sparc/shared/include/tlib.h
 libbsp_a_SOURCES += ../../sparc/shared/timer/gptimer.c
 libbsp_a_SOURCES += ../../sparc/shared/timer/tlib.c
 
 # PCI
-include_HEADERS += ../../sparc/shared/include/grpci.h
-include_HEADERS += ../../sparc/shared/include/grpci2.h
-include_HEADERS += ../../sparc/shared/include/pcif.h
-include_HEADERS += include/at697_pci.h
+include_bsp_HEADERS += ../../sparc/shared/include/grpci.h
+include_bsp_HEADERS += ../../sparc/shared/include/grpci2.h
+include_bsp_HEADERS += ../../sparc/shared/include/pcif.h
+include_bsp_HEADERS += include/at697_pci.h
 libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c
 libbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c
 libbsp_a_SOURCES += ../../sparc/shared/pci/pcif.c
@@ -110,12 +110,12 @@ libbsp_a_SOURCES +=  ../../sparc/shared/pci/pci_memreg_sparc_be.c
 libbsp_a_SOURCES +=  pci/at697_pci.c
 
 # PCI target devices
-include_HEADERS += ../../sparc/shared/include/gr_701.h
-include_HEADERS += ../../sparc/shared/include/gr_rasta_adcdac.h
-include_HEADERS += ../../sparc/shared/include/gr_rasta_io.h
-include_HEADERS += ../../sparc/shared/include/gr_rasta_spw_router.h
-include_HEADERS += ../../sparc/shared/include/gr_rasta_tmtc.h
-include_HEADERS += ../../sparc/shared/include/gr_leon4_n2x.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr_701.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_adcdac.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_io.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_spw_router.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_tmtc.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr_leon4_n2x.h
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_701.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_rasta_adcdac.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_rasta_io.c
@@ -124,76 +124,76 @@ libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_rasta_tmtc.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_leon4_n2x.c
 
 # B1553BRM
-include_HEADERS += ../../sparc/shared/include/b1553brm.h
-include_HEADERS += ../../sparc/shared/include/b1553rt.h
+include_bsp_HEADERS += ../../sparc/shared/include/b1553brm.h
+include_bsp_HEADERS += ../../sparc/shared/include/b1553rt.h
 libbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/b1553rt.c
 
 # GR1553B
-include_HEADERS += ../../sparc/shared/include/gr1553b.h
-include_HEADERS += ../../sparc/shared/include/gr1553bc.h
-include_HEADERS += ../../sparc/shared/include/gr1553bc_list.h
-include_HEADERS += ../../sparc/shared/include/gr1553bm.h
-include_HEADERS += ../../sparc/shared/include/gr1553rt.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr1553b.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc_list.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr1553bm.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr1553rt.h
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553b.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bc.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bm.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553rt.c
 
 # CAN
-include_HEADERS += ../../sparc/shared/include/occan.h
-include_HEADERS += ../../sparc/shared/include/grcan.h
+include_bsp_HEADERS += ../../sparc/shared/include/occan.h
+include_bsp_HEADERS += ../../sparc/shared/include/grcan.h
 libbsp_a_SOURCES += ../../sparc/shared/can/occan.c \
     ../../sparc/shared/can/grcan.c
 
 # SpaceWire
-include_HEADERS += ../../sparc/shared/include/grspw.h
-include_HEADERS += ../../sparc/shared/include/grspw_router.h
+include_bsp_HEADERS += ../../sparc/shared/include/grspw.h
+include_bsp_HEADERS += ../../sparc/shared/include/grspw_router.h
 libbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c
 libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_router.c
 
 # UART (RAW)
-include_HEADERS += ../../sparc/shared/include/apbuart.h
+include_bsp_HEADERS += ../../sparc/shared/include/apbuart.h
 libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart.c
 
 # I2CMST
-include_HEADERS += ../../sparc/shared/include/i2cmst.h
+include_bsp_HEADERS += ../../sparc/shared/include/i2cmst.h
 libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c
 
 # SPI
-include_HEADERS += ../../sparc/shared/include/spictrl.h
+include_bsp_HEADERS += ../../sparc/shared/include/spictrl.h
 libbsp_a_SOURCES += ../../sparc/shared/spi/spictrl.c
 
 # TIME
-include_HEADERS += ../../sparc/shared/include/spwcuc.h
-include_HEADERS += ../../sparc/shared/include/grctm.h
+include_bsp_HEADERS += ../../sparc/shared/include/spwcuc.h
+include_bsp_HEADERS += ../../sparc/shared/include/grctm.h
 libbsp_a_SOURCES += ../../sparc/shared/time/spwcuc.c
 libbsp_a_SOURCES += ../../sparc/shared/time/grctm.c
 
 # GPIO
-include_HEADERS += ../../sparc/shared/include/grgpio.h
-include_HEADERS += ../../sparc/shared/include/gpiolib.h
+include_bsp_HEADERS += ../../sparc/shared/include/grgpio.h
+include_bsp_HEADERS += ../../sparc/shared/include/gpiolib.h
 libbsp_a_SOURCES += ../../sparc/shared/gpio/grgpio.c
 libbsp_a_SOURCES += ../../sparc/shared/gpio/gpiolib.c
 
 # PWM
-include_HEADERS += ../../sparc/shared/include/grpwm.h
+include_bsp_HEADERS += ../../sparc/shared/include/grpwm.h
 libbsp_a_SOURCES += ../../sparc/shared/pwm/grpwm.c
 
 # ADC and DAC
-include_HEADERS += ../../sparc/shared/include/gradcdac.h
+include_bsp_HEADERS += ../../sparc/shared/include/gradcdac.h
 libbsp_a_SOURCES += ../../sparc/shared/analog/gradcdac.c
 
 # Memory controllers
 libbsp_a_SOURCES += ../../sparc/shared/mem/mctrl.c
-include_HEADERS += ../../sparc/shared/include/mctrl.h
+include_bsp_HEADERS += ../../sparc/shared/include/mctrl.h
 
 # timer
 libbsp_a_SOURCES += timer/timer.c
 
 # TM/TC
-include_HEADERS += ../../sparc/shared/include/grtc.h
-include_HEADERS += ../../sparc/shared/include/grtm.h
+include_bsp_HEADERS += ../../sparc/shared/include/grtc.h
+include_bsp_HEADERS += ../../sparc/shared/include/grtm.h
 libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtc.c
 libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtm.c
 
@@ -231,13 +231,13 @@ endif
 if HAS_NETWORKING
 noinst_PROGRAMS += leon_greth.rel
 leon_greth_rel_SOURCES = ../../sparc/shared/net/greth.c
-include_HEADERS += ../../sparc/shared/include/greth.h
+include_bsp_HEADERS += ../../sparc/shared/include/greth.h
 leon_greth_rel_CPPFLAGS = $(AM_CPPFLAGS)
 leon_greth_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 leon_greth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # BSP Network configuration
-include_HEADERS += ../../sparc/shared/include/network_interface_add.h
+include_bsp_HEADERS += ../../sparc/shared/include/network_interface_add.h
 libbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c
 endif
 
diff --git a/c/src/lib/libbsp/sparc/leon2/pci/at697_pci.c b/c/src/lib/libbsp/sparc/leon2/pci/at697_pci.c
index bfa7f13829..d7064234be 100644
--- a/c/src/lib/libbsp/sparc/leon2/pci/at697_pci.c
+++ b/c/src/lib/libbsp/sparc/leon2/pci/at697_pci.c
@@ -43,7 +43,7 @@
 #include <drvmgr/pci_bus.h>
 #include <drvmgr/leon2_amba_bus.h>
 
-#include <at697_pci.h>
+#include <bsp/at697_pci.h>
 #include <leon.h>
 
 /* Configuration options */
diff --git a/c/src/lib/libbsp/sparc/leon2/preinstall.am b/c/src/lib/libbsp/sparc/leon2/preinstall.am
index 5b72841e40..f4c8ca43ee 100644
--- a/c/src/lib/libbsp/sparc/leon2/preinstall.am
+++ b/c/src/lib/libbsp/sparc/leon2/preinstall.am
@@ -45,9 +45,9 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
 
-$(PROJECT_INCLUDE)/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/debug_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/debug_defs.h
+$(PROJECT_INCLUDE)/bsp/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/debug_defs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/debug_defs.h
 
 $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
@@ -81,9 +81,9 @@ $(PROJECT_INCLUDE)/bsp/gnatcommon.h: ../shared/include/gnatcommon.h $(PROJECT_IN
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gnatcommon.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gnatcommon.h
 
-$(PROJECT_INCLUDE)/genirq.h: ../../sparc/shared/include/genirq.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/genirq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/genirq.h
+$(PROJECT_INCLUDE)/bsp/genirq.h: ../../sparc/shared/include/genirq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/genirq.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/genirq.h
 
 $(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
@@ -109,149 +109,149 @@ $(PROJECT_INCLUDE)/grlib.h: ../../sparc/shared/include/grlib.h $(PROJECT_INCLUDE
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grlib.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/grlib.h
 
-$(PROJECT_INCLUDE)/ahbstat.h: ../../sparc/shared/include/ahbstat.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ahbstat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ahbstat.h
+$(PROJECT_INCLUDE)/bsp/ahbstat.h: ../../sparc/shared/include/ahbstat.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ahbstat.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ahbstat.h
 
-$(PROJECT_INCLUDE)/gptimer.h: ../../sparc/shared/include/gptimer.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gptimer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gptimer.h
+$(PROJECT_INCLUDE)/bsp/gptimer.h: ../../sparc/shared/include/gptimer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gptimer.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gptimer.h
 
-$(PROJECT_INCLUDE)/tlib.h: ../../sparc/shared/include/tlib.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tlib.h
+$(PROJECT_INCLUDE)/bsp/tlib.h: ../../sparc/shared/include/tlib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tlib.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tlib.h
 
-$(PROJECT_INCLUDE)/grpci.h: ../../sparc/shared/include/grpci.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grpci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grpci.h
+$(PROJECT_INCLUDE)/bsp/grpci.h: ../../sparc/shared/include/grpci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci.h
 
-$(PROJECT_INCLUDE)/grpci2.h: ../../sparc/shared/include/grpci2.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grpci2.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grpci2.h
+$(PROJECT_INCLUDE)/bsp/grpci2.h: ../../sparc/shared/include/grpci2.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci2.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci2.h
 
-$(PROJECT_INCLUDE)/pcif.h: ../../sparc/shared/include/pcif.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pcif.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pcif.h
+$(PROJECT_INCLUDE)/bsp/pcif.h: ../../sparc/shared/include/pcif.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pcif.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pcif.h
 
-$(PROJECT_INCLUDE)/at697_pci.h: include/at697_pci.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at697_pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at697_pci.h
+$(PROJECT_INCLUDE)/bsp/at697_pci.h: include/at697_pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/at697_pci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/at697_pci.h
 
-$(PROJECT_INCLUDE)/gr_701.h: ../../sparc/shared/include/gr_701.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr_701.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr_701.h
+$(PROJECT_INCLUDE)/bsp/gr_701.h: ../../sparc/shared/include/gr_701.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_701.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_701.h
 
-$(PROJECT_INCLUDE)/gr_rasta_adcdac.h: ../../sparc/shared/include/gr_rasta_adcdac.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr_rasta_adcdac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr_rasta_adcdac.h
+$(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h: ../../sparc/shared/include/gr_rasta_adcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h
 
-$(PROJECT_INCLUDE)/gr_rasta_io.h: ../../sparc/shared/include/gr_rasta_io.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr_rasta_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr_rasta_io.h
+$(PROJECT_INCLUDE)/bsp/gr_rasta_io.h: ../../sparc/shared/include/gr_rasta_io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h
 
-$(PROJECT_INCLUDE)/gr_rasta_spw_router.h: ../../sparc/shared/include/gr_rasta_spw_router.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr_rasta_spw_router.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr_rasta_spw_router.h
+$(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h: ../../sparc/shared/include/gr_rasta_spw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h
 
-$(PROJECT_INCLUDE)/gr_rasta_tmtc.h: ../../sparc/shared/include/gr_rasta_tmtc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr_rasta_tmtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr_rasta_tmtc.h
+$(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h: ../../sparc/shared/include/gr_rasta_tmtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h
 
-$(PROJECT_INCLUDE)/gr_leon4_n2x.h: ../../sparc/shared/include/gr_leon4_n2x.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr_leon4_n2x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr_leon4_n2x.h
+$(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h: ../../sparc/shared/include/gr_leon4_n2x.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h
 
-$(PROJECT_INCLUDE)/b1553brm.h: ../../sparc/shared/include/b1553brm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/b1553brm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/b1553brm.h
+$(PROJECT_INCLUDE)/bsp/b1553brm.h: ../../sparc/shared/include/b1553brm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553brm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553brm.h
 
-$(PROJECT_INCLUDE)/b1553rt.h: ../../sparc/shared/include/b1553rt.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/b1553rt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/b1553rt.h
+$(PROJECT_INCLUDE)/bsp/b1553rt.h: ../../sparc/shared/include/b1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553rt.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553rt.h
 
-$(PROJECT_INCLUDE)/gr1553b.h: ../../sparc/shared/include/gr1553b.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr1553b.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr1553b.h
+$(PROJECT_INCLUDE)/bsp/gr1553b.h: ../../sparc/shared/include/gr1553b.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553b.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553b.h
 
-$(PROJECT_INCLUDE)/gr1553bc.h: ../../sparc/shared/include/gr1553bc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr1553bc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr1553bc.h
+$(PROJECT_INCLUDE)/bsp/gr1553bc.h: ../../sparc/shared/include/gr1553bc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc.h
 
-$(PROJECT_INCLUDE)/gr1553bc_list.h: ../../sparc/shared/include/gr1553bc_list.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr1553bc_list.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr1553bc_list.h
+$(PROJECT_INCLUDE)/bsp/gr1553bc_list.h: ../../sparc/shared/include/gr1553bc_list.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h
 
-$(PROJECT_INCLUDE)/gr1553bm.h: ../../sparc/shared/include/gr1553bm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr1553bm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr1553bm.h
+$(PROJECT_INCLUDE)/bsp/gr1553bm.h: ../../sparc/shared/include/gr1553bm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bm.h
 
-$(PROJECT_INCLUDE)/gr1553rt.h: ../../sparc/shared/include/gr1553rt.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr1553rt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr1553rt.h
+$(PROJECT_INCLUDE)/bsp/gr1553rt.h: ../../sparc/shared/include/gr1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553rt.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553rt.h
 
-$(PROJECT_INCLUDE)/occan.h: ../../sparc/shared/include/occan.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/occan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/occan.h
+$(PROJECT_INCLUDE)/bsp/occan.h: ../../sparc/shared/include/occan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/occan.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/occan.h
 
-$(PROJECT_INCLUDE)/grcan.h: ../../sparc/shared/include/grcan.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grcan.h
+$(PROJECT_INCLUDE)/bsp/grcan.h: ../../sparc/shared/include/grcan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grcan.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grcan.h
 
-$(PROJECT_INCLUDE)/grspw.h: ../../sparc/shared/include/grspw.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grspw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grspw.h
+$(PROJECT_INCLUDE)/bsp/grspw.h: ../../sparc/shared/include/grspw.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw.h
 
-$(PROJECT_INCLUDE)/grspw_router.h: ../../sparc/shared/include/grspw_router.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grspw_router.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grspw_router.h
+$(PROJECT_INCLUDE)/bsp/grspw_router.h: ../../sparc/shared/include/grspw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_router.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_router.h
 
-$(PROJECT_INCLUDE)/apbuart.h: ../../sparc/shared/include/apbuart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/apbuart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/apbuart.h
+$(PROJECT_INCLUDE)/bsp/apbuart.h: ../../sparc/shared/include/apbuart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart.h
 
-$(PROJECT_INCLUDE)/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2cmst.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2cmst.h
+$(PROJECT_INCLUDE)/bsp/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2cmst.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2cmst.h
 
-$(PROJECT_INCLUDE)/spictrl.h: ../../sparc/shared/include/spictrl.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/spictrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/spictrl.h
+$(PROJECT_INCLUDE)/bsp/spictrl.h: ../../sparc/shared/include/spictrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spictrl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spictrl.h
 
-$(PROJECT_INCLUDE)/spwcuc.h: ../../sparc/shared/include/spwcuc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/spwcuc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/spwcuc.h
+$(PROJECT_INCLUDE)/bsp/spwcuc.h: ../../sparc/shared/include/spwcuc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spwcuc.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spwcuc.h
 
-$(PROJECT_INCLUDE)/grctm.h: ../../sparc/shared/include/grctm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grctm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grctm.h
+$(PROJECT_INCLUDE)/bsp/grctm.h: ../../sparc/shared/include/grctm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grctm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grctm.h
 
-$(PROJECT_INCLUDE)/grgpio.h: ../../sparc/shared/include/grgpio.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grgpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grgpio.h
+$(PROJECT_INCLUDE)/bsp/grgpio.h: ../../sparc/shared/include/grgpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grgpio.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grgpio.h
 
-$(PROJECT_INCLUDE)/gpiolib.h: ../../sparc/shared/include/gpiolib.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gpiolib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gpiolib.h
+$(PROJECT_INCLUDE)/bsp/gpiolib.h: ../../sparc/shared/include/gpiolib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpiolib.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpiolib.h
 
-$(PROJECT_INCLUDE)/grpwm.h: ../../sparc/shared/include/grpwm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grpwm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grpwm.h
+$(PROJECT_INCLUDE)/bsp/grpwm.h: ../../sparc/shared/include/grpwm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpwm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpwm.h
 
-$(PROJECT_INCLUDE)/gradcdac.h: ../../sparc/shared/include/gradcdac.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gradcdac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gradcdac.h
+$(PROJECT_INCLUDE)/bsp/gradcdac.h: ../../sparc/shared/include/gradcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gradcdac.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gradcdac.h
 
-$(PROJECT_INCLUDE)/mctrl.h: ../../sparc/shared/include/mctrl.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mctrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mctrl.h
+$(PROJECT_INCLUDE)/bsp/mctrl.h: ../../sparc/shared/include/mctrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mctrl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mctrl.h
 
-$(PROJECT_INCLUDE)/grtc.h: ../../sparc/shared/include/grtc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grtc.h
+$(PROJECT_INCLUDE)/bsp/grtc.h: ../../sparc/shared/include/grtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtc.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtc.h
 
-$(PROJECT_INCLUDE)/grtm.h: ../../sparc/shared/include/grtm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grtm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grtm.h
+$(PROJECT_INCLUDE)/bsp/grtm.h: ../../sparc/shared/include/grtm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtm.h
 
 $(PROJECT_INCLUDE)/drvmgr/$(dirstamp):
 	@$(MKDIR_P) $(PROJECT_INCLUDE)/drvmgr
@@ -271,11 +271,11 @@ $(PROJECT_INCLUDE)/drvmgr/bspcommon.h: ../../sparc/shared/include/drvmgr/bspcomm
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/bspcommon.h
 
 if HAS_NETWORKING
-$(PROJECT_INCLUDE)/greth.h: ../../sparc/shared/include/greth.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/greth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/greth.h
+$(PROJECT_INCLUDE)/bsp/greth.h: ../../sparc/shared/include/greth.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/greth.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/greth.h
 
-$(PROJECT_INCLUDE)/network_interface_add.h: ../../sparc/shared/include/network_interface_add.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/network_interface_add.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/network_interface_add.h
+$(PROJECT_INCLUDE)/bsp/network_interface_add.h: ../../sparc/shared/include/network_interface_add.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/network_interface_add.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/network_interface_add.h
 endif
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index 587d4d1d7f..72a074b34e 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -8,7 +8,7 @@ dist_project_lib_DATA = bsp_specs
 
 include_HEADERS = include/bsp.h
 include_HEADERS += include/tm27.h
-include_HEADERS += ../../sparc/shared/include/debug_defs.h
+include_bsp_HEADERS = ../../sparc/shared/include/debug_defs.h
 
 nodist_include_HEADERS = include/bspopts.h
 nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
@@ -49,13 +49,13 @@ libbsp_a_SOURCES += ../../sparc/shared/cpu.c
 libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
 # gnatsupp
 libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
-include_bsp_HEADERS = ../shared/include/gnatcommon.h
+include_bsp_HEADERS += ../shared/include/gnatcommon.h
 # AMBA bus
 include_HEADERS += include/amba.h
 include_HEADERS += ../../sparc/shared/include/ambapp.h
 include_HEADERS += ../../sparc/shared/include/ambapp_ids.h
 include_HEADERS += ../../sparc/shared/include/grlib.h
-include_HEADERS += ../../sparc/shared/include/ahbstat.h
+include_bsp_HEADERS += ../../sparc/shared/include/ahbstat.h
 libbsp_a_SOURCES += amba/amba.c
 libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c
 libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_alloc.c
@@ -70,8 +70,8 @@ libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_show.c
 libbsp_a_SOURCES += ../../sparc/shared/amba/ahbstat.c
 
 # Clock Driver and Timer Library
-include_HEADERS += ../../sparc/shared/include/gptimer.h
-include_HEADERS += ../../sparc/shared/include/tlib.h
+include_bsp_HEADERS += ../../sparc/shared/include/gptimer.h
+include_bsp_HEADERS += ../../sparc/shared/include/tlib.h
 libbsp_a_SOURCES += ../../sparc/shared/timer/gptimer.c
 libbsp_a_SOURCES += ../../sparc/shared/timer/tlib.c
 libbsp_a_SOURCES += ../../sparc/shared/timer/tlib_ckinit.c
@@ -84,13 +84,13 @@ libbsp_a_SOURCES += ../../shared/console-termios.c
 libbsp_a_SOURCES += console/console.c
 libbsp_a_SOURCES += ../../sparc/shared/uart/cons.c
 libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart_cons.c
-include_HEADERS += ../../sparc/shared/include/cons.h
-include_HEADERS += ../../sparc/shared/include/apbuart_cons.h
+include_bsp_HEADERS += ../../sparc/shared/include/cons.h
+include_bsp_HEADERS += ../../sparc/shared/include/apbuart_cons.h
 # debugio
 libbsp_a_SOURCES += console/printk_support.c
 
 # IRQ
-include_HEADERS += ../../sparc/shared/include/genirq.h
+include_bsp_HEADERS += ../../sparc/shared/include/genirq.h
 include_bsp_HEADERS += \
     ../../shared/include/irq-generic.h \
     ../../shared/include/irq-info.h \
@@ -108,9 +108,9 @@ libbsp_a_SOURCES += \
     ../../shared/src/irq-shell.c
 
 # PCI
-include_HEADERS += ../../sparc/shared/include/grpci.h
-include_HEADERS += ../../sparc/shared/include/grpci2.h
-include_HEADERS += ../../sparc/shared/include/pcif.h
+include_bsp_HEADERS += ../../sparc/shared/include/grpci.h
+include_bsp_HEADERS += ../../sparc/shared/include/grpci2.h
+include_bsp_HEADERS += ../../sparc/shared/include/pcif.h
 libbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c
 libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/pcif.c
@@ -118,13 +118,13 @@ libbsp_a_SOURCES +=  ../../sparc/shared/pci/pci_memreg_sparc_le.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/pci_memreg_sparc_be.c
 
 # PCI target devices
-include_HEADERS += ../../sparc/shared/include/gr_701.h
-include_HEADERS += ../../sparc/shared/include/gr_rasta_adcdac.h
-include_HEADERS += ../../sparc/shared/include/gr_rasta_io.h
-include_HEADERS += ../../sparc/shared/include/gr_rasta_spw_router.h
-include_HEADERS += ../../sparc/shared/include/gr_rasta_tmtc.h
-include_HEADERS += ../../sparc/shared/include/gr_tmtc_1553.h
-include_HEADERS += ../../sparc/shared/include/gr_leon4_n2x.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr_701.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_adcdac.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_io.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_spw_router.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_tmtc.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr_tmtc_1553.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr_leon4_n2x.h
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_701.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_rasta_adcdac.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_rasta_io.c
@@ -134,78 +134,78 @@ libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_tmtc_1553.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_leon4_n2x.c
 
 # B1553BRM
-include_HEADERS += ../../sparc/shared/include/b1553brm.h
-include_HEADERS += ../../sparc/shared/include/b1553rt.h
+include_bsp_HEADERS += ../../sparc/shared/include/b1553brm.h
+include_bsp_HEADERS += ../../sparc/shared/include/b1553rt.h
 libbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/b1553rt.c
 
 # GR1553B
-include_HEADERS += ../../sparc/shared/include/gr1553b.h
-include_HEADERS += ../../sparc/shared/include/gr1553bc.h
-include_HEADERS += ../../sparc/shared/include/gr1553bc_list.h
-include_HEADERS += ../../sparc/shared/include/gr1553bm.h
-include_HEADERS += ../../sparc/shared/include/gr1553rt.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr1553b.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc_list.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr1553bm.h
+include_bsp_HEADERS += ../../sparc/shared/include/gr1553rt.h
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553b.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bc.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bm.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553rt.c
 
 # CAN
-include_HEADERS += ../../sparc/shared/include/occan.h \
+include_bsp_HEADERS += ../../sparc/shared/include/occan.h \
     ../../sparc/shared/include/grcan.h
 libbsp_a_SOURCES += ../../sparc/shared/can/occan.c \
     ../../sparc/shared/can/grcan.c
 
 # SpaceWire
-include_HEADERS += ../../sparc/shared/include/grspw.h
-include_HEADERS += ../../sparc/shared/include/grspw_pkt.h
-include_HEADERS += ../../sparc/shared/include/grspw_router.h
+include_bsp_HEADERS += ../../sparc/shared/include/grspw.h
+include_bsp_HEADERS += ../../sparc/shared/include/grspw_pkt.h
+include_bsp_HEADERS += ../../sparc/shared/include/grspw_router.h
 libbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c
 libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_pkt.c
 libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_router.c
 
 # UART
-include_HEADERS += ../../sparc/shared/include/apbuart.h \
+include_bsp_HEADERS += ../../sparc/shared/include/apbuart.h \
     ../../sparc/shared/include/apbuart_termios.h
 libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart.c \
     ../../sparc/shared/uart/apbuart_termios.c
 
 # I2CMST
-include_HEADERS += ../../sparc/shared/include/i2cmst.h
+include_bsp_HEADERS += ../../sparc/shared/include/i2cmst.h
 libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c
 
 # SPI
-include_HEADERS += ../../sparc/shared/include/spictrl.h
+include_bsp_HEADERS += ../../sparc/shared/include/spictrl.h
 libbsp_a_SOURCES += ../../sparc/shared/spi/spictrl.c
 
 # TIME
-include_HEADERS += ../../sparc/shared/include/spwcuc.h
-include_HEADERS += ../../sparc/shared/include/grctm.h
+include_bsp_HEADERS += ../../sparc/shared/include/spwcuc.h
+include_bsp_HEADERS += ../../sparc/shared/include/grctm.h
 libbsp_a_SOURCES += ../../sparc/shared/time/spwcuc.c
 libbsp_a_SOURCES += ../../sparc/shared/time/grctm.c
 
 # GPIO
-include_HEADERS += ../../sparc/shared/include/grgpio.h
-include_HEADERS += ../../sparc/shared/include/gpiolib.h
+include_bsp_HEADERS += ../../sparc/shared/include/grgpio.h
+include_bsp_HEADERS += ../../sparc/shared/include/gpiolib.h
 libbsp_a_SOURCES += ../../sparc/shared/gpio/grgpio.c
 libbsp_a_SOURCES += ../../sparc/shared/gpio/gpiolib.c
 
 # PWM
-include_HEADERS += ../../sparc/shared/include/grpwm.h
+include_bsp_HEADERS += ../../sparc/shared/include/grpwm.h
 libbsp_a_SOURCES += ../../sparc/shared/pwm/grpwm.c
 
 # ADC and DAC
-include_HEADERS += ../../sparc/shared/include/gradcdac.h
+include_bsp_HEADERS += ../../sparc/shared/include/gradcdac.h
 libbsp_a_SOURCES += ../../sparc/shared/analog/gradcdac.c
 
 # Memory controllers
 libbsp_a_SOURCES += ../../sparc/shared/mem/mctrl.c
-include_HEADERS += ../../sparc/shared/include/mctrl.h
+include_bsp_HEADERS += ../../sparc/shared/include/mctrl.h
 
 # timer
 libbsp_a_SOURCES += timer/timer.c
 libbsp_a_SOURCES += timer/watchdog.c
-include_HEADERS += include/watchdog.h
+include_bsp_HEADERS += include/watchdog.h
 
 # Cache
 libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c
@@ -213,18 +213,18 @@ libbsp_a_SOURCES += include/cache_.h
 libbsp_a_CPPFLAGS = -I$(srcdir)/include
 
 # GR712
-include_HEADERS += ../../sparc/shared/include/grascs.h
-include_HEADERS += ../../sparc/shared/include/satcan.h 
-include_HEADERS += ../../sparc/shared/include/canmux.h
-include_HEADERS += ../../sparc/shared/include/grslink.h
+include_bsp_HEADERS += ../../sparc/shared/include/grascs.h
+include_bsp_HEADERS += ../../sparc/shared/include/satcan.h 
+include_bsp_HEADERS += ../../sparc/shared/include/canmux.h
+include_bsp_HEADERS += ../../sparc/shared/include/grslink.h
 libbsp_a_SOURCES += ../../sparc/shared/ascs/grascs.c
 libbsp_a_SOURCES += ../../sparc/shared/can/satcan.c
 libbsp_a_SOURCES += ../../sparc/shared/can/canmux.c
 libbsp_a_SOURCES += ../../sparc/shared/slink/grslink.c
 
 # TM/TC
-include_HEADERS += ../../sparc/shared/include/grtc.h
-include_HEADERS += ../../sparc/shared/include/grtm.h
+include_bsp_HEADERS += ../../sparc/shared/include/grtc.h
+include_bsp_HEADERS += ../../sparc/shared/include/grtm.h
 libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtc.c
 libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtm.c
 
@@ -261,7 +261,7 @@ if HAS_NETWORKING
 noinst_PROGRAMS += leon_greth.rel
 libbsp_a_SOURCES += leon_greth/leon_greth.c
 leon_greth_rel_SOURCES = ../../sparc/shared/net/greth.c
-include_HEADERS += ../../sparc/shared/include/greth.h
+include_bsp_HEADERS += ../../sparc/shared/include/greth.h
 leon_greth_rel_CPPFLAGS = $(AM_CPPFLAGS)
 leon_greth_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 leon_greth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
@@ -269,7 +269,7 @@ endif
 
 # BSP Network configuration
 if HAS_NETWORKING
-include_HEADERS += ../../sparc/shared/include/network_interface_add.h
+include_bsp_HEADERS += ../../sparc/shared/include/network_interface_add.h
 libbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c
 endif
 
diff --git a/c/src/lib/libbsp/sparc/leon3/console/console.c b/c/src/lib/libbsp/sparc/leon3/console/console.c
index 4140bd66c9..ad6e32c4aa 100644
--- a/c/src/lib/libbsp/sparc/leon3/console/console.c
+++ b/c/src/lib/libbsp/sparc/leon3/console/console.c
@@ -28,7 +28,7 @@
 
 #include <bsp.h>
 #include <bsp/fatal.h>
-#include <apbuart_termios.h>
+#include <bsp/apbuart_termios.h>
 
 /* The LEON3 BSP UART driver can rely on the Driver Manager if the
  * DrvMgr is initialized during startup. Otherwise the classic driver
diff --git a/c/src/lib/libbsp/sparc/leon3/console/printk_support.c b/c/src/lib/libbsp/sparc/leon3/console/printk_support.c
index 2fc005ca4b..7b8d3439cb 100644
--- a/c/src/lib/libbsp/sparc/leon3/console/printk_support.c
+++ b/c/src/lib/libbsp/sparc/leon3/console/printk_support.c
@@ -21,8 +21,8 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <stdio.h>
-#include <apbuart.h>
-#include <apbuart_termios.h>
+#include <bsp/apbuart.h>
+#include <bsp/apbuart_termios.h>
 
 int debug_uart_index __attribute__((weak)) = 0;
 struct apbuart_regs *dbg_uart = NULL;
diff --git a/c/src/lib/libbsp/sparc/leon3/preinstall.am b/c/src/lib/libbsp/sparc/leon3/preinstall.am
index fe9b99b536..5ef0a6394a 100644
--- a/c/src/lib/libbsp/sparc/leon3/preinstall.am
+++ b/c/src/lib/libbsp/sparc/leon3/preinstall.am
@@ -45,9 +45,9 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
 
-$(PROJECT_INCLUDE)/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/debug_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/debug_defs.h
+$(PROJECT_INCLUDE)/bsp/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/debug_defs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/debug_defs.h
 
 $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
@@ -105,29 +105,29 @@ $(PROJECT_INCLUDE)/grlib.h: ../../sparc/shared/include/grlib.h $(PROJECT_INCLUDE
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grlib.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/grlib.h
 
-$(PROJECT_INCLUDE)/ahbstat.h: ../../sparc/shared/include/ahbstat.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ahbstat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ahbstat.h
+$(PROJECT_INCLUDE)/bsp/ahbstat.h: ../../sparc/shared/include/ahbstat.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ahbstat.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ahbstat.h
 
-$(PROJECT_INCLUDE)/gptimer.h: ../../sparc/shared/include/gptimer.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gptimer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gptimer.h
+$(PROJECT_INCLUDE)/bsp/gptimer.h: ../../sparc/shared/include/gptimer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gptimer.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gptimer.h
 
-$(PROJECT_INCLUDE)/tlib.h: ../../sparc/shared/include/tlib.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tlib.h
+$(PROJECT_INCLUDE)/bsp/tlib.h: ../../sparc/shared/include/tlib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tlib.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tlib.h
 
-$(PROJECT_INCLUDE)/cons.h: ../../sparc/shared/include/cons.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/cons.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/cons.h
+$(PROJECT_INCLUDE)/bsp/cons.h: ../../sparc/shared/include/cons.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/cons.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/cons.h
 
-$(PROJECT_INCLUDE)/apbuart_cons.h: ../../sparc/shared/include/apbuart_cons.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/apbuart_cons.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/apbuart_cons.h
+$(PROJECT_INCLUDE)/bsp/apbuart_cons.h: ../../sparc/shared/include/apbuart_cons.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart_cons.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart_cons.h
 
-$(PROJECT_INCLUDE)/genirq.h: ../../sparc/shared/include/genirq.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/genirq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/genirq.h
+$(PROJECT_INCLUDE)/bsp/genirq.h: ../../sparc/shared/include/genirq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/genirq.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/genirq.h
 
 $(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
@@ -141,165 +141,165 @@ $(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstam
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
 
-$(PROJECT_INCLUDE)/grpci.h: ../../sparc/shared/include/grpci.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grpci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grpci.h
+$(PROJECT_INCLUDE)/bsp/grpci.h: ../../sparc/shared/include/grpci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci.h
 
-$(PROJECT_INCLUDE)/grpci2.h: ../../sparc/shared/include/grpci2.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grpci2.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grpci2.h
+$(PROJECT_INCLUDE)/bsp/grpci2.h: ../../sparc/shared/include/grpci2.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci2.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci2.h
 
-$(PROJECT_INCLUDE)/pcif.h: ../../sparc/shared/include/pcif.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pcif.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pcif.h
+$(PROJECT_INCLUDE)/bsp/pcif.h: ../../sparc/shared/include/pcif.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pcif.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pcif.h
 
-$(PROJECT_INCLUDE)/gr_701.h: ../../sparc/shared/include/gr_701.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr_701.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr_701.h
+$(PROJECT_INCLUDE)/bsp/gr_701.h: ../../sparc/shared/include/gr_701.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_701.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_701.h
 
-$(PROJECT_INCLUDE)/gr_rasta_adcdac.h: ../../sparc/shared/include/gr_rasta_adcdac.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr_rasta_adcdac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr_rasta_adcdac.h
+$(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h: ../../sparc/shared/include/gr_rasta_adcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h
 
-$(PROJECT_INCLUDE)/gr_rasta_io.h: ../../sparc/shared/include/gr_rasta_io.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr_rasta_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr_rasta_io.h
+$(PROJECT_INCLUDE)/bsp/gr_rasta_io.h: ../../sparc/shared/include/gr_rasta_io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h
 
-$(PROJECT_INCLUDE)/gr_rasta_spw_router.h: ../../sparc/shared/include/gr_rasta_spw_router.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr_rasta_spw_router.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr_rasta_spw_router.h
+$(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h: ../../sparc/shared/include/gr_rasta_spw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h
 
-$(PROJECT_INCLUDE)/gr_rasta_tmtc.h: ../../sparc/shared/include/gr_rasta_tmtc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr_rasta_tmtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr_rasta_tmtc.h
+$(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h: ../../sparc/shared/include/gr_rasta_tmtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h
 
-$(PROJECT_INCLUDE)/gr_tmtc_1553.h: ../../sparc/shared/include/gr_tmtc_1553.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr_tmtc_1553.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr_tmtc_1553.h
+$(PROJECT_INCLUDE)/bsp/gr_tmtc_1553.h: ../../sparc/shared/include/gr_tmtc_1553.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_tmtc_1553.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_tmtc_1553.h
 
-$(PROJECT_INCLUDE)/gr_leon4_n2x.h: ../../sparc/shared/include/gr_leon4_n2x.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr_leon4_n2x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr_leon4_n2x.h
+$(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h: ../../sparc/shared/include/gr_leon4_n2x.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h
 
-$(PROJECT_INCLUDE)/b1553brm.h: ../../sparc/shared/include/b1553brm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/b1553brm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/b1553brm.h
+$(PROJECT_INCLUDE)/bsp/b1553brm.h: ../../sparc/shared/include/b1553brm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553brm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553brm.h
 
-$(PROJECT_INCLUDE)/b1553rt.h: ../../sparc/shared/include/b1553rt.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/b1553rt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/b1553rt.h
+$(PROJECT_INCLUDE)/bsp/b1553rt.h: ../../sparc/shared/include/b1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553rt.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553rt.h
 
-$(PROJECT_INCLUDE)/gr1553b.h: ../../sparc/shared/include/gr1553b.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr1553b.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr1553b.h
+$(PROJECT_INCLUDE)/bsp/gr1553b.h: ../../sparc/shared/include/gr1553b.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553b.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553b.h
 
-$(PROJECT_INCLUDE)/gr1553bc.h: ../../sparc/shared/include/gr1553bc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr1553bc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr1553bc.h
+$(PROJECT_INCLUDE)/bsp/gr1553bc.h: ../../sparc/shared/include/gr1553bc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc.h
 
-$(PROJECT_INCLUDE)/gr1553bc_list.h: ../../sparc/shared/include/gr1553bc_list.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr1553bc_list.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr1553bc_list.h
+$(PROJECT_INCLUDE)/bsp/gr1553bc_list.h: ../../sparc/shared/include/gr1553bc_list.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h
 
-$(PROJECT_INCLUDE)/gr1553bm.h: ../../sparc/shared/include/gr1553bm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr1553bm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr1553bm.h
+$(PROJECT_INCLUDE)/bsp/gr1553bm.h: ../../sparc/shared/include/gr1553bm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bm.h
 
-$(PROJECT_INCLUDE)/gr1553rt.h: ../../sparc/shared/include/gr1553rt.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr1553rt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gr1553rt.h
+$(PROJECT_INCLUDE)/bsp/gr1553rt.h: ../../sparc/shared/include/gr1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553rt.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553rt.h
 
-$(PROJECT_INCLUDE)/occan.h: ../../sparc/shared/include/occan.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/occan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/occan.h
+$(PROJECT_INCLUDE)/bsp/occan.h: ../../sparc/shared/include/occan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/occan.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/occan.h
 
-$(PROJECT_INCLUDE)/grcan.h: ../../sparc/shared/include/grcan.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grcan.h
+$(PROJECT_INCLUDE)/bsp/grcan.h: ../../sparc/shared/include/grcan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grcan.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grcan.h
 
-$(PROJECT_INCLUDE)/grspw.h: ../../sparc/shared/include/grspw.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grspw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grspw.h
+$(PROJECT_INCLUDE)/bsp/grspw.h: ../../sparc/shared/include/grspw.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw.h
 
-$(PROJECT_INCLUDE)/grspw_pkt.h: ../../sparc/shared/include/grspw_pkt.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grspw_pkt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grspw_pkt.h
+$(PROJECT_INCLUDE)/bsp/grspw_pkt.h: ../../sparc/shared/include/grspw_pkt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_pkt.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_pkt.h
 
-$(PROJECT_INCLUDE)/grspw_router.h: ../../sparc/shared/include/grspw_router.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grspw_router.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grspw_router.h
+$(PROJECT_INCLUDE)/bsp/grspw_router.h: ../../sparc/shared/include/grspw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_router.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_router.h
 
-$(PROJECT_INCLUDE)/apbuart.h: ../../sparc/shared/include/apbuart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/apbuart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/apbuart.h
+$(PROJECT_INCLUDE)/bsp/apbuart.h: ../../sparc/shared/include/apbuart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart.h
 
-$(PROJECT_INCLUDE)/apbuart_termios.h: ../../sparc/shared/include/apbuart_termios.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/apbuart_termios.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/apbuart_termios.h
+$(PROJECT_INCLUDE)/bsp/apbuart_termios.h: ../../sparc/shared/include/apbuart_termios.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart_termios.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart_termios.h
 
-$(PROJECT_INCLUDE)/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2cmst.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2cmst.h
+$(PROJECT_INCLUDE)/bsp/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2cmst.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2cmst.h
 
-$(PROJECT_INCLUDE)/spictrl.h: ../../sparc/shared/include/spictrl.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/spictrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/spictrl.h
+$(PROJECT_INCLUDE)/bsp/spictrl.h: ../../sparc/shared/include/spictrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spictrl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spictrl.h
 
-$(PROJECT_INCLUDE)/spwcuc.h: ../../sparc/shared/include/spwcuc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/spwcuc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/spwcuc.h
+$(PROJECT_INCLUDE)/bsp/spwcuc.h: ../../sparc/shared/include/spwcuc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spwcuc.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spwcuc.h
 
-$(PROJECT_INCLUDE)/grctm.h: ../../sparc/shared/include/grctm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grctm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grctm.h
+$(PROJECT_INCLUDE)/bsp/grctm.h: ../../sparc/shared/include/grctm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grctm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grctm.h
 
-$(PROJECT_INCLUDE)/grgpio.h: ../../sparc/shared/include/grgpio.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grgpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grgpio.h
+$(PROJECT_INCLUDE)/bsp/grgpio.h: ../../sparc/shared/include/grgpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grgpio.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grgpio.h
 
-$(PROJECT_INCLUDE)/gpiolib.h: ../../sparc/shared/include/gpiolib.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gpiolib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gpiolib.h
+$(PROJECT_INCLUDE)/bsp/gpiolib.h: ../../sparc/shared/include/gpiolib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpiolib.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpiolib.h
 
-$(PROJECT_INCLUDE)/grpwm.h: ../../sparc/shared/include/grpwm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grpwm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grpwm.h
+$(PROJECT_INCLUDE)/bsp/grpwm.h: ../../sparc/shared/include/grpwm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpwm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpwm.h
 
-$(PROJECT_INCLUDE)/gradcdac.h: ../../sparc/shared/include/gradcdac.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gradcdac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/gradcdac.h
+$(PROJECT_INCLUDE)/bsp/gradcdac.h: ../../sparc/shared/include/gradcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gradcdac.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gradcdac.h
 
-$(PROJECT_INCLUDE)/mctrl.h: ../../sparc/shared/include/mctrl.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mctrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mctrl.h
+$(PROJECT_INCLUDE)/bsp/mctrl.h: ../../sparc/shared/include/mctrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mctrl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mctrl.h
 
-$(PROJECT_INCLUDE)/watchdog.h: include/watchdog.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/watchdog.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/watchdog.h
+$(PROJECT_INCLUDE)/bsp/watchdog.h: include/watchdog.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/watchdog.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/watchdog.h
 
-$(PROJECT_INCLUDE)/grascs.h: ../../sparc/shared/include/grascs.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grascs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grascs.h
+$(PROJECT_INCLUDE)/bsp/grascs.h: ../../sparc/shared/include/grascs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grascs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grascs.h
 
-$(PROJECT_INCLUDE)/satcan.h: ../../sparc/shared/include/satcan.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/satcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/satcan.h
+$(PROJECT_INCLUDE)/bsp/satcan.h: ../../sparc/shared/include/satcan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/satcan.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/satcan.h
 
-$(PROJECT_INCLUDE)/canmux.h: ../../sparc/shared/include/canmux.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/canmux.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/canmux.h
+$(PROJECT_INCLUDE)/bsp/canmux.h: ../../sparc/shared/include/canmux.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/canmux.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/canmux.h
 
-$(PROJECT_INCLUDE)/grslink.h: ../../sparc/shared/include/grslink.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grslink.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grslink.h
+$(PROJECT_INCLUDE)/bsp/grslink.h: ../../sparc/shared/include/grslink.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grslink.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grslink.h
 
-$(PROJECT_INCLUDE)/grtc.h: ../../sparc/shared/include/grtc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grtc.h
+$(PROJECT_INCLUDE)/bsp/grtc.h: ../../sparc/shared/include/grtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtc.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtc.h
 
-$(PROJECT_INCLUDE)/grtm.h: ../../sparc/shared/include/grtm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grtm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grtm.h
+$(PROJECT_INCLUDE)/bsp/grtm.h: ../../sparc/shared/include/grtm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtm.h
 
 $(PROJECT_INCLUDE)/drvmgr/$(dirstamp):
 	@$(MKDIR_P) $(PROJECT_INCLUDE)/drvmgr
@@ -319,12 +319,12 @@ $(PROJECT_INCLUDE)/drvmgr/bspcommon.h: ../../sparc/shared/include/drvmgr/bspcomm
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/bspcommon.h
 
 if HAS_NETWORKING
-$(PROJECT_INCLUDE)/greth.h: ../../sparc/shared/include/greth.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/greth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/greth.h
+$(PROJECT_INCLUDE)/bsp/greth.h: ../../sparc/shared/include/greth.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/greth.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/greth.h
 endif
 if HAS_NETWORKING
-$(PROJECT_INCLUDE)/network_interface_add.h: ../../sparc/shared/include/network_interface_add.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/network_interface_add.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/network_interface_add.h
+$(PROJECT_INCLUDE)/bsp/network_interface_add.h: ../../sparc/shared/include/network_interface_add.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/network_interface_add.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/network_interface_add.h
 endif
diff --git a/c/src/lib/libbsp/sparc/leon3/timer/watchdog.c b/c/src/lib/libbsp/sparc/leon3/timer/watchdog.c
index 37e0d43094..5ec5bb639c 100644
--- a/c/src/lib/libbsp/sparc/leon3/timer/watchdog.c
+++ b/c/src/lib/libbsp/sparc/leon3/timer/watchdog.c
@@ -11,7 +11,7 @@
  */
 
 #include <bsp.h>
-#include <watchdog.h>
+#include <bsp/watchdog.h>
 #include <grlib.h>
 
 extern volatile struct gptimer_regs *LEON3_Timer_Regs;
diff --git a/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c b/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c
index da8e2afdb6..d998748e94 100644
--- a/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c
+++ b/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c
@@ -27,7 +27,7 @@
 #include <rtems/bspIo.h>
 
 #include <drvmgr/drvmgr.h>
-#include <b1553brm.h>
+#include <bsp/b1553brm.h>
 #include <ambapp.h>
 #include <drvmgr/ambapp_bus.h>
 
diff --git a/c/src/lib/libbsp/sparc/shared/1553/b1553rt.c b/c/src/lib/libbsp/sparc/shared/1553/b1553rt.c
index 57bc4d3b50..b5561089c3 100644
--- a/c/src/lib/libbsp/sparc/shared/1553/b1553rt.c
+++ b/c/src/lib/libbsp/sparc/shared/1553/b1553rt.c
@@ -19,7 +19,7 @@
 #include <rtems/bspIo.h>
 
 #include <drvmgr/drvmgr.h>
-#include <b1553rt.h>
+#include <bsp/b1553rt.h>
 #include <ambapp.h>
 #include <drvmgr/ambapp_bus.h>
 
diff --git a/c/src/lib/libbsp/sparc/shared/1553/gr1553b.c b/c/src/lib/libbsp/sparc/shared/1553/gr1553b.c
index c715e4fa40..c92cbdc051 100644
--- a/c/src/lib/libbsp/sparc/shared/1553/gr1553b.c
+++ b/c/src/lib/libbsp/sparc/shared/1553/gr1553b.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <drvmgr/ambapp_bus.h>
 
-#include <gr1553b.h>
+#include <bsp/gr1553b.h>
 
 /* Driver Manager interface for BC, RT, BM, BRM, BC-BM and RT-BM */
 
diff --git a/c/src/lib/libbsp/sparc/shared/1553/gr1553bc.c b/c/src/lib/libbsp/sparc/shared/1553/gr1553bc.c
index 636d39cca9..e61c36d858 100644
--- a/c/src/lib/libbsp/sparc/shared/1553/gr1553bc.c
+++ b/c/src/lib/libbsp/sparc/shared/1553/gr1553bc.c
@@ -13,8 +13,8 @@
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
 
-#include <gr1553b.h>
-#include <gr1553bc.h>
+#include <bsp/gr1553b.h>
+#include <bsp/gr1553bc.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/c/src/lib/libbsp/sparc/shared/1553/gr1553bm.c b/c/src/lib/libbsp/sparc/shared/1553/gr1553bm.c
index 746899fa8f..2cc7d3afc7 100644
--- a/c/src/lib/libbsp/sparc/shared/1553/gr1553bm.c
+++ b/c/src/lib/libbsp/sparc/shared/1553/gr1553bm.c
@@ -13,8 +13,8 @@
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
 
-#include <gr1553b.h>
-#include <gr1553bm.h>
+#include <bsp/gr1553b.h>
+#include <bsp/gr1553bm.h>
 
 
 #define GR1553BM_WRITE_MEM(adr, val) *(volatile uint32_t *)(adr) = (uint32_t)(val)
diff --git a/c/src/lib/libbsp/sparc/shared/1553/gr1553rt.c b/c/src/lib/libbsp/sparc/shared/1553/gr1553rt.c
index f1d5fdd395..e1acd046f5 100644
--- a/c/src/lib/libbsp/sparc/shared/1553/gr1553rt.c
+++ b/c/src/lib/libbsp/sparc/shared/1553/gr1553rt.c
@@ -13,8 +13,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <gr1553b.h>
-#include <gr1553rt.h>
+#include <bsp/gr1553b.h>
+#include <bsp/gr1553rt.h>
 
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
diff --git a/c/src/lib/libbsp/sparc/shared/amba/ahbstat.c b/c/src/lib/libbsp/sparc/shared/amba/ahbstat.c
index 8825a29439..5e7ecd7047 100644
--- a/c/src/lib/libbsp/sparc/shared/amba/ahbstat.c
+++ b/c/src/lib/libbsp/sparc/shared/amba/ahbstat.c
@@ -12,7 +12,7 @@
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
 
-#include <ahbstat.h>
+#include <bsp/ahbstat.h>
 
 void ahbstat_isr(void *arg);
 
diff --git a/c/src/lib/libbsp/sparc/shared/analog/gradcdac.c b/c/src/lib/libbsp/sparc/shared/analog/gradcdac.c
index c04c856b09..96e86b16f9 100644
--- a/c/src/lib/libbsp/sparc/shared/analog/gradcdac.c
+++ b/c/src/lib/libbsp/sparc/shared/analog/gradcdac.c
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
-#include <gradcdac.h>
+#include <bsp/gradcdac.h>
 
 /****************** DEBUG Definitions ********************/
 #define DBG_IOCTRL 1
@@ -26,7 +26,7 @@
 #define DEBUG
 #define DEBUGFUNCS
 */
-#include <debug_defs.h>
+#include <bsp/debug_defs.h>
 
 struct gradcdac_priv {
 	struct gradcdac_regs *regs;	/* Must be first */
diff --git a/c/src/lib/libbsp/sparc/shared/ascs/grascs.c b/c/src/lib/libbsp/sparc/shared/ascs/grascs.c
index a2019703d1..b9319caffd 100644
--- a/c/src/lib/libbsp/sparc/shared/ascs/grascs.c
+++ b/c/src/lib/libbsp/sparc/shared/ascs/grascs.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <bsp.h>
 #include <ambapp.h>
-#include <grascs.h>
+#include <bsp/grascs.h>
 
 #ifndef GAISLER_ASCS
 #define GAISLER_ASCS 0x043
diff --git a/c/src/lib/libbsp/sparc/shared/can/canmux.c b/c/src/lib/libbsp/sparc/shared/can/canmux.c
index 0884d911f5..fecdfd867e 100644
--- a/c/src/lib/libbsp/sparc/shared/can/canmux.c
+++ b/c/src/lib/libbsp/sparc/shared/can/canmux.c
@@ -16,7 +16,7 @@
 #include <bsp.h>
 #include <rtems/bspIo.h> /* printk */
 
-#include <canmux.h>
+#include <bsp/canmux.h>
 #include <ambapp.h>
 
 #ifndef GAISLER_CANMUX
diff --git a/c/src/lib/libbsp/sparc/shared/can/grcan.c b/c/src/lib/libbsp/sparc/shared/can/grcan.c
index 7ad53e1fb6..1d7d1ba872 100644
--- a/c/src/lib/libbsp/sparc/shared/can/grcan.c
+++ b/c/src/lib/libbsp/sparc/shared/can/grcan.c
@@ -18,7 +18,7 @@
 #include <ctype.h>
 #include <rtems/bspIo.h>
 
-#include <grcan.h>
+#include <bsp/grcan.h>
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
 #include <ambapp.h>
@@ -85,7 +85,7 @@
 #define DEBUG
 #define DEBUGFUNCS
 */
-#include <debug_defs.h>
+#include <bsp/debug_defs.h>
 
 /*********************************************************/
 
diff --git a/c/src/lib/libbsp/sparc/shared/can/occan.c b/c/src/lib/libbsp/sparc/shared/can/occan.c
index b9050cdb8e..2f113c44bd 100644
--- a/c/src/lib/libbsp/sparc/shared/can/occan.c
+++ b/c/src/lib/libbsp/sparc/shared/can/occan.c
@@ -17,7 +17,7 @@
 
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
-#include <occan.h>
+#include <bsp/occan.h>
 
 /* RTEMS -> ERRNO decoding table
 
diff --git a/c/src/lib/libbsp/sparc/shared/can/satcan.c b/c/src/lib/libbsp/sparc/shared/can/satcan.c
index 36c6bb9f5d..d21d00e0f0 100644
--- a/c/src/lib/libbsp/sparc/shared/can/satcan.c
+++ b/c/src/lib/libbsp/sparc/shared/can/satcan.c
@@ -16,7 +16,7 @@
 #include <bsp.h>
 #include <rtems/bspIo.h> /* printk */
 
-#include <satcan.h>
+#include <bsp/satcan.h>
 #include <ambapp.h>
 
 #ifndef GAISLER_SATCAN
diff --git a/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus_grlib.c b/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus_grlib.c
index 69b2816e5b..ebca4252ce 100644
--- a/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus_grlib.c
+++ b/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus_grlib.c
@@ -19,7 +19,7 @@
 
 #include <drvmgr/ambapp_bus.h>
 #include <drvmgr/ambapp_bus_grlib.h>
-#include <genirq.h>
+#include <bsp/genirq.h>
 
 #include <bsp.h>
 
diff --git a/c/src/lib/libbsp/sparc/shared/gpio/gpiolib.c b/c/src/lib/libbsp/sparc/shared/gpio/gpiolib.c
index 6fb1cfc70c..08f8eaa4fa 100644
--- a/c/src/lib/libbsp/sparc/shared/gpio/gpiolib.c
+++ b/c/src/lib/libbsp/sparc/shared/gpio/gpiolib.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <gpiolib.h>
+#include <bsp/gpiolib.h>
 
 struct gpiolib_port;
 
diff --git a/c/src/lib/libbsp/sparc/shared/gpio/grgpio.c b/c/src/lib/libbsp/sparc/shared/gpio/grgpio.c
index e9a5426d88..f3fb88699f 100644
--- a/c/src/lib/libbsp/sparc/shared/gpio/grgpio.c
+++ b/c/src/lib/libbsp/sparc/shared/gpio/grgpio.c
@@ -18,8 +18,8 @@
 
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
-#include <grgpio.h>
-#include <gpiolib.h>
+#include <bsp/grgpio.h>
+#include <bsp/gpiolib.h>
 #include <ambapp.h>
 #include <grlib.h>
 
diff --git a/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c b/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c
index b95e39f4fd..347b3fa5bd 100644
--- a/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c
+++ b/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c
@@ -19,7 +19,7 @@
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
 
-#include <i2cmst.h>
+#include <bsp/i2cmst.h>
 
 /* Enable debug printks? */
 /*#define DEBUG*/
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bc.h b/c/src/lib/libbsp/sparc/shared/include/gr1553bc.h
index cb71b92394..d0ebd7bf3e 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr1553bc.h
+++ b/c/src/lib/libbsp/sparc/shared/include/gr1553bc.h
@@ -40,7 +40,7 @@ struct gr1553bc_major_cfg;
 #endif
 
 #include <stdint.h>
-#include <gr1553bc_list.h>
+#include <bsp/gr1553bc_list.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h b/c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h
index 24f52815af..b717da2097 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h
+++ b/c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h
@@ -193,7 +193,7 @@
  */
 
 #include <stdint.h>
-#include <gr1553bc.h>
+#include <bsp/gr1553bc.h>
 
 /**** CONFIGURATION OPTIONS ****/
 
diff --git a/c/src/lib/libbsp/sparc/shared/irq/genirq.c b/c/src/lib/libbsp/sparc/shared/irq/genirq.c
index 57654b38bf..fa419b1394 100644
--- a/c/src/lib/libbsp/sparc/shared/irq/genirq.c
+++ b/c/src/lib/libbsp/sparc/shared/irq/genirq.c
@@ -12,7 +12,7 @@
 #include <rtems.h>
 #include <stdlib.h>
 #include <string.h>
-#include <genirq.h>
+#include <bsp/genirq.h>
 
 struct genirq_handler_entry {
 	struct genirq_handler_entry	*next;		/* Next ISR entry for this IRQ number */
diff --git a/c/src/lib/libbsp/sparc/shared/mem/mctrl.c b/c/src/lib/libbsp/sparc/shared/mem/mctrl.c
index a9407356ba..31ec32e66d 100644
--- a/c/src/lib/libbsp/sparc/shared/mem/mctrl.c
+++ b/c/src/lib/libbsp/sparc/shared/mem/mctrl.c
@@ -20,7 +20,7 @@
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
 
-#include <mctrl.h>
+#include <bsp/mctrl.h>
 
 #define MEMSET(priv, start, c, length) memset((void *)start, c, length)
 
diff --git a/c/src/lib/libbsp/sparc/shared/net/greth.c b/c/src/lib/libbsp/sparc/shared/net/greth.c
index d5d477fc6e..a6b38ef82a 100644
--- a/c/src/lib/libbsp/sparc/shared/net/greth.c
+++ b/c/src/lib/libbsp/sparc/shared/net/greth.c
@@ -27,7 +27,7 @@
 #include <rtems/error.h>
 #include <rtems/rtems_bsdnet.h>
 
-#include <greth.h>
+#include <bsp/greth.h>
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
 #include <ambapp.h>
diff --git a/c/src/lib/libbsp/sparc/shared/net/network_interface_add.c b/c/src/lib/libbsp/sparc/shared/net/network_interface_add.c
index 6e3a58a75c..dd6e12f8db 100644
--- a/c/src/lib/libbsp/sparc/shared/net/network_interface_add.c
+++ b/c/src/lib/libbsp/sparc/shared/net/network_interface_add.c
@@ -17,7 +17,7 @@
 #include <rtems/rtems_bsdnet.h>
 #include <stdio.h>
 
-#include <network_interface_add.h>
+#include <bsp/network_interface_add.h>
 
 extern struct rtems_bsdnet_config rtems_bsdnet_config;
 
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_701.c b/c/src/lib/libbsp/sparc/shared/pci/gr_701.c
index b52b14a214..815b850c6d 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_701.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_701.c
@@ -33,9 +33,9 @@
 #include <drvmgr/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
 #include <drvmgr/bspcommon.h>
-#include <genirq.h>
+#include <bsp/genirq.h>
 
-#include <gr_701.h>
+#include <bsp/gr_701.h>
 
 /* Offset from 0x80000000 (dual bus version) */
 #define AHB1_BASE_ADDR 0x80000000
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c b/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c
index d997162ecd..2423248ade 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c
@@ -40,9 +40,9 @@
 #include <drvmgr/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
 #include <drvmgr/bspcommon.h>
-#include <genirq.h>
+#include <bsp/genirq.h>
 
-#include <gr_leon4_n2x.h>
+#include <bsp/gr_leon4_n2x.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/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c
index 145c9f267e..96225c8b64 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c
@@ -31,9 +31,9 @@
 #include <drvmgr/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
 #include <drvmgr/bspcommon.h>
-#include <genirq.h>
+#include <bsp/genirq.h>
 
-#include <gr_rasta_adcdac.h>
+#include <bsp/gr_rasta_adcdac.h>
 
 /*#define DEBUG 1*/
 
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c
index 06af6d0f9e..417056f692 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c
@@ -31,9 +31,9 @@
 #include <drvmgr/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
 #include <drvmgr/bspcommon.h>
-#include <genirq.h>
+#include <bsp/genirq.h>
 
-#include <gr_rasta_io.h>
+#include <bsp/gr_rasta_io.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/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c
index 92e6b4af83..986adcc75e 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c
@@ -29,8 +29,8 @@
 #include <drvmgr/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
 #include <drvmgr/bspcommon.h>
-#include <genirq.h>
-#include <gr_rasta_spw_router.h>
+#include <bsp/genirq.h>
+#include <bsp/gr_rasta_spw_router.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/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c
index 7714a00aba..809919ee3c 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c
@@ -31,9 +31,9 @@
 #include <drvmgr/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
 #include <drvmgr/bspcommon.h>
-#include <genirq.h>
+#include <bsp/genirq.h>
 
-#include <gr_rasta_tmtc.h>
+#include <bsp/gr_rasta_tmtc.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/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c b/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c
index c2bd8ebde9..28d93b493d 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c
@@ -32,9 +32,9 @@
 #include <drvmgr/ambapp_bus.h>
 #include <drvmgr/pci_bus.h>
 #include <drvmgr/bspcommon.h>
-#include <genirq.h>
+#include <bsp/genirq.h>
 
-#include <gr_tmtc_1553.h>
+#include <bsp/gr_tmtc_1553.h>
 
 
 /*#define DEBUG 1 */
diff --git a/c/src/lib/libbsp/sparc/shared/pci/grpci.c b/c/src/lib/libbsp/sparc/shared/pci/grpci.c
index af3d0359ab..b417956d90 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/grpci.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/grpci.c
@@ -29,7 +29,7 @@
 #include <drvmgr/ambapp_bus.h>
 #include <ambapp.h>
 #include <drvmgr/pci_bus.h>
-#include <grpci.h>
+#include <bsp/grpci.h>
 
 #define DMAPCI_ADDR 0x80000500
 
diff --git a/c/src/lib/libbsp/sparc/shared/pci/grpci2.c b/c/src/lib/libbsp/sparc/shared/pci/grpci2.c
index 53c4181d68..07bc8038b3 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/grpci2.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/grpci2.c
@@ -40,7 +40,7 @@
 #include <drvmgr/ambapp_bus.h>
 #include <ambapp.h>
 #include <drvmgr/pci_bus.h>
-#include <grpci2.h>
+#include <bsp/grpci2.h>
 
 #ifndef IRQ_GLOBAL_PREPARE
  #define IRQ_GLOBAL_PREPARE(level) rtems_interrupt_level level
diff --git a/c/src/lib/libbsp/sparc/shared/pci/pcif.c b/c/src/lib/libbsp/sparc/shared/pci/pcif.c
index 8ace3dfc5f..32de562283 100644
--- a/c/src/lib/libbsp/sparc/shared/pci/pcif.c
+++ b/c/src/lib/libbsp/sparc/shared/pci/pcif.c
@@ -29,7 +29,7 @@
 #include <drvmgr/ambapp_bus.h>
 #include <ambapp.h>
 #include <drvmgr/pci_bus.h>
-#include <pcif.h>
+#include <bsp/pcif.h>
 
 
 /* Configuration options */
diff --git a/c/src/lib/libbsp/sparc/shared/pwm/grpwm.c b/c/src/lib/libbsp/sparc/shared/pwm/grpwm.c
index b4506c67e7..8a5db9a796 100644
--- a/c/src/lib/libbsp/sparc/shared/pwm/grpwm.c
+++ b/c/src/lib/libbsp/sparc/shared/pwm/grpwm.c
@@ -19,7 +19,7 @@
 
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
-#include <grpwm.h>
+#include <bsp/grpwm.h>
 #include <ambapp.h>
 
 /* #define DEBUG 1 */
diff --git a/c/src/lib/libbsp/sparc/shared/slink/grslink.c b/c/src/lib/libbsp/sparc/shared/slink/grslink.c
index 0c3d086a64..474c9c354e 100644
--- a/c/src/lib/libbsp/sparc/shared/slink/grslink.c
+++ b/c/src/lib/libbsp/sparc/shared/slink/grslink.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 
 #include <bsp.h>
-#include <grslink.h>
+#include <bsp/grslink.h>
 #include <ambapp.h>
 
 #ifndef GAISLER_SLINK
@@ -553,7 +553,7 @@ void SLINK_seqabort(void)
  * Function: SLINK_seqstatus
  * Returns: The current or status of the SEQUENCE operation:
  *          SLINK_COMPLETED, SLINK_ACTIVE, SLINK_PARERR, SLINK_AMBAERR,
- *          SLINK_ABORTED (these are defined in grslink.h)
+ *          SLINK_ABORTED (these are defined in bsp/grslink.h)
  * Description: Meaning of returned values:
  *              SLINK_ABORTED: Aborted before all operations completed.
  *              SLINK_ACTIVE: The core is busy processing the SEQUENCE
@@ -588,7 +588,7 @@ int SLINK_seqwrds(void)
 /* 
  * Function: SLINK_hwstatus
  * Returns: The SLINK core's status register. The register values can be 
- *          interpreted with the help of macros defined in grslink.h.
+ *          interpreted with the help of macros defined in bsp/grslink.h.
  */
 int SLINK_hwstatus(void)
 {
diff --git a/c/src/lib/libbsp/sparc/shared/spi/spictrl.c b/c/src/lib/libbsp/sparc/shared/spi/spictrl.c
index dab478d4f1..b34b037394 100644
--- a/c/src/lib/libbsp/sparc/shared/spi/spictrl.c
+++ b/c/src/lib/libbsp/sparc/shared/spi/spictrl.c
@@ -19,7 +19,7 @@
 
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
-#include <spictrl.h>
+#include <bsp/spictrl.h>
 #include <ambapp.h>
 
 #include <rtems/libi2c.h>
diff --git a/c/src/lib/libbsp/sparc/shared/spw/grspw.c b/c/src/lib/libbsp/sparc/shared/spw/grspw.c
index d50e7574b6..a145b1c3ab 100644
--- a/c/src/lib/libbsp/sparc/shared/spw/grspw.c
+++ b/c/src/lib/libbsp/sparc/shared/spw/grspw.c
@@ -22,7 +22,7 @@
 
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
-#include <grspw.h>
+#include <bsp/grspw.h>
 
 #define DBGSPW_IOCALLS 1
 #define DBGSPW_TX 2
diff --git a/c/src/lib/libbsp/sparc/shared/spw/grspw_pkt.c b/c/src/lib/libbsp/sparc/shared/spw/grspw_pkt.c
index 41ca009bc7..7c9d898e4b 100644
--- a/c/src/lib/libbsp/sparc/shared/spw/grspw_pkt.c
+++ b/c/src/lib/libbsp/sparc/shared/spw/grspw_pkt.c
@@ -26,7 +26,7 @@
 #include <drvmgr/drvmgr.h>
 #include <ambapp.h>
 #include <drvmgr/ambapp_bus.h>
-#include <grspw_pkt.h>
+#include <bsp/grspw_pkt.h>
 
 /* This driver has been prepared for SMP operation however never tested 
  * on a SMP system - use on your own risk.
diff --git a/c/src/lib/libbsp/sparc/shared/spw/grspw_router.c b/c/src/lib/libbsp/sparc/shared/spw/grspw_router.c
index b0d0c610ce..a2e0b44297 100644
--- a/c/src/lib/libbsp/sparc/shared/spw/grspw_router.c
+++ b/c/src/lib/libbsp/sparc/shared/spw/grspw_router.c
@@ -14,7 +14,7 @@
 
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
-#include <grspw_router.h>
+#include <bsp/grspw_router.h>
 
 #define ROUTER_DBG(args...)
 
diff --git a/c/src/lib/libbsp/sparc/shared/time/grctm.c b/c/src/lib/libbsp/sparc/shared/time/grctm.c
index c756a430ae..e83aeedac2 100644
--- a/c/src/lib/libbsp/sparc/shared/time/grctm.c
+++ b/c/src/lib/libbsp/sparc/shared/time/grctm.c
@@ -12,7 +12,7 @@
 #include <drvmgr/ambapp_bus.h>
 #include <stdlib.h>
 
-#include <grctm.h>
+#include <bsp/grctm.h>
 
 /* Private structure of GRCTM driver */
 struct grctm_priv {
diff --git a/c/src/lib/libbsp/sparc/shared/time/spwcuc.c b/c/src/lib/libbsp/sparc/shared/time/spwcuc.c
index f5d0f11237..a1912017fe 100644
--- a/c/src/lib/libbsp/sparc/shared/time/spwcuc.c
+++ b/c/src/lib/libbsp/sparc/shared/time/spwcuc.c
@@ -13,7 +13,7 @@
 #include <drvmgr/ambapp_bus.h>
 #include <stdlib.h>
  
-#include <spwcuc.h>
+#include <bsp/spwcuc.h>
 
 /* Private structure of SPWCUC driver. */
 struct spwcuc_priv {
diff --git a/c/src/lib/libbsp/sparc/shared/timer/gptimer.c b/c/src/lib/libbsp/sparc/shared/timer/gptimer.c
index f8dec2be1c..de35cd75f4 100644
--- a/c/src/lib/libbsp/sparc/shared/timer/gptimer.c
+++ b/c/src/lib/libbsp/sparc/shared/timer/gptimer.c
@@ -37,8 +37,8 @@
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
 #include <grlib.h>
-#include <gptimer.h>
-#include "tlib.h"
+#include <bsp/gptimer.h>
+#include <bsp/tlib.h>
 
 #if defined(LEON3) && defined(RTEMS_DRVMGR_STARTUP)
 #include <leon.h>
diff --git a/c/src/lib/libbsp/sparc/shared/timer/tlib.c b/c/src/lib/libbsp/sparc/shared/timer/tlib.c
index d1f68eded2..ea62c4d13d 100644
--- a/c/src/lib/libbsp/sparc/shared/timer/tlib.c
+++ b/c/src/lib/libbsp/sparc/shared/timer/tlib.c
@@ -10,7 +10,7 @@
  */
 
 #include <rtems.h>
-#include <tlib.h>
+#include <bsp/tlib.h>
 
 struct tlib_dev *tlib_dev_head = NULL;
 struct tlib_dev *tlib_dev_tail = NULL;
diff --git a/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c b/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c
index a5afbbeafa..a656ee52af 100644
--- a/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c
+++ b/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c
@@ -14,7 +14,7 @@
 #include <rtems.h>
 #include <stdlib.h>
 #include <bsp.h>
-#include <tlib.h>
+#include <bsp/tlib.h>
 
 #ifdef RTEMS_DRVMGR_STARTUP
 
diff --git a/c/src/lib/libbsp/sparc/shared/tmtc/grtc.c b/c/src/lib/libbsp/sparc/shared/tmtc/grtc.c
index 600c40ac7d..d1e4ab7e79 100644
--- a/c/src/lib/libbsp/sparc/shared/tmtc/grtc.c
+++ b/c/src/lib/libbsp/sparc/shared/tmtc/grtc.c
@@ -21,7 +21,7 @@
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
 #include <ambapp.h>
-#include <grtc.h>
+#include <bsp/grtc.h>
 
 #ifndef IRQ_GLOBAL_PREPARE
  #define IRQ_GLOBAL_PREPARE(level) rtems_interrupt_level level
@@ -40,7 +40,7 @@
 #define DEBUGFUNCS
 */
 
-#include <debug_defs.h>
+#include <bsp/debug_defs.h>
 
 #ifdef DEBUG_ERROR
 #define DEBUG_ERR_LOG(device,error) grtc_log_error(device,error)
diff --git a/c/src/lib/libbsp/sparc/shared/tmtc/grtm.c b/c/src/lib/libbsp/sparc/shared/tmtc/grtm.c
index 1d9fb005f3..2302c56ca0 100644
--- a/c/src/lib/libbsp/sparc/shared/tmtc/grtm.c
+++ b/c/src/lib/libbsp/sparc/shared/tmtc/grtm.c
@@ -21,7 +21,7 @@
 #include <drvmgr/drvmgr.h>
 #include <ambapp.h>
 #include <drvmgr/ambapp_bus.h>
-#include <grtm.h>
+#include <bsp/grtm.h>
 
 #ifndef IRQ_GLOBAL_PREPARE
  #define IRQ_GLOBAL_PREPARE(level) rtems_interrupt_level level
@@ -40,7 +40,7 @@
 #define DEBUGFUNCS
 */
 
-#include <debug_defs.h>
+#include <bsp/debug_defs.h>
 
 /* GRTM register map */
 struct grtm_regs {
diff --git a/c/src/lib/libbsp/sparc/shared/uart/apbuart.c b/c/src/lib/libbsp/sparc/shared/uart/apbuart.c
index 75fe094244..202def36bd 100644
--- a/c/src/lib/libbsp/sparc/shared/uart/apbuart.c
+++ b/c/src/lib/libbsp/sparc/shared/uart/apbuart.c
@@ -23,7 +23,7 @@
 
 #include <ambapp.h>
 #include <grlib.h>
-#include <apbuart.h>
+#include <bsp/apbuart.h>
 
 #ifndef DEFAULT_TXBUF_SIZE
  #define DEFAULT_TXBUF_SIZE 32
diff --git a/c/src/lib/libbsp/sparc/shared/uart/apbuart_cons.c b/c/src/lib/libbsp/sparc/shared/uart/apbuart_cons.c
index 8bee2e9f21..b79a2cf73b 100644
--- a/c/src/lib/libbsp/sparc/shared/uart/apbuart_cons.c
+++ b/c/src/lib/libbsp/sparc/shared/uart/apbuart_cons.c
@@ -27,12 +27,12 @@
 
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus.h>
-#include <apbuart.h>
+#include <bsp/apbuart.h>
 #include <ambapp.h>
 #include <grlib.h>
-#include <cons.h>
+#include <bsp/cons.h>
 #include <rtems/termiostypes.h>
-#include <apbuart_cons.h>
+#include <bsp/apbuart_cons.h>
 
 /*#define DEBUG 1  */
 
diff --git a/c/src/lib/libbsp/sparc/shared/uart/apbuart_termios.c b/c/src/lib/libbsp/sparc/shared/uart/apbuart_termios.c
index 3000dbcb93..21f2e834cb 100644
--- a/c/src/lib/libbsp/sparc/shared/uart/apbuart_termios.c
+++ b/c/src/lib/libbsp/sparc/shared/uart/apbuart_termios.c
@@ -11,8 +11,8 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <apbuart_termios.h>
-#include <apbuart.h>
+#include <bsp/apbuart_termios.h>
+#include <bsp/apbuart.h>
 #include <bsp.h>
 
 static void apbuart_isr(void *arg)
diff --git a/c/src/lib/libbsp/sparc/shared/uart/cons.c b/c/src/lib/libbsp/sparc/shared/uart/cons.c
index f0af1f9c52..a31b6ef9f4 100644
--- a/c/src/lib/libbsp/sparc/shared/uart/cons.c
+++ b/c/src/lib/libbsp/sparc/shared/uart/cons.c
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <rtems/libio.h>
 #include <rtems/bspIo.h>
-#include <cons.h>
+#include <bsp/cons.h>
 
 #ifdef RTEMS_DRVMGR_STARTUP