1217 files changed, 1860 insertions, 0 deletions

diff --git a/bsps/arm/altera-cyclone-v/headers.am b/bsps/arm/altera-cyclone-v/headers.am
new file mode 100644
index 0000000000..f63ee38854
--- /dev/null
+++ b/bsps/arm/altera-cyclone-v/headers.am
@@ -0,0 +1,45 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_16550_uart.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_address_space.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_cache.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_clock_group.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_clock_manager.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_dma.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_dma_common.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_dma_program.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_generalpurpose_io.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_hwlibs_ver.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_interrupt_common.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_mpu_registers.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_qspi_private.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_reset_manager.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/hwlib.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/i2cdrv.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/irq.h
+
+include_bsp_socaldir = $(includedir)/bsp/socal
+include_bsp_socal_HEADERS =
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_acpidmap.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_clkmgr.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_dmanonsecure.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_dmasecure.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_gpio.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_i2c.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_l3.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_qspi.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_qspidata.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_rstmgr.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_sdr.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_sysmgr.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_uart.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/hps.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/socal.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/include/bsp.h b/bsps/arm/altera-cyclone-v/include/bsp.h
index 4118823958..4118823958 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/include/bsp.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_16550_uart.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_16550_uart.h
index bca6f63e00..bca6f63e00 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_16550_uart.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/alt_16550_uart.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_address_space.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_address_space.h
index 781cc49aa3..781cc49aa3 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_address_space.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/alt_address_space.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_cache.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_cache.h
index 8d088ab744..8d088ab744 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_cache.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/alt_cache.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_clock_group.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_clock_group.h
index a43608e9f3..a43608e9f3 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_clock_group.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/alt_clock_group.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_clock_manager.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_clock_manager.h
index d6d96544f7..d6d96544f7 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_clock_manager.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/alt_clock_manager.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_dma.h
index 6be93fbd32..6be93fbd32 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/alt_dma.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma_common.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_dma_common.h
index e82bc1ae4d..e82bc1ae4d 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma_common.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/alt_dma_common.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma_program.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_dma_program.h
index 5fa876f237..5fa876f237 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma_program.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/alt_dma_program.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_generalpurpose_io.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_generalpurpose_io.h
index 0a7abaef8e..0a7abaef8e 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_generalpurpose_io.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/alt_generalpurpose_io.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_hwlibs_ver.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_hwlibs_ver.h
index 7596d50d66..7596d50d66 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_hwlibs_ver.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/alt_hwlibs_ver.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_i2c.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_i2c.h
index 7af55cf4ac..7af55cf4ac 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_i2c.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/alt_i2c.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_interrupt_common.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_interrupt_common.h
index 004fd3188c..004fd3188c 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_interrupt_common.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/alt_interrupt_common.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_mpu_registers.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_mpu_registers.h
index 2ead15df86..2ead15df86 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_mpu_registers.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/alt_mpu_registers.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_qspi_private.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_qspi_private.h
index 21fd3a957d..21fd3a957d 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_qspi_private.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/alt_qspi_private.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_reset_manager.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_reset_manager.h
index d719e3f05e..d719e3f05e 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_reset_manager.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/alt_reset_manager.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/hwlib.h b/bsps/arm/altera-cyclone-v/include/bsp/hwlib.h
index aba7e877c4..aba7e877c4 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/hwlib.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/hwlib.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/include/i2cdrv.h b/bsps/arm/altera-cyclone-v/include/bsp/i2cdrv.h
index 9a4411d637..9a4411d637 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/include/i2cdrv.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/i2cdrv.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/include/irq.h b/bsps/arm/altera-cyclone-v/include/bsp/irq.h
index c136500415..c136500415 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/include/irq.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_acpidmap.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_acpidmap.h
index 3a6bf0fffa..3a6bf0fffa 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_acpidmap.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_acpidmap.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_clkmgr.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_clkmgr.h
index 1875a84f10..1875a84f10 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_clkmgr.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_clkmgr.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_dmanonsecure.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_dmanonsecure.h
index 1425708983..1425708983 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_dmanonsecure.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_dmanonsecure.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_dmasecure.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_dmasecure.h
index 5941433268..5941433268 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_dmasecure.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_dmasecure.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_gpio.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_gpio.h
index 8bc4640161..8bc4640161 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_gpio.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_gpio.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_i2c.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_i2c.h
index b50543a884..b50543a884 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_i2c.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_i2c.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_l3.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_l3.h
index 12e6f21b89..12e6f21b89 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_l3.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_l3.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_qspi.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_qspi.h
index cbec31b76f..cbec31b76f 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_qspi.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_qspi.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_qspidata.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_qspidata.h
index 19383eefe5..19383eefe5 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_qspidata.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_qspidata.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_rstmgr.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_rstmgr.h
index ab4ac65dcb..ab4ac65dcb 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_rstmgr.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_rstmgr.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_sdr.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_sdr.h
index 785aa743cb..785aa743cb 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_sdr.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_sdr.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_sysmgr.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_sysmgr.h
index fce6d6e11e..fce6d6e11e 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_sysmgr.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_sysmgr.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_uart.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_uart.h
index b64111960b..b64111960b 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_uart.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_uart.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/hps.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/hps.h
index c6b312b415..c6b312b415 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/hps.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/socal/hps.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/socal.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/socal.h
index f6090cd0ca..f6090cd0ca 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/socal.h
+++ b/bsps/arm/altera-cyclone-v/include/bsp/socal/socal.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/include/tm27.h b/bsps/arm/altera-cyclone-v/include/tm27.h
index c17c0107b4..c17c0107b4 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/include/tm27.h
+++ b/bsps/arm/altera-cyclone-v/include/tm27.h
diff --git a/bsps/arm/atsam/headers.am b/bsps/arm/atsam/headers.am
new file mode 100644
index 0000000000..1ec34a2e69
--- /dev/null
+++ b/bsps/arm/atsam/headers.am
@@ -0,0 +1,269 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/atsam/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/atsam-clock-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/atsam-i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/atsam-spi.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/pin-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/power.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/sc16is752.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/spi.h
+
+include_libchipdir = $(includedir)/libchip
+include_libchip_HEADERS =
+include_libchip_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/chip.h
+include_libchip_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/compiler.h
+
+include_libchip_includedir = $(includedir)/libchip/include
+include_libchip_include_HEADERS =
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/acc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/adc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/aes.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/afe_dma.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/afec.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/chip.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/dac_dma.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/efc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/exceptions.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/flashd.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/gmac.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/gmacd.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/hsmci.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/icm.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/isi.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/iso7816_4.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/mcan.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/mcid.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/mediaLB.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/mpu.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/pio.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/pio_capture.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/pio_it.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/pmc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/pwmc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/qspi.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/qspi_dma.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/rstc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/rtc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/rtt.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sdramc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/smc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/spi.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/spi_dma.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/ssc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/supc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/tc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/timetick.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/trace.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/trng.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/twi.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/twid.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/uart.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/uart_dma.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/usart.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/usart_dma.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/usbhs.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/video.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/wdt.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/xdma_hardware_interface.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/xdmac.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/xdmad.h
+
+include_libchip_include_same70dir = $(includedir)/libchip/include/same70
+include_libchip_include_same70_HEADERS =
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70j19.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70j20.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70j21.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70n19.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70n20.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70n21.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70q19.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70q20.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70q21.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/system_same70.h
+
+include_libchip_include_same70_componentdir = $(includedir)/libchip/include/same70/component
+include_libchip_include_same70_component_HEADERS =
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_acc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_aes.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_afec.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_chipid.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_dacc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_efc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_gmac.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_gpbr.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_hsmci.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_icm.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_isi.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_matrix.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_mcan.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_pio.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_pmc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_pwm.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_qspi.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_rstc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_rswdt.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_rtc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_rtt.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_sdramc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_smc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_spi.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_ssc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_supc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_tc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_trng.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_twihs.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_uart.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_usart.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_usbhs.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_utmi.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_wdt.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_xdmac.h
+
+include_libchip_include_same70_piodir = $(includedir)/libchip/include/same70/pio
+include_libchip_include_same70_pio_HEADERS =
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j19.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j20.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j21.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n19.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n20.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n21.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q19.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q20.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q21.h
+
+include_libchip_include_sams70dir = $(includedir)/libchip/include/sams70
+include_libchip_include_sams70_HEADERS =
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70j19.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70j20.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70j21.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70n19.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70n20.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70n21.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70q19.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70q20.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70q21.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/system_sams70.h
+
+include_libchip_include_sams70_componentdir = $(includedir)/libchip/include/sams70/component
+include_libchip_include_sams70_component_HEADERS =
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_acc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_aes.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_afec.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_chipid.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_dacc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_efc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_gpbr.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_hsmci.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_icm.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_isi.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_matrix.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_pio.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_pmc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_pwm.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_qspi.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_rstc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_rswdt.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_rtc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_rtt.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_sdramc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_smc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_spi.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_ssc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_supc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_tc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_trng.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_twihs.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_uart.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_usart.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_usbhs.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_utmi.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_wdt.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_xdmac.h
+
+include_libchip_include_sams70_piodir = $(includedir)/libchip/include/sams70/pio
+include_libchip_include_sams70_pio_HEADERS =
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j19.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j20.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j21.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n19.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n20.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n21.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q19.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q20.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q21.h
+
+include_libchip_include_samv71dir = $(includedir)/libchip/include/samv71
+include_libchip_include_samv71_HEADERS =
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71j19.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71j20.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71j21.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71n19.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71n20.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71n21.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71q19.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71q20.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71q21.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/system_samv71.h
+
+include_libchip_include_samv71_componentdir = $(includedir)/libchip/include/samv71/component
+include_libchip_include_samv71_component_HEADERS =
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_acc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_aes.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_afec.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_chipid.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_dacc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_efc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_gmac.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_gpbr.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_hsmci.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_icm.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_isi.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_matrix.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_mcan.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_mlb.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_pio.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_pmc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_pwm.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_qspi.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_rstc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_rswdt.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_rtc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_rtt.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_sdramc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_smc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_spi.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_ssc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_supc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_tc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_trng.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_twihs.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_uart.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_usart.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_usbhs.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_utmi.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_wdt.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_xdmac.h
+
+include_libchip_include_samv71_piodir = $(includedir)/libchip/include/samv71/pio
+include_libchip_include_samv71_pio_HEADERS =
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j19.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j20.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j21.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n19.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n20.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n21.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q19.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q20.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q21.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/bsp.h b/bsps/arm/atsam/include/bsp.h
index cd0103ad70..cd0103ad70 100644
--- a/c/src/lib/libbsp/arm/atsam/include/bsp.h
+++ b/bsps/arm/atsam/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/atsam-clock-config.h b/bsps/arm/atsam/include/bsp/atsam-clock-config.h
index 396986894b..396986894b 100644
--- a/c/src/lib/libbsp/arm/atsam/include/atsam-clock-config.h
+++ b/bsps/arm/atsam/include/bsp/atsam-clock-config.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/atsam-i2c.h b/bsps/arm/atsam/include/bsp/atsam-i2c.h
index 7425db9f7b..7425db9f7b 100644
--- a/c/src/lib/libbsp/arm/atsam/include/atsam-i2c.h
+++ b/bsps/arm/atsam/include/bsp/atsam-i2c.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/atsam-spi.h b/bsps/arm/atsam/include/bsp/atsam-spi.h
index 548dd544f4..548dd544f4 100644
--- a/c/src/lib/libbsp/arm/atsam/include/atsam-spi.h
+++ b/bsps/arm/atsam/include/bsp/atsam-spi.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/i2c.h b/bsps/arm/atsam/include/bsp/i2c.h
index 1ea1204ff5..1ea1204ff5 100644
--- a/c/src/lib/libbsp/arm/atsam/include/i2c.h
+++ b/bsps/arm/atsam/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/irq.h b/bsps/arm/atsam/include/bsp/irq.h
index 19370e4852..19370e4852 100644
--- a/c/src/lib/libbsp/arm/atsam/include/irq.h
+++ b/bsps/arm/atsam/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/pin-config.h b/bsps/arm/atsam/include/bsp/pin-config.h
index 8f4a61428f..8f4a61428f 100644
--- a/c/src/lib/libbsp/arm/atsam/include/pin-config.h
+++ b/bsps/arm/atsam/include/bsp/pin-config.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/power.h b/bsps/arm/atsam/include/bsp/power.h
index a352386a0e..a352386a0e 100644
--- a/c/src/lib/libbsp/arm/atsam/include/power.h
+++ b/bsps/arm/atsam/include/bsp/power.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/sc16is752.h b/bsps/arm/atsam/include/bsp/sc16is752.h
index 35d298a7ed..35d298a7ed 100644
--- a/c/src/lib/libbsp/arm/atsam/include/sc16is752.h
+++ b/bsps/arm/atsam/include/bsp/sc16is752.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/spi.h b/bsps/arm/atsam/include/bsp/spi.h
index 958e629ba3..958e629ba3 100644
--- a/c/src/lib/libbsp/arm/atsam/include/spi.h
+++ b/bsps/arm/atsam/include/bsp/spi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/chip.h b/bsps/arm/atsam/include/libchip/chip.h
index 56e8cffbd1..56e8cffbd1 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/chip.h
+++ b/bsps/arm/atsam/include/libchip/chip.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/compiler.h b/bsps/arm/atsam/include/libchip/compiler.h
index f36013ac21..f36013ac21 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/compiler.h
+++ b/bsps/arm/atsam/include/libchip/compiler.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/acc.h b/bsps/arm/atsam/include/libchip/include/acc.h
index 4d10665bc6..4d10665bc6 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/acc.h
+++ b/bsps/arm/atsam/include/libchip/include/acc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/adc.h b/bsps/arm/atsam/include/libchip/include/adc.h
index a5585c9651..a5585c9651 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/adc.h
+++ b/bsps/arm/atsam/include/libchip/include/adc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/aes.h b/bsps/arm/atsam/include/libchip/include/aes.h
index 1fca47989d..1fca47989d 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/aes.h
+++ b/bsps/arm/atsam/include/libchip/include/aes.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/afe_dma.h b/bsps/arm/atsam/include/libchip/include/afe_dma.h
index 6bcfbb3bcc..6bcfbb3bcc 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/afe_dma.h
+++ b/bsps/arm/atsam/include/libchip/include/afe_dma.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/afec.h b/bsps/arm/atsam/include/libchip/include/afec.h
index 75c74ff2b6..75c74ff2b6 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/afec.h
+++ b/bsps/arm/atsam/include/libchip/include/afec.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/chip.h b/bsps/arm/atsam/include/libchip/include/chip.h
index a9f1f01bea..a9f1f01bea 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/chip.h
+++ b/bsps/arm/atsam/include/libchip/include/chip.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/dac_dma.h b/bsps/arm/atsam/include/libchip/include/dac_dma.h
index 11d100b76d..11d100b76d 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/dac_dma.h
+++ b/bsps/arm/atsam/include/libchip/include/dac_dma.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/efc.h b/bsps/arm/atsam/include/libchip/include/efc.h
index c4ff7c49f6..c4ff7c49f6 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/efc.h
+++ b/bsps/arm/atsam/include/libchip/include/efc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/exceptions.h b/bsps/arm/atsam/include/libchip/include/exceptions.h
index 2a18dae728..2a18dae728 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/exceptions.h
+++ b/bsps/arm/atsam/include/libchip/include/exceptions.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/flashd.h b/bsps/arm/atsam/include/libchip/include/flashd.h
index c34325aa89..c34325aa89 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/flashd.h
+++ b/bsps/arm/atsam/include/libchip/include/flashd.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/gmac.h b/bsps/arm/atsam/include/libchip/include/gmac.h
index 64e0079c25..64e0079c25 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/gmac.h
+++ b/bsps/arm/atsam/include/libchip/include/gmac.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/gmacd.h b/bsps/arm/atsam/include/libchip/include/gmacd.h
index 9cda2f8a6c..9cda2f8a6c 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/gmacd.h
+++ b/bsps/arm/atsam/include/libchip/include/gmacd.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/hsmci.h b/bsps/arm/atsam/include/libchip/include/hsmci.h
index f228a3e261..f228a3e261 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/hsmci.h
+++ b/bsps/arm/atsam/include/libchip/include/hsmci.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/icm.h b/bsps/arm/atsam/include/libchip/include/icm.h
index eee19260d5..eee19260d5 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/icm.h
+++ b/bsps/arm/atsam/include/libchip/include/icm.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/isi.h b/bsps/arm/atsam/include/libchip/include/isi.h
index 198dc98039..198dc98039 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/isi.h
+++ b/bsps/arm/atsam/include/libchip/include/isi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/iso7816_4.h b/bsps/arm/atsam/include/libchip/include/iso7816_4.h
index 3fa1ce97ea..3fa1ce97ea 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/iso7816_4.h
+++ b/bsps/arm/atsam/include/libchip/include/iso7816_4.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mcan.h b/bsps/arm/atsam/include/libchip/include/mcan.h
index 216c3b07ae..216c3b07ae 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mcan.h
+++ b/bsps/arm/atsam/include/libchip/include/mcan.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mcid.h b/bsps/arm/atsam/include/libchip/include/mcid.h
index 385f7ad29d..385f7ad29d 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mcid.h
+++ b/bsps/arm/atsam/include/libchip/include/mcid.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mediaLB.h b/bsps/arm/atsam/include/libchip/include/mediaLB.h
index 566c444b01..566c444b01 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mediaLB.h
+++ b/bsps/arm/atsam/include/libchip/include/mediaLB.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mpu.h b/bsps/arm/atsam/include/libchip/include/mpu.h
index 06f70d5d62..06f70d5d62 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mpu.h
+++ b/bsps/arm/atsam/include/libchip/include/mpu.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pio.h b/bsps/arm/atsam/include/libchip/include/pio.h
index 6cf463d1ec..6cf463d1ec 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pio.h
+++ b/bsps/arm/atsam/include/libchip/include/pio.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pio_capture.h b/bsps/arm/atsam/include/libchip/include/pio_capture.h
index 087b19d0b4..087b19d0b4 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pio_capture.h
+++ b/bsps/arm/atsam/include/libchip/include/pio_capture.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pio_it.h b/bsps/arm/atsam/include/libchip/include/pio_it.h
index b03973caa1..b03973caa1 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pio_it.h
+++ b/bsps/arm/atsam/include/libchip/include/pio_it.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pmc.h b/bsps/arm/atsam/include/libchip/include/pmc.h
index 4494513fff..4494513fff 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pmc.h
+++ b/bsps/arm/atsam/include/libchip/include/pmc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pwmc.h b/bsps/arm/atsam/include/libchip/include/pwmc.h
index fccfb15556..fccfb15556 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pwmc.h
+++ b/bsps/arm/atsam/include/libchip/include/pwmc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi.h b/bsps/arm/atsam/include/libchip/include/qspi.h
index c1f81f6ad6..c1f81f6ad6 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi.h
+++ b/bsps/arm/atsam/include/libchip/include/qspi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi_dma.h b/bsps/arm/atsam/include/libchip/include/qspi_dma.h
index 8ee274e15d..8ee274e15d 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi_dma.h
+++ b/bsps/arm/atsam/include/libchip/include/qspi_dma.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/rstc.h b/bsps/arm/atsam/include/libchip/include/rstc.h
index 7c33a465b0..7c33a465b0 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/rstc.h
+++ b/bsps/arm/atsam/include/libchip/include/rstc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/rtc.h b/bsps/arm/atsam/include/libchip/include/rtc.h
index 9fd724824a..9fd724824a 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/rtc.h
+++ b/bsps/arm/atsam/include/libchip/include/rtc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/rtt.h b/bsps/arm/atsam/include/libchip/include/rtt.h
index 2dd2ca5eb5..2dd2ca5eb5 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/rtt.h
+++ b/bsps/arm/atsam/include/libchip/include/rtt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_acc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_acc.h
index 9810e118f8..9810e118f8 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_acc.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_acc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_aes.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_aes.h
index cd14abc0a1..cd14abc0a1 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_aes.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_aes.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_afec.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_afec.h
index 8b009b4ba1..8b009b4ba1 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_afec.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_afec.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_chipid.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_chipid.h
index 0bf098d895..0bf098d895 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_chipid.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_chipid.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_dacc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_dacc.h
index a57a1e1b32..a57a1e1b32 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_dacc.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_dacc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_efc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_efc.h
index 809db26a7a..809db26a7a 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_efc.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_efc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_gmac.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_gmac.h
index 6baf8fbd60..6baf8fbd60 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_gmac.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_gmac.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_gpbr.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_gpbr.h
index a88b2b63c4..a88b2b63c4 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_gpbr.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_gpbr.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_hsmci.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_hsmci.h
index 47f3e1c57c..47f3e1c57c 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_hsmci.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_hsmci.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_icm.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_icm.h
index 62a077414f..62a077414f 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_icm.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_icm.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_isi.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_isi.h
index 78839a68a6..78839a68a6 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_isi.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_isi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_matrix.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_matrix.h
index f9325ce550..f9325ce550 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_matrix.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_matrix.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_mcan.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_mcan.h
index aa9784e723..aa9784e723 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_mcan.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_mcan.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_pio.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_pio.h
index 357ebaf4fd..357ebaf4fd 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_pio.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_pio.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_pmc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_pmc.h
index 63d9749f1f..63d9749f1f 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_pmc.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_pmc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_pwm.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_pwm.h
index 46ad816164..46ad816164 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_pwm.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_pwm.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_qspi.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_qspi.h
index 79711335d6..79711335d6 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_qspi.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_qspi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rstc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_rstc.h
index 984c621ac4..984c621ac4 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rstc.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_rstc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rswdt.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_rswdt.h
index 959faa2875..959faa2875 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rswdt.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_rswdt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rtc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_rtc.h
index ef391274d5..ef391274d5 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rtc.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_rtc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rtt.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_rtt.h
index dd4dfd5b86..dd4dfd5b86 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rtt.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_rtt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_sdramc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_sdramc.h
index 758f78919a..758f78919a 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_sdramc.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_sdramc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_smc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_smc.h
index 02489ddf9a..02489ddf9a 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_smc.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_smc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_spi.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_spi.h
index 69517090e6..69517090e6 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_spi.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_spi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_ssc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_ssc.h
index dd929003d7..dd929003d7 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_ssc.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_ssc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_supc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_supc.h
index 54ad2e048b..54ad2e048b 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_supc.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_supc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_tc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_tc.h
index ce068e41c9..ce068e41c9 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_tc.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_tc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_trng.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_trng.h
index f1a18b7634..f1a18b7634 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_trng.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_trng.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_twihs.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_twihs.h
index 6a5f39da61..6a5f39da61 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_twihs.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_twihs.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_uart.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_uart.h
index 451b72e618..451b72e618 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_uart.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_uart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_usart.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_usart.h
index c8e7a4abda..c8e7a4abda 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_usart.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_usart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_usbhs.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_usbhs.h
index 72ea8f5e34..72ea8f5e34 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_usbhs.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_usbhs.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_utmi.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_utmi.h
index 26ca52180b..26ca52180b 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_utmi.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_utmi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_wdt.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_wdt.h
index 12ddb6da95..12ddb6da95 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_wdt.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_wdt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_xdmac.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_xdmac.h
index 28f3745e59..28f3745e59 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_xdmac.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/component/component_xdmac.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70j19.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j19.h
index caae7f179b..caae7f179b 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70j19.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70j20.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j20.h
index b4c8725975..b4c8725975 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70j20.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70j21.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j21.h
index 1c973f41f6..1c973f41f6 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70j21.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70n19.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n19.h
index ee761f9ce8..ee761f9ce8 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70n19.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70n20.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n20.h
index 8bec67ff00..8bec67ff00 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70n20.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70n21.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n21.h
index a0b3757033..a0b3757033 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70n21.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70q19.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q19.h
index 532ba6d4e6..532ba6d4e6 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70q19.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70q20.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q20.h
index f9b35f5d23..f9b35f5d23 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70q20.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70q21.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q21.h
index 507b287f89..507b287f89 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70q21.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70.h b/bsps/arm/atsam/include/libchip/include/same70/same70.h
index f7e5a5c9ce..f7e5a5c9ce 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/same70.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j19.h b/bsps/arm/atsam/include/libchip/include/same70/same70j19.h
index a82d7c1ad8..a82d7c1ad8 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j19.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/same70j19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j20.h b/bsps/arm/atsam/include/libchip/include/same70/same70j20.h
index a877891ea7..a877891ea7 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j20.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/same70j20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j21.h b/bsps/arm/atsam/include/libchip/include/same70/same70j21.h
index 812c28c3af..812c28c3af 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j21.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/same70j21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n19.h b/bsps/arm/atsam/include/libchip/include/same70/same70n19.h
index ed565d4e31..ed565d4e31 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n19.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/same70n19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n20.h b/bsps/arm/atsam/include/libchip/include/same70/same70n20.h
index 84b12656c9..84b12656c9 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n20.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/same70n20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n21.h b/bsps/arm/atsam/include/libchip/include/same70/same70n21.h
index ceaeef3b3c..ceaeef3b3c 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n21.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/same70n21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q19.h b/bsps/arm/atsam/include/libchip/include/same70/same70q19.h
index 136ac0e239..136ac0e239 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q19.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/same70q19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q20.h b/bsps/arm/atsam/include/libchip/include/same70/same70q20.h
index dc5858cda6..dc5858cda6 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q20.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/same70q20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q21.h b/bsps/arm/atsam/include/libchip/include/same70/same70q21.h
index 3cd174e6cf..3cd174e6cf 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q21.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/same70q21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/system_same70.h b/bsps/arm/atsam/include/libchip/include/same70/system_same70.h
index fd0428426c..fd0428426c 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/system_same70.h
+++ b/bsps/arm/atsam/include/libchip/include/same70/system_same70.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_acc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_acc.h
index 84d991560e..84d991560e 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_acc.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_acc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_aes.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_aes.h
index 86d6e95a18..86d6e95a18 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_aes.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_aes.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_afec.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_afec.h
index 638bf0a4f1..638bf0a4f1 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_afec.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_afec.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_chipid.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_chipid.h
index b6ca561684..b6ca561684 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_chipid.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_chipid.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_dacc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_dacc.h
index d9f5fd020a..d9f5fd020a 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_dacc.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_dacc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_efc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_efc.h
index 7ac6dedf1d..7ac6dedf1d 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_efc.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_efc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_gpbr.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_gpbr.h
index 7a4139a128..7a4139a128 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_gpbr.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_gpbr.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_hsmci.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_hsmci.h
index 53fbd4a024..53fbd4a024 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_hsmci.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_hsmci.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_icm.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_icm.h
index 3c2c3eb854..3c2c3eb854 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_icm.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_icm.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_isi.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_isi.h
index 82dd0cbf91..82dd0cbf91 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_isi.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_isi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_matrix.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_matrix.h
index b539d4d1f9..b539d4d1f9 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_matrix.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_matrix.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_pio.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_pio.h
index 690fdfe227..690fdfe227 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_pio.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_pio.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_pmc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_pmc.h
index 37f413b90c..37f413b90c 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_pmc.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_pmc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_pwm.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_pwm.h
index 3cfbfb6ec8..3cfbfb6ec8 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_pwm.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_pwm.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_qspi.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_qspi.h
index 5cf18bc84f..5cf18bc84f 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_qspi.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_qspi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rstc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_rstc.h
index 75a8b6cb5e..75a8b6cb5e 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rstc.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_rstc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rswdt.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_rswdt.h
index 9f1247b865..9f1247b865 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rswdt.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_rswdt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rtc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_rtc.h
index c4829bf588..c4829bf588 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rtc.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_rtc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rtt.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_rtt.h
index ac0e7dfb15..ac0e7dfb15 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rtt.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_rtt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_sdramc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_sdramc.h
index 03b275a84e..03b275a84e 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_sdramc.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_sdramc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_smc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_smc.h
index a616e3a7b1..a616e3a7b1 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_smc.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_smc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_spi.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_spi.h
index f7ac02f0e9..f7ac02f0e9 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_spi.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_spi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_ssc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_ssc.h
index 2aa87c0f46..2aa87c0f46 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_ssc.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_ssc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_supc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_supc.h
index 9f60ebe2fc..9f60ebe2fc 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_supc.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_supc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_tc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_tc.h
index 3a058c97c0..3a058c97c0 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_tc.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_tc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_trng.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_trng.h
index 928092bb36..928092bb36 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_trng.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_trng.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_twihs.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_twihs.h
index a859622c92..a859622c92 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_twihs.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_twihs.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_uart.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_uart.h
index d509699140..d509699140 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_uart.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_uart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_usart.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_usart.h
index aa666b91d8..aa666b91d8 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_usart.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_usart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_usbhs.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_usbhs.h
index a9b0a838db..a9b0a838db 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_usbhs.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_usbhs.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_utmi.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_utmi.h
index b45b124527..b45b124527 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_utmi.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_utmi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_wdt.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_wdt.h
index 28750e038e..28750e038e 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_wdt.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_wdt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_xdmac.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_xdmac.h
index 8a8d5893ff..8a8d5893ff 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_xdmac.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/component/component_xdmac.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70j19.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j19.h
index c4d2927b7f..c4d2927b7f 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70j19.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70j20.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j20.h
index 0724b32eae..0724b32eae 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70j20.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70j21.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j21.h
index ded9233a47..ded9233a47 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70j21.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70n19.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n19.h
index ddb50ac46a..ddb50ac46a 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70n19.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70n20.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n20.h
index 1f71c5270d..1f71c5270d 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70n20.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70n21.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n21.h
index 9337105295..9337105295 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70n21.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70q19.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q19.h
index a09aeb8038..a09aeb8038 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70q19.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70q20.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q20.h
index 21085a77c8..21085a77c8 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70q20.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70q21.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q21.h
index f6a8772012..f6a8772012 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70q21.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70.h
index 19360d766a..19360d766a 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/sams70.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j19.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70j19.h
index 82e2d7f8e0..82e2d7f8e0 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j19.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/sams70j19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j20.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70j20.h
index e9f40dd5eb..e9f40dd5eb 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j20.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/sams70j20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j21.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70j21.h
index db2dbb90a2..db2dbb90a2 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j21.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/sams70j21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n19.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70n19.h
index 8a810f1619..8a810f1619 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n19.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/sams70n19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n20.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70n20.h
index f95b970e67..f95b970e67 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n20.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/sams70n20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n21.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70n21.h
index 61170b4d00..61170b4d00 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n21.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/sams70n21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q19.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70q19.h
index 67d465f8ce..67d465f8ce 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q19.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/sams70q19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q20.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70q20.h
index 46c034cbab..46c034cbab 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q20.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/sams70q20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q21.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70q21.h
index 1528f4139f..1528f4139f 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q21.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/sams70q21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/system_sams70.h b/bsps/arm/atsam/include/libchip/include/sams70/system_sams70.h
index 3e74f5c900..3e74f5c900 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/system_sams70.h
+++ b/bsps/arm/atsam/include/libchip/include/sams70/system_sams70.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_acc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_acc.h
index 593effacef..593effacef 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_acc.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_acc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_aes.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_aes.h
index 10680b0258..10680b0258 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_aes.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_aes.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_afec.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_afec.h
index b514a28b05..b514a28b05 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_afec.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_afec.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_chipid.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_chipid.h
index 591fead101..591fead101 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_chipid.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_chipid.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_dacc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_dacc.h
index 6f12ae2511..6f12ae2511 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_dacc.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_dacc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_efc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_efc.h
index 1b7161d8c8..1b7161d8c8 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_efc.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_efc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_gmac.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_gmac.h
index fae8b33872..fae8b33872 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_gmac.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_gmac.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_gpbr.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_gpbr.h
index 8a1af5f2a9..8a1af5f2a9 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_gpbr.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_gpbr.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_hsmci.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_hsmci.h
index f50b93deed..f50b93deed 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_hsmci.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_hsmci.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_icm.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_icm.h
index b4d9653bb0..b4d9653bb0 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_icm.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_icm.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_isi.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_isi.h
index 063bfb2c16..063bfb2c16 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_isi.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_isi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_matrix.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_matrix.h
index c8ec1289a2..c8ec1289a2 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_matrix.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_matrix.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_mcan.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_mcan.h
index cc11cd1929..cc11cd1929 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_mcan.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_mcan.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_mlb.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_mlb.h
index 8dbaeab759..8dbaeab759 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_mlb.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_mlb.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_pio.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_pio.h
index 835f663aa8..835f663aa8 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_pio.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_pio.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_pmc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_pmc.h
index 145abd2e94..145abd2e94 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_pmc.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_pmc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_pwm.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_pwm.h
index a3b40e8020..a3b40e8020 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_pwm.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_pwm.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_qspi.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_qspi.h
index 46e0380e05..46e0380e05 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_qspi.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_qspi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rstc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_rstc.h
index 0ff4473c32..0ff4473c32 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rstc.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_rstc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rswdt.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_rswdt.h
index 4c9d146f36..4c9d146f36 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rswdt.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_rswdt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rtc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_rtc.h
index 533e0ed724..533e0ed724 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rtc.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_rtc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rtt.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_rtt.h
index aa49aa3fbd..aa49aa3fbd 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rtt.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_rtt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_sdramc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_sdramc.h
index b524a1d438..b524a1d438 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_sdramc.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_sdramc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_smc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_smc.h
index b345c982bc..b345c982bc 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_smc.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_smc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_spi.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_spi.h
index ed85ef1a60..ed85ef1a60 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_spi.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_spi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_ssc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_ssc.h
index 5705d61a8c..5705d61a8c 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_ssc.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_ssc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_supc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_supc.h
index 1998c04dde..1998c04dde 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_supc.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_supc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_tc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_tc.h
index 7457f031ce..7457f031ce 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_tc.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_tc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_trng.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_trng.h
index 1892c83a23..1892c83a23 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_trng.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_trng.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_twihs.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_twihs.h
index f8731a4ad3..f8731a4ad3 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_twihs.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_twihs.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_uart.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_uart.h
index 9459816dfb..9459816dfb 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_uart.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_uart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_usart.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_usart.h
index 155c9ee2e0..155c9ee2e0 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_usart.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_usart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_usbhs.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_usbhs.h
index 95e34fd3b5..95e34fd3b5 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_usbhs.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_usbhs.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_utmi.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_utmi.h
index abdde2f148..abdde2f148 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_utmi.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_utmi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_wdt.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_wdt.h
index 1c6d5b4321..1c6d5b4321 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_wdt.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_wdt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_xdmac.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_xdmac.h
index a36f4525f0..a36f4525f0 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_xdmac.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/component/component_xdmac.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71j19.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j19.h
index c2adb67e71..c2adb67e71 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71j19.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71j20.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j20.h
index 311e7f1a48..311e7f1a48 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71j20.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71j21.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j21.h
index f04d899e72..f04d899e72 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71j21.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71n19.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n19.h
index d8060f8efd..d8060f8efd 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71n19.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71n20.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n20.h
index b8670d4034..b8670d4034 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71n20.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71n21.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n21.h
index 134f9f7e1a..134f9f7e1a 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71n21.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71q19.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q19.h
index 37925fd3f9..37925fd3f9 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71q19.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71q20.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q20.h
index fcd68f266f..fcd68f266f 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71q20.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71q21.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q21.h
index aaa19aad5b..aaa19aad5b 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71q21.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71.h
index 4bdbce555e..4bdbce555e 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/samv71.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j19.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71j19.h
index ad3c38f6ab..ad3c38f6ab 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j19.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/samv71j19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j20.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71j20.h
index 9df556c9f0..9df556c9f0 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j20.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/samv71j20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j21.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71j21.h
index 4c306b8e23..4c306b8e23 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j21.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/samv71j21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n19.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71n19.h
index 8f2c0b9731..8f2c0b9731 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n19.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/samv71n19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n20.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71n20.h
index e709e5f736..e709e5f736 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n20.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/samv71n20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n21.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71n21.h
index dc1ef6e8a2..dc1ef6e8a2 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n21.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/samv71n21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q19.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71q19.h
index e42381c63c..e42381c63c 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q19.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/samv71q19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q20.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71q20.h
index cfc1780b56..cfc1780b56 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q20.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/samv71q20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q21.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71q21.h
index 401ee9b8be..401ee9b8be 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q21.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/samv71q21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/system_samv71.h b/bsps/arm/atsam/include/libchip/include/samv71/system_samv71.h
index f38282d233..f38282d233 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/system_samv71.h
+++ b/bsps/arm/atsam/include/libchip/include/samv71/system_samv71.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sdramc.h b/bsps/arm/atsam/include/libchip/include/sdramc.h
index 078127fbe9..078127fbe9 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sdramc.h
+++ b/bsps/arm/atsam/include/libchip/include/sdramc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/smc.h b/bsps/arm/atsam/include/libchip/include/smc.h
index 72253ab38a..72253ab38a 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/smc.h
+++ b/bsps/arm/atsam/include/libchip/include/smc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/spi.h b/bsps/arm/atsam/include/libchip/include/spi.h
index 0d888fbdfa..0d888fbdfa 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/spi.h
+++ b/bsps/arm/atsam/include/libchip/include/spi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/spi_dma.h b/bsps/arm/atsam/include/libchip/include/spi_dma.h
index 72a77d512c..72a77d512c 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/spi_dma.h
+++ b/bsps/arm/atsam/include/libchip/include/spi_dma.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/ssc.h b/bsps/arm/atsam/include/libchip/include/ssc.h
index bf76d6d2de..bf76d6d2de 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/ssc.h
+++ b/bsps/arm/atsam/include/libchip/include/ssc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/supc.h b/bsps/arm/atsam/include/libchip/include/supc.h
index 65d556372b..65d556372b 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/supc.h
+++ b/bsps/arm/atsam/include/libchip/include/supc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/tc.h b/bsps/arm/atsam/include/libchip/include/tc.h
index 2136634475..2136634475 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/tc.h
+++ b/bsps/arm/atsam/include/libchip/include/tc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/timetick.h b/bsps/arm/atsam/include/libchip/include/timetick.h
index ac12a8b25a..ac12a8b25a 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/timetick.h
+++ b/bsps/arm/atsam/include/libchip/include/timetick.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/trace.h b/bsps/arm/atsam/include/libchip/include/trace.h
index 95a613f69a..95a613f69a 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/trace.h
+++ b/bsps/arm/atsam/include/libchip/include/trace.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/trng.h b/bsps/arm/atsam/include/libchip/include/trng.h
index 29b28314c6..29b28314c6 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/trng.h
+++ b/bsps/arm/atsam/include/libchip/include/trng.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/twi.h b/bsps/arm/atsam/include/libchip/include/twi.h
index 6a5de366f2..6a5de366f2 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/twi.h
+++ b/bsps/arm/atsam/include/libchip/include/twi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/twid.h b/bsps/arm/atsam/include/libchip/include/twid.h
index 564a93339f..564a93339f 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/twid.h
+++ b/bsps/arm/atsam/include/libchip/include/twid.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/uart.h b/bsps/arm/atsam/include/libchip/include/uart.h
index 4380856285..4380856285 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/uart.h
+++ b/bsps/arm/atsam/include/libchip/include/uart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/uart_dma.h b/bsps/arm/atsam/include/libchip/include/uart_dma.h
index 8329b6b930..8329b6b930 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/uart_dma.h
+++ b/bsps/arm/atsam/include/libchip/include/uart_dma.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/usart.h b/bsps/arm/atsam/include/libchip/include/usart.h
index a1d1c378af..a1d1c378af 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/usart.h
+++ b/bsps/arm/atsam/include/libchip/include/usart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/usart_dma.h b/bsps/arm/atsam/include/libchip/include/usart_dma.h
index 0329cd1818..0329cd1818 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/usart_dma.h
+++ b/bsps/arm/atsam/include/libchip/include/usart_dma.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/usbhs.h b/bsps/arm/atsam/include/libchip/include/usbhs.h
index e30e15b313..e30e15b313 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/usbhs.h
+++ b/bsps/arm/atsam/include/libchip/include/usbhs.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/video.h b/bsps/arm/atsam/include/libchip/include/video.h
index 1ea18d214b..1ea18d214b 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/video.h
+++ b/bsps/arm/atsam/include/libchip/include/video.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/wdt.h b/bsps/arm/atsam/include/libchip/include/wdt.h
index 9d87ffa55f..9d87ffa55f 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/wdt.h
+++ b/bsps/arm/atsam/include/libchip/include/wdt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdma_hardware_interface.h b/bsps/arm/atsam/include/libchip/include/xdma_hardware_interface.h
index c115a4f8c7..c115a4f8c7 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdma_hardware_interface.h
+++ b/bsps/arm/atsam/include/libchip/include/xdma_hardware_interface.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdmac.h b/bsps/arm/atsam/include/libchip/include/xdmac.h
index 0b00dd505e..0b00dd505e 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdmac.h
+++ b/bsps/arm/atsam/include/libchip/include/xdmac.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdmad.h b/bsps/arm/atsam/include/libchip/include/xdmad.h
index 3b5e0838c2..3b5e0838c2 100644
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdmad.h
+++ b/bsps/arm/atsam/include/libchip/include/xdmad.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/tm27.h b/bsps/arm/atsam/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/atsam/include/tm27.h
+++ b/bsps/arm/atsam/include/tm27.h
diff --git a/bsps/arm/beagle/headers.am b/bsps/arm/beagle/headers.am
new file mode 100644
index 0000000000..6692d0b69c
--- /dev/null
+++ b/bsps/arm/beagle/headers.am
@@ -0,0 +1,14 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/beagle/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/beagle/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/beagle/include/bsp/bbb-gpio.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/beagle/include/bsp/bbb-pwm.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/beagle/include/bsp/beagleboneblack.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/beagle/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/beagle/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/bsp.h b/bsps/arm/beagle/include/bsp.h
index 1a69b5e308..1a69b5e308 100644
--- a/c/src/lib/libbsp/arm/beagle/include/bsp.h
+++ b/bsps/arm/beagle/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/bbb-gpio.h b/bsps/arm/beagle/include/bsp/bbb-gpio.h
index ceb12a4dec..ceb12a4dec 100644
--- a/c/src/lib/libbsp/arm/beagle/include/bbb-gpio.h
+++ b/bsps/arm/beagle/include/bsp/bbb-gpio.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/bbb-pwm.h b/bsps/arm/beagle/include/bsp/bbb-pwm.h
index cf5d6fe552..cf5d6fe552 100644
--- a/c/src/lib/libbsp/arm/beagle/include/bbb-pwm.h
+++ b/bsps/arm/beagle/include/bsp/bbb-pwm.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/beagleboneblack.h b/bsps/arm/beagle/include/bsp/beagleboneblack.h
index c62f4aa92d..c62f4aa92d 100644
--- a/c/src/lib/libbsp/arm/beagle/include/beagleboneblack.h
+++ b/bsps/arm/beagle/include/bsp/beagleboneblack.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/i2c.h b/bsps/arm/beagle/include/bsp/i2c.h
index 3ada3c4b0d..3ada3c4b0d 100644
--- a/c/src/lib/libbsp/arm/beagle/include/i2c.h
+++ b/bsps/arm/beagle/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/irq.h b/bsps/arm/beagle/include/bsp/irq.h
index 4cbf3a271f..4cbf3a271f 100644
--- a/c/src/lib/libbsp/arm/beagle/include/irq.h
+++ b/bsps/arm/beagle/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/tm27.h b/bsps/arm/beagle/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/beagle/include/tm27.h
+++ b/bsps/arm/beagle/include/tm27.h
diff --git a/bsps/arm/csb336/headers.am b/bsps/arm/csb336/headers.am
new file mode 100644
index 0000000000..911de17b50
--- /dev/null
+++ b/bsps/arm/csb336/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/csb336/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/csb336/include/mc9328mxl.h
+include_HEADERS += ../../../../../../bsps/arm/csb336/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/csb336/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/csb336/include/bsp.h b/bsps/arm/csb336/include/bsp.h
index ed036d5454..ed036d5454 100644
--- a/c/src/lib/libbsp/arm/csb336/include/bsp.h
+++ b/bsps/arm/csb336/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/csb336/include/bsp/irq.h b/bsps/arm/csb336/include/bsp/irq.h
index eb56fdd887..eb56fdd887 100644
--- a/c/src/lib/libbsp/arm/csb336/include/bsp/irq.h
+++ b/bsps/arm/csb336/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/csb336/include/mc9328mxl.h b/bsps/arm/csb336/include/mc9328mxl.h
index dd0516283a..dd0516283a 100644
--- a/c/src/lib/libbsp/arm/csb336/include/mc9328mxl.h
+++ b/bsps/arm/csb336/include/mc9328mxl.h
diff --git a/c/src/lib/libbsp/arm/csb336/include/tm27.h b/bsps/arm/csb336/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/csb336/include/tm27.h
+++ b/bsps/arm/csb336/include/tm27.h
diff --git a/bsps/arm/csb337/headers.am b/bsps/arm/csb337/headers.am
new file mode 100644
index 0000000000..4fff8adeac
--- /dev/null
+++ b/bsps/arm/csb337/headers.am
@@ -0,0 +1,21 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/at91rm9200.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/at91rm9200_dbgu.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/at91rm9200_emac.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/at91rm9200_gpio.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/at91rm9200_mem.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/at91rm9200_pmc.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/at91rm9200_usart.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/bits.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/font8x16.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/sed1356.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/sed1356_16bit.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/csb337/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/at91rm9200.h b/bsps/arm/csb337/include/at91rm9200.h
index 3ed64c7073..3ed64c7073 100644
--- a/c/src/lib/libbsp/arm/csb337/include/at91rm9200.h
+++ b/bsps/arm/csb337/include/at91rm9200.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_dbgu.h b/bsps/arm/csb337/include/at91rm9200_dbgu.h
index 9a65483db0..9a65483db0 100644
--- a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_dbgu.h
+++ b/bsps/arm/csb337/include/at91rm9200_dbgu.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_emac.h b/bsps/arm/csb337/include/at91rm9200_emac.h
index 77c42d1526..77c42d1526 100644
--- a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_emac.h
+++ b/bsps/arm/csb337/include/at91rm9200_emac.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_gpio.h b/bsps/arm/csb337/include/at91rm9200_gpio.h
index 9fa18ad476..9fa18ad476 100644
--- a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_gpio.h
+++ b/bsps/arm/csb337/include/at91rm9200_gpio.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_mem.h b/bsps/arm/csb337/include/at91rm9200_mem.h
index fafb18f6e8..fafb18f6e8 100644
--- a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_mem.h
+++ b/bsps/arm/csb337/include/at91rm9200_mem.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_pmc.h b/bsps/arm/csb337/include/at91rm9200_pmc.h
index 70cf77fc5a..70cf77fc5a 100644
--- a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_pmc.h
+++ b/bsps/arm/csb337/include/at91rm9200_pmc.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_usart.h b/bsps/arm/csb337/include/at91rm9200_usart.h
index 387f353992..387f353992 100644
--- a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_usart.h
+++ b/bsps/arm/csb337/include/at91rm9200_usart.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/bits.h b/bsps/arm/csb337/include/bits.h
index 6f2c4036b6..6f2c4036b6 100644
--- a/c/src/lib/libbsp/arm/csb337/include/bits.h
+++ b/bsps/arm/csb337/include/bits.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/bsp.h b/bsps/arm/csb337/include/bsp.h
index c99de2fd0a..c99de2fd0a 100644
--- a/c/src/lib/libbsp/arm/csb337/include/bsp.h
+++ b/bsps/arm/csb337/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/bsp/irq.h b/bsps/arm/csb337/include/bsp/irq.h
index 771059a3e4..771059a3e4 100644
--- a/c/src/lib/libbsp/arm/csb337/include/bsp/irq.h
+++ b/bsps/arm/csb337/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/csb337/console/font8x16.h b/bsps/arm/csb337/include/font8x16.h
index 0445b67668..0445b67668 100644
--- a/c/src/lib/libbsp/arm/csb337/console/font8x16.h
+++ b/bsps/arm/csb337/include/font8x16.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/sed1356.h b/bsps/arm/csb337/include/sed1356.h
index d4451ab7e1..d4451ab7e1 100644
--- a/c/src/lib/libbsp/arm/csb337/include/sed1356.h
+++ b/bsps/arm/csb337/include/sed1356.h
diff --git a/c/src/lib/libbsp/arm/csb337/console/sed1356_16bit.h b/bsps/arm/csb337/include/sed1356_16bit.h
index 5ccf85d01c..5ccf85d01c 100644
--- a/c/src/lib/libbsp/arm/csb337/console/sed1356_16bit.h
+++ b/bsps/arm/csb337/include/sed1356_16bit.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/tm27.h b/bsps/arm/csb337/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/csb337/include/tm27.h
+++ b/bsps/arm/csb337/include/tm27.h
diff --git a/bsps/arm/edb7312/headers.am b/bsps/arm/edb7312/headers.am
new file mode 100644
index 0000000000..706c1e138e
--- /dev/null
+++ b/bsps/arm/edb7312/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/edb7312/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/edb7312/include/ep7312.h
+include_HEADERS += ../../../../../../bsps/arm/edb7312/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/edb7312/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/edb7312/include/bsp.h b/bsps/arm/edb7312/include/bsp.h
index fa7a480970..fa7a480970 100644
--- a/c/src/lib/libbsp/arm/edb7312/include/bsp.h
+++ b/bsps/arm/edb7312/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/edb7312/irq/irq.h b/bsps/arm/edb7312/include/bsp/irq.h
index 04579a7c6f..04579a7c6f 100644
--- a/c/src/lib/libbsp/arm/edb7312/irq/irq.h
+++ b/bsps/arm/edb7312/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/edb7312/include/ep7312.h b/bsps/arm/edb7312/include/ep7312.h
index ba9d430bc6..ba9d430bc6 100644
--- a/c/src/lib/libbsp/arm/edb7312/include/ep7312.h
+++ b/bsps/arm/edb7312/include/ep7312.h
diff --git a/c/src/lib/libbsp/arm/edb7312/include/tm27.h b/bsps/arm/edb7312/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/edb7312/include/tm27.h
+++ b/bsps/arm/edb7312/include/tm27.h
diff --git a/bsps/arm/gdbarmsim/headers.am b/bsps/arm/gdbarmsim/headers.am
new file mode 100644
index 0000000000..25e9fcafc7
--- /dev/null
+++ b/bsps/arm/gdbarmsim/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/gdbarmsim/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/gdbarmsim/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/gdbarmsim/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/gdbarmsim/include/bsp/swi.h
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/include/bsp.h b/bsps/arm/gdbarmsim/include/bsp.h
index 798fa95cb4..798fa95cb4 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/include/bsp.h
+++ b/bsps/arm/gdbarmsim/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/include/irq.h b/bsps/arm/gdbarmsim/include/bsp/irq.h
index 3c86d22797..3c86d22797 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/include/irq.h
+++ b/bsps/arm/gdbarmsim/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/include/swi.h b/bsps/arm/gdbarmsim/include/bsp/swi.h
index e9eb434a58..e9eb434a58 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/include/swi.h
+++ b/bsps/arm/gdbarmsim/include/bsp/swi.h
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/include/tm27.h b/bsps/arm/gdbarmsim/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/include/tm27.h
+++ b/bsps/arm/gdbarmsim/include/tm27.h
diff --git a/bsps/arm/gumstix/headers.am b/bsps/arm/gumstix/headers.am
new file mode 100644
index 0000000000..410ad6cf75
--- /dev/null
+++ b/bsps/arm/gumstix/headers.am
@@ -0,0 +1,12 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/gumstix/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/gumstix/include/ffuart.h
+include_HEADERS += ../../../../../../bsps/arm/gumstix/include/pxa255.h
+include_HEADERS += ../../../../../../bsps/arm/gumstix/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/gumstix/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/gumstix/include/bsp.h b/bsps/arm/gumstix/include/bsp.h
index caee8f9e19..caee8f9e19 100644
--- a/c/src/lib/libbsp/arm/gumstix/include/bsp.h
+++ b/bsps/arm/gumstix/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/gumstix/include/bsp/irq.h b/bsps/arm/gumstix/include/bsp/irq.h
index a8b5d24da1..a8b5d24da1 100644
--- a/c/src/lib/libbsp/arm/gumstix/include/bsp/irq.h
+++ b/bsps/arm/gumstix/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/gumstix/include/ffuart.h b/bsps/arm/gumstix/include/ffuart.h
index 68df822183..68df822183 100644
--- a/c/src/lib/libbsp/arm/gumstix/include/ffuart.h
+++ b/bsps/arm/gumstix/include/ffuart.h
diff --git a/c/src/lib/libbsp/arm/gumstix/include/pxa255.h b/bsps/arm/gumstix/include/pxa255.h
index d5f2830c53..d5f2830c53 100644
--- a/c/src/lib/libbsp/arm/gumstix/include/pxa255.h
+++ b/bsps/arm/gumstix/include/pxa255.h
diff --git a/c/src/lib/libbsp/arm/gumstix/include/tm27.h b/bsps/arm/gumstix/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/gumstix/include/tm27.h
+++ b/bsps/arm/gumstix/include/tm27.h
diff --git a/bsps/arm/headers.am b/bsps/arm/headers.am
new file mode 100644
index 0000000000..764a085442
--- /dev/null
+++ b/bsps/arm/headers.am
@@ -0,0 +1,45 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../bsps/arm/include/cmsis_gcc.h
+include_HEADERS += ../../../../../bsps/arm/include/core_cm7.h
+include_HEADERS += ../../../../../bsps/arm/include/core_cmFunc.h
+include_HEADERS += ../../../../../bsps/arm/include/core_cmInstr.h
+include_HEADERS += ../../../../../bsps/arm/include/core_cmSimd.h
+include_HEADERS += ../../../../../bsps/arm/include/uart.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-a8core-start.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-a9mpcore-clock.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-a9mpcore-irq.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-a9mpcore-regs.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-a9mpcore-start.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-cp15-start.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-errata.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-gic-irq.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-gic-regs.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-gic-tm27.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-gic.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-pl011-regs.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-pl011.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-pl050-regs.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-pl050.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-pl111-fb.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-pl111-regs.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-release-id.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/armv7m-irq.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/linker-symbols.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/lpc-dma.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/lpc-emc.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/lpc-i2s.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/lpc-lcd.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/lpc-timer.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/start.h
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += ../../../../../bsps/arm/include/libcpu/am335x.h
+include_libcpu_HEADERS += ../../../../../bsps/arm/include/libcpu/mmu.h
+include_libcpu_HEADERS += ../../../../../bsps/arm/include/libcpu/omap3.h
+include_libcpu_HEADERS += ../../../../../bsps/arm/include/libcpu/omap_timer.h
diff --git a/bsps/arm/imx/headers.am b/bsps/arm/imx/headers.am
new file mode 100644
index 0000000000..dd18164254
--- /dev/null
+++ b/bsps/arm/imx/headers.am
@@ -0,0 +1,22 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/imx/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/imx/include/tm27.h
+
+include_arm_freescale_imxdir = $(includedir)/arm/freescale/imx
+include_arm_freescale_imx_HEADERS =
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_ccmvar.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_ecspireg.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_gpcreg.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_i2creg.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_iomuxreg.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_iomuxvar.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_srcreg.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_uartreg.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_wdogreg.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/imx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_ccmvar.h b/bsps/arm/imx/include/arm/freescale/imx/imx_ccmvar.h
index 5633de6f50..5633de6f50 100644
--- a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_ccmvar.h
+++ b/bsps/arm/imx/include/arm/freescale/imx/imx_ccmvar.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_ecspireg.h b/bsps/arm/imx/include/arm/freescale/imx/imx_ecspireg.h
index 299ed2bd7a..299ed2bd7a 100644
--- a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_ecspireg.h
+++ b/bsps/arm/imx/include/arm/freescale/imx/imx_ecspireg.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_gpcreg.h b/bsps/arm/imx/include/arm/freescale/imx/imx_gpcreg.h
index 924166c70d..924166c70d 100644
--- a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_gpcreg.h
+++ b/bsps/arm/imx/include/arm/freescale/imx/imx_gpcreg.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_i2creg.h b/bsps/arm/imx/include/arm/freescale/imx/imx_i2creg.h
index 0f1b7f13c5..0f1b7f13c5 100644
--- a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_i2creg.h
+++ b/bsps/arm/imx/include/arm/freescale/imx/imx_i2creg.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_iomuxreg.h b/bsps/arm/imx/include/arm/freescale/imx/imx_iomuxreg.h
index b84fde26de..b84fde26de 100644
--- a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_iomuxreg.h
+++ b/bsps/arm/imx/include/arm/freescale/imx/imx_iomuxreg.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_iomuxvar.h b/bsps/arm/imx/include/arm/freescale/imx/imx_iomuxvar.h
index 8050b56a84..8050b56a84 100644
--- a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_iomuxvar.h
+++ b/bsps/arm/imx/include/arm/freescale/imx/imx_iomuxvar.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_srcreg.h b/bsps/arm/imx/include/arm/freescale/imx/imx_srcreg.h
index b5f3490b79..b5f3490b79 100644
--- a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_srcreg.h
+++ b/bsps/arm/imx/include/arm/freescale/imx/imx_srcreg.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_uartreg.h b/bsps/arm/imx/include/arm/freescale/imx/imx_uartreg.h
index 35862601e2..35862601e2 100644
--- a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_uartreg.h
+++ b/bsps/arm/imx/include/arm/freescale/imx/imx_uartreg.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_wdogreg.h b/bsps/arm/imx/include/arm/freescale/imx/imx_wdogreg.h
index e26dfb2cc3..e26dfb2cc3 100644
--- a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_wdogreg.h
+++ b/bsps/arm/imx/include/arm/freescale/imx/imx_wdogreg.h
diff --git a/c/src/lib/libbsp/arm/imx/include/bsp.h b/bsps/arm/imx/include/bsp.h
index b5fb7127df..b5fb7127df 100644
--- a/c/src/lib/libbsp/arm/imx/include/bsp.h
+++ b/bsps/arm/imx/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/imx/include/irq.h b/bsps/arm/imx/include/bsp/irq.h
index 73d2e69b30..73d2e69b30 100644
--- a/c/src/lib/libbsp/arm/imx/include/irq.h
+++ b/bsps/arm/imx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/imx/include/tm27.h b/bsps/arm/imx/include/tm27.h
index c17c0107b4..c17c0107b4 100644
--- a/c/src/lib/libbsp/arm/imx/include/tm27.h
+++ b/bsps/arm/imx/include/tm27.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a8core-start.h b/bsps/arm/include/bsp/arm-a8core-start.h
index 416f282028..416f282028 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-a8core-start.h
+++ b/bsps/arm/include/bsp/arm-a8core-start.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-clock.h b/bsps/arm/include/bsp/arm-a9mpcore-clock.h
index 9a8c653801..9a8c653801 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-clock.h
+++ b/bsps/arm/include/bsp/arm-a9mpcore-clock.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-irq.h b/bsps/arm/include/bsp/arm-a9mpcore-irq.h
index f0d3c1b983..f0d3c1b983 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-irq.h
+++ b/bsps/arm/include/bsp/arm-a9mpcore-irq.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-regs.h b/bsps/arm/include/bsp/arm-a9mpcore-regs.h
index d1538357d8..d1538357d8 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-regs.h
+++ b/bsps/arm/include/bsp/arm-a9mpcore-regs.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h b/bsps/arm/include/bsp/arm-a9mpcore-start.h
index 7d6185b39e..7d6185b39e 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h
+++ b/bsps/arm/include/bsp/arm-a9mpcore-start.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-cp15-start.h b/bsps/arm/include/bsp/arm-cp15-start.h
index a749f7dc98..a749f7dc98 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-cp15-start.h
+++ b/bsps/arm/include/bsp/arm-cp15-start.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-errata.h b/bsps/arm/include/bsp/arm-errata.h
index 5108c98f15..5108c98f15 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-errata.h
+++ b/bsps/arm/include/bsp/arm-errata.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-gic-irq.h b/bsps/arm/include/bsp/arm-gic-irq.h
index 09d3fe5ac2..09d3fe5ac2 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-gic-irq.h
+++ b/bsps/arm/include/bsp/arm-gic-irq.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-gic-regs.h b/bsps/arm/include/bsp/arm-gic-regs.h
index 2375b5cf74..2375b5cf74 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-gic-regs.h
+++ b/bsps/arm/include/bsp/arm-gic-regs.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-gic-tm27.h b/bsps/arm/include/bsp/arm-gic-tm27.h
index 95f3077716..95f3077716 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-gic-tm27.h
+++ b/bsps/arm/include/bsp/arm-gic-tm27.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-gic.h b/bsps/arm/include/bsp/arm-gic.h
index ab5840919a..ab5840919a 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-gic.h
+++ b/bsps/arm/include/bsp/arm-gic.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl011-regs.h b/bsps/arm/include/bsp/arm-pl011-regs.h
index 2b930f4b4c..2b930f4b4c 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-pl011-regs.h
+++ b/bsps/arm/include/bsp/arm-pl011-regs.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl011.h b/bsps/arm/include/bsp/arm-pl011.h
index 08189c477c..08189c477c 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-pl011.h
+++ b/bsps/arm/include/bsp/arm-pl011.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl050-regs.h b/bsps/arm/include/bsp/arm-pl050-regs.h
index f90aeb6cf9..f90aeb6cf9 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-pl050-regs.h
+++ b/bsps/arm/include/bsp/arm-pl050-regs.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl050.h b/bsps/arm/include/bsp/arm-pl050.h
index af4e246124..af4e246124 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-pl050.h
+++ b/bsps/arm/include/bsp/arm-pl050.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl111-fb.h b/bsps/arm/include/bsp/arm-pl111-fb.h
index 0c8c6231e1..0c8c6231e1 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-pl111-fb.h
+++ b/bsps/arm/include/bsp/arm-pl111-fb.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl111-regs.h b/bsps/arm/include/bsp/arm-pl111-regs.h
index ed27ba41a0..ed27ba41a0 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-pl111-regs.h
+++ b/bsps/arm/include/bsp/arm-pl111-regs.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-release-id.h b/bsps/arm/include/bsp/arm-release-id.h
index e06be006da..e06be006da 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-release-id.h
+++ b/bsps/arm/include/bsp/arm-release-id.h
diff --git a/c/src/lib/libbsp/arm/shared/armv7m/include/armv7m-irq.h b/bsps/arm/include/bsp/armv7m-irq.h
index f91ab362e7..f91ab362e7 100644
--- a/c/src/lib/libbsp/arm/shared/armv7m/include/armv7m-irq.h
+++ b/bsps/arm/include/bsp/armv7m-irq.h
diff --git a/c/src/lib/libbsp/arm/shared/include/linker-symbols.h b/bsps/arm/include/bsp/linker-symbols.h
index 1a996f51f2..1a996f51f2 100644
--- a/c/src/lib/libbsp/arm/shared/include/linker-symbols.h
+++ b/bsps/arm/include/bsp/linker-symbols.h
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-dma.h b/bsps/arm/include/bsp/lpc-dma.h
index 45d567b36c..45d567b36c 100644
--- a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-dma.h
+++ b/bsps/arm/include/bsp/lpc-dma.h
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-emc.h b/bsps/arm/include/bsp/lpc-emc.h
index 31cb4241c8..31cb4241c8 100644
--- a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-emc.h
+++ b/bsps/arm/include/bsp/lpc-emc.h
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-i2s.h b/bsps/arm/include/bsp/lpc-i2s.h
index 65e951b7d7..65e951b7d7 100644
--- a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-i2s.h
+++ b/bsps/arm/include/bsp/lpc-i2s.h
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-lcd.h b/bsps/arm/include/bsp/lpc-lcd.h
index a3ca4fe11a..a3ca4fe11a 100644
--- a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-lcd.h
+++ b/bsps/arm/include/bsp/lpc-lcd.h
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-timer.h b/bsps/arm/include/bsp/lpc-timer.h
index 4c7ad4f1d1..4c7ad4f1d1 100644
--- a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-timer.h
+++ b/bsps/arm/include/bsp/lpc-timer.h
diff --git a/c/src/lib/libbsp/arm/shared/include/start.h b/bsps/arm/include/bsp/start.h
index bf8eed4433..bf8eed4433 100644
--- a/c/src/lib/libbsp/arm/shared/include/start.h
+++ b/bsps/arm/include/bsp/start.h
diff --git a/c/src/lib/libbsp/arm/shared/CMSIS/Include/cmsis_gcc.h b/bsps/arm/include/cmsis_gcc.h
index d868f2e64b..d868f2e64b 100644
--- a/c/src/lib/libbsp/arm/shared/CMSIS/Include/cmsis_gcc.h
+++ b/bsps/arm/include/cmsis_gcc.h
diff --git a/c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cm7.h b/bsps/arm/include/core_cm7.h
index 20963c148c..20963c148c 100644
--- a/c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cm7.h
+++ b/bsps/arm/include/core_cm7.h
diff --git a/c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cmFunc.h b/bsps/arm/include/core_cmFunc.h
index ca319a55cb..ca319a55cb 100644
--- a/c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cmFunc.h
+++ b/bsps/arm/include/core_cmFunc.h
diff --git a/c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cmInstr.h b/bsps/arm/include/core_cmInstr.h
index a0a506458d..a0a506458d 100644
--- a/c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cmInstr.h
+++ b/bsps/arm/include/core_cmInstr.h
diff --git a/c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cmSimd.h b/bsps/arm/include/core_cmSimd.h
index 4d76bf9018..4d76bf9018 100644
--- a/c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cmSimd.h
+++ b/bsps/arm/include/core_cmSimd.h
diff --git a/c/src/lib/libcpu/arm/shared/include/am335x.h b/bsps/arm/include/libcpu/am335x.h
index 367e97cae9..367e97cae9 100644
--- a/c/src/lib/libcpu/arm/shared/include/am335x.h
+++ b/bsps/arm/include/libcpu/am335x.h
diff --git a/c/src/lib/libcpu/arm/shared/include/mmu.h b/bsps/arm/include/libcpu/mmu.h
index b82e838695..b82e838695 100644
--- a/c/src/lib/libcpu/arm/shared/include/mmu.h
+++ b/bsps/arm/include/libcpu/mmu.h
diff --git a/c/src/lib/libcpu/arm/shared/include/omap3.h b/bsps/arm/include/libcpu/omap3.h
index 0cc43d6383..0cc43d6383 100644
--- a/c/src/lib/libcpu/arm/shared/include/omap3.h
+++ b/bsps/arm/include/libcpu/omap3.h
diff --git a/c/src/lib/libcpu/arm/shared/include/omap_timer.h b/bsps/arm/include/libcpu/omap_timer.h
index ef8787a571..ef8787a571 100644
--- a/c/src/lib/libcpu/arm/shared/include/omap_timer.h
+++ b/bsps/arm/include/libcpu/omap_timer.h
diff --git a/c/src/lib/libbsp/arm/shared/comm/uart.h b/bsps/arm/include/uart.h
index 742c56bda3..742c56bda3 100644
--- a/c/src/lib/libbsp/arm/shared/comm/uart.h
+++ b/bsps/arm/include/uart.h
diff --git a/bsps/arm/lm3s69xx/headers.am b/bsps/arm/lm3s69xx/headers.am
new file mode 100644
index 0000000000..2572e1ab9c
--- /dev/null
+++ b/bsps/arm/lm3s69xx/headers.am
@@ -0,0 +1,15 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/bsp/io.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/bsp/lm3s69xx.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/bsp/ssi.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/bsp/syscon.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/bsp/uart.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/bsp.h b/bsps/arm/lm3s69xx/include/bsp.h
index b07656cb73..b07656cb73 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/include/bsp.h
+++ b/bsps/arm/lm3s69xx/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/io.h b/bsps/arm/lm3s69xx/include/bsp/io.h
index f9ddf4c8ee..f9ddf4c8ee 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/include/io.h
+++ b/bsps/arm/lm3s69xx/include/bsp/io.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/irq.h b/bsps/arm/lm3s69xx/include/bsp/irq.h
index 0b380c2ce2..0b380c2ce2 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/include/irq.h
+++ b/bsps/arm/lm3s69xx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/lm3s69xx.h b/bsps/arm/lm3s69xx/include/bsp/lm3s69xx.h
index ce3548d376..ce3548d376 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/include/lm3s69xx.h
+++ b/bsps/arm/lm3s69xx/include/bsp/lm3s69xx.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/ssi.h b/bsps/arm/lm3s69xx/include/bsp/ssi.h
index e6e44c5aae..e6e44c5aae 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/include/ssi.h
+++ b/bsps/arm/lm3s69xx/include/bsp/ssi.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/syscon.h b/bsps/arm/lm3s69xx/include/bsp/syscon.h
index 016839b5e5..016839b5e5 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/include/syscon.h
+++ b/bsps/arm/lm3s69xx/include/bsp/syscon.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/uart.h b/bsps/arm/lm3s69xx/include/bsp/uart.h
index 544fed55eb..544fed55eb 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/include/uart.h
+++ b/bsps/arm/lm3s69xx/include/bsp/uart.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/tm27.h b/bsps/arm/lm3s69xx/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/include/tm27.h
+++ b/bsps/arm/lm3s69xx/include/tm27.h
diff --git a/bsps/arm/lpc176x/headers.am b/bsps/arm/lpc176x/headers.am
new file mode 100644
index 0000000000..aceb1c4fa5
--- /dev/null
+++ b/bsps/arm/lpc176x/headers.am
@@ -0,0 +1,30 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/lpc176x/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/adc-defs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/adc.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/can-defs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/can.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/common-types.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/dma.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/gpio-defs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/io-defs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/io.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/lpc-clock-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/lpc-gpio.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/lpc176x.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/mbed-pinmap.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/pwmout-defs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/pwmout.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/system-clocks.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/timer-defs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/timer.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/watchdog-defs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/watchdog.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/bsp.h b/bsps/arm/lpc176x/include/bsp.h
index e81e1cd53c..e81e1cd53c 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/bsp.h
+++ b/bsps/arm/lpc176x/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/adc-defs.h b/bsps/arm/lpc176x/include/bsp/adc-defs.h
index 3daca807b7..3daca807b7 100755
--- a/c/src/lib/libbsp/arm/lpc176x/include/adc-defs.h
+++ b/bsps/arm/lpc176x/include/bsp/adc-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/adc.h b/bsps/arm/lpc176x/include/bsp/adc.h
index 34df8b7efd..34df8b7efd 100755
--- a/c/src/lib/libbsp/arm/lpc176x/include/adc.h
+++ b/bsps/arm/lpc176x/include/bsp/adc.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/can-defs.h b/bsps/arm/lpc176x/include/bsp/can-defs.h
index 4db229eb1c..4db229eb1c 100755
--- a/c/src/lib/libbsp/arm/lpc176x/include/can-defs.h
+++ b/bsps/arm/lpc176x/include/bsp/can-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/can.h b/bsps/arm/lpc176x/include/bsp/can.h
index 7515ec2f53..7515ec2f53 100755
--- a/c/src/lib/libbsp/arm/lpc176x/include/can.h
+++ b/bsps/arm/lpc176x/include/bsp/can.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/common-types.h b/bsps/arm/lpc176x/include/bsp/common-types.h
index 943ff288a9..943ff288a9 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/common-types.h
+++ b/bsps/arm/lpc176x/include/bsp/common-types.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/dma.h b/bsps/arm/lpc176x/include/bsp/dma.h
index 65edfc4e30..65edfc4e30 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/dma.h
+++ b/bsps/arm/lpc176x/include/bsp/dma.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/gpio-defs.h b/bsps/arm/lpc176x/include/bsp/gpio-defs.h
index c6ed499d35..c6ed499d35 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/gpio-defs.h
+++ b/bsps/arm/lpc176x/include/bsp/gpio-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/io-defs.h b/bsps/arm/lpc176x/include/bsp/io-defs.h
index f9cf3dbbbd..f9cf3dbbbd 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/io-defs.h
+++ b/bsps/arm/lpc176x/include/bsp/io-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/io.h b/bsps/arm/lpc176x/include/bsp/io.h
index 4a8510479c..4a8510479c 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/io.h
+++ b/bsps/arm/lpc176x/include/bsp/io.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/irq.h b/bsps/arm/lpc176x/include/bsp/irq.h
index 719608c8f7..719608c8f7 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/irq.h
+++ b/bsps/arm/lpc176x/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/lpc-clock-config.h b/bsps/arm/lpc176x/include/bsp/lpc-clock-config.h
index 3eef02152e..3eef02152e 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/lpc-clock-config.h
+++ b/bsps/arm/lpc176x/include/bsp/lpc-clock-config.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/lpc-gpio.h b/bsps/arm/lpc176x/include/bsp/lpc-gpio.h
index 9cb23df142..9cb23df142 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/lpc-gpio.h
+++ b/bsps/arm/lpc176x/include/bsp/lpc-gpio.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/lpc176x.h b/bsps/arm/lpc176x/include/bsp/lpc176x.h
index f10991f346..f10991f346 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/lpc176x.h
+++ b/bsps/arm/lpc176x/include/bsp/lpc176x.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/mbed-pinmap.h b/bsps/arm/lpc176x/include/bsp/mbed-pinmap.h
index 3556bc5fbf..3556bc5fbf 100755
--- a/c/src/lib/libbsp/arm/lpc176x/include/mbed-pinmap.h
+++ b/bsps/arm/lpc176x/include/bsp/mbed-pinmap.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/pwmout-defs.h b/bsps/arm/lpc176x/include/bsp/pwmout-defs.h
index f55b154a05..f55b154a05 100755
--- a/c/src/lib/libbsp/arm/lpc176x/include/pwmout-defs.h
+++ b/bsps/arm/lpc176x/include/bsp/pwmout-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/pwmout.h b/bsps/arm/lpc176x/include/bsp/pwmout.h
index 1427fc5f3e..1427fc5f3e 100755
--- a/c/src/lib/libbsp/arm/lpc176x/include/pwmout.h
+++ b/bsps/arm/lpc176x/include/bsp/pwmout.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/system-clocks.h b/bsps/arm/lpc176x/include/bsp/system-clocks.h
index 26087ff3e9..26087ff3e9 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/system-clocks.h
+++ b/bsps/arm/lpc176x/include/bsp/system-clocks.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/timer-defs.h b/bsps/arm/lpc176x/include/bsp/timer-defs.h
index 3827aa9279..3827aa9279 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/timer-defs.h
+++ b/bsps/arm/lpc176x/include/bsp/timer-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/timer.h b/bsps/arm/lpc176x/include/bsp/timer.h
index 6805b55f0e..6805b55f0e 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/timer.h
+++ b/bsps/arm/lpc176x/include/bsp/timer.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/watchdog-defs.h b/bsps/arm/lpc176x/include/bsp/watchdog-defs.h
index 44ea80527e..44ea80527e 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/watchdog-defs.h
+++ b/bsps/arm/lpc176x/include/bsp/watchdog-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/watchdog.h b/bsps/arm/lpc176x/include/bsp/watchdog.h
index 8b5f033605..8b5f033605 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/watchdog.h
+++ b/bsps/arm/lpc176x/include/bsp/watchdog.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/tm27.h b/bsps/arm/lpc176x/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/tm27.h
+++ b/bsps/arm/lpc176x/include/tm27.h
diff --git a/bsps/arm/lpc24xx/headers.am b/bsps/arm/lpc24xx/headers.am
new file mode 100644
index 0000000000..e2f4d26042
--- /dev/null
+++ b/bsps/arm/lpc24xx/headers.am
@@ -0,0 +1,21 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/dma.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/io.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/lcd.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/lpc-clock-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/lpc-ethernet-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/lpc17xx.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/lpc24xx.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/ssp.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/start-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/system-clocks.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h b/bsps/arm/lpc24xx/include/bsp.h
index 5424808841..5424808841 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h
+++ b/bsps/arm/lpc24xx/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/dma.h b/bsps/arm/lpc24xx/include/bsp/dma.h
index b2e6c3e665..b2e6c3e665 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/dma.h
+++ b/bsps/arm/lpc24xx/include/bsp/dma.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/i2c.h b/bsps/arm/lpc24xx/include/bsp/i2c.h
index 42836ddfa8..42836ddfa8 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/i2c.h
+++ b/bsps/arm/lpc24xx/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/io.h b/bsps/arm/lpc24xx/include/bsp/io.h
index 9f58ee8efb..9f58ee8efb 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/io.h
+++ b/bsps/arm/lpc24xx/include/bsp/io.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/irq.h b/bsps/arm/lpc24xx/include/bsp/irq.h
index 0f0e473a0c..0f0e473a0c 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/irq.h
+++ b/bsps/arm/lpc24xx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lcd.h b/bsps/arm/lpc24xx/include/bsp/lcd.h
index c415074bd4..c415074bd4 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/lcd.h
+++ b/bsps/arm/lpc24xx/include/bsp/lcd.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lpc-clock-config.h b/bsps/arm/lpc24xx/include/bsp/lpc-clock-config.h
index 5e6b469e0f..5e6b469e0f 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/lpc-clock-config.h
+++ b/bsps/arm/lpc24xx/include/bsp/lpc-clock-config.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lpc-ethernet-config.h b/bsps/arm/lpc24xx/include/bsp/lpc-ethernet-config.h
index d24f132567..d24f132567 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/lpc-ethernet-config.h
+++ b/bsps/arm/lpc24xx/include/bsp/lpc-ethernet-config.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lpc17xx.h b/bsps/arm/lpc24xx/include/bsp/lpc17xx.h
index 9c35102e98..9c35102e98 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/lpc17xx.h
+++ b/bsps/arm/lpc24xx/include/bsp/lpc17xx.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lpc24xx.h b/bsps/arm/lpc24xx/include/bsp/lpc24xx.h
index 64a910c041..64a910c041 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/lpc24xx.h
+++ b/bsps/arm/lpc24xx/include/bsp/lpc24xx.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/ssp.h b/bsps/arm/lpc24xx/include/bsp/ssp.h
index 1a77219d0e..1a77219d0e 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/ssp.h
+++ b/bsps/arm/lpc24xx/include/bsp/ssp.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/start-config.h b/bsps/arm/lpc24xx/include/bsp/start-config.h
index 4476cbdebe..4476cbdebe 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/start-config.h
+++ b/bsps/arm/lpc24xx/include/bsp/start-config.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/system-clocks.h b/bsps/arm/lpc24xx/include/bsp/system-clocks.h
index 564d12ec10..564d12ec10 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/system-clocks.h
+++ b/bsps/arm/lpc24xx/include/bsp/system-clocks.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/tm27.h b/bsps/arm/lpc24xx/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/tm27.h
+++ b/bsps/arm/lpc24xx/include/tm27.h
diff --git a/bsps/arm/lpc32xx/headers.am b/bsps/arm/lpc32xx/headers.am
new file mode 100644
index 0000000000..40c0cfdb3d
--- /dev/null
+++ b/bsps/arm/lpc32xx/headers.am
@@ -0,0 +1,19 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/boot.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/emc.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/hsu.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/lpc-clock-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/lpc-ethernet-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/lpc32xx.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/mmu.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/nand-mlc.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/bsp.h b/bsps/arm/lpc32xx/include/bsp.h
index 0f9d1318cd..0f9d1318cd 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/bsp.h
+++ b/bsps/arm/lpc32xx/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/boot.h b/bsps/arm/lpc32xx/include/bsp/boot.h
index b9c845bc8f..b9c845bc8f 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/boot.h
+++ b/bsps/arm/lpc32xx/include/bsp/boot.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/emc.h b/bsps/arm/lpc32xx/include/bsp/emc.h
index c0ae18b395..c0ae18b395 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/emc.h
+++ b/bsps/arm/lpc32xx/include/bsp/emc.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/hsu.h b/bsps/arm/lpc32xx/include/bsp/hsu.h
index ba97dfb423..ba97dfb423 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/hsu.h
+++ b/bsps/arm/lpc32xx/include/bsp/hsu.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/i2c.h b/bsps/arm/lpc32xx/include/bsp/i2c.h
index e0bf8349ac..e0bf8349ac 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/i2c.h
+++ b/bsps/arm/lpc32xx/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/irq.h b/bsps/arm/lpc32xx/include/bsp/irq.h
index fbb13b5262..fbb13b5262 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/irq.h
+++ b/bsps/arm/lpc32xx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/lpc-clock-config.h b/bsps/arm/lpc32xx/include/bsp/lpc-clock-config.h
index 2b676b433f..2b676b433f 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/lpc-clock-config.h
+++ b/bsps/arm/lpc32xx/include/bsp/lpc-clock-config.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/lpc-ethernet-config.h b/bsps/arm/lpc32xx/include/bsp/lpc-ethernet-config.h
index 53e9e8415d..53e9e8415d 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/lpc-ethernet-config.h
+++ b/bsps/arm/lpc32xx/include/bsp/lpc-ethernet-config.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/lpc32xx.h b/bsps/arm/lpc32xx/include/bsp/lpc32xx.h
index 2edb1e334e..2edb1e334e 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/lpc32xx.h
+++ b/bsps/arm/lpc32xx/include/bsp/lpc32xx.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/mmu.h b/bsps/arm/lpc32xx/include/bsp/mmu.h
index 32352b5ed9..32352b5ed9 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/mmu.h
+++ b/bsps/arm/lpc32xx/include/bsp/mmu.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/nand-mlc.h b/bsps/arm/lpc32xx/include/bsp/nand-mlc.h
index 2aa8312945..2aa8312945 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/nand-mlc.h
+++ b/bsps/arm/lpc32xx/include/bsp/nand-mlc.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/tm27.h b/bsps/arm/lpc32xx/include/tm27.h
index 4cbc17a085..4cbc17a085 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/tm27.h
+++ b/bsps/arm/lpc32xx/include/tm27.h
diff --git a/bsps/arm/raspberrypi/headers.am b/bsps/arm/raspberrypi/headers.am
new file mode 100644
index 0000000000..91cd18c86f
--- /dev/null
+++ b/bsps/arm/raspberrypi/headers.am
@@ -0,0 +1,20 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/fbcons.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/mailbox.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/mmu.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/raspberrypi.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/rpi-fb.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/rpi-gpio.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/spi.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/usart.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/vc.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/bsp.h b/bsps/arm/raspberrypi/include/bsp.h
index ecd5b6af08..ecd5b6af08 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/bsp.h
+++ b/bsps/arm/raspberrypi/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/console/fbcons.h b/bsps/arm/raspberrypi/include/bsp/fbcons.h
index d0e126699a..d0e126699a 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/console/fbcons.h
+++ b/bsps/arm/raspberrypi/include/bsp/fbcons.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/i2c.h b/bsps/arm/raspberrypi/include/bsp/i2c.h
index 4a8dbbf2ac..4a8dbbf2ac 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/i2c.h
+++ b/bsps/arm/raspberrypi/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/irq.h b/bsps/arm/raspberrypi/include/bsp/irq.h
index 4600534171..4600534171 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/irq.h
+++ b/bsps/arm/raspberrypi/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/mailbox.h b/bsps/arm/raspberrypi/include/bsp/mailbox.h
index e6cb0f8c27..e6cb0f8c27 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/mailbox.h
+++ b/bsps/arm/raspberrypi/include/bsp/mailbox.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/mmu.h b/bsps/arm/raspberrypi/include/bsp/mmu.h
index 45ecc5a2a4..45ecc5a2a4 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/mmu.h
+++ b/bsps/arm/raspberrypi/include/bsp/mmu.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h b/bsps/arm/raspberrypi/include/bsp/raspberrypi.h
index 4ef5f713ad..4ef5f713ad 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h
+++ b/bsps/arm/raspberrypi/include/bsp/raspberrypi.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/rpi-fb.h b/bsps/arm/raspberrypi/include/bsp/rpi-fb.h
index 4f3c07fea2..4f3c07fea2 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/rpi-fb.h
+++ b/bsps/arm/raspberrypi/include/bsp/rpi-fb.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/rpi-gpio.h b/bsps/arm/raspberrypi/include/bsp/rpi-gpio.h
index 82ba4b1f2a..82ba4b1f2a 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/rpi-gpio.h
+++ b/bsps/arm/raspberrypi/include/bsp/rpi-gpio.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/spi.h b/bsps/arm/raspberrypi/include/bsp/spi.h
index 1bbbc6d2a4..1bbbc6d2a4 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/spi.h
+++ b/bsps/arm/raspberrypi/include/bsp/spi.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/usart.h b/bsps/arm/raspberrypi/include/bsp/usart.h
index 491392b1f7..491392b1f7 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/usart.h
+++ b/bsps/arm/raspberrypi/include/bsp/usart.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/vc.h b/bsps/arm/raspberrypi/include/bsp/vc.h
index e863732cd5..e863732cd5 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/vc.h
+++ b/bsps/arm/raspberrypi/include/bsp/vc.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/tm27.h b/bsps/arm/raspberrypi/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/tm27.h
+++ b/bsps/arm/raspberrypi/include/tm27.h
diff --git a/bsps/arm/realview-pbx-a9/headers.am b/bsps/arm/realview-pbx-a9/headers.am
new file mode 100644
index 0000000000..be4dc1aeb4
--- /dev/null
+++ b/bsps/arm/realview-pbx-a9/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/realview-pbx-a9/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/realview-pbx-a9/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/realview-pbx-a9/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/include/bsp.h b/bsps/arm/realview-pbx-a9/include/bsp.h
index 4423984e47..4423984e47 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/include/bsp.h
+++ b/bsps/arm/realview-pbx-a9/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/include/irq.h b/bsps/arm/realview-pbx-a9/include/bsp/irq.h
index 3c9790e9ef..3c9790e9ef 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/include/irq.h
+++ b/bsps/arm/realview-pbx-a9/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/include/tm27.h b/bsps/arm/realview-pbx-a9/include/tm27.h
index c336d8d310..c336d8d310 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/include/tm27.h
+++ b/bsps/arm/realview-pbx-a9/include/tm27.h
diff --git a/bsps/arm/rtl22xx/headers.am b/bsps/arm/rtl22xx/headers.am
new file mode 100644
index 0000000000..70f14bf3ed
--- /dev/null
+++ b/bsps/arm/rtl22xx/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/rtl22xx/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/rtl22xx/include/lpc22xx.h
+include_HEADERS += ../../../../../../bsps/arm/rtl22xx/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/rtl22xx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h b/bsps/arm/rtl22xx/include/bsp.h
index 9b376daf0d..9b376daf0d 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h
+++ b/bsps/arm/rtl22xx/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/bsp/irq.h b/bsps/arm/rtl22xx/include/bsp/irq.h
index 31825ca56e..31825ca56e 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/include/bsp/irq.h
+++ b/bsps/arm/rtl22xx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/lpc22xx.h b/bsps/arm/rtl22xx/include/lpc22xx.h
index babaf8343d..babaf8343d 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/include/lpc22xx.h
+++ b/bsps/arm/rtl22xx/include/lpc22xx.h
diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/tm27.h b/bsps/arm/rtl22xx/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/include/tm27.h
+++ b/bsps/arm/rtl22xx/include/tm27.h
diff --git a/bsps/arm/smdk2410/headers.am b/bsps/arm/smdk2410/headers.am
new file mode 100644
index 0000000000..25d2eb723e
--- /dev/null
+++ b/bsps/arm/smdk2410/headers.am
@@ -0,0 +1,14 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/smdk2410/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/smdk2410/include/s3c2400.h
+include_HEADERS += ../../../../../../bsps/arm/smdk2410/include/s3c2410.h
+include_HEADERS += ../../../../../../bsps/arm/smdk2410/include/s3c24xx.h
+include_HEADERS += ../../../../../../bsps/arm/smdk2410/include/smc.h
+include_HEADERS += ../../../../../../bsps/arm/smdk2410/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/smdk2410/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/include/bsp.h b/bsps/arm/smdk2410/include/bsp.h
index 25764195d0..25764195d0 100644
--- a/c/src/lib/libbsp/arm/smdk2410/include/bsp.h
+++ b/bsps/arm/smdk2410/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/include/bsp/irq.h b/bsps/arm/smdk2410/include/bsp/irq.h
index 8882b4362b..8882b4362b 100644
--- a/c/src/lib/libbsp/arm/smdk2410/include/bsp/irq.h
+++ b/bsps/arm/smdk2410/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/include/s3c2400.h b/bsps/arm/smdk2410/include/s3c2400.h
index 89a3cf73d8..89a3cf73d8 100644
--- a/c/src/lib/libbsp/arm/smdk2410/include/s3c2400.h
+++ b/bsps/arm/smdk2410/include/s3c2400.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/include/s3c2410.h b/bsps/arm/smdk2410/include/s3c2410.h
index c6a0a0b452..c6a0a0b452 100644
--- a/c/src/lib/libbsp/arm/smdk2410/include/s3c2410.h
+++ b/bsps/arm/smdk2410/include/s3c2410.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/include/s3c24xx.h b/bsps/arm/smdk2410/include/s3c24xx.h
index 914b867abf..914b867abf 100644
--- a/c/src/lib/libbsp/arm/smdk2410/include/s3c24xx.h
+++ b/bsps/arm/smdk2410/include/s3c24xx.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/smc/smc.h b/bsps/arm/smdk2410/include/smc.h
index 10ec14a771..10ec14a771 100644
--- a/c/src/lib/libbsp/arm/smdk2410/smc/smc.h
+++ b/bsps/arm/smdk2410/include/smc.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/include/tm27.h b/bsps/arm/smdk2410/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/smdk2410/include/tm27.h
+++ b/bsps/arm/smdk2410/include/tm27.h
diff --git a/bsps/arm/stm32f4/headers.am b/bsps/arm/stm32f4/headers.am
new file mode 100644
index 0000000000..f1270b546e
--- /dev/null
+++ b/bsps/arm/stm32f4/headers.am
@@ -0,0 +1,29 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/stm32f4/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/io.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/rcc.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32_i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32_usart.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f10xxx_exti.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f10xxx_gpio.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f10xxx_rcc.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_adc.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_exti.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_flash.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_gpio.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_otgfs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_pwr.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_rcc.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_syscfg.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_tim.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/usart.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/bsp.h b/bsps/arm/stm32f4/include/bsp.h
index 50052bc810..50052bc810 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/bsp.h
+++ b/bsps/arm/stm32f4/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/i2c.h b/bsps/arm/stm32f4/include/bsp/i2c.h
index fa18b1f92f..fa18b1f92f 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/i2c.h
+++ b/bsps/arm/stm32f4/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/io.h b/bsps/arm/stm32f4/include/bsp/io.h
index b7f8669cba..b7f8669cba 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/io.h
+++ b/bsps/arm/stm32f4/include/bsp/io.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/irq.h b/bsps/arm/stm32f4/include/bsp/irq.h
index 4771f521fe..4771f521fe 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/irq.h
+++ b/bsps/arm/stm32f4/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/rcc.h b/bsps/arm/stm32f4/include/bsp/rcc.h
index f1bd7d173c..f1bd7d173c 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/rcc.h
+++ b/bsps/arm/stm32f4/include/bsp/rcc.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32_i2c.h b/bsps/arm/stm32f4/include/bsp/stm32_i2c.h
index 21d9b34ed1..21d9b34ed1 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32_i2c.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32_i2c.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32_usart.h b/bsps/arm/stm32f4/include/bsp/stm32_usart.h
index c9c269533f..c9c269533f 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32_usart.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32_usart.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_exti.h b/bsps/arm/stm32f4/include/bsp/stm32f10xxx_exti.h
index ecb4bb900c..ecb4bb900c 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_exti.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32f10xxx_exti.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_gpio.h b/bsps/arm/stm32f4/include/bsp/stm32f10xxx_gpio.h
index ec7e675844..ec7e675844 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_gpio.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32f10xxx_gpio.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_rcc.h b/bsps/arm/stm32f4/include/bsp/stm32f10xxx_rcc.h
index c1c6629810..c1c6629810 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_rcc.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32f10xxx_rcc.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4.h b/bsps/arm/stm32f4/include/bsp/stm32f4.h
index 154d4f6d7b..154d4f6d7b 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32f4.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_adc.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_adc.h
index b9c1f9d5be..b9c1f9d5be 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_adc.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_adc.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_exti.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_exti.h
index df44ad56e8..df44ad56e8 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_exti.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_exti.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_flash.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_flash.h
index f81b19cd40..f81b19cd40 100755
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_flash.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_flash.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_gpio.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_gpio.h
index b129c23595..b129c23595 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_gpio.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_gpio.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_otgfs.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_otgfs.h
index cc2eb90c4c..cc2eb90c4c 100755
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_otgfs.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_otgfs.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_pwr.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_pwr.h
index 85af10738f..85af10738f 100755
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_pwr.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_pwr.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_rcc.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_rcc.h
index 5c004328d7..5c004328d7 100755
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_rcc.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_rcc.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_syscfg.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_syscfg.h
index 5249363cef..5249363cef 100755
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_syscfg.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_syscfg.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_tim.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_tim.h
index 45038945b8..45038945b8 100755
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_tim.h
+++ b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_tim.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/usart.h b/bsps/arm/stm32f4/include/bsp/usart.h
index bac0f6845a..bac0f6845a 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/usart.h
+++ b/bsps/arm/stm32f4/include/bsp/usart.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/tm27.h b/bsps/arm/stm32f4/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/tm27.h
+++ b/bsps/arm/stm32f4/include/tm27.h
diff --git a/bsps/arm/tms570/headers.am b/bsps/arm/tms570/headers.am
new file mode 100644
index 0000000000..4dd455e338
--- /dev/null
+++ b/bsps/arm/tms570/headers.am
@@ -0,0 +1,63 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/tms570/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/system-clocks.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570-pinmux.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570-pins.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570-pom.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570-rti.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570-sci-driver.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570-sci.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570-vim.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570_hwinit.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570_selftest.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570_selftest_parity.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570lc4357-pins.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570ls3137zwt-pins.h
+
+include_bsp_ti_hercdir = $(includedir)/bsp/ti_herc
+include_bsp_ti_herc_HEADERS =
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_adc.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_ccmsr.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_crc.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_dcan.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_dcc.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_dma.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_dmm.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_efuse.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_emacc.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_emacm.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_emif.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_esm.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_flash.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_flex_ray.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_gio.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_htu.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_i2c.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_iomm.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_lin.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_mdio.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_n2het.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_pbist.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_pcr.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_pll.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_pmm.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_pom.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_rti.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_rtp.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_sci.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_spi.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_stc.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_sys.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_sys2.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_tcr.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_tcram.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_vim.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/bsp.h b/bsps/arm/tms570/include/bsp.h
index 456380627f..456380627f 100644
--- a/c/src/lib/libbsp/arm/tms570/include/bsp.h
+++ b/bsps/arm/tms570/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/irq.h b/bsps/arm/tms570/include/bsp/irq.h
index 2952582453..2952582453 100644
--- a/c/src/lib/libbsp/arm/tms570/include/irq.h
+++ b/bsps/arm/tms570/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/system-clocks.h b/bsps/arm/tms570/include/bsp/system-clocks.h
index 0e1d1301d4..0e1d1301d4 100644
--- a/c/src/lib/libbsp/arm/tms570/include/system-clocks.h
+++ b/bsps/arm/tms570/include/bsp/system-clocks.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_adc.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_adc.h
index 1649fbeb4b..1649fbeb4b 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_adc.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_adc.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_ccmsr.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_ccmsr.h
index 941ed54753..941ed54753 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_ccmsr.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_ccmsr.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_crc.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_crc.h
index f1352f67b6..f1352f67b6 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_crc.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_crc.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dcan.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_dcan.h
index c278f554ff..c278f554ff 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dcan.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_dcan.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dcc.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_dcc.h
index 4c90276523..4c90276523 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dcc.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_dcc.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dma.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_dma.h
index 717f05b010..717f05b010 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dma.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_dma.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dmm.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_dmm.h
index 55d656ef86..55d656ef86 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dmm.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_dmm.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_efuse.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_efuse.h
index decf5bbeff..decf5bbeff 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_efuse.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_efuse.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emacc.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_emacc.h
index c7c564cf49..c7c564cf49 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emacc.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_emacc.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emacm.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_emacm.h
index c6e63210aa..c6e63210aa 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emacm.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_emacm.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emif.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_emif.h
index 0810fd097f..0810fd097f 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emif.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_emif.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_esm.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_esm.h
index 3ea4b6b43c..3ea4b6b43c 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_esm.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_esm.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_flash.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_flash.h
index 6c5a127d0b..6c5a127d0b 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_flash.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_flash.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_flex_ray.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_flex_ray.h
index e077ab65fd..e077ab65fd 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_flex_ray.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_flex_ray.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_gio.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_gio.h
index 3cb7851754..3cb7851754 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_gio.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_gio.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_htu.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_htu.h
index 3df27be461..3df27be461 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_htu.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_htu.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_i2c.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_i2c.h
index 63ed3f8d95..63ed3f8d95 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_i2c.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_i2c.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_iomm.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_iomm.h
index f6197e811c..f6197e811c 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_iomm.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_iomm.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_lin.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_lin.h
index d2c3a3bfe8..d2c3a3bfe8 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_lin.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_lin.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_mdio.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_mdio.h
index 704a0bc8a4..704a0bc8a4 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_mdio.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_mdio.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_n2het.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_n2het.h
index 06b8bbeb0a..06b8bbeb0a 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_n2het.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_n2het.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pbist.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_pbist.h
index 2c5ed29760..2c5ed29760 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pbist.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_pbist.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pcr.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_pcr.h
index 4d5613aa9f..4d5613aa9f 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pcr.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_pcr.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pll.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_pll.h
index 1cb8b03308..1cb8b03308 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pll.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_pll.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pmm.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_pmm.h
index c834b83999..c834b83999 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pmm.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_pmm.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pom.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_pom.h
index 1a4df19f8a..1a4df19f8a 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pom.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_pom.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_rti.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_rti.h
index 029b3b5721..029b3b5721 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_rti.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_rti.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_rtp.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_rtp.h
index cd54b29050..cd54b29050 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_rtp.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_rtp.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sci.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_sci.h
index 6b954f7fcf..6b954f7fcf 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sci.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_sci.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_spi.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_spi.h
index 35335c61e0..35335c61e0 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_spi.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_spi.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_stc.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_stc.h
index e935f450b8..e935f450b8 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_stc.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_stc.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sys.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_sys.h
index e191970ad6..e191970ad6 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sys.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_sys.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sys2.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_sys2.h
index 29ec5a141c..29ec5a141c 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sys2.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_sys2.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_tcr.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_tcr.h
index 5304504afc..5304504afc 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_tcr.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_tcr.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_tcram.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_tcram.h
index 1a48848e76..1a48848e76 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_tcram.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_tcram.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_vim.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_vim.h
index d0347a4509..d0347a4509 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_vim.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_vim.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-pinmux.h b/bsps/arm/tms570/include/bsp/tms570-pinmux.h
index 8b93c66bfa..8b93c66bfa 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-pinmux.h
+++ b/bsps/arm/tms570/include/bsp/tms570-pinmux.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-pins.h b/bsps/arm/tms570/include/bsp/tms570-pins.h
index f8db69fa19..f8db69fa19 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-pins.h
+++ b/bsps/arm/tms570/include/bsp/tms570-pins.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-pom.h b/bsps/arm/tms570/include/bsp/tms570-pom.h
index 2c54a016dc..2c54a016dc 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-pom.h
+++ b/bsps/arm/tms570/include/bsp/tms570-pom.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-rti.h b/bsps/arm/tms570/include/bsp/tms570-rti.h
index 552db88a62..552db88a62 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-rti.h
+++ b/bsps/arm/tms570/include/bsp/tms570-rti.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-sci-driver.h b/bsps/arm/tms570/include/bsp/tms570-sci-driver.h
index 61693ce0ff..61693ce0ff 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-sci-driver.h
+++ b/bsps/arm/tms570/include/bsp/tms570-sci-driver.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-sci.h b/bsps/arm/tms570/include/bsp/tms570-sci.h
index 9c502dcd6a..9c502dcd6a 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-sci.h
+++ b/bsps/arm/tms570/include/bsp/tms570-sci.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-vim.h b/bsps/arm/tms570/include/bsp/tms570-vim.h
index 9fa7e056f4..9fa7e056f4 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-vim.h
+++ b/bsps/arm/tms570/include/bsp/tms570-vim.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570.h b/bsps/arm/tms570/include/bsp/tms570.h
index f278a93606..f278a93606 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570.h
+++ b/bsps/arm/tms570/include/bsp/tms570.h
diff --git a/c/src/lib/libbsp/arm/tms570/hwinit/tms570_hwinit.h b/bsps/arm/tms570/include/bsp/tms570_hwinit.h
index 2c84b6e5fa..2c84b6e5fa 100644
--- a/c/src/lib/libbsp/arm/tms570/hwinit/tms570_hwinit.h
+++ b/bsps/arm/tms570/include/bsp/tms570_hwinit.h
diff --git a/c/src/lib/libbsp/arm/tms570/hwinit/tms570_selftest.h b/bsps/arm/tms570/include/bsp/tms570_selftest.h
index bbec8c2adf..bbec8c2adf 100644
--- a/c/src/lib/libbsp/arm/tms570/hwinit/tms570_selftest.h
+++ b/bsps/arm/tms570/include/bsp/tms570_selftest.h
diff --git a/c/src/lib/libbsp/arm/tms570/hwinit/tms570_selftest_parity.h b/bsps/arm/tms570/include/bsp/tms570_selftest_parity.h
index a1c3ec7b3e..a1c3ec7b3e 100644
--- a/c/src/lib/libbsp/arm/tms570/hwinit/tms570_selftest_parity.h
+++ b/bsps/arm/tms570/include/bsp/tms570_selftest_parity.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570lc4357-pins.h b/bsps/arm/tms570/include/bsp/tms570lc4357-pins.h
index 2beeae8bab..2beeae8bab 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570lc4357-pins.h
+++ b/bsps/arm/tms570/include/bsp/tms570lc4357-pins.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570ls3137zwt-pins.h b/bsps/arm/tms570/include/bsp/tms570ls3137zwt-pins.h
index 63c08e8ddb..63c08e8ddb 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570ls3137zwt-pins.h
+++ b/bsps/arm/tms570/include/bsp/tms570ls3137zwt-pins.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tm27.h b/bsps/arm/tms570/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tm27.h
+++ b/bsps/arm/tms570/include/tm27.h
diff --git a/bsps/arm/xilinx-zynq/headers.am b/bsps/arm/xilinx-zynq/headers.am
new file mode 100644
index 0000000000..708bd6411a
--- /dev/null
+++ b/bsps/arm/xilinx-zynq/headers.am
@@ -0,0 +1,15 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/cadence-i2c-regs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/cadence-i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/zynq-uart-regs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/bsp.h b/bsps/arm/xilinx-zynq/include/bsp.h
index afc6a66a06..afc6a66a06 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/bsp.h
+++ b/bsps/arm/xilinx-zynq/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c-regs.h b/bsps/arm/xilinx-zynq/include/bsp/cadence-i2c-regs.h
index c06a47c7f1..c06a47c7f1 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c-regs.h
+++ b/bsps/arm/xilinx-zynq/include/bsp/cadence-i2c-regs.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c.h b/bsps/arm/xilinx-zynq/include/bsp/cadence-i2c.h
index 9697cf3354..9697cf3354 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c.h
+++ b/bsps/arm/xilinx-zynq/include/bsp/cadence-i2c.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/i2c.h b/bsps/arm/xilinx-zynq/include/bsp/i2c.h
index 709ea0178e..709ea0178e 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/i2c.h
+++ b/bsps/arm/xilinx-zynq/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/irq.h b/bsps/arm/xilinx-zynq/include/bsp/irq.h
index e8288938fe..e8288938fe 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/irq.h
+++ b/bsps/arm/xilinx-zynq/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart-regs.h b/bsps/arm/xilinx-zynq/include/bsp/zynq-uart-regs.h
index 127f272fd9..127f272fd9 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart-regs.h
+++ b/bsps/arm/xilinx-zynq/include/bsp/zynq-uart-regs.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart.h b/bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h
index 4d3edfabef..4d3edfabef 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart.h
+++ b/bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/tm27.h b/bsps/arm/xilinx-zynq/include/tm27.h
index 39b8ecafec..39b8ecafec 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/tm27.h
+++ b/bsps/arm/xilinx-zynq/include/tm27.h
diff --git a/bsps/bfin/TLL6527M/headers.am b/bsps/bfin/TLL6527M/headers.am
new file mode 100644
index 0000000000..1ee13168de
--- /dev/null
+++ b/bsps/bfin/TLL6527M/headers.am
@@ -0,0 +1,7 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/bfin/TLL6527M/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/bfin/TLL6527M/include/cplb.h
+include_HEADERS += ../../../../../../bsps/bfin/TLL6527M/include/tm27.h
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h b/bsps/bfin/TLL6527M/include/bsp.h
index d027d8feff..d027d8feff 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h
+++ b/bsps/bfin/TLL6527M/include/bsp.h
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/include/cplb.h b/bsps/bfin/TLL6527M/include/cplb.h
index b6035ca142..b6035ca142 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/include/cplb.h
+++ b/bsps/bfin/TLL6527M/include/cplb.h
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/include/tm27.h b/bsps/bfin/TLL6527M/include/tm27.h
index 787004f8a6..787004f8a6 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/include/tm27.h
+++ b/bsps/bfin/TLL6527M/include/tm27.h
diff --git a/bsps/bfin/bf537Stamp/headers.am b/bsps/bfin/bf537Stamp/headers.am
new file mode 100644
index 0000000000..ae18fe2d1d
--- /dev/null
+++ b/bsps/bfin/bf537Stamp/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/bfin/bf537Stamp/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/bfin/bf537Stamp/include/tm27.h
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h b/bsps/bfin/bf537Stamp/include/bsp.h
index 8b14be13f6..8b14be13f6 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h
+++ b/bsps/bfin/bf537Stamp/include/bsp.h
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/include/tm27.h b/bsps/bfin/bf537Stamp/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/include/tm27.h
+++ b/bsps/bfin/bf537Stamp/include/tm27.h
diff --git a/bsps/bfin/eZKit533/headers.am b/bsps/bfin/eZKit533/headers.am
new file mode 100644
index 0000000000..0a6e170dbc
--- /dev/null
+++ b/bsps/bfin/eZKit533/headers.am
@@ -0,0 +1,7 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/bfin/eZKit533/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/bfin/eZKit533/include/cplb.h
+include_HEADERS += ../../../../../../bsps/bfin/eZKit533/include/tm27.h
diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h b/bsps/bfin/eZKit533/include/bsp.h
index 865ed72259..865ed72259 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h
+++ b/bsps/bfin/eZKit533/include/bsp.h
diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/cplb.h b/bsps/bfin/eZKit533/include/cplb.h
index 2c215e8954..2c215e8954 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/include/cplb.h
+++ b/bsps/bfin/eZKit533/include/cplb.h
diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/tm27.h b/bsps/bfin/eZKit533/include/tm27.h
index 6aaf4cfa1d..6aaf4cfa1d 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/include/tm27.h
+++ b/bsps/bfin/eZKit533/include/tm27.h
diff --git a/bsps/bfin/headers.am b/bsps/bfin/headers.am
new file mode 100644
index 0000000000..67f3f02572
--- /dev/null
+++ b/bsps/bfin/headers.am
@@ -0,0 +1,37 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../bsps/bfin/include/bf52x.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/bfin/include/bsp/interrupt.h
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/bf533.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/bf537.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/cecRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/coreTimerRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/dmaRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/ebiuRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/ethernet.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/ethernetRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/gpioRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/interrupt.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/memoryRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/mmu.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/mmuRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/ppiRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/rtcRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/sicRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/spi.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/spiRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/sport.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/sportRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/timerRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/twi.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/twiRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/uart.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/uartRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/wdogRegs.h
diff --git a/c/src/lib/libcpu/bfin/bf52x/include/bf52x.h b/bsps/bfin/include/bf52x.h
index 6c3d087c79..6c3d087c79 100644
--- a/c/src/lib/libcpu/bfin/bf52x/include/bf52x.h
+++ b/bsps/bfin/include/bf52x.h
diff --git a/c/src/lib/libcpu/bfin/bf52x/interrupt/interrupt.h b/bsps/bfin/include/bsp/interrupt.h
index 7a98775dd5..7a98775dd5 100644
--- a/c/src/lib/libcpu/bfin/bf52x/interrupt/interrupt.h
+++ b/bsps/bfin/include/bsp/interrupt.h
diff --git a/c/src/lib/libcpu/bfin/include/bf533.h b/bsps/bfin/include/libcpu/bf533.h
index 78cfaa0125..78cfaa0125 100644
--- a/c/src/lib/libcpu/bfin/include/bf533.h
+++ b/bsps/bfin/include/libcpu/bf533.h
diff --git a/c/src/lib/libcpu/bfin/include/bf537.h b/bsps/bfin/include/libcpu/bf537.h
index 8ed235205f..8ed235205f 100644
--- a/c/src/lib/libcpu/bfin/include/bf537.h
+++ b/bsps/bfin/include/libcpu/bf537.h
diff --git a/c/src/lib/libcpu/bfin/include/cecRegs.h b/bsps/bfin/include/libcpu/cecRegs.h
index 89564c6f70..89564c6f70 100644
--- a/c/src/lib/libcpu/bfin/include/cecRegs.h
+++ b/bsps/bfin/include/libcpu/cecRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/coreTimerRegs.h b/bsps/bfin/include/libcpu/coreTimerRegs.h
index c5b257783c..c5b257783c 100644
--- a/c/src/lib/libcpu/bfin/include/coreTimerRegs.h
+++ b/bsps/bfin/include/libcpu/coreTimerRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/dmaRegs.h b/bsps/bfin/include/libcpu/dmaRegs.h
index 7c895b7cab..7c895b7cab 100644
--- a/c/src/lib/libcpu/bfin/include/dmaRegs.h
+++ b/bsps/bfin/include/libcpu/dmaRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/ebiuRegs.h b/bsps/bfin/include/libcpu/ebiuRegs.h
index 1a07ff6985..1a07ff6985 100644
--- a/c/src/lib/libcpu/bfin/include/ebiuRegs.h
+++ b/bsps/bfin/include/libcpu/ebiuRegs.h
diff --git a/c/src/lib/libcpu/bfin/network/ethernet.h b/bsps/bfin/include/libcpu/ethernet.h
index 0a8fc0c4b0..0a8fc0c4b0 100644
--- a/c/src/lib/libcpu/bfin/network/ethernet.h
+++ b/bsps/bfin/include/libcpu/ethernet.h
diff --git a/c/src/lib/libcpu/bfin/include/ethernetRegs.h b/bsps/bfin/include/libcpu/ethernetRegs.h
index 7bf85c576b..7bf85c576b 100644
--- a/c/src/lib/libcpu/bfin/include/ethernetRegs.h
+++ b/bsps/bfin/include/libcpu/ethernetRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/gpioRegs.h b/bsps/bfin/include/libcpu/gpioRegs.h
index 02862916e1..02862916e1 100644
--- a/c/src/lib/libcpu/bfin/include/gpioRegs.h
+++ b/bsps/bfin/include/libcpu/gpioRegs.h
diff --git a/c/src/lib/libcpu/bfin/interrupt/interrupt.h b/bsps/bfin/include/libcpu/interrupt.h
index 2c6b538bde..2c6b538bde 100644
--- a/c/src/lib/libcpu/bfin/interrupt/interrupt.h
+++ b/bsps/bfin/include/libcpu/interrupt.h
diff --git a/c/src/lib/libcpu/bfin/include/memoryRegs.h b/bsps/bfin/include/libcpu/memoryRegs.h
index 130235e3d1..130235e3d1 100644
--- a/c/src/lib/libcpu/bfin/include/memoryRegs.h
+++ b/bsps/bfin/include/libcpu/memoryRegs.h
diff --git a/c/src/lib/libcpu/bfin/mmu/mmu.h b/bsps/bfin/include/libcpu/mmu.h
index d6e2ea58a9..d6e2ea58a9 100644
--- a/c/src/lib/libcpu/bfin/mmu/mmu.h
+++ b/bsps/bfin/include/libcpu/mmu.h
diff --git a/c/src/lib/libcpu/bfin/include/mmuRegs.h b/bsps/bfin/include/libcpu/mmuRegs.h
index 271ef4dcf5..271ef4dcf5 100644
--- a/c/src/lib/libcpu/bfin/include/mmuRegs.h
+++ b/bsps/bfin/include/libcpu/mmuRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/ppiRegs.h b/bsps/bfin/include/libcpu/ppiRegs.h
index 0ff301aefc..0ff301aefc 100644
--- a/c/src/lib/libcpu/bfin/include/ppiRegs.h
+++ b/bsps/bfin/include/libcpu/ppiRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/rtcRegs.h b/bsps/bfin/include/libcpu/rtcRegs.h
index 09245c2b91..09245c2b91 100644
--- a/c/src/lib/libcpu/bfin/include/rtcRegs.h
+++ b/bsps/bfin/include/libcpu/rtcRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/sicRegs.h b/bsps/bfin/include/libcpu/sicRegs.h
index 79fdd0d77c..79fdd0d77c 100644
--- a/c/src/lib/libcpu/bfin/include/sicRegs.h
+++ b/bsps/bfin/include/libcpu/sicRegs.h
diff --git a/c/src/lib/libcpu/bfin/serial/spi.h b/bsps/bfin/include/libcpu/spi.h
index db8bfaa612..db8bfaa612 100644
--- a/c/src/lib/libcpu/bfin/serial/spi.h
+++ b/bsps/bfin/include/libcpu/spi.h
diff --git a/c/src/lib/libcpu/bfin/include/spiRegs.h b/bsps/bfin/include/libcpu/spiRegs.h
index dcf792bb69..dcf792bb69 100644
--- a/c/src/lib/libcpu/bfin/include/spiRegs.h
+++ b/bsps/bfin/include/libcpu/spiRegs.h
diff --git a/c/src/lib/libcpu/bfin/serial/sport.h b/bsps/bfin/include/libcpu/sport.h
index 6ed481b593..6ed481b593 100644
--- a/c/src/lib/libcpu/bfin/serial/sport.h
+++ b/bsps/bfin/include/libcpu/sport.h
diff --git a/c/src/lib/libcpu/bfin/include/sportRegs.h b/bsps/bfin/include/libcpu/sportRegs.h
index f9f263b024..f9f263b024 100644
--- a/c/src/lib/libcpu/bfin/include/sportRegs.h
+++ b/bsps/bfin/include/libcpu/sportRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/timerRegs.h b/bsps/bfin/include/libcpu/timerRegs.h
index b66bae3339..b66bae3339 100644
--- a/c/src/lib/libcpu/bfin/include/timerRegs.h
+++ b/bsps/bfin/include/libcpu/timerRegs.h
diff --git a/c/src/lib/libcpu/bfin/serial/twi.h b/bsps/bfin/include/libcpu/twi.h
index 2392ba532b..2392ba532b 100644
--- a/c/src/lib/libcpu/bfin/serial/twi.h
+++ b/bsps/bfin/include/libcpu/twi.h
diff --git a/c/src/lib/libcpu/bfin/include/twiRegs.h b/bsps/bfin/include/libcpu/twiRegs.h
index c776f7886e..c776f7886e 100644
--- a/c/src/lib/libcpu/bfin/include/twiRegs.h
+++ b/bsps/bfin/include/libcpu/twiRegs.h
diff --git a/c/src/lib/libcpu/bfin/serial/uart.h b/bsps/bfin/include/libcpu/uart.h
index 730e0e261f..730e0e261f 100644
--- a/c/src/lib/libcpu/bfin/serial/uart.h
+++ b/bsps/bfin/include/libcpu/uart.h
diff --git a/c/src/lib/libcpu/bfin/include/uartRegs.h b/bsps/bfin/include/libcpu/uartRegs.h
index f48052e49b..f48052e49b 100644
--- a/c/src/lib/libcpu/bfin/include/uartRegs.h
+++ b/bsps/bfin/include/libcpu/uartRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/wdogRegs.h b/bsps/bfin/include/libcpu/wdogRegs.h
index 9e76d345b0..9e76d345b0 100644
--- a/c/src/lib/libcpu/bfin/include/wdogRegs.h
+++ b/bsps/bfin/include/libcpu/wdogRegs.h
diff --git a/bsps/epiphany/epiphany_sim/headers.am b/bsps/epiphany/epiphany_sim/headers.am
new file mode 100644
index 0000000000..bbe2514398
--- /dev/null
+++ b/bsps/epiphany/epiphany_sim/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/epiphany/epiphany_sim/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/epiphany/epiphany_sim/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/epiphany/epiphany_sim/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/include/bsp.h b/bsps/epiphany/epiphany_sim/include/bsp.h
index 46d495a8c5..46d495a8c5 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/include/bsp.h
+++ b/bsps/epiphany/epiphany_sim/include/bsp.h
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/include/irq.h b/bsps/epiphany/epiphany_sim/include/bsp/irq.h
index 2b15a4536c..2b15a4536c 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/include/irq.h
+++ b/bsps/epiphany/epiphany_sim/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/include/tm27.h b/bsps/epiphany/epiphany_sim/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/include/tm27.h
+++ b/bsps/epiphany/epiphany_sim/include/tm27.h
diff --git a/bsps/epiphany/headers.am b/bsps/epiphany/headers.am
new file mode 100644
index 0000000000..0ce8fb808b
--- /dev/null
+++ b/bsps/epiphany/headers.am
@@ -0,0 +1,5 @@
+## This file was generated by "./boostrap -H".
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/epiphany/include/bsp/linker-symbols.h
diff --git a/c/src/lib/libbsp/epiphany/shared/include/linker-symbols.h b/bsps/epiphany/include/bsp/linker-symbols.h
index c218b7ff99..c218b7ff99 100644
--- a/c/src/lib/libbsp/epiphany/shared/include/linker-symbols.h
+++ b/bsps/epiphany/include/bsp/linker-symbols.h
diff --git a/bsps/headers.am b/bsps/headers.am
new file mode 100644
index 0000000000..ab7fa34c58
--- /dev/null
+++ b/bsps/headers.am
@@ -0,0 +1,83 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../bsps/include/mpci.h
+include_HEADERS += ../../bsps/include/shm_driver.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../bsps/include/bsp/VME.h
+include_bsp_HEADERS += ../../bsps/include/bsp/VMEDMA.h
+include_bsp_HEADERS += ../../bsps/include/bsp/bootcard.h
+include_bsp_HEADERS += ../../bsps/include/bsp/bspVmeDmaList.h
+include_bsp_HEADERS += ../../bsps/include/bsp/console-polled.h
+include_bsp_HEADERS += ../../bsps/include/bsp/console-termios.h
+include_bsp_HEADERS += ../../bsps/include/bsp/default-initial-extension.h
+include_bsp_HEADERS += ../../bsps/include/bsp/fatal.h
+include_bsp_HEADERS += ../../bsps/include/bsp/fdt.h
+include_bsp_HEADERS += ../../bsps/include/bsp/gpio.h
+include_bsp_HEADERS += ../../bsps/include/bsp/irq-generic.h
+include_bsp_HEADERS += ../../bsps/include/bsp/irq-info.h
+include_bsp_HEADERS += ../../bsps/include/bsp/mm.h
+include_bsp_HEADERS += ../../bsps/include/bsp/stackalloc.h
+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_bsp_HEADERS += ../../bsps/include/bsp/vmeTsi148.h
+include_bsp_HEADERS += ../../bsps/include/bsp/vmeTsi148DMA.h
+include_bsp_HEADERS += ../../bsps/include/bsp/vmeUniverse.h
+include_bsp_HEADERS += ../../bsps/include/bsp/vmeUniverseDMA.h
+include_bsp_HEADERS += ../../bsps/include/bsp/vme_am_defs.h
+
+include_libchipdir = $(includedir)/libchip
+include_libchip_HEADERS =
+include_libchip_HEADERS += ../../bsps/include/libchip/am29lv160.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ata.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ata_internal.h
+include_libchip_HEADERS += ../../bsps/include/libchip/cs8900.h
+include_libchip_HEADERS += ../../bsps/include/libchip/disp_hcms29xx.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ds1375-rtc.h
+include_libchip_HEADERS += ../../bsps/include/libchip/greth.h
+include_libchip_HEADERS += ../../bsps/include/libchip/i2c-2b-eeprom.h
+include_libchip_HEADERS += ../../bsps/include/libchip/i2c-ds1621.h
+include_libchip_HEADERS += ../../bsps/include/libchip/i2c-sc620.h
+include_libchip_HEADERS += ../../bsps/include/libchip/i82586var.h
+include_libchip_HEADERS += ../../bsps/include/libchip/icm7170.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ide_ctrl.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ide_ctrl_cfg.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ide_ctrl_io.h
+include_libchip_HEADERS += ../../bsps/include/libchip/if_dcreg.h
+include_libchip_HEADERS += ../../bsps/include/libchip/if_fxpvar.h
+include_libchip_HEADERS += ../../bsps/include/libchip/m48t08.h
+include_libchip_HEADERS += ../../bsps/include/libchip/mc146818a.h
+include_libchip_HEADERS += ../../bsps/include/libchip/mc68681.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ns16550.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ns16550_p.h
+include_libchip_HEADERS += ../../bsps/include/libchip/open_eth.h
+include_libchip_HEADERS += ../../bsps/include/libchip/rtc.h
+include_libchip_HEADERS += ../../bsps/include/libchip/serial.h
+include_libchip_HEADERS += ../../bsps/include/libchip/sersupp.h
+include_libchip_HEADERS += ../../bsps/include/libchip/smc91111.h
+include_libchip_HEADERS += ../../bsps/include/libchip/smc91111exp.h
+include_libchip_HEADERS += ../../bsps/include/libchip/sonic.h
+include_libchip_HEADERS += ../../bsps/include/libchip/spi-flash-m25p40.h
+include_libchip_HEADERS += ../../bsps/include/libchip/spi-fram-fm25l256.h
+include_libchip_HEADERS += ../../bsps/include/libchip/spi-memdrv.h
+include_libchip_HEADERS += ../../bsps/include/libchip/spi-sd-card.h
+include_libchip_HEADERS += ../../bsps/include/libchip/wd80x3.h
+include_libchip_HEADERS += ../../bsps/include/libchip/z85c30.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += ../../bsps/include/rtems/umon.h
+
+include_rtems_zilogdir = $(includedir)/rtems/zilog
+include_rtems_zilog_HEADERS =
+include_rtems_zilog_HEADERS += ../../bsps/include/rtems/zilog/z8036.h
+include_rtems_zilog_HEADERS += ../../bsps/include/rtems/zilog/z8530.h
+
+include_umondir = $(includedir)/umon
+include_umon_HEADERS =
+include_umon_HEADERS += ../../bsps/include/umon/cli.h
+include_umon_HEADERS += ../../bsps/include/umon/monlib.h
+include_umon_HEADERS += ../../bsps/include/umon/tfs.h
diff --git a/bsps/i386/headers.am b/bsps/i386/headers.am
new file mode 100644
index 0000000000..8a3d39cfbb
--- /dev/null
+++ b/bsps/i386/headers.am
@@ -0,0 +1,20 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../bsps/i386/include/i386_io.h
+include_HEADERS += ../../../../../bsps/i386/include/uart.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/i386/include/bsp/apic.h
+include_bsp_HEADERS += ../../../../../bsps/i386/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../bsps/i386/include/bsp/irq_asm.h
+include_bsp_HEADERS += ../../../../../bsps/i386/include/bsp/realmode_int.h
+include_bsp_HEADERS += ../../../../../bsps/i386/include/bsp/smp-imps.h
+include_bsp_HEADERS += ../../../../../bsps/i386/include/bsp/tty_drv.h
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += ../../../../../bsps/i386/include/libcpu/byteorder.h
+include_libcpu_HEADERS += ../../../../../bsps/i386/include/libcpu/cpuModel.h
+include_libcpu_HEADERS += ../../../../../bsps/i386/include/libcpu/page.h
diff --git a/c/src/lib/libbsp/i386/shared/irq/apic.h b/bsps/i386/include/bsp/apic.h
index 9ae103b963..9ae103b963 100644
--- a/c/src/lib/libbsp/i386/shared/irq/apic.h
+++ b/bsps/i386/include/bsp/apic.h
diff --git a/c/src/lib/libbsp/i386/shared/irq/irq.h b/bsps/i386/include/bsp/irq.h
index f7e673c8a7..f7e673c8a7 100644
--- a/c/src/lib/libbsp/i386/shared/irq/irq.h
+++ b/bsps/i386/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/i386/shared/irq/irq_asm.h b/bsps/i386/include/bsp/irq_asm.h
index 05cb4e6cc3..05cb4e6cc3 100644
--- a/c/src/lib/libbsp/i386/shared/irq/irq_asm.h
+++ b/bsps/i386/include/bsp/irq_asm.h
diff --git a/c/src/lib/libbsp/i386/shared/realmode_int/realmode_int.h b/bsps/i386/include/bsp/realmode_int.h
index e8a1e36d01..e8a1e36d01 100644
--- a/c/src/lib/libbsp/i386/shared/realmode_int/realmode_int.h
+++ b/bsps/i386/include/bsp/realmode_int.h
diff --git a/c/src/lib/libbsp/i386/shared/smp/smp-imps.h b/bsps/i386/include/bsp/smp-imps.h
index 60e688547b..60e688547b 100644
--- a/c/src/lib/libbsp/i386/shared/smp/smp-imps.h
+++ b/bsps/i386/include/bsp/smp-imps.h
diff --git a/c/src/lib/libbsp/i386/shared/comm/tty_drv.h b/bsps/i386/include/bsp/tty_drv.h
index cbfb346f22..cbfb346f22 100644
--- a/c/src/lib/libbsp/i386/shared/comm/tty_drv.h
+++ b/bsps/i386/include/bsp/tty_drv.h
diff --git a/c/src/lib/libbsp/i386/shared/comm/i386_io.h b/bsps/i386/include/i386_io.h
index 1308d58b6b..1308d58b6b 100644
--- a/c/src/lib/libbsp/i386/shared/comm/i386_io.h
+++ b/bsps/i386/include/i386_io.h
diff --git a/c/src/lib/libcpu/i386/byteorder.h b/bsps/i386/include/libcpu/byteorder.h
index 939e51fe84..939e51fe84 100644
--- a/c/src/lib/libcpu/i386/byteorder.h
+++ b/bsps/i386/include/libcpu/byteorder.h
diff --git a/c/src/lib/libcpu/i386/cpuModel.h b/bsps/i386/include/libcpu/cpuModel.h
index d17839b7ea..d17839b7ea 100644
--- a/c/src/lib/libcpu/i386/cpuModel.h
+++ b/bsps/i386/include/libcpu/cpuModel.h
diff --git a/c/src/lib/libcpu/i386/page.h b/bsps/i386/include/libcpu/page.h
index 5e9cec2227..5e9cec2227 100644
--- a/c/src/lib/libcpu/i386/page.h
+++ b/bsps/i386/include/libcpu/page.h
diff --git a/c/src/lib/libbsp/i386/shared/comm/uart.h b/bsps/i386/include/uart.h
index 96e4a312b4..96e4a312b4 100644
--- a/c/src/lib/libbsp/i386/shared/comm/uart.h
+++ b/bsps/i386/include/uart.h
diff --git a/bsps/i386/pc386/headers.am b/bsps/i386/pc386/headers.am
new file mode 100644
index 0000000000..0109c11eed
--- /dev/null
+++ b/bsps/i386/pc386/headers.am
@@ -0,0 +1,25 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/i386/pc386/include/crt.h
+include_HEADERS += ../../../../../../bsps/i386/pc386/include/edid.h
+include_HEADERS += ../../../../../../bsps/i386/pc386/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp/bspimpl.h
+include_bsp_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp/exar17d15x.h
+include_bsp_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp/fb_default_mode.h
+include_bsp_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp/fb_vesa.h
+include_bsp_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp/rtd316.h
+include_bsp_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp/tblsizes.h
+include_bsp_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp/vbe3.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += ../../../../../../bsps/i386/pc386/include/rtems/kd.h
+include_rtems_HEADERS += ../../../../../../bsps/i386/pc386/include/rtems/keyboard.h
+include_rtems_HEADERS += ../../../../../../bsps/i386/pc386/include/rtems/ps2_drv.h
+include_rtems_HEADERS += ../../../../../../bsps/i386/pc386/include/rtems/vgacons.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/bsps/i386/pc386/include/bsp.h
index 4ff89527b2..4ff89527b2 100644
--- a/c/src/lib/libbsp/i386/pc386/include/bsp.h
+++ b/bsps/i386/pc386/include/bsp.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/bspimpl.h b/bsps/i386/pc386/include/bsp/bspimpl.h
index 314fb91eb9..314fb91eb9 100644
--- a/c/src/lib/libbsp/i386/pc386/include/bspimpl.h
+++ b/bsps/i386/pc386/include/bsp/bspimpl.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/exar17d15x.h b/bsps/i386/pc386/include/bsp/exar17d15x.h
index 9e1194ffec..9e1194ffec 100644
--- a/c/src/lib/libbsp/i386/pc386/console/exar17d15x.h
+++ b/bsps/i386/pc386/include/bsp/exar17d15x.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/fb_default_mode.h b/bsps/i386/pc386/include/bsp/fb_default_mode.h
index 948ffee5b6..948ffee5b6 100644
--- a/c/src/lib/libbsp/i386/pc386/console/fb_default_mode.h
+++ b/bsps/i386/pc386/include/bsp/fb_default_mode.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/fb_vesa.h b/bsps/i386/pc386/include/bsp/fb_vesa.h
index d8bfd1bcb4..d8bfd1bcb4 100644
--- a/c/src/lib/libbsp/i386/pc386/include/fb_vesa.h
+++ b/bsps/i386/pc386/include/bsp/fb_vesa.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/rtd316.h b/bsps/i386/pc386/include/bsp/rtd316.h
index aabad2c263..aabad2c263 100644
--- a/c/src/lib/libbsp/i386/pc386/console/rtd316.h
+++ b/bsps/i386/pc386/include/bsp/rtd316.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/tblsizes.h b/bsps/i386/pc386/include/bsp/tblsizes.h
index cea8619c8f..cea8619c8f 100644
--- a/c/src/lib/libbsp/i386/pc386/include/tblsizes.h
+++ b/bsps/i386/pc386/include/bsp/tblsizes.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/vbe3.h b/bsps/i386/pc386/include/bsp/vbe3.h
index b62ab6f3ac..b62ab6f3ac 100644
--- a/c/src/lib/libbsp/i386/pc386/include/vbe3.h
+++ b/bsps/i386/pc386/include/bsp/vbe3.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/crt.h b/bsps/i386/pc386/include/crt.h
index ba0534a5aa..ba0534a5aa 100644
--- a/c/src/lib/libbsp/i386/pc386/include/crt.h
+++ b/bsps/i386/pc386/include/crt.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/edid.h b/bsps/i386/pc386/include/edid.h
index 836294dcad..836294dcad 100644
--- a/c/src/lib/libbsp/i386/pc386/include/edid.h
+++ b/bsps/i386/pc386/include/edid.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/kd.h b/bsps/i386/pc386/include/rtems/kd.h
index c97e4f7bdd..c97e4f7bdd 100644
--- a/c/src/lib/libbsp/i386/pc386/console/kd.h
+++ b/bsps/i386/pc386/include/rtems/kd.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/keyboard.h b/bsps/i386/pc386/include/rtems/keyboard.h
index ffc8aabfbd..ffc8aabfbd 100644
--- a/c/src/lib/libbsp/i386/pc386/console/keyboard.h
+++ b/bsps/i386/pc386/include/rtems/keyboard.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/ps2_drv.h b/bsps/i386/pc386/include/rtems/ps2_drv.h
index 536b56a6ed..536b56a6ed 100644
--- a/c/src/lib/libbsp/i386/pc386/console/ps2_drv.h
+++ b/bsps/i386/pc386/include/rtems/ps2_drv.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/vgacons.h b/bsps/i386/pc386/include/rtems/vgacons.h
index df7615bf5e..df7615bf5e 100644
--- a/c/src/lib/libbsp/i386/pc386/console/vgacons.h
+++ b/bsps/i386/pc386/include/rtems/vgacons.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/tm27.h b/bsps/i386/pc386/include/tm27.h
index b53ab8e97a..b53ab8e97a 100644
--- a/c/src/lib/libbsp/i386/pc386/include/tm27.h
+++ b/bsps/i386/pc386/include/tm27.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/VME.h b/bsps/include/bsp/VME.h
index bdaa45870e..bdaa45870e 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/VME.h
+++ b/bsps/include/bsp/VME.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/VMEDMA.h b/bsps/include/bsp/VMEDMA.h
index 636f6d365c..636f6d365c 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/VMEDMA.h
+++ b/bsps/include/bsp/VMEDMA.h
diff --git a/c/src/lib/libbsp/shared/include/bootcard.h b/bsps/include/bsp/bootcard.h
index aaac42e8e2..aaac42e8e2 100644
--- a/c/src/lib/libbsp/shared/include/bootcard.h
+++ b/bsps/include/bsp/bootcard.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.h b/bsps/include/bsp/bspVmeDmaList.h
index 414afab5c9..414afab5c9 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.h
+++ b/bsps/include/bsp/bspVmeDmaList.h
diff --git a/c/src/lib/libbsp/shared/include/console-polled.h b/bsps/include/bsp/console-polled.h
index 09a99c30cb..09a99c30cb 100644
--- a/c/src/lib/libbsp/shared/include/console-polled.h
+++ b/bsps/include/bsp/console-polled.h
diff --git a/c/src/lib/libbsp/shared/include/console-termios.h b/bsps/include/bsp/console-termios.h
index 413dde4663..413dde4663 100644
--- a/c/src/lib/libbsp/shared/include/console-termios.h
+++ b/bsps/include/bsp/console-termios.h
diff --git a/c/src/lib/libbsp/shared/include/default-initial-extension.h b/bsps/include/bsp/default-initial-extension.h
index 1c795b7278..1c795b7278 100644
--- a/c/src/lib/libbsp/shared/include/default-initial-extension.h
+++ b/bsps/include/bsp/default-initial-extension.h
diff --git a/c/src/lib/libbsp/shared/include/fatal.h b/bsps/include/bsp/fatal.h
index ca2e39aba8..ca2e39aba8 100644
--- a/c/src/lib/libbsp/shared/include/fatal.h
+++ b/bsps/include/bsp/fatal.h
diff --git a/c/src/lib/libbsp/shared/include/fdt.h b/bsps/include/bsp/fdt.h
index 4ed05b136c..4ed05b136c 100644
--- a/c/src/lib/libbsp/shared/include/fdt.h
+++ b/bsps/include/bsp/fdt.h
diff --git a/c/src/lib/libbsp/shared/include/gpio.h b/bsps/include/bsp/gpio.h
index 64a877ae7a..64a877ae7a 100644
--- a/c/src/lib/libbsp/shared/include/gpio.h
+++ b/bsps/include/bsp/gpio.h
diff --git a/c/src/lib/libbsp/shared/include/irq-generic.h b/bsps/include/bsp/irq-generic.h
index 187aea84d1..187aea84d1 100644
--- a/c/src/lib/libbsp/shared/include/irq-generic.h
+++ b/bsps/include/bsp/irq-generic.h
diff --git a/c/src/lib/libbsp/shared/include/irq-info.h b/bsps/include/bsp/irq-info.h
index ea6d629e76..ea6d629e76 100644
--- a/c/src/lib/libbsp/shared/include/irq-info.h
+++ b/bsps/include/bsp/irq-info.h
diff --git a/c/src/lib/libbsp/shared/include/mm.h b/bsps/include/bsp/mm.h
index 2152f686ba..2152f686ba 100644
--- a/c/src/lib/libbsp/shared/include/mm.h
+++ b/bsps/include/bsp/mm.h
diff --git a/c/src/lib/libbsp/shared/include/stackalloc.h b/bsps/include/bsp/stackalloc.h
index 89414c8e6e..89414c8e6e 100644
--- a/c/src/lib/libbsp/shared/include/stackalloc.h
+++ b/bsps/include/bsp/stackalloc.h
diff --git a/c/src/lib/libbsp/shared/include/u-boot.h b/bsps/include/bsp/u-boot.h
index 866cd9bbb0..866cd9bbb0 100644
--- a/c/src/lib/libbsp/shared/include/u-boot.h
+++ b/bsps/include/bsp/u-boot.h
diff --git a/c/src/lib/libbsp/shared/include/uart-output-char.h b/bsps/include/bsp/uart-output-char.h
index a6648d1ad4..a6648d1ad4 100644
--- a/c/src/lib/libbsp/shared/include/uart-output-char.h
+++ b/bsps/include/bsp/uart-output-char.h
diff --git a/c/src/lib/libbsp/shared/include/utility.h b/bsps/include/bsp/utility.h
index fee28f445a..fee28f445a 100644
--- a/c/src/lib/libbsp/shared/include/utility.h
+++ b/bsps/include/bsp/utility.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h b/bsps/include/bsp/vmeTsi148.h
index 6183940a2d..6183940a2d 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h
+++ b/bsps/include/bsp/vmeTsi148.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148DMA.h b/bsps/include/bsp/vmeTsi148DMA.h
index da7c99302b..da7c99302b 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148DMA.h
+++ b/bsps/include/bsp/vmeTsi148DMA.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h b/bsps/include/bsp/vmeUniverse.h
index 7cb9f8d2de..7cb9f8d2de 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h
+++ b/bsps/include/bsp/vmeUniverse.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverseDMA.h b/bsps/include/bsp/vmeUniverseDMA.h
index d0a3d6f0e7..d0a3d6f0e7 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverseDMA.h
+++ b/bsps/include/bsp/vmeUniverseDMA.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h b/bsps/include/bsp/vme_am_defs.h
index efa28b3aa0..efa28b3aa0 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h
+++ b/bsps/include/bsp/vme_am_defs.h
diff --git a/c/src/libchip/flash/am29lv160.h b/bsps/include/libchip/am29lv160.h
index 49d8e248ac..49d8e248ac 100644
--- a/c/src/libchip/flash/am29lv160.h
+++ b/bsps/include/libchip/am29lv160.h
diff --git a/c/src/libchip/ide/ata.h b/bsps/include/libchip/ata.h
index 66cc46747d..66cc46747d 100644
--- a/c/src/libchip/ide/ata.h
+++ b/bsps/include/libchip/ata.h
diff --git a/c/src/libchip/ide/ata_internal.h b/bsps/include/libchip/ata_internal.h
index 985b6f597c..985b6f597c 100644
--- a/c/src/libchip/ide/ata_internal.h
+++ b/bsps/include/libchip/ata_internal.h
diff --git a/c/src/libchip/network/cs8900.h b/bsps/include/libchip/cs8900.h
index 79c943842d..79c943842d 100644
--- a/c/src/libchip/network/cs8900.h
+++ b/bsps/include/libchip/cs8900.h
diff --git a/c/src/libchip/display/disp_hcms29xx.h b/bsps/include/libchip/disp_hcms29xx.h
index 84b74b6910..84b74b6910 100644
--- a/c/src/libchip/display/disp_hcms29xx.h
+++ b/bsps/include/libchip/disp_hcms29xx.h
diff --git a/c/src/libchip/rtc/ds1375-rtc.h b/bsps/include/libchip/ds1375-rtc.h
index a5be96293f..a5be96293f 100644
--- a/c/src/libchip/rtc/ds1375-rtc.h
+++ b/bsps/include/libchip/ds1375-rtc.h
diff --git a/c/src/libchip/network/greth.h b/bsps/include/libchip/greth.h
index c6e000dbd3..c6e000dbd3 100644
--- a/c/src/libchip/network/greth.h
+++ b/bsps/include/libchip/greth.h
diff --git a/c/src/libchip/i2c/i2c-2b-eeprom.h b/bsps/include/libchip/i2c-2b-eeprom.h
index 93730d1e3b..93730d1e3b 100644
--- a/c/src/libchip/i2c/i2c-2b-eeprom.h
+++ b/bsps/include/libchip/i2c-2b-eeprom.h
diff --git a/c/src/libchip/i2c/i2c-ds1621.h b/bsps/include/libchip/i2c-ds1621.h
index 64df69f465..64df69f465 100644
--- a/c/src/libchip/i2c/i2c-ds1621.h
+++ b/bsps/include/libchip/i2c-ds1621.h
diff --git a/c/src/libchip/i2c/i2c-sc620.h b/bsps/include/libchip/i2c-sc620.h
index 27721b91c3..27721b91c3 100644
--- a/c/src/libchip/i2c/i2c-sc620.h
+++ b/bsps/include/libchip/i2c-sc620.h
diff --git a/c/src/libchip/network/i82586var.h b/bsps/include/libchip/i82586var.h
index c9421a6732..c9421a6732 100644
--- a/c/src/libchip/network/i82586var.h
+++ b/bsps/include/libchip/i82586var.h
diff --git a/c/src/libchip/rtc/icm7170.h b/bsps/include/libchip/icm7170.h
index 6b95c905a4..6b95c905a4 100644
--- a/c/src/libchip/rtc/icm7170.h
+++ b/bsps/include/libchip/icm7170.h
diff --git a/c/src/libchip/ide/ide_ctrl.h b/bsps/include/libchip/ide_ctrl.h
index de32e4bed9..de32e4bed9 100644
--- a/c/src/libchip/ide/ide_ctrl.h
+++ b/bsps/include/libchip/ide_ctrl.h
diff --git a/c/src/libchip/ide/ide_ctrl_cfg.h b/bsps/include/libchip/ide_ctrl_cfg.h
index 3339a28d2b..3339a28d2b 100644
--- a/c/src/libchip/ide/ide_ctrl_cfg.h
+++ b/bsps/include/libchip/ide_ctrl_cfg.h
diff --git a/c/src/libchip/ide/ide_ctrl_io.h b/bsps/include/libchip/ide_ctrl_io.h
index 9534b0e88f..9534b0e88f 100644
--- a/c/src/libchip/ide/ide_ctrl_io.h
+++ b/bsps/include/libchip/ide_ctrl_io.h
diff --git a/c/src/libchip/network/if_dcreg.h b/bsps/include/libchip/if_dcreg.h
index 07395c1884..07395c1884 100644
--- a/c/src/libchip/network/if_dcreg.h
+++ b/bsps/include/libchip/if_dcreg.h
diff --git a/c/src/libchip/network/if_fxpvar.h b/bsps/include/libchip/if_fxpvar.h
index f29f52c080..f29f52c080 100644
--- a/c/src/libchip/network/if_fxpvar.h
+++ b/bsps/include/libchip/if_fxpvar.h
diff --git a/c/src/libchip/rtc/m48t08.h b/bsps/include/libchip/m48t08.h
index 3c46d384d5..3c46d384d5 100644
--- a/c/src/libchip/rtc/m48t08.h
+++ b/bsps/include/libchip/m48t08.h
diff --git a/c/src/libchip/rtc/mc146818a.h b/bsps/include/libchip/mc146818a.h
index 4eb5af04d7..4eb5af04d7 100644
--- a/c/src/libchip/rtc/mc146818a.h
+++ b/bsps/include/libchip/mc146818a.h
diff --git a/c/src/libchip/serial/mc68681.h b/bsps/include/libchip/mc68681.h
index e498a41b30..e498a41b30 100644
--- a/c/src/libchip/serial/mc68681.h
+++ b/bsps/include/libchip/mc68681.h
diff --git a/c/src/libchip/serial/ns16550.h b/bsps/include/libchip/ns16550.h
index 4f1b98bf0b..4f1b98bf0b 100644
--- a/c/src/libchip/serial/ns16550.h
+++ b/bsps/include/libchip/ns16550.h
diff --git a/c/src/libchip/serial/ns16550_p.h b/bsps/include/libchip/ns16550_p.h
index e3d0eba557..e3d0eba557 100755
--- a/c/src/libchip/serial/ns16550_p.h
+++ b/bsps/include/libchip/ns16550_p.h
diff --git a/c/src/libchip/network/open_eth.h b/bsps/include/libchip/open_eth.h
index 66a5204230..66a5204230 100644
--- a/c/src/libchip/network/open_eth.h
+++ b/bsps/include/libchip/open_eth.h
diff --git a/c/src/libchip/rtc/rtc.h b/bsps/include/libchip/rtc.h
index 49dd51c2e2..49dd51c2e2 100644
--- a/c/src/libchip/rtc/rtc.h
+++ b/bsps/include/libchip/rtc.h
diff --git a/c/src/libchip/serial/serial.h b/bsps/include/libchip/serial.h
index 49a7bebdca..49a7bebdca 100644
--- a/c/src/libchip/serial/serial.h
+++ b/bsps/include/libchip/serial.h
diff --git a/c/src/libchip/serial/sersupp.h b/bsps/include/libchip/sersupp.h
index 6d24d25b61..6d24d25b61 100644
--- a/c/src/libchip/serial/sersupp.h
+++ b/bsps/include/libchip/sersupp.h
diff --git a/c/src/libchip/network/smc91111.h b/bsps/include/libchip/smc91111.h
index 7ec83716d0..7ec83716d0 100644
--- a/c/src/libchip/network/smc91111.h
+++ b/bsps/include/libchip/smc91111.h
diff --git a/c/src/libchip/network/smc91111exp.h b/bsps/include/libchip/smc91111exp.h
index 08e086d9e7..08e086d9e7 100644
--- a/c/src/libchip/network/smc91111exp.h
+++ b/bsps/include/libchip/smc91111exp.h
diff --git a/c/src/libchip/network/sonic.h b/bsps/include/libchip/sonic.h
index fe119ff20a..fe119ff20a 100644
--- a/c/src/libchip/network/sonic.h
+++ b/bsps/include/libchip/sonic.h
diff --git a/c/src/libchip/i2c/spi-flash-m25p40.h b/bsps/include/libchip/spi-flash-m25p40.h
index 2009b6fed3..2009b6fed3 100644
--- a/c/src/libchip/i2c/spi-flash-m25p40.h
+++ b/bsps/include/libchip/spi-flash-m25p40.h
diff --git a/c/src/libchip/i2c/spi-fram-fm25l256.h b/bsps/include/libchip/spi-fram-fm25l256.h
index a2167a3074..a2167a3074 100644
--- a/c/src/libchip/i2c/spi-fram-fm25l256.h
+++ b/bsps/include/libchip/spi-fram-fm25l256.h
diff --git a/c/src/libchip/i2c/spi-memdrv.h b/bsps/include/libchip/spi-memdrv.h
index ed4aa55b6f..ed4aa55b6f 100644
--- a/c/src/libchip/i2c/spi-memdrv.h
+++ b/bsps/include/libchip/spi-memdrv.h
diff --git a/c/src/libchip/i2c/spi-sd-card.h b/bsps/include/libchip/spi-sd-card.h
index 77e905a155..77e905a155 100644
--- a/c/src/libchip/i2c/spi-sd-card.h
+++ b/bsps/include/libchip/spi-sd-card.h
diff --git a/c/src/libchip/network/wd80x3.h b/bsps/include/libchip/wd80x3.h
index b4aa12e735..b4aa12e735 100644
--- a/c/src/libchip/network/wd80x3.h
+++ b/bsps/include/libchip/wd80x3.h
diff --git a/c/src/libchip/serial/z85c30.h b/bsps/include/libchip/z85c30.h
index 656d50ea1c..656d50ea1c 100644
--- a/c/src/libchip/serial/z85c30.h
+++ b/bsps/include/libchip/z85c30.h
diff --git a/c/src/libchip/shmdr/mpci.h b/bsps/include/mpci.h
index cc7c5826de..cc7c5826de 100644
--- a/c/src/libchip/shmdr/mpci.h
+++ b/bsps/include/mpci.h
diff --git a/c/src/lib/libbsp/shared/umon/umon.h b/bsps/include/rtems/umon.h
index d25a7818dd..d25a7818dd 100644
--- a/c/src/lib/libbsp/shared/umon/umon.h
+++ b/bsps/include/rtems/umon.h
diff --git a/c/src/lib/libbsp/shared/include/zilog/z8036.h b/bsps/include/rtems/zilog/z8036.h
index fea1493905..fea1493905 100644
--- a/c/src/lib/libbsp/shared/include/zilog/z8036.h
+++ b/bsps/include/rtems/zilog/z8036.h
diff --git a/c/src/lib/libbsp/shared/include/zilog/z8530.h b/bsps/include/rtems/zilog/z8530.h
index 161b9a022c..161b9a022c 100644
--- a/c/src/lib/libbsp/shared/include/zilog/z8530.h
+++ b/bsps/include/rtems/zilog/z8530.h
diff --git a/c/src/libchip/shmdr/shm_driver.h b/bsps/include/shm_driver.h
index cb94cec0cb..cb94cec0cb 100644
--- a/c/src/libchip/shmdr/shm_driver.h
+++ b/bsps/include/shm_driver.h
diff --git a/c/src/lib/libbsp/shared/umon/cli.h b/bsps/include/umon/cli.h
index 0e1689db26..0e1689db26 100644
--- a/c/src/lib/libbsp/shared/umon/cli.h
+++ b/bsps/include/umon/cli.h
diff --git a/c/src/lib/libbsp/shared/umon/monlib.h b/bsps/include/umon/monlib.h
index efbfc93d59..efbfc93d59 100644
--- a/c/src/lib/libbsp/shared/umon/monlib.h
+++ b/bsps/include/umon/monlib.h
diff --git a/c/src/lib/libbsp/shared/umon/tfs.h b/bsps/include/umon/tfs.h
index 258288bd14..258288bd14 100644
--- a/c/src/lib/libbsp/shared/umon/tfs.h
+++ b/bsps/include/umon/tfs.h
diff --git a/bsps/lm32/headers.am b/bsps/lm32/headers.am
new file mode 100644
index 0000000000..e44184dbea
--- /dev/null
+++ b/bsps/lm32/headers.am
@@ -0,0 +1,18 @@
+## This file was generated by "./boostrap -H".
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_ac97.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_buttons.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_dmx.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_flash.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_gpio.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_ir.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_memcard.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_midi.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_pfpu.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_tmu.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_usbinput.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_versions.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_video.h
diff --git a/c/src/lib/libbsp/lm32/shared/include/irq.h b/bsps/lm32/include/bsp/irq.h
index b1ccd66339..b1ccd66339 100644
--- a/c/src/lib/libbsp/lm32/shared/include/irq.h
+++ b/bsps/lm32/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_ac97/milkymist_ac97.h b/bsps/lm32/include/bsp/milkymist_ac97.h
index 37415a1f5e..37415a1f5e 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_ac97/milkymist_ac97.h
+++ b/bsps/lm32/include/bsp/milkymist_ac97.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_buttons/milkymist_buttons.h b/bsps/lm32/include/bsp/milkymist_buttons.h
index de6ee51438..de6ee51438 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_buttons/milkymist_buttons.h
+++ b/bsps/lm32/include/bsp/milkymist_buttons.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_dmx/milkymist_dmx.h b/bsps/lm32/include/bsp/milkymist_dmx.h
index a933e3423f..a933e3423f 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_dmx/milkymist_dmx.h
+++ b/bsps/lm32/include/bsp/milkymist_dmx.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_flash/milkymist_flash.h b/bsps/lm32/include/bsp/milkymist_flash.h
index 2acf855096..2acf855096 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_flash/milkymist_flash.h
+++ b/bsps/lm32/include/bsp/milkymist_flash.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_gpio/milkymist_gpio.h b/bsps/lm32/include/bsp/milkymist_gpio.h
index 1e30b9c280..1e30b9c280 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_gpio/milkymist_gpio.h
+++ b/bsps/lm32/include/bsp/milkymist_gpio.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_ir/milkymist_ir.h b/bsps/lm32/include/bsp/milkymist_ir.h
index 4df7f3550c..4df7f3550c 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_ir/milkymist_ir.h
+++ b/bsps/lm32/include/bsp/milkymist_ir.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_memcard/milkymist_memcard.h b/bsps/lm32/include/bsp/milkymist_memcard.h
index 713b45be07..713b45be07 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_memcard/milkymist_memcard.h
+++ b/bsps/lm32/include/bsp/milkymist_memcard.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_midi/milkymist_midi.h b/bsps/lm32/include/bsp/milkymist_midi.h
index da53de6af5..da53de6af5 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_midi/milkymist_midi.h
+++ b/bsps/lm32/include/bsp/milkymist_midi.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_pfpu/milkymist_pfpu.h b/bsps/lm32/include/bsp/milkymist_pfpu.h
index 73ea5fa28e..73ea5fa28e 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_pfpu/milkymist_pfpu.h
+++ b/bsps/lm32/include/bsp/milkymist_pfpu.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_tmu/milkymist_tmu.h b/bsps/lm32/include/bsp/milkymist_tmu.h
index 94f8394ef7..94f8394ef7 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_tmu/milkymist_tmu.h
+++ b/bsps/lm32/include/bsp/milkymist_tmu.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_usbinput/milkymist_usbinput.h b/bsps/lm32/include/bsp/milkymist_usbinput.h
index 04c376fa8a..04c376fa8a 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_usbinput/milkymist_usbinput.h
+++ b/bsps/lm32/include/bsp/milkymist_usbinput.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_versions/milkymist_versions.h b/bsps/lm32/include/bsp/milkymist_versions.h
index 3b5063f306..3b5063f306 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_versions/milkymist_versions.h
+++ b/bsps/lm32/include/bsp/milkymist_versions.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_video/milkymist_video.h b/bsps/lm32/include/bsp/milkymist_video.h
index 6ec3cc0a83..6ec3cc0a83 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_video/milkymist_video.h
+++ b/bsps/lm32/include/bsp/milkymist_video.h
diff --git a/bsps/lm32/lm32_evr/headers.am b/bsps/lm32/lm32_evr/headers.am
new file mode 100644
index 0000000000..213b66effe
--- /dev/null
+++ b/bsps/lm32/lm32_evr/headers.am
@@ -0,0 +1,7 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/lm32/lm32_evr/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/lm32/lm32_evr/include/system_conf.h
+include_HEADERS += ../../../../../../bsps/lm32/lm32_evr/include/tm27.h
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h b/bsps/lm32/lm32_evr/include/bsp.h
index 7c3ac8400d..7c3ac8400d 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h
+++ b/bsps/lm32/lm32_evr/include/bsp.h
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/system_conf.h b/bsps/lm32/lm32_evr/include/system_conf.h
index 41f17e2be0..41f17e2be0 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/include/system_conf.h
+++ b/bsps/lm32/lm32_evr/include/system_conf.h
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/tm27.h b/bsps/lm32/lm32_evr/include/tm27.h
index f62e62e73f..f62e62e73f 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/include/tm27.h
+++ b/bsps/lm32/lm32_evr/include/tm27.h
diff --git a/bsps/lm32/milkymist/headers.am b/bsps/lm32/milkymist/headers.am
new file mode 100644
index 0000000000..1bd114fba1
--- /dev/null
+++ b/bsps/lm32/milkymist/headers.am
@@ -0,0 +1,7 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/lm32/milkymist/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/lm32/milkymist/include/system_conf.h
+include_HEADERS += ../../../../../../bsps/lm32/milkymist/include/tm27.h
diff --git a/c/src/lib/libbsp/lm32/milkymist/include/bsp.h b/bsps/lm32/milkymist/include/bsp.h
index d8af4a3124..d8af4a3124 100644
--- a/c/src/lib/libbsp/lm32/milkymist/include/bsp.h
+++ b/bsps/lm32/milkymist/include/bsp.h
diff --git a/c/src/lib/libbsp/lm32/milkymist/include/system_conf.h b/bsps/lm32/milkymist/include/system_conf.h
index 8ba4a1cf43..8ba4a1cf43 100644
--- a/c/src/lib/libbsp/lm32/milkymist/include/system_conf.h
+++ b/bsps/lm32/milkymist/include/system_conf.h
diff --git a/c/src/lib/libbsp/lm32/milkymist/include/tm27.h b/bsps/lm32/milkymist/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/lm32/milkymist/include/tm27.h
+++ b/bsps/lm32/milkymist/include/tm27.h
diff --git a/bsps/m32c/m32cbsp/headers.am b/bsps/m32c/m32cbsp/headers.am
new file mode 100644
index 0000000000..463baaeb43
--- /dev/null
+++ b/bsps/m32c/m32cbsp/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m32c/m32cbsp/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m32c/m32cbsp/include/tm27.h
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/include/bsp.h b/bsps/m32c/m32cbsp/include/bsp.h
index b7c6891e09..b7c6891e09 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/include/bsp.h
+++ b/bsps/m32c/m32cbsp/include/bsp.h
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/include/tm27.h b/bsps/m32c/m32cbsp/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/include/tm27.h
+++ b/bsps/m32c/m32cbsp/include/tm27.h
diff --git a/bsps/m68k/av5282/headers.am b/bsps/m68k/av5282/headers.am
new file mode 100644
index 0000000000..a6a9154900
--- /dev/null
+++ b/bsps/m68k/av5282/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/av5282/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/av5282/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/av5282/include/bsp.h b/bsps/m68k/av5282/include/bsp.h
index a8b32e745e..a8b32e745e 100644
--- a/c/src/lib/libbsp/m68k/av5282/include/bsp.h
+++ b/bsps/m68k/av5282/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/av5282/include/tm27.h b/bsps/m68k/av5282/include/tm27.h
index 1e1dc77e59..1e1dc77e59 100644
--- a/c/src/lib/libbsp/m68k/av5282/include/tm27.h
+++ b/bsps/m68k/av5282/include/tm27.h
diff --git a/bsps/m68k/csb360/headers.am b/bsps/m68k/csb360/headers.am
new file mode 100644
index 0000000000..5c713a234d
--- /dev/null
+++ b/bsps/m68k/csb360/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/csb360/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/csb360/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/csb360/include/bsp.h b/bsps/m68k/csb360/include/bsp.h
index 5272e17ae2..5272e17ae2 100644
--- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h
+++ b/bsps/m68k/csb360/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/csb360/include/tm27.h b/bsps/m68k/csb360/include/tm27.h
index 5f2fd8a383..5f2fd8a383 100644
--- a/c/src/lib/libbsp/m68k/csb360/include/tm27.h
+++ b/bsps/m68k/csb360/include/tm27.h
diff --git a/bsps/m68k/gen68340/headers.am b/bsps/m68k/gen68340/headers.am
new file mode 100644
index 0000000000..ca3dba2b1e
--- /dev/null
+++ b/bsps/m68k/gen68340/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/gen68340/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/gen68340/include/m340timer.h
+include_HEADERS += ../../../../../../bsps/m68k/gen68340/include/m340uart.h
+include_HEADERS += ../../../../../../bsps/m68k/gen68340/include/m68340.h
+include_HEADERS += ../../../../../../bsps/m68k/gen68340/include/m68340.inc
+include_HEADERS += ../../../../../../bsps/m68k/gen68340/include/m68349.inc
+include_HEADERS += ../../../../../../bsps/m68k/gen68340/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/bsps/m68k/gen68340/include/bsp.h
index 28d86ff2f7..28d86ff2f7 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
+++ b/bsps/m68k/gen68340/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m340timer.h b/bsps/m68k/gen68340/include/m340timer.h
index 892c690e5f..892c690e5f 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/m340timer.h
+++ b/bsps/m68k/gen68340/include/m340timer.h
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h b/bsps/m68k/gen68340/include/m340uart.h
index 619a732a14..619a732a14 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h
+++ b/bsps/m68k/gen68340/include/m340uart.h
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m68340.h b/bsps/m68k/gen68340/include/m68340.h
index 37440f3098..37440f3098 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/m68340.h
+++ b/bsps/m68k/gen68340/include/m68340.h
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m68340.inc b/bsps/m68k/gen68340/include/m68340.inc
index 5c1ba36799..5c1ba36799 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/m68340.inc
+++ b/bsps/m68k/gen68340/include/m68340.inc
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m68349.inc b/bsps/m68k/gen68340/include/m68349.inc
index 4e3ce53d29..4e3ce53d29 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/m68349.inc
+++ b/bsps/m68k/gen68340/include/m68349.inc
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/tm27.h b/bsps/m68k/gen68340/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/tm27.h
+++ b/bsps/m68k/gen68340/include/tm27.h
diff --git a/bsps/m68k/gen68360/headers.am b/bsps/m68k/gen68360/headers.am
new file mode 100644
index 0000000000..be0ec17252
--- /dev/null
+++ b/bsps/m68k/gen68360/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/gen68360/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/gen68360/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/bsps/m68k/gen68360/include/bsp.h
index 0c6a94066c..0c6a94066c 100644
--- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
+++ b/bsps/m68k/gen68360/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/gen68360/include/tm27.h b/bsps/m68k/gen68360/include/tm27.h
index c71eed3897..c71eed3897 100644
--- a/c/src/lib/libbsp/m68k/gen68360/include/tm27.h
+++ b/bsps/m68k/gen68360/include/tm27.h
diff --git a/bsps/m68k/genmcf548x/headers.am b/bsps/m68k/genmcf548x/headers.am
new file mode 100644
index 0000000000..80752c512e
--- /dev/null
+++ b/bsps/m68k/genmcf548x/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/genmcf548x/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/genmcf548x/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/m68k/genmcf548x/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h b/bsps/m68k/genmcf548x/include/bsp.h
index 77a7bca0e8..77a7bca0e8 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
+++ b/bsps/m68k/genmcf548x/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/irq.h b/bsps/m68k/genmcf548x/include/bsp/irq.h
index 825cc0d104..825cc0d104 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/include/irq.h
+++ b/bsps/m68k/genmcf548x/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/tm27.h b/bsps/m68k/genmcf548x/include/tm27.h
index 31ea8bca0c..31ea8bca0c 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/include/tm27.h
+++ b/bsps/m68k/genmcf548x/include/tm27.h
diff --git a/bsps/m68k/headers.am b/bsps/m68k/headers.am
new file mode 100644
index 0000000000..526fa7769f
--- /dev/null
+++ b/bsps/m68k/headers.am
@@ -0,0 +1,47 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../bsps/m68k/include/mvme16x_hw.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/m68k/include/bsp/linker-symbols.h
+
+include_mcf5206dir = $(includedir)/mcf5206
+include_mcf5206_HEADERS =
+include_mcf5206_HEADERS += ../../../../../bsps/m68k/include/mcf5206/mcf5206e.h
+include_mcf5206_HEADERS += ../../../../../bsps/m68k/include/mcf5206/mcfmbus.h
+include_mcf5206_HEADERS += ../../../../../bsps/m68k/include/mcf5206/mcfuart.h
+
+include_mcf5223xdir = $(includedir)/mcf5223x
+include_mcf5223x_HEADERS =
+include_mcf5223x_HEADERS += ../../../../../bsps/m68k/include/mcf5223x/mcf5223x.h
+
+include_mcf5225xdir = $(includedir)/mcf5225x
+include_mcf5225x_HEADERS =
+include_mcf5225x_HEADERS += ../../../../../bsps/m68k/include/mcf5225x/fec.h
+include_mcf5225x_HEADERS += ../../../../../bsps/m68k/include/mcf5225x/mcf5225x.h
+
+include_mcf5235dir = $(includedir)/mcf5235
+include_mcf5235_HEADERS =
+include_mcf5235_HEADERS += ../../../../../bsps/m68k/include/mcf5235/mcf5235.h
+
+include_mcf5272dir = $(includedir)/mcf5272
+include_mcf5272_HEADERS =
+include_mcf5272_HEADERS += ../../../../../bsps/m68k/include/mcf5272/mcf5272.h
+
+include_mcf5282dir = $(includedir)/mcf5282
+include_mcf5282_HEADERS =
+include_mcf5282_HEADERS += ../../../../../bsps/m68k/include/mcf5282/mcf5282.h
+
+include_mcf532xdir = $(includedir)/mcf532x
+include_mcf532x_HEADERS =
+include_mcf532x_HEADERS += ../../../../../bsps/m68k/include/mcf532x/mcf532x.h
+
+include_mcf548xdir = $(includedir)/mcf548x
+include_mcf548x_HEADERS =
+include_mcf548x_HEADERS += ../../../../../bsps/m68k/include/mcf548x/MCD_dma.h
+include_mcf548x_HEADERS += ../../../../../bsps/m68k/include/mcf548x/MCD_progCheck.h
+include_mcf548x_HEADERS += ../../../../../bsps/m68k/include/mcf548x/MCD_tasksInit.h
+include_mcf548x_HEADERS += ../../../../../bsps/m68k/include/mcf548x/mcdma_glue.h
+include_mcf548x_HEADERS += ../../../../../bsps/m68k/include/mcf548x/mcf548x.h
diff --git a/c/src/lib/libbsp/m68k/shared/include/linker-symbols.h b/bsps/m68k/include/bsp/linker-symbols.h
index 8bf5ebfa07..8bf5ebfa07 100644
--- a/c/src/lib/libbsp/m68k/shared/include/linker-symbols.h
+++ b/bsps/m68k/include/bsp/linker-symbols.h
diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcf5206e.h b/bsps/m68k/include/mcf5206/mcf5206e.h
index 06dadca9b1..06dadca9b1 100644
--- a/c/src/lib/libcpu/m68k/mcf5206/include/mcf5206e.h
+++ b/bsps/m68k/include/mcf5206/mcf5206e.h
diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h b/bsps/m68k/include/mcf5206/mcfmbus.h
index f70a70e483..f70a70e483 100644
--- a/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h
+++ b/bsps/m68k/include/mcf5206/mcfmbus.h
diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h b/bsps/m68k/include/mcf5206/mcfuart.h
index bd9df5bb56..bd9df5bb56 100644
--- a/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h
+++ b/bsps/m68k/include/mcf5206/mcfuart.h
diff --git a/c/src/lib/libcpu/m68k/mcf5223x/include/mcf5223x.h b/bsps/m68k/include/mcf5223x/mcf5223x.h
index 0886105b17..0886105b17 100644
--- a/c/src/lib/libcpu/m68k/mcf5223x/include/mcf5223x.h
+++ b/bsps/m68k/include/mcf5223x/mcf5223x.h
diff --git a/c/src/lib/libcpu/m68k/mcf5225x/include/fec.h b/bsps/m68k/include/mcf5225x/fec.h
index 8d8d6c3763..8d8d6c3763 100644
--- a/c/src/lib/libcpu/m68k/mcf5225x/include/fec.h
+++ b/bsps/m68k/include/mcf5225x/fec.h
diff --git a/c/src/lib/libcpu/m68k/mcf5225x/include/mcf5225x.h b/bsps/m68k/include/mcf5225x/mcf5225x.h
index ded447ffac..ded447ffac 100644
--- a/c/src/lib/libcpu/m68k/mcf5225x/include/mcf5225x.h
+++ b/bsps/m68k/include/mcf5225x/mcf5225x.h
diff --git a/c/src/lib/libcpu/m68k/mcf5235/include/mcf5235.h b/bsps/m68k/include/mcf5235/mcf5235.h
index 87e0d91541..87e0d91541 100644
--- a/c/src/lib/libcpu/m68k/mcf5235/include/mcf5235.h
+++ b/bsps/m68k/include/mcf5235/mcf5235.h
diff --git a/c/src/lib/libcpu/m68k/mcf5272/include/mcf5272.h b/bsps/m68k/include/mcf5272/mcf5272.h
index 37dae92d98..37dae92d98 100644
--- a/c/src/lib/libcpu/m68k/mcf5272/include/mcf5272.h
+++ b/bsps/m68k/include/mcf5272/mcf5272.h
diff --git a/c/src/lib/libcpu/m68k/mcf5282/include/mcf5282.h b/bsps/m68k/include/mcf5282/mcf5282.h
index 3724f489de..3724f489de 100644
--- a/c/src/lib/libcpu/m68k/mcf5282/include/mcf5282.h
+++ b/bsps/m68k/include/mcf5282/mcf5282.h
diff --git a/c/src/lib/libcpu/m68k/mcf532x/include/mcf532x.h b/bsps/m68k/include/mcf532x/mcf532x.h
index 798fb1175b..798fb1175b 100644
--- a/c/src/lib/libcpu/m68k/mcf532x/include/mcf532x.h
+++ b/bsps/m68k/include/mcf532x/mcf532x.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h b/bsps/m68k/include/mcf548x/MCD_dma.h
index ea6f8863cb..ea6f8863cb 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h
+++ b/bsps/m68k/include/mcf548x/MCD_dma.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_progCheck.h b/bsps/m68k/include/mcf548x/MCD_progCheck.h
index e0f578fdaf..e0f578fdaf 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_progCheck.h
+++ b/bsps/m68k/include/mcf548x/MCD_progCheck.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.h b/bsps/m68k/include/mcf548x/MCD_tasksInit.h
index daf871cd6d..daf871cd6d 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.h
+++ b/bsps/m68k/include/mcf548x/MCD_tasksInit.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.h b/bsps/m68k/include/mcf548x/mcdma_glue.h
index de0621120f..de0621120f 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.h
+++ b/bsps/m68k/include/mcf548x/mcdma_glue.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/include/mcf548x.h b/bsps/m68k/include/mcf548x/mcf548x.h
index 7a9dc73698..7a9dc73698 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/include/mcf548x.h
+++ b/bsps/m68k/include/mcf548x/mcf548x.h
diff --git a/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h b/bsps/m68k/include/mvme16x_hw.h
index 2ac595a0fa..2ac595a0fa 100644
--- a/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h
+++ b/bsps/m68k/include/mvme16x_hw.h
diff --git a/bsps/m68k/mcf5206elite/headers.am b/bsps/m68k/mcf5206elite/headers.am
new file mode 100644
index 0000000000..1faf6942f8
--- /dev/null
+++ b/bsps/m68k/mcf5206elite/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mcf5206elite/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5206elite/include/ds1307.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5206elite/include/i2c.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5206elite/include/i2cdrv.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5206elite/include/nvram.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5206elite/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h b/bsps/m68k/mcf5206elite/include/bsp.h
index 47c7e8c745..47c7e8c745 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h
+++ b/bsps/m68k/mcf5206elite/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/ds1307.h b/bsps/m68k/mcf5206elite/include/ds1307.h
index 8e5636a0c8..8e5636a0c8 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/ds1307.h
+++ b/bsps/m68k/mcf5206elite/include/ds1307.h
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h b/bsps/m68k/mcf5206elite/include/i2c.h
index 8bec067a3a..8bec067a3a 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h
+++ b/bsps/m68k/mcf5206elite/include/i2c.h
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2cdrv.h b/bsps/m68k/mcf5206elite/include/i2cdrv.h
index 4b4a1ec141..4b4a1ec141 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2cdrv.h
+++ b/bsps/m68k/mcf5206elite/include/i2cdrv.h
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/nvram.h b/bsps/m68k/mcf5206elite/include/nvram.h
index fd75db2363..fd75db2363 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/nvram.h
+++ b/bsps/m68k/mcf5206elite/include/nvram.h
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/tm27.h b/bsps/m68k/mcf5206elite/include/tm27.h
index 2abef68311..2abef68311 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/tm27.h
+++ b/bsps/m68k/mcf5206elite/include/tm27.h
diff --git a/bsps/m68k/mcf52235/headers.am b/bsps/m68k/mcf52235/headers.am
new file mode 100644
index 0000000000..b536b21164
--- /dev/null
+++ b/bsps/m68k/mcf52235/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mcf52235/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf52235/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h b/bsps/m68k/mcf52235/include/bsp.h
index ef3b928a24..ef3b928a24 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h
+++ b/bsps/m68k/mcf52235/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mcf52235/include/tm27.h b/bsps/m68k/mcf52235/include/tm27.h
index b4b62ef721..b4b62ef721 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/include/tm27.h
+++ b/bsps/m68k/mcf52235/include/tm27.h
diff --git a/bsps/m68k/mcf5225x/headers.am b/bsps/m68k/mcf5225x/headers.am
new file mode 100644
index 0000000000..200bebf9b5
--- /dev/null
+++ b/bsps/m68k/mcf5225x/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mcf5225x/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5225x/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h b/bsps/m68k/mcf5225x/include/bsp.h
index 8b8d40f485..8b8d40f485 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h
+++ b/bsps/m68k/mcf5225x/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/include/tm27.h b/bsps/m68k/mcf5225x/include/tm27.h
index fcf1c4f8aa..fcf1c4f8aa 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/include/tm27.h
+++ b/bsps/m68k/mcf5225x/include/tm27.h
diff --git a/bsps/m68k/mcf5235/headers.am b/bsps/m68k/mcf5235/headers.am
new file mode 100644
index 0000000000..e00b25f46c
--- /dev/null
+++ b/bsps/m68k/mcf5235/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mcf5235/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5235/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h b/bsps/m68k/mcf5235/include/bsp.h
index 14a6b04034..14a6b04034 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h
+++ b/bsps/m68k/mcf5235/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mcf5235/include/tm27.h b/bsps/m68k/mcf5235/include/tm27.h
index 92a85c789a..92a85c789a 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/include/tm27.h
+++ b/bsps/m68k/mcf5235/include/tm27.h
diff --git a/bsps/m68k/mcf5329/headers.am b/bsps/m68k/mcf5329/headers.am
new file mode 100644
index 0000000000..c1ee57ae55
--- /dev/null
+++ b/bsps/m68k/mcf5329/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mcf5329/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5329/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h b/bsps/m68k/mcf5329/include/bsp.h
index 7670e7a2d9..7670e7a2d9 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h
+++ b/bsps/m68k/mcf5329/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mcf5329/include/tm27.h b/bsps/m68k/mcf5329/include/tm27.h
index 33376540ac..33376540ac 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/include/tm27.h
+++ b/bsps/m68k/mcf5329/include/tm27.h
diff --git a/bsps/m68k/mrm332/headers.am b/bsps/m68k/mrm332/headers.am
new file mode 100644
index 0000000000..84ad4ec522
--- /dev/null
+++ b/bsps/m68k/mrm332/headers.am
@@ -0,0 +1,7 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mrm332/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mrm332/include/mrm332.h
+include_HEADERS += ../../../../../../bsps/m68k/mrm332/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/bsps/m68k/mrm332/include/bsp.h
index 6d4f7b8eb2..6d4f7b8eb2 100644
--- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
+++ b/bsps/m68k/mrm332/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h b/bsps/m68k/mrm332/include/mrm332.h
index 1b8672752d..1b8672752d 100644
--- a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h
+++ b/bsps/m68k/mrm332/include/mrm332.h
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/tm27.h b/bsps/m68k/mrm332/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/m68k/mrm332/include/tm27.h
+++ b/bsps/m68k/mrm332/include/tm27.h
diff --git a/bsps/m68k/mvme147/headers.am b/bsps/m68k/mvme147/headers.am
new file mode 100644
index 0000000000..c6b61dd0e1
--- /dev/null
+++ b/bsps/m68k/mvme147/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mvme147/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mvme147/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h b/bsps/m68k/mvme147/include/bsp.h
index 9cf3fbf5a8..9cf3fbf5a8 100644
--- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h
+++ b/bsps/m68k/mvme147/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mvme147/include/tm27.h b/bsps/m68k/mvme147/include/tm27.h
index 5b548a888a..5b548a888a 100644
--- a/c/src/lib/libbsp/m68k/mvme147/include/tm27.h
+++ b/bsps/m68k/mvme147/include/tm27.h
diff --git a/bsps/m68k/mvme147s/headers.am b/bsps/m68k/mvme147s/headers.am
new file mode 100644
index 0000000000..d42fd64a42
--- /dev/null
+++ b/bsps/m68k/mvme147s/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mvme147s/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mvme147s/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h b/bsps/m68k/mvme147s/include/bsp.h
index 3a4803fec2..3a4803fec2 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
+++ b/bsps/m68k/mvme147s/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/tm27.h b/bsps/m68k/mvme147s/include/tm27.h
index 48ae0f459a..48ae0f459a 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/include/tm27.h
+++ b/bsps/m68k/mvme147s/include/tm27.h
diff --git a/bsps/m68k/mvme162/headers.am b/bsps/m68k/mvme162/headers.am
new file mode 100644
index 0000000000..5456150cf5
--- /dev/null
+++ b/bsps/m68k/mvme162/headers.am
@@ -0,0 +1,7 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mvme162/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mvme162/include/page_table.h
+include_HEADERS += ../../../../../../bsps/m68k/mvme162/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/bsps/m68k/mvme162/include/bsp.h
index 3645a31086..3645a31086 100644
--- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
+++ b/bsps/m68k/mvme162/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/page_table.h b/bsps/m68k/mvme162/include/page_table.h
index 09b93a49bd..09b93a49bd 100644
--- a/c/src/lib/libbsp/m68k/mvme162/include/page_table.h
+++ b/bsps/m68k/mvme162/include/page_table.h
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/tm27.h b/bsps/m68k/mvme162/include/tm27.h
index 750408d009..750408d009 100644
--- a/c/src/lib/libbsp/m68k/mvme162/include/tm27.h
+++ b/bsps/m68k/mvme162/include/tm27.h
diff --git a/bsps/m68k/mvme167/headers.am b/bsps/m68k/mvme167/headers.am
new file mode 100644
index 0000000000..23b9370680
--- /dev/null
+++ b/bsps/m68k/mvme167/headers.am
@@ -0,0 +1,7 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mvme167/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mvme167/include/page_table.h
+include_HEADERS += ../../../../../../bsps/m68k/mvme167/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/bsps/m68k/mvme167/include/bsp.h
index d04b4f3952..d04b4f3952 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
+++ b/bsps/m68k/mvme167/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/page_table.h b/bsps/m68k/mvme167/include/page_table.h
index 2db5591729..2db5591729 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/page_table.h
+++ b/bsps/m68k/mvme167/include/page_table.h
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/tm27.h b/bsps/m68k/mvme167/include/tm27.h
index 5b65311794..5b65311794 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/tm27.h
+++ b/bsps/m68k/mvme167/include/tm27.h
diff --git a/bsps/m68k/uC5282/headers.am b/bsps/m68k/uC5282/headers.am
new file mode 100644
index 0000000000..5757c0d98e
--- /dev/null
+++ b/bsps/m68k/uC5282/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/uC5282/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/uC5282/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h b/bsps/m68k/uC5282/include/bsp.h
index a887cc0385..a887cc0385 100644
--- a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h
+++ b/bsps/m68k/uC5282/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/uC5282/include/tm27.h b/bsps/m68k/uC5282/include/tm27.h
index 9a24da3755..9a24da3755 100644
--- a/c/src/lib/libbsp/m68k/uC5282/include/tm27.h
+++ b/bsps/m68k/uC5282/include/tm27.h
diff --git a/bsps/mips/csb350/headers.am b/bsps/mips/csb350/headers.am
new file mode 100644
index 0000000000..47c143ca0c
--- /dev/null
+++ b/bsps/mips/csb350/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/mips/csb350/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/mips/csb350/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/mips/csb350/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/csb350/include/bsp.h b/bsps/mips/csb350/include/bsp.h
index ed503a1faa..ed503a1faa 100644
--- a/c/src/lib/libbsp/mips/csb350/include/bsp.h
+++ b/bsps/mips/csb350/include/bsp.h
diff --git a/c/src/lib/libbsp/mips/csb350/include/irq.h b/bsps/mips/csb350/include/bsp/irq.h
index 4f006fdd5f..4f006fdd5f 100644
--- a/c/src/lib/libbsp/mips/csb350/include/irq.h
+++ b/bsps/mips/csb350/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/csb350/include/tm27.h b/bsps/mips/csb350/include/tm27.h
index 3a8957d698..3a8957d698 100644
--- a/c/src/lib/libbsp/mips/csb350/include/tm27.h
+++ b/bsps/mips/csb350/include/tm27.h
diff --git a/bsps/mips/headers.am b/bsps/mips/headers.am
new file mode 100644
index 0000000000..c9aece50dc
--- /dev/null
+++ b/bsps/mips/headers.am
@@ -0,0 +1,15 @@
+## This file was generated by "./boostrap -H".
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/mips/include/bsp/i8259.h
+include_bsp_HEADERS += ../../../../../bsps/mips/include/bsp/regs.h
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += ../../../../../bsps/mips/include/libcpu/au1x00.h
+include_libcpu_HEADERS += ../../../../../bsps/mips/include/libcpu/isr_entries.h
+include_libcpu_HEADERS += ../../../../../bsps/mips/include/libcpu/rm5231.h
+include_libcpu_HEADERS += ../../../../../bsps/mips/include/libcpu/tx3904.h
+include_libcpu_HEADERS += ../../../../../bsps/mips/include/libcpu/tx4925.h
+include_libcpu_HEADERS += ../../../../../bsps/mips/include/libcpu/tx4938.h
diff --git a/bsps/mips/hurricane/headers.am b/bsps/mips/hurricane/headers.am
new file mode 100644
index 0000000000..d9713d1b90
--- /dev/null
+++ b/bsps/mips/hurricane/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/mips/hurricane/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/mips/hurricane/include/tm27.h
+include_HEADERS += ../../../../../../bsps/mips/hurricane/include/usc.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/mips/hurricane/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/hurricane/include/bsp.h b/bsps/mips/hurricane/include/bsp.h
index 1c9dc652f0..1c9dc652f0 100644
--- a/c/src/lib/libbsp/mips/hurricane/include/bsp.h
+++ b/bsps/mips/hurricane/include/bsp.h
diff --git a/c/src/lib/libbsp/mips/hurricane/include/irq.h b/bsps/mips/hurricane/include/bsp/irq.h
index 3347ecb2a6..3347ecb2a6 100644
--- a/c/src/lib/libbsp/mips/hurricane/include/irq.h
+++ b/bsps/mips/hurricane/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/hurricane/include/tm27.h b/bsps/mips/hurricane/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/mips/hurricane/include/tm27.h
+++ b/bsps/mips/hurricane/include/tm27.h
diff --git a/c/src/lib/libbsp/mips/hurricane/include/usc.h b/bsps/mips/hurricane/include/usc.h
index 167eff0949..167eff0949 100644
--- a/c/src/lib/libbsp/mips/hurricane/include/usc.h
+++ b/bsps/mips/hurricane/include/usc.h
diff --git a/c/src/lib/libbsp/mips/shared/irq/i8259.h b/bsps/mips/include/bsp/i8259.h
index 8d10523b40..8d10523b40 100644
--- a/c/src/lib/libbsp/mips/shared/irq/i8259.h
+++ b/bsps/mips/include/bsp/i8259.h
diff --git a/c/src/lib/libbsp/mips/shared/liblnk/regs.h b/bsps/mips/include/bsp/regs.h
index 5cc9fac745..5cc9fac745 100644
--- a/c/src/lib/libbsp/mips/shared/liblnk/regs.h
+++ b/bsps/mips/include/bsp/regs.h
diff --git a/c/src/lib/libcpu/mips/au1x00/include/au1x00.h b/bsps/mips/include/libcpu/au1x00.h
index a85a39ed48..a85a39ed48 100644
--- a/c/src/lib/libcpu/mips/au1x00/include/au1x00.h
+++ b/bsps/mips/include/libcpu/au1x00.h
diff --git a/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h b/bsps/mips/include/libcpu/isr_entries.h
index e142018be7..e142018be7 100644
--- a/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h
+++ b/bsps/mips/include/libcpu/isr_entries.h
diff --git a/c/src/lib/libcpu/mips/rm52xx/include/rm5231.h b/bsps/mips/include/libcpu/rm5231.h
index c9ad3f9861..c9ad3f9861 100644
--- a/c/src/lib/libcpu/mips/rm52xx/include/rm5231.h
+++ b/bsps/mips/include/libcpu/rm5231.h
diff --git a/c/src/lib/libcpu/mips/tx39/include/tx3904.h b/bsps/mips/include/libcpu/tx3904.h
index b573d3c7d9..b573d3c7d9 100644
--- a/c/src/lib/libcpu/mips/tx39/include/tx3904.h
+++ b/bsps/mips/include/libcpu/tx3904.h
diff --git a/c/src/lib/libcpu/mips/tx49/include/tx4925.h b/bsps/mips/include/libcpu/tx4925.h
index 56f58d9bf3..56f58d9bf3 100644
--- a/c/src/lib/libcpu/mips/tx49/include/tx4925.h
+++ b/bsps/mips/include/libcpu/tx4925.h
diff --git a/c/src/lib/libcpu/mips/tx49/include/tx4938.h b/bsps/mips/include/libcpu/tx4938.h
index 5005cc4149..5005cc4149 100644
--- a/c/src/lib/libcpu/mips/tx49/include/tx4938.h
+++ b/bsps/mips/include/libcpu/tx4938.h
diff --git a/bsps/mips/jmr3904/headers.am b/bsps/mips/jmr3904/headers.am
new file mode 100644
index 0000000000..b7adec7f52
--- /dev/null
+++ b/bsps/mips/jmr3904/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/mips/jmr3904/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/mips/jmr3904/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/mips/jmr3904/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h b/bsps/mips/jmr3904/include/bsp.h
index 52696b3987..52696b3987 100644
--- a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h
+++ b/bsps/mips/jmr3904/include/bsp.h
diff --git a/c/src/lib/libbsp/mips/jmr3904/include/irq.h b/bsps/mips/jmr3904/include/bsp/irq.h
index cdb50e244e..cdb50e244e 100644
--- a/c/src/lib/libbsp/mips/jmr3904/include/irq.h
+++ b/bsps/mips/jmr3904/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/jmr3904/include/tm27.h b/bsps/mips/jmr3904/include/tm27.h
index f73ccdea40..f73ccdea40 100644
--- a/c/src/lib/libbsp/mips/jmr3904/include/tm27.h
+++ b/bsps/mips/jmr3904/include/tm27.h
diff --git a/bsps/mips/malta/headers.am b/bsps/mips/malta/headers.am
new file mode 100644
index 0000000000..35d8bb70d0
--- /dev/null
+++ b/bsps/mips/malta/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/mips/malta/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/mips/malta/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/mips/malta/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/mips/malta/include/bsp/pci.h
diff --git a/c/src/lib/libbsp/mips/malta/include/bsp.h b/bsps/mips/malta/include/bsp.h
index c1169cd0a4..c1169cd0a4 100644
--- a/c/src/lib/libbsp/mips/malta/include/bsp.h
+++ b/bsps/mips/malta/include/bsp.h
diff --git a/c/src/lib/libbsp/mips/malta/include/irq.h b/bsps/mips/malta/include/bsp/irq.h
index 3ca6f964a9..3ca6f964a9 100644
--- a/c/src/lib/libbsp/mips/malta/include/irq.h
+++ b/bsps/mips/malta/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/malta/include/pci.h b/bsps/mips/malta/include/bsp/pci.h
index c5944da548..c5944da548 100644
--- a/c/src/lib/libbsp/mips/malta/include/pci.h
+++ b/bsps/mips/malta/include/bsp/pci.h
diff --git a/c/src/lib/libbsp/mips/malta/include/tm27.h b/bsps/mips/malta/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/mips/malta/include/tm27.h
+++ b/bsps/mips/malta/include/tm27.h
diff --git a/bsps/mips/rbtx4925/headers.am b/bsps/mips/rbtx4925/headers.am
new file mode 100644
index 0000000000..eaffa3e5d8
--- /dev/null
+++ b/bsps/mips/rbtx4925/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/mips/rbtx4925/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/mips/rbtx4925/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/mips/rbtx4925/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h b/bsps/mips/rbtx4925/include/bsp.h
index ef5d6ef07f..ef5d6ef07f 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h
+++ b/bsps/mips/rbtx4925/include/bsp.h
diff --git a/c/src/lib/libbsp/mips/rbtx4925/include/irq.h b/bsps/mips/rbtx4925/include/bsp/irq.h
index d3987b2d39..d3987b2d39 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/include/irq.h
+++ b/bsps/mips/rbtx4925/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/rbtx4925/include/tm27.h b/bsps/mips/rbtx4925/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/include/tm27.h
+++ b/bsps/mips/rbtx4925/include/tm27.h
diff --git a/bsps/mips/rbtx4938/headers.am b/bsps/mips/rbtx4938/headers.am
new file mode 100644
index 0000000000..51360cf6ae
--- /dev/null
+++ b/bsps/mips/rbtx4938/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/mips/rbtx4938/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/mips/rbtx4938/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/mips/rbtx4938/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h b/bsps/mips/rbtx4938/include/bsp.h
index b57a60f2df..b57a60f2df 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h
+++ b/bsps/mips/rbtx4938/include/bsp.h
diff --git a/c/src/lib/libbsp/mips/rbtx4938/include/irq.h b/bsps/mips/rbtx4938/include/bsp/irq.h
index bb18dcf86d..bb18dcf86d 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/include/irq.h
+++ b/bsps/mips/rbtx4938/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/rbtx4938/include/tm27.h b/bsps/mips/rbtx4938/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/include/tm27.h
+++ b/bsps/mips/rbtx4938/include/tm27.h
diff --git a/bsps/moxie/moxiesim/headers.am b/bsps/moxie/moxiesim/headers.am
new file mode 100644
index 0000000000..5f900bdcc3
--- /dev/null
+++ b/bsps/moxie/moxiesim/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/moxie/moxiesim/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/moxie/moxiesim/include/tm27.h
diff --git a/c/src/lib/libbsp/moxie/moxiesim/include/bsp.h b/bsps/moxie/moxiesim/include/bsp.h
index 276693c97a..276693c97a 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/include/bsp.h
+++ b/bsps/moxie/moxiesim/include/bsp.h
diff --git a/c/src/lib/libbsp/moxie/moxiesim/include/tm27.h b/bsps/moxie/moxiesim/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/include/tm27.h
+++ b/bsps/moxie/moxiesim/include/tm27.h
diff --git a/bsps/nios2/nios2_iss/headers.am b/bsps/nios2/nios2_iss/headers.am
new file mode 100644
index 0000000000..522f74c0a9
--- /dev/null
+++ b/bsps/nios2/nios2_iss/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/nios2/nios2_iss/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/nios2/nios2_iss/include/tm27.h
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h b/bsps/nios2/nios2_iss/include/bsp.h
index 3883e39ab6..3883e39ab6 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h
+++ b/bsps/nios2/nios2_iss/include/bsp.h
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/include/tm27.h b/bsps/nios2/nios2_iss/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/include/tm27.h
+++ b/bsps/nios2/nios2_iss/include/tm27.h
diff --git a/bsps/no_cpu/no_bsp/headers.am b/bsps/no_cpu/no_bsp/headers.am
new file mode 100644
index 0000000000..33b3f811ac
--- /dev/null
+++ b/bsps/no_cpu/no_bsp/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/no_cpu/no_bsp/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/no_cpu/no_bsp/include/tm27.h
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h b/bsps/no_cpu/no_bsp/include/bsp.h
index 97064425d7..97064425d7 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h
+++ b/bsps/no_cpu/no_bsp/include/bsp.h
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/include/tm27.h b/bsps/no_cpu/no_bsp/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/include/tm27.h
+++ b/bsps/no_cpu/no_bsp/include/tm27.h
diff --git a/bsps/or1k/generic_or1k/headers.am b/bsps/or1k/generic_or1k/headers.am
new file mode 100644
index 0000000000..3576c64a9c
--- /dev/null
+++ b/bsps/or1k/generic_or1k/headers.am
@@ -0,0 +1,12 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/or1k/generic_or1k/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/or1k/generic_or1k/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/or1k/generic_or1k/include/bsp/generic_or1k.h
+include_bsp_HEADERS += ../../../../../../bsps/or1k/generic_or1k/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/or1k/generic_or1k/include/bsp/uart.h
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/bsp.h b/bsps/or1k/generic_or1k/include/bsp.h
index 16839930a4..16839930a4 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/include/bsp.h
+++ b/bsps/or1k/generic_or1k/include/bsp.h
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/generic_or1k.h b/bsps/or1k/generic_or1k/include/bsp/generic_or1k.h
index e4d9760640..e4d9760640 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/include/generic_or1k.h
+++ b/bsps/or1k/generic_or1k/include/bsp/generic_or1k.h
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/irq.h b/bsps/or1k/generic_or1k/include/bsp/irq.h
index 791aefcae0..791aefcae0 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/include/irq.h
+++ b/bsps/or1k/generic_or1k/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/uart.h b/bsps/or1k/generic_or1k/include/bsp/uart.h
index dbf3bbf9ef..dbf3bbf9ef 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/include/uart.h
+++ b/bsps/or1k/generic_or1k/include/bsp/uart.h
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/tm27.h b/bsps/or1k/generic_or1k/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/include/tm27.h
+++ b/bsps/or1k/generic_or1k/include/tm27.h
diff --git a/bsps/or1k/headers.am b/bsps/or1k/headers.am
new file mode 100644
index 0000000000..7729a76231
--- /dev/null
+++ b/bsps/or1k/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/or1k/include/bsp/cache_.h
+include_bsp_HEADERS += ../../../../../bsps/or1k/include/bsp/linker-symbols.h
diff --git a/c/src/lib/libbsp/or1k/shared/include/cache_.h b/bsps/or1k/include/bsp/cache_.h
index ed2053858e..ed2053858e 100644
--- a/c/src/lib/libbsp/or1k/shared/include/cache_.h
+++ b/bsps/or1k/include/bsp/cache_.h
diff --git a/c/src/lib/libbsp/or1k/shared/include/linker-symbols.h b/bsps/or1k/include/bsp/linker-symbols.h
index f0f8377892..f0f8377892 100644
--- a/c/src/lib/libbsp/or1k/shared/include/linker-symbols.h
+++ b/bsps/or1k/include/bsp/linker-symbols.h
diff --git a/bsps/powerpc/beatnik/headers.am b/bsps/powerpc/beatnik/headers.am
new file mode 100644
index 0000000000..36df3cd759
--- /dev/null
+++ b/bsps/powerpc/beatnik/headers.am
@@ -0,0 +1,22 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/VMEConfig.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/bsp_bsdnet_attach.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/early_enet_link_status.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/gt_timer.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/gti2c_busdrv.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/gti2creg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/gtintrreg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/gtpcireg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/gtreg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/if_em_pub.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/if_gfe_pub.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/if_mve_pub.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h b/bsps/powerpc/beatnik/include/bsp.h
index e980f1a056..e980f1a056 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h
+++ b/bsps/powerpc/beatnik/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/vme/VMEConfig.h b/bsps/powerpc/beatnik/include/bsp/VMEConfig.h
index 986a01674e..986a01674e 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/vme/VMEConfig.h
+++ b/bsps/powerpc/beatnik/include/bsp/VMEConfig.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/support/bsp_bsdnet_attach.h b/bsps/powerpc/beatnik/include/bsp/bsp_bsdnet_attach.h
index a12e9e2c86..a12e9e2c86 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/support/bsp_bsdnet_attach.h
+++ b/bsps/powerpc/beatnik/include/bsp/bsp_bsdnet_attach.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/support/early_enet_link_status.h b/bsps/powerpc/beatnik/include/bsp/early_enet_link_status.h
index 74160a3b84..74160a3b84 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/support/early_enet_link_status.h
+++ b/bsps/powerpc/beatnik/include/bsp/early_enet_link_status.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gt_timer.h b/bsps/powerpc/beatnik/include/bsp/gt_timer.h
index 4a68971d13..4a68971d13 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gt_timer.h
+++ b/bsps/powerpc/beatnik/include/bsp/gt_timer.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gti2c_busdrv.h b/bsps/powerpc/beatnik/include/bsp/gti2c_busdrv.h
index b75e16cdf8..b75e16cdf8 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gti2c_busdrv.h
+++ b/bsps/powerpc/beatnik/include/bsp/gti2c_busdrv.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gti2creg.h b/bsps/powerpc/beatnik/include/bsp/gti2creg.h
index 33e566f5bc..33e566f5bc 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gti2creg.h
+++ b/bsps/powerpc/beatnik/include/bsp/gti2creg.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtintrreg.h b/bsps/powerpc/beatnik/include/bsp/gtintrreg.h
index bd3f69514e..bd3f69514e 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtintrreg.h
+++ b/bsps/powerpc/beatnik/include/bsp/gtintrreg.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtpcireg.h b/bsps/powerpc/beatnik/include/bsp/gtpcireg.h
index d01fc702ac..d01fc702ac 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtpcireg.h
+++ b/bsps/powerpc/beatnik/include/bsp/gtpcireg.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtreg.h b/bsps/powerpc/beatnik/include/bsp/gtreg.h
index a6c87e2047..a6c87e2047 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtreg.h
+++ b/bsps/powerpc/beatnik/include/bsp/gtreg.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_pub.h b/bsps/powerpc/beatnik/include/bsp/if_em_pub.h
index eb970e465b..eb970e465b 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_pub.h
+++ b/bsps/powerpc/beatnik/include/bsp/if_em_pub.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe_pub.h b/bsps/powerpc/beatnik/include/bsp/if_gfe_pub.h
index 8ea849efb1..8ea849efb1 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe_pub.h
+++ b/bsps/powerpc/beatnik/include/bsp/if_gfe_pub.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/if_mve_pub.h b/bsps/powerpc/beatnik/include/bsp/if_mve_pub.h
index 0a84310d72..0a84310d72 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/if_mve_pub.h
+++ b/bsps/powerpc/beatnik/include/bsp/if_mve_pub.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/irq/irq.h b/bsps/powerpc/beatnik/include/bsp/irq.h
index e5f9558ecf..e5f9558ecf 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/irq/irq.h
+++ b/bsps/powerpc/beatnik/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/include/tm27.h b/bsps/powerpc/beatnik/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/include/tm27.h
+++ b/bsps/powerpc/beatnik/include/tm27.h
diff --git a/bsps/powerpc/gen5200/headers.am b/bsps/powerpc/gen5200/headers.am
new file mode 100644
index 0000000000..7a98ad9ec4
--- /dev/null
+++ b/bsps/powerpc/gen5200/headers.am
@@ -0,0 +1,45 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/ata.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm_ops.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/i2cdrv.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/mpc5200.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/mscan-base.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/mscan.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/nvram.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/slicetimer.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/u-boot-config.h
+
+include_bsp_bestcommdir = $(includedir)/bsp/bestcomm
+include_bsp_bestcomm_HEADERS =
+include_bsp_bestcomm_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_api.h
+include_bsp_bestcomm_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_glue.h
+include_bsp_bestcomm_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_priv.h
+include_bsp_bestcomm_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.capi.h
+include_bsp_bestcomm_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.h
+
+include_bsp_bestcomm_includedir = $(includedir)/bsp/bestcomm/include
+include_bsp_bestcomm_include_HEADERS =
+include_bsp_bestcomm_include_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/include/ppctypes.h
+
+include_bsp_bestcomm_include_mgt5200dir = $(includedir)/bsp/bestcomm/include/mgt5200
+include_bsp_bestcomm_include_mgt5200_HEADERS =
+include_bsp_bestcomm_include_mgt5200_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/mgt5200.h
+include_bsp_bestcomm_include_mgt5200_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/sdma.h
+
+include_bsp_bestcomm_task_apidir = $(includedir)/bsp/bestcomm/task_api
+include_bsp_bestcomm_task_api_HEADERS =
+include_bsp_bestcomm_task_api_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_api_mem.h
+include_bsp_bestcomm_task_api_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_cntrl.h
+include_bsp_bestcomm_task_api_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_bdtable.h
+include_bsp_bestcomm_task_api_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_general.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h b/bsps/powerpc/gen5200/include/bsp.h
index 40ac1116c5..40ac1116c5 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h
+++ b/bsps/powerpc/gen5200/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/ata.h b/bsps/powerpc/gen5200/include/bsp/ata.h
index 3d8ccfc49a..3d8ccfc49a 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/ata.h
+++ b/bsps/powerpc/gen5200/include/bsp/ata.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm.h b/bsps/powerpc/gen5200/include/bsp/bestcomm.h
index 366465565a..366465565a 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_api.h
index f1fa22d1d5..f1fa22d1d5 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_api.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_glue.h
index 18827b77c7..18827b77c7 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_glue.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_priv.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_priv.h
index 102fc082cb..102fc082cb 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_priv.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_priv.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.capi.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.capi.h
index 6b07cbcb2a..6b07cbcb2a 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.capi.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.capi.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.h
index 1f8b86cded..1f8b86cded 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/mgt5200.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/mgt5200.h
index 9e4b94cd10..9e4b94cd10 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/mgt5200.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/mgt5200.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/sdma.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/sdma.h
index 52d84777ad..52d84777ad 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/sdma.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/sdma.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/ppctypes.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/ppctypes.h
index ff2aed1997..ff2aed1997 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/ppctypes.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/ppctypes.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_api_mem.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_api_mem.h
index dc529d6a22..dc529d6a22 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_api_mem.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_api_mem.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_cntrl.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_cntrl.h
index 3712bae3d0..3712bae3d0 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_cntrl.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_cntrl.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_bdtable.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_bdtable.h
index 7f261d21ee..7f261d21ee 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_bdtable.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_bdtable.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_general.h
index be7bb9d7b0..be7bb9d7b0 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_general.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm_ops.h b/bsps/powerpc/gen5200/include/bsp/bestcomm_ops.h
index 2b74adf366..2b74adf366 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm_ops.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm_ops.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h b/bsps/powerpc/gen5200/include/bsp/i2c.h
index e5d7d472dd..e5d7d472dd 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h
+++ b/bsps/powerpc/gen5200/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/i2cdrv.h b/bsps/powerpc/gen5200/include/bsp/i2cdrv.h
index 4b4a1ec141..4b4a1ec141 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/i2cdrv.h
+++ b/bsps/powerpc/gen5200/include/bsp/i2cdrv.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/irq.h b/bsps/powerpc/gen5200/include/bsp/irq.h
index 5a0b3bd29e..5a0b3bd29e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/irq.h
+++ b/bsps/powerpc/gen5200/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/mpc5200.h b/bsps/powerpc/gen5200/include/bsp/mpc5200.h
index 263e66fb9e..263e66fb9e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/mpc5200.h
+++ b/bsps/powerpc/gen5200/include/bsp/mpc5200.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h b/bsps/powerpc/gen5200/include/bsp/mscan-base.h
index a2b8737d8e..a2b8737d8e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h
+++ b/bsps/powerpc/gen5200/include/bsp/mscan-base.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.h b/bsps/powerpc/gen5200/include/bsp/mscan.h
index 9cb7fd44e7..9cb7fd44e7 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.h
+++ b/bsps/powerpc/gen5200/include/bsp/mscan.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.h b/bsps/powerpc/gen5200/include/bsp/nvram.h
index b05c35986f..b05c35986f 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.h
+++ b/bsps/powerpc/gen5200/include/bsp/nvram.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.h b/bsps/powerpc/gen5200/include/bsp/slicetimer.h
index e089dbc8ad..e089dbc8ad 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.h
+++ b/bsps/powerpc/gen5200/include/bsp/slicetimer.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/u-boot-config.h b/bsps/powerpc/gen5200/include/bsp/u-boot-config.h
index 2fee83bce9..2fee83bce9 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/u-boot-config.h
+++ b/bsps/powerpc/gen5200/include/bsp/u-boot-config.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h b/bsps/powerpc/gen5200/include/tm27.h
index ff43cc9ab6..ff43cc9ab6 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h
+++ b/bsps/powerpc/gen5200/include/tm27.h
diff --git a/bsps/powerpc/gen83xx/headers.am b/bsps/powerpc/gen83xx/headers.am
new file mode 100644
index 0000000000..39d4333934
--- /dev/null
+++ b/bsps/powerpc/gen83xx/headers.am
@@ -0,0 +1,13 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/gen83xx/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/gen83xx/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen83xx/include/bsp/hwreg_vals.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen83xx/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen83xx/include/bsp/tsec-config.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen83xx/include/bsp/u-boot-config.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h b/bsps/powerpc/gen83xx/include/bsp.h
index 59fd20de54..59fd20de54 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h
+++ b/bsps/powerpc/gen83xx/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/hwreg_vals.h b/bsps/powerpc/gen83xx/include/bsp/hwreg_vals.h
index c7a5bac9c2..c7a5bac9c2 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/hwreg_vals.h
+++ b/bsps/powerpc/gen83xx/include/bsp/hwreg_vals.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/irq.h b/bsps/powerpc/gen83xx/include/bsp/irq.h
index dc084ed2a2..dc084ed2a2 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/irq.h
+++ b/bsps/powerpc/gen83xx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/tsec-config.h b/bsps/powerpc/gen83xx/include/bsp/tsec-config.h
index 5ec0ccbad1..5ec0ccbad1 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/tsec-config.h
+++ b/bsps/powerpc/gen83xx/include/bsp/tsec-config.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/u-boot-config.h b/bsps/powerpc/gen83xx/include/bsp/u-boot-config.h
index c2271c965b..c2271c965b 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/u-boot-config.h
+++ b/bsps/powerpc/gen83xx/include/bsp/u-boot-config.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h b/bsps/powerpc/gen83xx/include/tm27.h
index 22787473a5..22787473a5 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h
+++ b/bsps/powerpc/gen83xx/include/tm27.h
diff --git a/bsps/powerpc/haleakala/headers.am b/bsps/powerpc/haleakala/headers.am
new file mode 100644
index 0000000000..ed8becdf81
--- /dev/null
+++ b/bsps/powerpc/haleakala/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/haleakala/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/haleakala/include/mmu_405.h
+include_HEADERS += ../../../../../../bsps/powerpc/haleakala/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/haleakala/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h b/bsps/powerpc/haleakala/include/bsp.h
index b26e739e60..b26e739e60 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h
+++ b/bsps/powerpc/haleakala/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/haleakala/irq/irq.h b/bsps/powerpc/haleakala/include/bsp/irq.h
index c413ec3172..c413ec3172 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/irq/irq.h
+++ b/bsps/powerpc/haleakala/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/haleakala/include/mmu_405.h b/bsps/powerpc/haleakala/include/mmu_405.h
index e11cfa7738..e11cfa7738 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/include/mmu_405.h
+++ b/bsps/powerpc/haleakala/include/mmu_405.h
diff --git a/c/src/lib/libbsp/powerpc/haleakala/include/tm27.h b/bsps/powerpc/haleakala/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/include/tm27.h
+++ b/bsps/powerpc/haleakala/include/tm27.h
diff --git a/bsps/powerpc/headers.am b/bsps/powerpc/headers.am
new file mode 100644
index 0000000000..5033d8ae5a
--- /dev/null
+++ b/bsps/powerpc/headers.am
@@ -0,0 +1,101 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../bsps/powerpc/include/ictrl.h
+include_HEADERS += ../../../../../bsps/powerpc/include/mpc5xx.h
+include_HEADERS += ../../../../../bsps/powerpc/include/mpc8260.h
+include_HEADERS += ../../../../../bsps/powerpc/include/mpc8xx.h
+include_HEADERS += ../../../../../bsps/powerpc/include/nvram.h
+include_HEADERS += ../../../../../bsps/powerpc/include/tty_drv.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/consoleIo.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/flashPgm.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/flashPgmPvt.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/irq_supp.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/linker-symbols.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/motorola.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/openpic.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/pci.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/pnp.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/residual.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/start.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/tictac.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/tsec.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/u-boot-board-info.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/uart.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/vectors.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/vpd.h
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/bat.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/byteorder.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/c_clock.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/cpuIdent.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/e500_mmu.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/io.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/irq.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/mmu.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/page.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/pgtable.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/powerpc-utility.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/pte121.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/raw_exception.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/spr.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/stackTrace.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/vectors.h
+
+include_mpc55xxdir = $(includedir)/mpc55xx
+include_mpc55xx_HEADERS =
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/dspi.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/edma.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/emios.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc551x.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc555x.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc556x.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc564xL.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc5668.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc567x.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/mpc55xx.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/reg-defs.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/regs-edma.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/regs-mmu.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/regs.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/siu.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/watchdog.h
+
+include_mpc5xxdir = $(includedir)/mpc5xx
+include_mpc5xx_HEADERS =
+include_mpc5xx_HEADERS += ../../../../../bsps/powerpc/include/mpc5xx/console.h
+
+include_mpc8260dir = $(includedir)/mpc8260
+include_mpc8260_HEADERS =
+include_mpc8260_HEADERS += ../../../../../bsps/powerpc/include/mpc8260/console.h
+include_mpc8260_HEADERS += ../../../../../bsps/powerpc/include/mpc8260/cpm.h
+include_mpc8260_HEADERS += ../../../../../bsps/powerpc/include/mpc8260/mmu.h
+
+include_mpc83xxdir = $(includedir)/mpc83xx
+include_mpc83xx_HEADERS =
+include_mpc83xx_HEADERS += ../../../../../bsps/powerpc/include/mpc83xx/gtm.h
+include_mpc83xx_HEADERS += ../../../../../bsps/powerpc/include/mpc83xx/mpc83xx.h
+include_mpc83xx_HEADERS += ../../../../../bsps/powerpc/include/mpc83xx/mpc83xx_i2cdrv.h
+include_mpc83xx_HEADERS += ../../../../../bsps/powerpc/include/mpc83xx/mpc83xx_spidrv.h
+
+include_mpc8xxdir = $(includedir)/mpc8xx
+include_mpc8xx_HEADERS =
+include_mpc8xx_HEADERS += ../../../../../bsps/powerpc/include/mpc8xx/console.h
+include_mpc8xx_HEADERS += ../../../../../bsps/powerpc/include/mpc8xx/cpm.h
+include_mpc8xx_HEADERS += ../../../../../bsps/powerpc/include/mpc8xx/mmu.h
+
+include_ppc4xxdir = $(includedir)/ppc4xx
+include_ppc4xx_HEADERS =
+include_ppc4xx_HEADERS += ../../../../../bsps/powerpc/include/ppc4xx/ppc405ex.h
+include_ppc4xx_HEADERS += ../../../../../bsps/powerpc/include/ppc4xx/ppc405gp.h
+
+include_rtems_powerpcdir = $(includedir)/rtems/powerpc
+include_rtems_powerpc_HEADERS =
+include_rtems_powerpc_HEADERS += ../../../../../bsps/powerpc/include/rtems/powerpc/cache.h
+include_rtems_powerpc_HEADERS += ../../../../../bsps/powerpc/include/rtems/powerpc/debugmod.h
+include_rtems_powerpc_HEADERS += ../../../../../bsps/powerpc/include/rtems/powerpc/powerpc.h
diff --git a/c/src/lib/libbsp/powerpc/shared/console/consoleIo.h b/bsps/powerpc/include/bsp/consoleIo.h
index e62c9d143c..e62c9d143c 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/consoleIo.h
+++ b/bsps/powerpc/include/bsp/consoleIo.h
diff --git a/c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h b/bsps/powerpc/include/bsp/flashPgm.h
index 19f2c4708e..19f2c4708e 100644
--- a/c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h
+++ b/bsps/powerpc/include/bsp/flashPgm.h
diff --git a/c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h b/bsps/powerpc/include/bsp/flashPgmPvt.h
index c26b8ed01d..c26b8ed01d 100644
--- a/c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h
+++ b/bsps/powerpc/include/bsp/flashPgmPvt.h
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq_supp.h b/bsps/powerpc/include/bsp/irq_supp.h
index 65af48c87f..65af48c87f 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq_supp.h
+++ b/bsps/powerpc/include/bsp/irq_supp.h
diff --git a/c/src/lib/libbsp/powerpc/shared/include/linker-symbols.h b/bsps/powerpc/include/bsp/linker-symbols.h
index de7a6c483d..de7a6c483d 100644
--- a/c/src/lib/libbsp/powerpc/shared/include/linker-symbols.h
+++ b/bsps/powerpc/include/bsp/linker-symbols.h
diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h b/bsps/powerpc/include/bsp/motorola.h
index 14360d56d1..14360d56d1 100644
--- a/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h
+++ b/bsps/powerpc/include/bsp/motorola.h
diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h b/bsps/powerpc/include/bsp/openpic.h
index df782596b5..df782596b5 100644
--- a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h
+++ b/bsps/powerpc/include/bsp/openpic.h
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pci.h b/bsps/powerpc/include/bsp/pci.h
index 42dc43875b..42dc43875b 100644
--- a/c/src/lib/libbsp/powerpc/shared/pci/pci.h
+++ b/bsps/powerpc/include/bsp/pci.h
diff --git a/c/src/lib/libbsp/powerpc/shared/residual/pnp.h b/bsps/powerpc/include/bsp/pnp.h
index 203a1a46d3..203a1a46d3 100644
--- a/c/src/lib/libbsp/powerpc/shared/residual/pnp.h
+++ b/bsps/powerpc/include/bsp/pnp.h
diff --git a/c/src/lib/libbsp/powerpc/shared/residual/residual.h b/bsps/powerpc/include/bsp/residual.h
index 1bf1a34e20..1bf1a34e20 100644
--- a/c/src/lib/libbsp/powerpc/shared/residual/residual.h
+++ b/bsps/powerpc/include/bsp/residual.h
diff --git a/c/src/lib/libbsp/powerpc/shared/include/start.h b/bsps/powerpc/include/bsp/start.h
index ab718a87ee..ab718a87ee 100644
--- a/c/src/lib/libbsp/powerpc/shared/include/start.h
+++ b/bsps/powerpc/include/bsp/start.h
diff --git a/c/src/lib/libbsp/powerpc/shared/include/tictac.h b/bsps/powerpc/include/bsp/tictac.h
index 31c7386943..31c7386943 100644
--- a/c/src/lib/libbsp/powerpc/shared/include/tictac.h
+++ b/bsps/powerpc/include/bsp/tictac.h
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.h b/bsps/powerpc/include/bsp/tsec.h
index 4efbfa2ab0..4efbfa2ab0 100644
--- a/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.h
+++ b/bsps/powerpc/include/bsp/tsec.h
diff --git a/c/src/lib/libbsp/powerpc/shared/include/u-boot-board-info.h b/bsps/powerpc/include/bsp/u-boot-board-info.h
index b377705687..b377705687 100644
--- a/c/src/lib/libbsp/powerpc/shared/include/u-boot-board-info.h
+++ b/bsps/powerpc/include/bsp/u-boot-board-info.h
diff --git a/c/src/lib/libbsp/powerpc/shared/console/uart.h b/bsps/powerpc/include/bsp/uart.h
index b7539b5b7b..b7539b5b7b 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/uart.h
+++ b/bsps/powerpc/include/bsp/uart.h
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h b/bsps/powerpc/include/bsp/vectors.h
index 81526eb4b0..81526eb4b0 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h
+++ b/bsps/powerpc/include/bsp/vectors.h
diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/vpd.h b/bsps/powerpc/include/bsp/vpd.h
index 23e49ac9f0..23e49ac9f0 100644
--- a/c/src/lib/libbsp/powerpc/shared/motorola/vpd.h
+++ b/bsps/powerpc/include/bsp/vpd.h
diff --git a/c/src/lib/libcpu/powerpc/mpc505/ictrl/ictrl.h b/bsps/powerpc/include/ictrl.h
index 303ece825d..303ece825d 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/ictrl/ictrl.h
+++ b/bsps/powerpc/include/ictrl.h
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h b/bsps/powerpc/include/libcpu/bat.h
index 2a27e810ee..2a27e810ee 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h
+++ b/bsps/powerpc/include/libcpu/bat.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/byteorder.h b/bsps/powerpc/include/libcpu/byteorder.h
index 0654fefb58..0654fefb58 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/byteorder.h
+++ b/bsps/powerpc/include/libcpu/byteorder.h
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h b/bsps/powerpc/include/libcpu/c_clock.h
index bd4918fb44..bd4918fb44 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h
+++ b/bsps/powerpc/include/libcpu/c_clock.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h b/bsps/powerpc/include/libcpu/cpuIdent.h
index e051deba92..e051deba92 100755
--- a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h
+++ b/bsps/powerpc/include/libcpu/cpuIdent.h
diff --git a/c/src/lib/libcpu/powerpc/e500/mmu/e500_mmu.h b/bsps/powerpc/include/libcpu/e500_mmu.h
index 84920e0d14..84920e0d14 100644
--- a/c/src/lib/libcpu/powerpc/e500/mmu/e500_mmu.h
+++ b/bsps/powerpc/include/libcpu/e500_mmu.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/io.h b/bsps/powerpc/include/libcpu/io.h
index 841df81f47..841df81f47 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/io.h
+++ b/bsps/powerpc/include/libcpu/io.h
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.h b/bsps/powerpc/include/libcpu/irq.h
index ab06041d24..ab06041d24 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.h
+++ b/bsps/powerpc/include/libcpu/irq.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/mmu.h b/bsps/powerpc/include/libcpu/mmu.h
index d3081316eb..d3081316eb 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/mmu.h
+++ b/bsps/powerpc/include/libcpu/mmu.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/page.h b/bsps/powerpc/include/libcpu/page.h
index 3efbdef5bc..3efbdef5bc 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/page.h
+++ b/bsps/powerpc/include/libcpu/page.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/pgtable.h b/bsps/powerpc/include/libcpu/pgtable.h
index 5be5874b4f..5be5874b4f 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/pgtable.h
+++ b/bsps/powerpc/include/libcpu/pgtable.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h b/bsps/powerpc/include/libcpu/powerpc-utility.h
index 4d6af38485..4d6af38485 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h
+++ b/bsps/powerpc/include/libcpu/powerpc-utility.h
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.h b/bsps/powerpc/include/libcpu/pte121.h
index a07e063f03..a07e063f03 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.h
+++ b/bsps/powerpc/include/libcpu/pte121.h
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.h b/bsps/powerpc/include/libcpu/raw_exception.h
index dd0c483b0d..dd0c483b0d 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.h
+++ b/bsps/powerpc/include/libcpu/raw_exception.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/spr.h b/bsps/powerpc/include/libcpu/spr.h
index 6c81d0ee91..6c81d0ee91 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/spr.h
+++ b/bsps/powerpc/include/libcpu/spr.h
diff --git a/c/src/lib/libcpu/powerpc/shared/src/stackTrace.h b/bsps/powerpc/include/libcpu/stackTrace.h
index f73dc2eff2..f73dc2eff2 100644
--- a/c/src/lib/libcpu/powerpc/shared/src/stackTrace.h
+++ b/bsps/powerpc/include/libcpu/stackTrace.h
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.h b/bsps/powerpc/include/libcpu/vectors.h
index 2c8914e2a4..2c8914e2a4 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.h
+++ b/bsps/powerpc/include/libcpu/vectors.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/dspi.h b/bsps/powerpc/include/mpc55xx/dspi.h
index 8ad98274ef..8ad98274ef 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/dspi.h
+++ b/bsps/powerpc/include/mpc55xx/dspi.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/edma.h b/bsps/powerpc/include/mpc55xx/edma.h
index 281cdf1c28..281cdf1c28 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/edma.h
+++ b/bsps/powerpc/include/mpc55xx/edma.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/emios.h b/bsps/powerpc/include/mpc55xx/emios.h
index d6ccadc07b..d6ccadc07b 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/emios.h
+++ b/bsps/powerpc/include/mpc55xx/emios.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc551x.h b/bsps/powerpc/include/mpc55xx/fsl-mpc551x.h
index dec0b4cf73..dec0b4cf73 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc551x.h
+++ b/bsps/powerpc/include/mpc55xx/fsl-mpc551x.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc555x.h b/bsps/powerpc/include/mpc55xx/fsl-mpc555x.h
index 0dea1957cf..0dea1957cf 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc555x.h
+++ b/bsps/powerpc/include/mpc55xx/fsl-mpc555x.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc556x.h b/bsps/powerpc/include/mpc55xx/fsl-mpc556x.h
index 41ad83729a..41ad83729a 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc556x.h
+++ b/bsps/powerpc/include/mpc55xx/fsl-mpc556x.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc564xL.h b/bsps/powerpc/include/mpc55xx/fsl-mpc564xL.h
index 61217ac656..61217ac656 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc564xL.h
+++ b/bsps/powerpc/include/mpc55xx/fsl-mpc564xL.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc5668.h b/bsps/powerpc/include/mpc55xx/fsl-mpc5668.h
index b7a1793dca..b7a1793dca 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc5668.h
+++ b/bsps/powerpc/include/mpc55xx/fsl-mpc5668.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h b/bsps/powerpc/include/mpc55xx/fsl-mpc567x.h
index 31a132a096..31a132a096 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h
+++ b/bsps/powerpc/include/mpc55xx/fsl-mpc567x.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/mpc55xx.h b/bsps/powerpc/include/mpc55xx/mpc55xx.h
index 634be30e18..634be30e18 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/mpc55xx.h
+++ b/bsps/powerpc/include/mpc55xx/mpc55xx.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h b/bsps/powerpc/include/mpc55xx/reg-defs.h
index 2d66f6a8d0..2d66f6a8d0 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h
+++ b/bsps/powerpc/include/mpc55xx/reg-defs.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs-edma.h b/bsps/powerpc/include/mpc55xx/regs-edma.h
index 804730ccd8..804730ccd8 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs-edma.h
+++ b/bsps/powerpc/include/mpc55xx/regs-edma.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs-mmu.h b/bsps/powerpc/include/mpc55xx/regs-mmu.h
index e03047c4ad..e03047c4ad 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs-mmu.h
+++ b/bsps/powerpc/include/mpc55xx/regs-mmu.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h b/bsps/powerpc/include/mpc55xx/regs.h
index 3a4e737f1a..3a4e737f1a 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h
+++ b/bsps/powerpc/include/mpc55xx/regs.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/siu.h b/bsps/powerpc/include/mpc55xx/siu.h
index 3495750145..3495750145 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/siu.h
+++ b/bsps/powerpc/include/mpc55xx/siu.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/watchdog.h b/bsps/powerpc/include/mpc55xx/watchdog.h
index d5a8af794e..d5a8af794e 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/watchdog.h
+++ b/bsps/powerpc/include/mpc55xx/watchdog.h
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/include/mpc5xx.h b/bsps/powerpc/include/mpc5xx.h
index fc9b756cbf..fc9b756cbf 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/include/mpc5xx.h
+++ b/bsps/powerpc/include/mpc5xx.h
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/include/console.h b/bsps/powerpc/include/mpc5xx/console.h
index c0633af938..c0633af938 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/include/console.h
+++ b/bsps/powerpc/include/mpc5xx/console.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h b/bsps/powerpc/include/mpc8260.h
index ea088ebae8..ea088ebae8 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h
+++ b/bsps/powerpc/include/mpc8260.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/console.h b/bsps/powerpc/include/mpc8260/console.h
index 049cef6d89..049cef6d89 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/include/console.h
+++ b/bsps/powerpc/include/mpc8260/console.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h b/bsps/powerpc/include/mpc8260/cpm.h
index 31708a4199..31708a4199 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h
+++ b/bsps/powerpc/include/mpc8260/cpm.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h b/bsps/powerpc/include/mpc8260/mmu.h
index 9445dde3bc..9445dde3bc 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h
+++ b/bsps/powerpc/include/mpc8260/mmu.h
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/include/gtm.h b/bsps/powerpc/include/mpc83xx/gtm.h
index a17510ed10..a17510ed10 100644
--- a/c/src/lib/libcpu/powerpc/mpc83xx/include/gtm.h
+++ b/bsps/powerpc/include/mpc83xx/gtm.h
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h b/bsps/powerpc/include/mpc83xx/mpc83xx.h
index 6f7417af1c..6f7417af1c 100644
--- a/c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h
+++ b/bsps/powerpc/include/mpc83xx/mpc83xx.h
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h b/bsps/powerpc/include/mpc83xx/mpc83xx_i2cdrv.h
index 206cb87cb4..206cb87cb4 100644
--- a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h
+++ b/bsps/powerpc/include/mpc83xx/mpc83xx_i2cdrv.h
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/spi/mpc83xx_spidrv.h b/bsps/powerpc/include/mpc83xx/mpc83xx_spidrv.h
index 92fe66831a..92fe66831a 100644
--- a/c/src/lib/libcpu/powerpc/mpc83xx/spi/mpc83xx_spidrv.h
+++ b/bsps/powerpc/include/mpc83xx/mpc83xx_spidrv.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h b/bsps/powerpc/include/mpc8xx.h
index 3222e7fd03..3222e7fd03 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h
+++ b/bsps/powerpc/include/mpc8xx.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/console.h b/bsps/powerpc/include/mpc8xx/console.h
index eea561e7eb..eea561e7eb 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/include/console.h
+++ b/bsps/powerpc/include/mpc8xx/console.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h b/bsps/powerpc/include/mpc8xx/cpm.h
index 49889bdc32..49889bdc32 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h
+++ b/bsps/powerpc/include/mpc8xx/cpm.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h b/bsps/powerpc/include/mpc8xx/mmu.h
index f818b14be1..f818b14be1 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h
+++ b/bsps/powerpc/include/mpc8xx/mmu.h
diff --git a/c/src/lib/libbsp/powerpc/shared/include/nvram.h b/bsps/powerpc/include/nvram.h
index f579544336..f579544336 100644
--- a/c/src/lib/libbsp/powerpc/shared/include/nvram.h
+++ b/bsps/powerpc/include/nvram.h
diff --git a/c/src/lib/libcpu/powerpc/ppc403/include/ppc405ex.h b/bsps/powerpc/include/ppc4xx/ppc405ex.h
index 98ebbe28a2..98ebbe28a2 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/include/ppc405ex.h
+++ b/bsps/powerpc/include/ppc4xx/ppc405ex.h
diff --git a/c/src/lib/libcpu/powerpc/ppc403/include/ppc405gp.h b/bsps/powerpc/include/ppc4xx/ppc405gp.h
index 9cf46a780a..9cf46a780a 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/include/ppc405gp.h
+++ b/bsps/powerpc/include/ppc4xx/ppc405gp.h
diff --git a/c/src/lib/libcpu/powerpc/rtems/powerpc/cache.h b/bsps/powerpc/include/rtems/powerpc/cache.h
index 1fdc75ae8b..1fdc75ae8b 100644
--- a/c/src/lib/libcpu/powerpc/rtems/powerpc/cache.h
+++ b/bsps/powerpc/include/rtems/powerpc/cache.h
diff --git a/c/src/lib/libcpu/powerpc/rtems/powerpc/debugmod.h b/bsps/powerpc/include/rtems/powerpc/debugmod.h
index 61b650695c..61b650695c 100644
--- a/c/src/lib/libcpu/powerpc/rtems/powerpc/debugmod.h
+++ b/bsps/powerpc/include/rtems/powerpc/debugmod.h
diff --git a/c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h b/bsps/powerpc/include/rtems/powerpc/powerpc.h
index 8b2cf1e371..8b2cf1e371 100644
--- a/c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h
+++ b/bsps/powerpc/include/rtems/powerpc/powerpc.h
diff --git a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.h b/bsps/powerpc/include/tty_drv.h
index d2024c89d7..d2024c89d7 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.h
+++ b/bsps/powerpc/include/tty_drv.h
diff --git a/bsps/powerpc/motorola_powerpc/headers.am b/bsps/powerpc/motorola_powerpc/headers.am
new file mode 100644
index 0000000000..b577b15c5b
--- /dev/null
+++ b/bsps/powerpc/motorola_powerpc/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/motorola_powerpc/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/motorola_powerpc/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/motorola_powerpc/include/bsp/VMEConfig.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/motorola_powerpc/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h b/bsps/powerpc/motorola_powerpc/include/bsp.h
index 675796becf..675796becf 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
+++ b/bsps/powerpc/motorola_powerpc/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/VMEConfig.h b/bsps/powerpc/motorola_powerpc/include/bsp/VMEConfig.h
index 9b355819f1..9b355819f1 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/VMEConfig.h
+++ b/bsps/powerpc/motorola_powerpc/include/bsp/VMEConfig.h
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/irq.h b/bsps/powerpc/motorola_powerpc/include/bsp/irq.h
index 2d575d8122..2d575d8122 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/irq.h
+++ b/bsps/powerpc/motorola_powerpc/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/tm27.h b/bsps/powerpc/motorola_powerpc/include/tm27.h
index 81eb55a54a..81eb55a54a 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/tm27.h
+++ b/bsps/powerpc/motorola_powerpc/include/tm27.h
diff --git a/bsps/powerpc/mpc55xxevb/headers.am b/bsps/powerpc/mpc55xxevb/headers.am
new file mode 100644
index 0000000000..6dffbe060c
--- /dev/null
+++ b/bsps/powerpc/mpc55xxevb/headers.am
@@ -0,0 +1,15 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/console-esci.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/console-generic.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/console-linflex.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/mpc55xx-config.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/smsc9218i.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h b/bsps/powerpc/mpc55xxevb/include/bsp.h
index eee5d208c1..eee5d208c1 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h
+++ b/bsps/powerpc/mpc55xxevb/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-esci.h b/bsps/powerpc/mpc55xxevb/include/bsp/console-esci.h
index 4be6788141..4be6788141 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-esci.h
+++ b/bsps/powerpc/mpc55xxevb/include/bsp/console-esci.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-generic.h b/bsps/powerpc/mpc55xxevb/include/bsp/console-generic.h
index c3f7a4628f..c3f7a4628f 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-generic.h
+++ b/bsps/powerpc/mpc55xxevb/include/bsp/console-generic.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-linflex.h b/bsps/powerpc/mpc55xxevb/include/bsp/console-linflex.h
index c70f36d13b..c70f36d13b 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-linflex.h
+++ b/bsps/powerpc/mpc55xxevb/include/bsp/console-linflex.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp/irq.h b/bsps/powerpc/mpc55xxevb/include/bsp/irq.h
index 4efa92219e..4efa92219e 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp/irq.h
+++ b/bsps/powerpc/mpc55xxevb/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/mpc55xx-config.h b/bsps/powerpc/mpc55xxevb/include/bsp/mpc55xx-config.h
index b432b9cecd..b432b9cecd 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/mpc55xx-config.h
+++ b/bsps/powerpc/mpc55xxevb/include/bsp/mpc55xx-config.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/smsc9218i.h b/bsps/powerpc/mpc55xxevb/include/bsp/smsc9218i.h
index e4366b039c..e4366b039c 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/smsc9218i.h
+++ b/bsps/powerpc/mpc55xxevb/include/bsp/smsc9218i.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/tm27.h b/bsps/powerpc/mpc55xxevb/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/tm27.h
+++ b/bsps/powerpc/mpc55xxevb/include/tm27.h
diff --git a/bsps/powerpc/mpc8260ads/headers.am b/bsps/powerpc/mpc8260ads/headers.am
new file mode 100644
index 0000000000..10c6e42313
--- /dev/null
+++ b/bsps/powerpc/mpc8260ads/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/mpc8260ads/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/mpc8260ads/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc8260ads/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h b/bsps/powerpc/mpc8260ads/include/bsp.h
index c207a2ec99..c207a2ec99 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h
+++ b/bsps/powerpc/mpc8260ads/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h b/bsps/powerpc/mpc8260ads/include/bsp/irq.h
index 1dd18611fc..1dd18611fc 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h
+++ b/bsps/powerpc/mpc8260ads/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/tm27.h b/bsps/powerpc/mpc8260ads/include/tm27.h
index b1eafc47aa..b1eafc47aa 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/tm27.h
+++ b/bsps/powerpc/mpc8260ads/include/tm27.h
diff --git a/bsps/powerpc/mvme3100/headers.am b/bsps/powerpc/mvme3100/headers.am
new file mode 100644
index 0000000000..3a242350e6
--- /dev/null
+++ b/bsps/powerpc/mvme3100/headers.am
@@ -0,0 +1,13 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/mvme3100/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/mvme3100/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme3100/include/bsp/VMEConfig.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme3100/include/bsp/if_tsec_pub.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme3100/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme3100/include/bsp/mpc8540_i2c_busdrv.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h b/bsps/powerpc/mvme3100/include/bsp.h
index 3fbfcb3120..3fbfcb3120 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
+++ b/bsps/powerpc/mvme3100/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/vme/VMEConfig.h b/bsps/powerpc/mvme3100/include/bsp/VMEConfig.h
index 10b424c2a8..10b424c2a8 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/vme/VMEConfig.h
+++ b/bsps/powerpc/mvme3100/include/bsp/VMEConfig.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/network/if_tsec_pub.h b/bsps/powerpc/mvme3100/include/bsp/if_tsec_pub.h
index 7eb0358eae..7eb0358eae 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/network/if_tsec_pub.h
+++ b/bsps/powerpc/mvme3100/include/bsp/if_tsec_pub.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/irq/irq.h b/bsps/powerpc/mvme3100/include/bsp/irq.h
index 0158e05149..0158e05149 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/irq/irq.h
+++ b/bsps/powerpc/mvme3100/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/i2c/mpc8540_i2c_busdrv.h b/bsps/powerpc/mvme3100/include/bsp/mpc8540_i2c_busdrv.h
index 181b45f468..181b45f468 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/i2c/mpc8540_i2c_busdrv.h
+++ b/bsps/powerpc/mvme3100/include/bsp/mpc8540_i2c_busdrv.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/include/tm27.h b/bsps/powerpc/mvme3100/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/include/tm27.h
+++ b/bsps/powerpc/mvme3100/include/tm27.h
diff --git a/bsps/powerpc/mvme5500/headers.am b/bsps/powerpc/mvme5500/headers.am
new file mode 100644
index 0000000000..94c03a6982
--- /dev/null
+++ b/bsps/powerpc/mvme5500/headers.am
@@ -0,0 +1,21 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/GT64260TWSI.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/GT64260eth.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/GT64260ethreg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/VMEConfig.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/VPD.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/bspException.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/bspMvme5500.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/gtpcireg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/gtreg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/if_wmreg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/pcireg.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h b/bsps/powerpc/mvme5500/include/bsp.h
index c1b17cee10..c1b17cee10 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
+++ b/bsps/powerpc/mvme5500/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/GT64260TWSI.h b/bsps/powerpc/mvme5500/include/bsp/GT64260TWSI.h
index 1377e6f607..1377e6f607 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/GT64260TWSI.h
+++ b/bsps/powerpc/mvme5500/include/bsp/GT64260TWSI.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.h b/bsps/powerpc/mvme5500/include/bsp/GT64260eth.h
index 2703bb423e..2703bb423e 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.h
+++ b/bsps/powerpc/mvme5500/include/bsp/GT64260eth.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260ethreg.h b/bsps/powerpc/mvme5500/include/bsp/GT64260ethreg.h
index d9081ccb53..d9081ccb53 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260ethreg.h
+++ b/bsps/powerpc/mvme5500/include/bsp/GT64260ethreg.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/vme/VMEConfig.h b/bsps/powerpc/mvme5500/include/bsp/VMEConfig.h
index ecc5789899..ecc5789899 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/vme/VMEConfig.h
+++ b/bsps/powerpc/mvme5500/include/bsp/VMEConfig.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/VPD.h b/bsps/powerpc/mvme5500/include/bsp/VPD.h
index 33aec8b74c..33aec8b74c 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/VPD.h
+++ b/bsps/powerpc/mvme5500/include/bsp/VPD.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/vectors/bspException.h b/bsps/powerpc/mvme5500/include/bsp/bspException.h
index 7cd816e818..7cd816e818 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/vectors/bspException.h
+++ b/bsps/powerpc/mvme5500/include/bsp/bspException.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/bspMvme5500.h b/bsps/powerpc/mvme5500/include/bsp/bspMvme5500.h
index 9fb53869ff..9fb53869ff 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/bspMvme5500.h
+++ b/bsps/powerpc/mvme5500/include/bsp/bspMvme5500.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/gtpcireg.h b/bsps/powerpc/mvme5500/include/bsp/gtpcireg.h
index 74751f6088..74751f6088 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/pci/gtpcireg.h
+++ b/bsps/powerpc/mvme5500/include/bsp/gtpcireg.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/gtreg.h b/bsps/powerpc/mvme5500/include/bsp/gtreg.h
index e9aaeff844..e9aaeff844 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/gtreg.h
+++ b/bsps/powerpc/mvme5500/include/bsp/gtreg.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wmreg.h b/bsps/powerpc/mvme5500/include/bsp/if_wmreg.h
index 3e21c62581..3e21c62581 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wmreg.h
+++ b/bsps/powerpc/mvme5500/include/bsp/if_wmreg.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h b/bsps/powerpc/mvme5500/include/bsp/irq.h
index 6704c2f626..6704c2f626 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h
+++ b/bsps/powerpc/mvme5500/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pcireg.h b/bsps/powerpc/mvme5500/include/bsp/pcireg.h
index 2b8b10d853..2b8b10d853 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pcireg.h
+++ b/bsps/powerpc/mvme5500/include/bsp/pcireg.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/tm27.h b/bsps/powerpc/mvme5500/include/tm27.h
index 2a80618cfb..2a80618cfb 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/include/tm27.h
+++ b/bsps/powerpc/mvme5500/include/tm27.h
diff --git a/bsps/powerpc/psim/headers.am b/bsps/powerpc/psim/headers.am
new file mode 100644
index 0000000000..a1f49d3727
--- /dev/null
+++ b/bsps/powerpc/psim/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/psim/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/psim/include/psim.h
+include_HEADERS += ../../../../../../bsps/powerpc/psim/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/psim/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/psim/include/bsp.h b/bsps/powerpc/psim/include/bsp.h
index cffc9632e7..cffc9632e7 100644
--- a/c/src/lib/libbsp/powerpc/psim/include/bsp.h
+++ b/bsps/powerpc/psim/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/psim/irq/irq.h b/bsps/powerpc/psim/include/bsp/irq.h
index 376c95a627..376c95a627 100644
--- a/c/src/lib/libbsp/powerpc/psim/irq/irq.h
+++ b/bsps/powerpc/psim/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/psim/include/psim.h b/bsps/powerpc/psim/include/psim.h
index e7b6fa7578..e7b6fa7578 100644
--- a/c/src/lib/libbsp/powerpc/psim/include/psim.h
+++ b/bsps/powerpc/psim/include/psim.h
diff --git a/c/src/lib/libbsp/powerpc/psim/include/tm27.h b/bsps/powerpc/psim/include/tm27.h
index 3a41283a13..3a41283a13 100644
--- a/c/src/lib/libbsp/powerpc/psim/include/tm27.h
+++ b/bsps/powerpc/psim/include/tm27.h
diff --git a/bsps/powerpc/qemuppc/headers.am b/bsps/powerpc/qemuppc/headers.am
new file mode 100644
index 0000000000..21ab8382a5
--- /dev/null
+++ b/bsps/powerpc/qemuppc/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/qemuppc/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/qemuppc/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/qemuppc/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/include/bsp.h b/bsps/powerpc/qemuppc/include/bsp.h
index 240cfd3bea..240cfd3bea 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/include/bsp.h
+++ b/bsps/powerpc/qemuppc/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/irq/irq.h b/bsps/powerpc/qemuppc/include/bsp/irq.h
index 7124dbcaf8..7124dbcaf8 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/irq/irq.h
+++ b/bsps/powerpc/qemuppc/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/include/tm27.h b/bsps/powerpc/qemuppc/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/include/tm27.h
+++ b/bsps/powerpc/qemuppc/include/tm27.h
diff --git a/bsps/powerpc/qoriq/headers.am b/bsps/powerpc/qoriq/headers.am
new file mode 100644
index 0000000000..9d23263d43
--- /dev/null
+++ b/bsps/powerpc/qoriq/headers.am
@@ -0,0 +1,24 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/tm27.h
+
+include_asmdir = $(includedir)/asm
+include_asm_HEADERS =
+include_asm_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/asm/epapr_hcalls.h
+include_asm_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/asm/fsl_hcalls.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/bsp/intercom.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/bsp/mmu.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/bsp/qoriq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/bsp/tsec-config.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/bsp/uart-bridge.h
+
+include_uapi_asmdir = $(includedir)/uapi/asm
+include_uapi_asm_HEADERS =
+include_uapi_asm_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/asm/epapr_hcalls.h b/bsps/powerpc/qoriq/include/asm/epapr_hcalls.h
index 3d87cca611..3d87cca611 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/asm/epapr_hcalls.h
+++ b/bsps/powerpc/qoriq/include/asm/epapr_hcalls.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/asm/fsl_hcalls.h b/bsps/powerpc/qoriq/include/asm/fsl_hcalls.h
index ba76c132aa..ba76c132aa 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/asm/fsl_hcalls.h
+++ b/bsps/powerpc/qoriq/include/asm/fsl_hcalls.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/bsp.h b/bsps/powerpc/qoriq/include/bsp.h
index d7e9e95b3f..d7e9e95b3f 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/bsp.h
+++ b/bsps/powerpc/qoriq/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/intercom.h b/bsps/powerpc/qoriq/include/bsp/intercom.h
index 39b2ba938e..39b2ba938e 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/intercom.h
+++ b/bsps/powerpc/qoriq/include/bsp/intercom.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/irq.h b/bsps/powerpc/qoriq/include/bsp/irq.h
index e178057950..e178057950 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/irq.h
+++ b/bsps/powerpc/qoriq/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/mmu.h b/bsps/powerpc/qoriq/include/bsp/mmu.h
index 4cacb1b375..4cacb1b375 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/mmu.h
+++ b/bsps/powerpc/qoriq/include/bsp/mmu.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/qoriq.h b/bsps/powerpc/qoriq/include/bsp/qoriq.h
index 2d28d0aec7..2d28d0aec7 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/qoriq.h
+++ b/bsps/powerpc/qoriq/include/bsp/qoriq.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/tsec-config.h b/bsps/powerpc/qoriq/include/bsp/tsec-config.h
index b1a70e7486..b1a70e7486 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/tsec-config.h
+++ b/bsps/powerpc/qoriq/include/bsp/tsec-config.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/uart-bridge.h b/bsps/powerpc/qoriq/include/bsp/uart-bridge.h
index 97e6553b7c..97e6553b7c 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/uart-bridge.h
+++ b/bsps/powerpc/qoriq/include/bsp/uart-bridge.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/tm27.h b/bsps/powerpc/qoriq/include/tm27.h
index 46264b7e67..46264b7e67 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/tm27.h
+++ b/bsps/powerpc/qoriq/include/tm27.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h b/bsps/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h
index b4504f3944..b4504f3944 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h
+++ b/bsps/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h
diff --git a/bsps/powerpc/ss555/headers.am b/bsps/powerpc/ss555/headers.am
new file mode 100644
index 0000000000..f53a4bd6b2
--- /dev/null
+++ b/bsps/powerpc/ss555/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/ss555/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/ss555/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/ss555/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h b/bsps/powerpc/ss555/include/bsp.h
index a82d10a667..a82d10a667 100644
--- a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h
+++ b/bsps/powerpc/ss555/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/ss555/irq/irq.h b/bsps/powerpc/ss555/include/bsp/irq.h
index 44e39608b1..44e39608b1 100644
--- a/c/src/lib/libbsp/powerpc/ss555/irq/irq.h
+++ b/bsps/powerpc/ss555/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/ss555/include/tm27.h b/bsps/powerpc/ss555/include/tm27.h
index 5106801744..5106801744 100644
--- a/c/src/lib/libbsp/powerpc/ss555/include/tm27.h
+++ b/bsps/powerpc/ss555/include/tm27.h
diff --git a/bsps/powerpc/t32mppc/headers.am b/bsps/powerpc/t32mppc/headers.am
new file mode 100644
index 0000000000..57d3bd9be1
--- /dev/null
+++ b/bsps/powerpc/t32mppc/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/t32mppc/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/t32mppc/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/t32mppc/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/include/bsp.h b/bsps/powerpc/t32mppc/include/bsp.h
index c27f235ef6..c27f235ef6 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/include/bsp.h
+++ b/bsps/powerpc/t32mppc/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/include/irq.h b/bsps/powerpc/t32mppc/include/bsp/irq.h
index 0053aa5ac1..0053aa5ac1 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/include/irq.h
+++ b/bsps/powerpc/t32mppc/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/include/tm27.h b/bsps/powerpc/t32mppc/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/include/tm27.h
+++ b/bsps/powerpc/t32mppc/include/tm27.h
diff --git a/bsps/powerpc/tqm8xx/headers.am b/bsps/powerpc/tqm8xx/headers.am
new file mode 100644
index 0000000000..a3c97f53da
--- /dev/null
+++ b/bsps/powerpc/tqm8xx/headers.am
@@ -0,0 +1,13 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/tqm8xx/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/tqm8xx/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/tqm8xx/include/bsp/8xx_immap.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/tqm8xx/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/tqm8xx/include/bsp/spi.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/tqm8xx/include/bsp/tqm.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h b/bsps/powerpc/tqm8xx/include/bsp.h
index 5c8eae81b4..5c8eae81b4 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h
+++ b/bsps/powerpc/tqm8xx/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/8xx_immap.h b/bsps/powerpc/tqm8xx/include/bsp/8xx_immap.h
index c1c414e25f..c1c414e25f 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/include/8xx_immap.h
+++ b/bsps/powerpc/tqm8xx/include/bsp/8xx_immap.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/irq.h b/bsps/powerpc/tqm8xx/include/bsp/irq.h
index 2d66829037..2d66829037 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/include/irq.h
+++ b/bsps/powerpc/tqm8xx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/spi/spi.h b/bsps/powerpc/tqm8xx/include/bsp/spi.h
index e2af971c8d..e2af971c8d 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/spi/spi.h
+++ b/bsps/powerpc/tqm8xx/include/bsp/spi.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/tqm.h b/bsps/powerpc/tqm8xx/include/bsp/tqm.h
index 11f6001304..11f6001304 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/include/tqm.h
+++ b/bsps/powerpc/tqm8xx/include/bsp/tqm.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/tm27.h b/bsps/powerpc/tqm8xx/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/include/tm27.h
+++ b/bsps/powerpc/tqm8xx/include/tm27.h
diff --git a/bsps/powerpc/virtex/headers.am b/bsps/powerpc/virtex/headers.am
new file mode 100644
index 0000000000..9feceaf16d
--- /dev/null
+++ b/bsps/powerpc/virtex/headers.am
@@ -0,0 +1,13 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/virtex/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/virtex/include/tm27.h
+include_HEADERS += ../../../../../../bsps/powerpc/virtex/include/xiltemac.h
+include_HEADERS += ../../../../../../bsps/powerpc/virtex/include/xparameters_dflt.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex/include/bsp/opbintctrl.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h b/bsps/powerpc/virtex/include/bsp.h
index 2f61ee2517..2f61ee2517 100644
--- a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h
+++ b/bsps/powerpc/virtex/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/irq/irq.h b/bsps/powerpc/virtex/include/bsp/irq.h
index 1ce5b68b98..1ce5b68b98 100644
--- a/c/src/lib/libbsp/powerpc/virtex/irq/irq.h
+++ b/bsps/powerpc/virtex/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/opbintctrl.h b/bsps/powerpc/virtex/include/bsp/opbintctrl.h
index 4ade0e48f8..4ade0e48f8 100644
--- a/c/src/lib/libbsp/powerpc/virtex/include/opbintctrl.h
+++ b/bsps/powerpc/virtex/include/bsp/opbintctrl.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/tm27.h b/bsps/powerpc/virtex/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/powerpc/virtex/include/tm27.h
+++ b/bsps/powerpc/virtex/include/tm27.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.h b/bsps/powerpc/virtex/include/xiltemac.h
index 185b89bdc1..185b89bdc1 100644
--- a/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.h
+++ b/bsps/powerpc/virtex/include/xiltemac.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/xparameters_dflt.h b/bsps/powerpc/virtex/include/xparameters_dflt.h
index b31cb26fe8..b31cb26fe8 100644
--- a/c/src/lib/libbsp/powerpc/virtex/include/xparameters_dflt.h
+++ b/bsps/powerpc/virtex/include/xparameters_dflt.h
diff --git a/bsps/powerpc/virtex4/headers.am b/bsps/powerpc/virtex4/headers.am
new file mode 100644
index 0000000000..9ea2ab1635
--- /dev/null
+++ b/bsps/powerpc/virtex4/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/virtex4/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/virtex4/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex4/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex4/include/bsp/mmu.h
diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h b/bsps/powerpc/virtex4/include/bsp.h
index 91e7ddf4ab..91e7ddf4ab 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h
+++ b/bsps/powerpc/virtex4/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/irq.h b/bsps/powerpc/virtex4/include/bsp/irq.h
index 45ef69adbf..45ef69adbf 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/include/irq.h
+++ b/bsps/powerpc/virtex4/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/mmu.h b/bsps/powerpc/virtex4/include/bsp/mmu.h
index 3e2710b95c..3e2710b95c 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/include/mmu.h
+++ b/bsps/powerpc/virtex4/include/bsp/mmu.h
diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/tm27.h b/bsps/powerpc/virtex4/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/include/tm27.h
+++ b/bsps/powerpc/virtex4/include/tm27.h
diff --git a/bsps/powerpc/virtex5/headers.am b/bsps/powerpc/virtex5/headers.am
new file mode 100644
index 0000000000..4a5dff7ff9
--- /dev/null
+++ b/bsps/powerpc/virtex5/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/virtex5/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/virtex5/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex5/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex5/include/bsp/mmu.h
diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h b/bsps/powerpc/virtex5/include/bsp.h
index ee9f20058d..ee9f20058d 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h
+++ b/bsps/powerpc/virtex5/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/irq.h b/bsps/powerpc/virtex5/include/bsp/irq.h
index 066090de7f..066090de7f 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/include/irq.h
+++ b/bsps/powerpc/virtex5/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/mmu.h b/bsps/powerpc/virtex5/include/bsp/mmu.h
index a3fb32b662..a3fb32b662 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/include/mmu.h
+++ b/bsps/powerpc/virtex5/include/bsp/mmu.h
diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/tm27.h b/bsps/powerpc/virtex5/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/include/tm27.h
+++ b/bsps/powerpc/virtex5/include/tm27.h
diff --git a/bsps/riscv/headers.am b/bsps/riscv/headers.am
new file mode 100644
index 0000000000..2fd6c8822e
--- /dev/null
+++ b/bsps/riscv/headers.am
@@ -0,0 +1,5 @@
+## This file was generated by "./boostrap -H".
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/riscv/include/bsp/linker-symbols.h
diff --git a/c/src/lib/libbsp/riscv/shared/include/linker-symbols.h b/bsps/riscv/include/bsp/linker-symbols.h
index a4b03f527c..a4b03f527c 100644
--- a/c/src/lib/libbsp/riscv/shared/include/linker-symbols.h
+++ b/bsps/riscv/include/bsp/linker-symbols.h
diff --git a/bsps/riscv/riscv_generic/headers.am b/bsps/riscv/riscv_generic/headers.am
new file mode 100644
index 0000000000..6993fe8688
--- /dev/null
+++ b/bsps/riscv/riscv_generic/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/riscv/riscv_generic/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/riscv/riscv_generic/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/riscv/riscv_generic/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/include/bsp.h b/bsps/riscv/riscv_generic/include/bsp.h
index 79f359ac34..79f359ac34 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/include/bsp.h
+++ b/bsps/riscv/riscv_generic/include/bsp.h
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/include/irq.h b/bsps/riscv/riscv_generic/include/bsp/irq.h
index d7ee45b378..d7ee45b378 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/include/irq.h
+++ b/bsps/riscv/riscv_generic/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/include/tm27.h b/bsps/riscv/riscv_generic/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/include/tm27.h
+++ b/bsps/riscv/riscv_generic/include/tm27.h
diff --git a/bsps/sh/gensh1/headers.am b/bsps/sh/gensh1/headers.am
new file mode 100644
index 0000000000..5118d283ce
--- /dev/null
+++ b/bsps/sh/gensh1/headers.am
@@ -0,0 +1,17 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sh/gensh1/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sh/gensh1/include/tm27.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh1/include/rtems/score/iosh7032.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh1/include/rtems/score/ispsh7032.h
+
+include_shdir = $(includedir)/sh
+include_sh_HEADERS =
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh1/include/sh/sci.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh1/include/sh/sh7_pfc.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh1/include/sh/sh7_sci.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/bsps/sh/gensh1/include/bsp.h
index 2c0da4b074..2c0da4b074 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h
+++ b/bsps/sh/gensh1/include/bsp.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/rtems/score/iosh7032.h b/bsps/sh/gensh1/include/rtems/score/iosh7032.h
index 3750024a64..3750024a64 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/rtems/score/iosh7032.h
+++ b/bsps/sh/gensh1/include/rtems/score/iosh7032.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/rtems/score/ispsh7032.h b/bsps/sh/gensh1/include/rtems/score/ispsh7032.h
index 9c7cee8bd6..9c7cee8bd6 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/rtems/score/ispsh7032.h
+++ b/bsps/sh/gensh1/include/rtems/score/ispsh7032.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/sh/sci.h b/bsps/sh/gensh1/include/sh/sci.h
index 5653afca3c..5653afca3c 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/sh/sci.h
+++ b/bsps/sh/gensh1/include/sh/sci.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/sh/sh7_pfc.h b/bsps/sh/gensh1/include/sh/sh7_pfc.h
index 1045af6af8..1045af6af8 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/sh/sh7_pfc.h
+++ b/bsps/sh/gensh1/include/sh/sh7_pfc.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/sh/sh7_sci.h b/bsps/sh/gensh1/include/sh/sh7_sci.h
index 0b80a485d3..0b80a485d3 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/sh/sh7_sci.h
+++ b/bsps/sh/gensh1/include/sh/sh7_sci.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/tm27.h b/bsps/sh/gensh1/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/tm27.h
+++ b/bsps/sh/gensh1/include/tm27.h
diff --git a/bsps/sh/gensh2/headers.am b/bsps/sh/gensh2/headers.am
new file mode 100644
index 0000000000..7062397ddf
--- /dev/null
+++ b/bsps/sh/gensh2/headers.am
@@ -0,0 +1,19 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sh/gensh2/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sh/gensh2/include/tm27.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh2/include/rtems/score/iosh7045.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh2/include/rtems/score/ispsh7045.h
+
+include_shdir = $(includedir)/sh
+include_sh_HEADERS =
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh2/include/sh/io_types.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh2/include/sh/sci.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh2/include/sh/sci_termios.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh2/include/sh/sh7_pfc.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh2/include/sh/sh7_sci.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/bsp.h b/bsps/sh/gensh2/include/bsp.h
index 221137ad81..221137ad81 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/bsp.h
+++ b/bsps/sh/gensh2/include/bsp.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/rtems/score/iosh7045.h b/bsps/sh/gensh2/include/rtems/score/iosh7045.h
index db3252b72d..db3252b72d 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/rtems/score/iosh7045.h
+++ b/bsps/sh/gensh2/include/rtems/score/iosh7045.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/rtems/score/ispsh7045.h b/bsps/sh/gensh2/include/rtems/score/ispsh7045.h
index fb9f5297ae..fb9f5297ae 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/rtems/score/ispsh7045.h
+++ b/bsps/sh/gensh2/include/rtems/score/ispsh7045.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/sh/io_types.h b/bsps/sh/gensh2/include/sh/io_types.h
index 1dab885672..1dab885672 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/sh/io_types.h
+++ b/bsps/sh/gensh2/include/sh/io_types.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/sh/sci.h b/bsps/sh/gensh2/include/sh/sci.h
index dc34371d48..dc34371d48 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/sh/sci.h
+++ b/bsps/sh/gensh2/include/sh/sci.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/sh/sci_termios.h b/bsps/sh/gensh2/include/sh/sci_termios.h
index 63750c9461..63750c9461 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/sh/sci_termios.h
+++ b/bsps/sh/gensh2/include/sh/sci_termios.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_pfc.h b/bsps/sh/gensh2/include/sh/sh7_pfc.h
index b56433a9e2..b56433a9e2 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_pfc.h
+++ b/bsps/sh/gensh2/include/sh/sh7_pfc.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_sci.h b/bsps/sh/gensh2/include/sh/sh7_sci.h
index 7218313704..7218313704 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_sci.h
+++ b/bsps/sh/gensh2/include/sh/sh7_sci.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/tm27.h b/bsps/sh/gensh2/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/tm27.h
+++ b/bsps/sh/gensh2/include/tm27.h
diff --git a/bsps/sh/gensh4/headers.am b/bsps/sh/gensh4/headers.am
new file mode 100644
index 0000000000..d3bb5ad26c
--- /dev/null
+++ b/bsps/sh/gensh4/headers.am
@@ -0,0 +1,19 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sh/gensh4/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sh/gensh4/include/sdram.h
+include_HEADERS += ../../../../../../bsps/sh/gensh4/include/tm27.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh4/include/rtems/score/iosh7750.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh4/include/rtems/score/ipl.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh4/include/rtems/score/ispsh7750.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh4/include/rtems/score/sh4_regs.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh4/include/rtems/score/sh7750_regs.h
+
+include_shdir = $(includedir)/sh
+include_sh_HEADERS =
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh4/include/sh/sh4uart.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/bsp.h b/bsps/sh/gensh4/include/bsp.h
index b70c2ffdac..b70c2ffdac 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/bsp.h
+++ b/bsps/sh/gensh4/include/bsp.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/iosh7750.h b/bsps/sh/gensh4/include/rtems/score/iosh7750.h
index c5c532dbc2..c5c532dbc2 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/iosh7750.h
+++ b/bsps/sh/gensh4/include/rtems/score/iosh7750.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ipl.h b/bsps/sh/gensh4/include/rtems/score/ipl.h
index 9ce2d87e0e..9ce2d87e0e 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ipl.h
+++ b/bsps/sh/gensh4/include/rtems/score/ipl.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ispsh7750.h b/bsps/sh/gensh4/include/rtems/score/ispsh7750.h
index 396644a241..396644a241 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ispsh7750.h
+++ b/bsps/sh/gensh4/include/rtems/score/ispsh7750.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh4_regs.h b/bsps/sh/gensh4/include/rtems/score/sh4_regs.h
index 074dc6d7a1..074dc6d7a1 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh4_regs.h
+++ b/bsps/sh/gensh4/include/rtems/score/sh4_regs.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh7750_regs.h b/bsps/sh/gensh4/include/rtems/score/sh7750_regs.h
index b65f9b6e51..b65f9b6e51 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh7750_regs.h
+++ b/bsps/sh/gensh4/include/rtems/score/sh7750_regs.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/sdram.h b/bsps/sh/gensh4/include/sdram.h
index 52acaa61db..52acaa61db 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/sdram.h
+++ b/bsps/sh/gensh4/include/sdram.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/sh/sh4uart.h b/bsps/sh/gensh4/include/sh/sh4uart.h
index 1e7a486eb8..1e7a486eb8 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/sh/sh4uart.h
+++ b/bsps/sh/gensh4/include/sh/sh4uart.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/tm27.h b/bsps/sh/gensh4/include/tm27.h
index c26ec49272..c26ec49272 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/tm27.h
+++ b/bsps/sh/gensh4/include/tm27.h
diff --git a/bsps/sh/shsim/headers.am b/bsps/sh/shsim/headers.am
new file mode 100644
index 0000000000..d221f41a07
--- /dev/null
+++ b/bsps/sh/shsim/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sh/shsim/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sh/shsim/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/sh/shsim/include/bsp/syscall.h
diff --git a/c/src/lib/libbsp/sh/shsim/include/bsp.h b/bsps/sh/shsim/include/bsp.h
index 7b8236b09a..7b8236b09a 100644
--- a/c/src/lib/libbsp/sh/shsim/include/bsp.h
+++ b/bsps/sh/shsim/include/bsp.h
diff --git a/c/src/lib/libbsp/sh/shsim/include/syscall.h b/bsps/sh/shsim/include/bsp/syscall.h
index e5cde7217b..e5cde7217b 100644
--- a/c/src/lib/libbsp/sh/shsim/include/syscall.h
+++ b/bsps/sh/shsim/include/bsp/syscall.h
diff --git a/c/src/lib/libbsp/sh/shsim/include/tm27.h b/bsps/sh/shsim/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/sh/shsim/include/tm27.h
+++ b/bsps/sh/shsim/include/tm27.h
diff --git a/bsps/sparc/erc32/headers.am b/bsps/sparc/erc32/headers.am
new file mode 100644
index 0000000000..00ad61f3e2
--- /dev/null
+++ b/bsps/sparc/erc32/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sparc/erc32/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sparc/erc32/include/erc32.h
+include_HEADERS += ../../../../../../bsps/sparc/erc32/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/sparc/erc32/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp.h b/bsps/sparc/erc32/include/bsp.h
index 71719f9cf3..71719f9cf3 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/bsp.h
+++ b/bsps/sparc/erc32/include/bsp.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp/irq.h b/bsps/sparc/erc32/include/bsp/irq.h
index 7789c9f57d..7789c9f57d 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/bsp/irq.h
+++ b/bsps/sparc/erc32/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/erc32.h b/bsps/sparc/erc32/include/erc32.h
index 7db4a6c91b..7db4a6c91b 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/erc32.h
+++ b/bsps/sparc/erc32/include/erc32.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/tm27.h b/bsps/sparc/erc32/include/tm27.h
index 958036fbf0..958036fbf0 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/tm27.h
+++ b/bsps/sparc/erc32/include/tm27.h
diff --git a/bsps/sparc/headers.am b/bsps/sparc/headers.am
new file mode 100644
index 0000000000..c561e0c06f
--- /dev/null
+++ b/bsps/sparc/headers.am
@@ -0,0 +1,75 @@
+## 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_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/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
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += ../../../../../bsps/sparc/include/libcpu/access.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/ambapp.h b/bsps/sparc/include/ambapp.h
index 338602e83d..338602e83d 100644
--- a/c/src/lib/libbsp/sparc/shared/include/ambapp.h
+++ b/bsps/sparc/include/ambapp.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/ambapp_ids.h b/bsps/sparc/include/ambapp_ids.h
index c0c3547e94..c0c3547e94 100644
--- a/c/src/lib/libbsp/sparc/shared/include/ambapp_ids.h
+++ b/bsps/sparc/include/ambapp_ids.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/ahbstat.h b/bsps/sparc/include/bsp/ahbstat.h
index 71e2330f69..71e2330f69 100644
--- a/c/src/lib/libbsp/sparc/shared/include/ahbstat.h
+++ b/bsps/sparc/include/bsp/ahbstat.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart.h b/bsps/sparc/include/bsp/apbuart.h
index a324805d7d..a324805d7d 100644
--- a/c/src/lib/libbsp/sparc/shared/include/apbuart.h
+++ b/bsps/sparc/include/bsp/apbuart.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart_cons.h b/bsps/sparc/include/bsp/apbuart_cons.h
index d0ac9244af..d0ac9244af 100644
--- a/c/src/lib/libbsp/sparc/shared/include/apbuart_cons.h
+++ b/bsps/sparc/include/bsp/apbuart_cons.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart_termios.h b/bsps/sparc/include/bsp/apbuart_termios.h
index 40377c1023..40377c1023 100644
--- a/c/src/lib/libbsp/sparc/shared/include/apbuart_termios.h
+++ b/bsps/sparc/include/bsp/apbuart_termios.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553brm.h b/bsps/sparc/include/bsp/b1553brm.h
index eba0716f75..eba0716f75 100644
--- a/c/src/lib/libbsp/sparc/shared/include/b1553brm.h
+++ b/bsps/sparc/include/bsp/b1553brm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553rt.h b/bsps/sparc/include/bsp/b1553rt.h
index fbe4b706de..fbe4b706de 100644
--- a/c/src/lib/libbsp/sparc/shared/include/b1553rt.h
+++ b/bsps/sparc/include/bsp/b1553rt.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/canmux.h b/bsps/sparc/include/bsp/canmux.h
index 02727f44c7..02727f44c7 100644
--- a/c/src/lib/libbsp/sparc/shared/include/canmux.h
+++ b/bsps/sparc/include/bsp/canmux.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/cons.h b/bsps/sparc/include/bsp/cons.h
index c30e41cf14..c30e41cf14 100644
--- a/c/src/lib/libbsp/sparc/shared/include/cons.h
+++ b/bsps/sparc/include/bsp/cons.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/debug_defs.h b/bsps/sparc/include/bsp/debug_defs.h
index 58f7460f52..58f7460f52 100644
--- a/c/src/lib/libbsp/sparc/shared/include/debug_defs.h
+++ b/bsps/sparc/include/bsp/debug_defs.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/genirq.h b/bsps/sparc/include/bsp/genirq.h
index 673be173b1..673be173b1 100644
--- a/c/src/lib/libbsp/sparc/shared/include/genirq.h
+++ b/bsps/sparc/include/bsp/genirq.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gnatcommon.h b/bsps/sparc/include/bsp/gnatcommon.h
index 1a04449293..1a04449293 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gnatcommon.h
+++ b/bsps/sparc/include/bsp/gnatcommon.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gpiolib.h b/bsps/sparc/include/bsp/gpiolib.h
index f82d4fa2c2..f82d4fa2c2 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gpiolib.h
+++ b/bsps/sparc/include/bsp/gpiolib.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gptimer.h b/bsps/sparc/include/bsp/gptimer.h
index ee0120d2bd..ee0120d2bd 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gptimer.h
+++ b/bsps/sparc/include/bsp/gptimer.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553b.h b/bsps/sparc/include/bsp/gr1553b.h
index 006417b530..006417b530 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr1553b.h
+++ b/bsps/sparc/include/bsp/gr1553b.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bc.h b/bsps/sparc/include/bsp/gr1553bc.h
index ec766d2147..ec766d2147 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr1553bc.h
+++ b/bsps/sparc/include/bsp/gr1553bc.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h b/bsps/sparc/include/bsp/gr1553bc_list.h
index a89ddf58cf..a89ddf58cf 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h
+++ b/bsps/sparc/include/bsp/gr1553bc_list.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bm.h b/bsps/sparc/include/bsp/gr1553bm.h
index 058bc59a45..058bc59a45 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr1553bm.h
+++ b/bsps/sparc/include/bsp/gr1553bm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553rt.h b/bsps/sparc/include/bsp/gr1553rt.h
index 55237b5dfd..55237b5dfd 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr1553rt.h
+++ b/bsps/sparc/include/bsp/gr1553rt.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_701.h b/bsps/sparc/include/bsp/gr_701.h
index acfd9237a2..acfd9237a2 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_701.h
+++ b/bsps/sparc/include/bsp/gr_701.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_cpci_gr740.h b/bsps/sparc/include/bsp/gr_cpci_gr740.h
index 55c28acb4c..55c28acb4c 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_cpci_gr740.h
+++ b/bsps/sparc/include/bsp/gr_cpci_gr740.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_leon4_n2x.h b/bsps/sparc/include/bsp/gr_leon4_n2x.h
index 9a8041202a..9a8041202a 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_leon4_n2x.h
+++ b/bsps/sparc/include/bsp/gr_leon4_n2x.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_adcdac.h b/bsps/sparc/include/bsp/gr_rasta_adcdac.h
index 9e16cab96b..9e16cab96b 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_adcdac.h
+++ b/bsps/sparc/include/bsp/gr_rasta_adcdac.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_io.h b/bsps/sparc/include/bsp/gr_rasta_io.h
index 72a44f5151..72a44f5151 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_io.h
+++ b/bsps/sparc/include/bsp/gr_rasta_io.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_spw_router.h b/bsps/sparc/include/bsp/gr_rasta_spw_router.h
index 1cc9e41979..1cc9e41979 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_spw_router.h
+++ b/bsps/sparc/include/bsp/gr_rasta_spw_router.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_tmtc.h b/bsps/sparc/include/bsp/gr_rasta_tmtc.h
index 2b10ce2df3..2b10ce2df3 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_tmtc.h
+++ b/bsps/sparc/include/bsp/gr_rasta_tmtc.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_tmtc_1553.h b/bsps/sparc/include/bsp/gr_tmtc_1553.h
index b6ac43da00..b6ac43da00 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_tmtc_1553.h
+++ b/bsps/sparc/include/bsp/gr_tmtc_1553.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gradcdac.h b/bsps/sparc/include/bsp/gradcdac.h
index b52077845f..b52077845f 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gradcdac.h
+++ b/bsps/sparc/include/bsp/gradcdac.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grascs.h b/bsps/sparc/include/bsp/grascs.h
index b393e77888..b393e77888 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grascs.h
+++ b/bsps/sparc/include/bsp/grascs.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grcan.h b/bsps/sparc/include/bsp/grcan.h
index 5cdbad4b01..5cdbad4b01 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grcan.h
+++ b/bsps/sparc/include/bsp/grcan.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grctm.h b/bsps/sparc/include/bsp/grctm.h
index 5ff81559aa..5ff81559aa 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grctm.h
+++ b/bsps/sparc/include/bsp/grctm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/greth.h b/bsps/sparc/include/bsp/greth.h
index 9209d823e3..9209d823e3 100644
--- a/c/src/lib/libbsp/sparc/shared/include/greth.h
+++ b/bsps/sparc/include/bsp/greth.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grgpio.h b/bsps/sparc/include/bsp/grgpio.h
index c49054548c..c49054548c 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grgpio.h
+++ b/bsps/sparc/include/bsp/grgpio.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/griommu.h b/bsps/sparc/include/bsp/griommu.h
index 2bafe4c513..2bafe4c513 100644
--- a/c/src/lib/libbsp/sparc/shared/include/griommu.h
+++ b/bsps/sparc/include/bsp/griommu.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grpci.h b/bsps/sparc/include/bsp/grpci.h
index 2321706200..2321706200 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grpci.h
+++ b/bsps/sparc/include/bsp/grpci.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grpci2.h b/bsps/sparc/include/bsp/grpci2.h
index c356b5641f..c356b5641f 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grpci2.h
+++ b/bsps/sparc/include/bsp/grpci2.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grpci2dma.h b/bsps/sparc/include/bsp/grpci2dma.h
index c1a2663a86..c1a2663a86 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grpci2dma.h
+++ b/bsps/sparc/include/bsp/grpci2dma.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grpwm.h b/bsps/sparc/include/bsp/grpwm.h
index 6898f8ac2e..6898f8ac2e 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grpwm.h
+++ b/bsps/sparc/include/bsp/grpwm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grslink.h b/bsps/sparc/include/bsp/grslink.h
index 575a24aee4..575a24aee4 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grslink.h
+++ b/bsps/sparc/include/bsp/grslink.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw.h b/bsps/sparc/include/bsp/grspw.h
index 3270e8a5a2..3270e8a5a2 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grspw.h
+++ b/bsps/sparc/include/bsp/grspw.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw_pkt.h b/bsps/sparc/include/bsp/grspw_pkt.h
index a74a7c9f6a..a74a7c9f6a 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grspw_pkt.h
+++ b/bsps/sparc/include/bsp/grspw_pkt.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw_router.h b/bsps/sparc/include/bsp/grspw_router.h
index 2fab8d5f6c..2fab8d5f6c 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grspw_router.h
+++ b/bsps/sparc/include/bsp/grspw_router.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grtc.h b/bsps/sparc/include/bsp/grtc.h
index 3ee1fa547c..3ee1fa547c 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grtc.h
+++ b/bsps/sparc/include/bsp/grtc.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grtm.h b/bsps/sparc/include/bsp/grtm.h
index 625f8389b7..625f8389b7 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grtm.h
+++ b/bsps/sparc/include/bsp/grtm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/i2cmst.h b/bsps/sparc/include/bsp/i2cmst.h
index 3eee717524..3eee717524 100644
--- a/c/src/lib/libbsp/sparc/shared/include/i2cmst.h
+++ b/bsps/sparc/include/bsp/i2cmst.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/l2c.h b/bsps/sparc/include/bsp/l2c.h
index 52473ddf2a..52473ddf2a 100644
--- a/c/src/lib/libbsp/sparc/shared/include/l2c.h
+++ b/bsps/sparc/include/bsp/l2c.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/l4stat.h b/bsps/sparc/include/bsp/l4stat.h
index 94fbe4b095..94fbe4b095 100644
--- a/c/src/lib/libbsp/sparc/shared/include/l4stat.h
+++ b/bsps/sparc/include/bsp/l4stat.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/mctrl.h b/bsps/sparc/include/bsp/mctrl.h
index db449cb11a..db449cb11a 100644
--- a/c/src/lib/libbsp/sparc/shared/include/mctrl.h
+++ b/bsps/sparc/include/bsp/mctrl.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/memscrub.h b/bsps/sparc/include/bsp/memscrub.h
index 1e55d8e127..1e55d8e127 100644
--- a/c/src/lib/libbsp/sparc/shared/include/memscrub.h
+++ b/bsps/sparc/include/bsp/memscrub.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/network_interface_add.h b/bsps/sparc/include/bsp/network_interface_add.h
index b04a96f003..b04a96f003 100644
--- a/c/src/lib/libbsp/sparc/shared/include/network_interface_add.h
+++ b/bsps/sparc/include/bsp/network_interface_add.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/occan.h b/bsps/sparc/include/bsp/occan.h
index 0bf34dee48..0bf34dee48 100644
--- a/c/src/lib/libbsp/sparc/shared/include/occan.h
+++ b/bsps/sparc/include/bsp/occan.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/pcif.h b/bsps/sparc/include/bsp/pcif.h
index 0221fcdd50..0221fcdd50 100644
--- a/c/src/lib/libbsp/sparc/shared/include/pcif.h
+++ b/bsps/sparc/include/bsp/pcif.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/satcan.h b/bsps/sparc/include/bsp/satcan.h
index ab9f5e0cd4..ab9f5e0cd4 100644
--- a/c/src/lib/libbsp/sparc/shared/include/satcan.h
+++ b/bsps/sparc/include/bsp/satcan.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/spictrl.h b/bsps/sparc/include/bsp/spictrl.h
index 98922fbd30..98922fbd30 100644
--- a/c/src/lib/libbsp/sparc/shared/include/spictrl.h
+++ b/bsps/sparc/include/bsp/spictrl.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/spwcuc.h b/bsps/sparc/include/bsp/spwcuc.h
index e420367640..e420367640 100644
--- a/c/src/lib/libbsp/sparc/shared/include/spwcuc.h
+++ b/bsps/sparc/include/bsp/spwcuc.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/tlib.h b/bsps/sparc/include/bsp/tlib.h
index debb8c8215..debb8c8215 100644
--- a/c/src/lib/libbsp/sparc/shared/include/tlib.h
+++ b/bsps/sparc/include/bsp/tlib.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus.h b/bsps/sparc/include/drvmgr/ambapp_bus.h
index d034aae3a3..d034aae3a3 100644
--- a/c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus.h
+++ b/bsps/sparc/include/drvmgr/ambapp_bus.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus_grlib.h b/bsps/sparc/include/drvmgr/ambapp_bus_grlib.h
index 2def4bc2b4..2def4bc2b4 100644
--- a/c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus_grlib.h
+++ b/bsps/sparc/include/drvmgr/ambapp_bus_grlib.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/bspcommon.h b/bsps/sparc/include/drvmgr/bspcommon.h
index d3470009f8..d3470009f8 100644
--- a/c/src/lib/libbsp/sparc/shared/include/drvmgr/bspcommon.h
+++ b/bsps/sparc/include/drvmgr/bspcommon.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/leon2_amba_bus.h b/bsps/sparc/include/drvmgr/leon2_amba_bus.h
index ebb3a08486..ebb3a08486 100644
--- a/c/src/lib/libbsp/sparc/shared/include/drvmgr/leon2_amba_bus.h
+++ b/bsps/sparc/include/drvmgr/leon2_amba_bus.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grlib.h b/bsps/sparc/include/grlib.h
index a2d0877fb8..a2d0877fb8 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grlib.h
+++ b/bsps/sparc/include/grlib.h
diff --git a/c/src/lib/libcpu/sparc/include/libcpu/access.h b/bsps/sparc/include/libcpu/access.h
index cdf6b77122..cdf6b77122 100644
--- a/c/src/lib/libcpu/sparc/include/libcpu/access.h
+++ b/bsps/sparc/include/libcpu/access.h
diff --git a/bsps/sparc/leon2/headers.am b/bsps/sparc/leon2/headers.am
new file mode 100644
index 0000000000..73ae163778
--- /dev/null
+++ b/bsps/sparc/leon2/headers.am
@@ -0,0 +1,12 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sparc/leon2/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sparc/leon2/include/leon.h
+include_HEADERS += ../../../../../../bsps/sparc/leon2/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/sparc/leon2/include/bsp/at697_pci.h
+include_bsp_HEADERS += ../../../../../../bsps/sparc/leon2/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp.h b/bsps/sparc/leon2/include/bsp.h
index 2028ba0db3..2028ba0db3 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/bsp.h
+++ b/bsps/sparc/leon2/include/bsp.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/at697_pci.h b/bsps/sparc/leon2/include/bsp/at697_pci.h
index 9a511ec6f9..9a511ec6f9 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/at697_pci.h
+++ b/bsps/sparc/leon2/include/bsp/at697_pci.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp/irq.h b/bsps/sparc/leon2/include/bsp/irq.h
index 086bf253c4..086bf253c4 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/bsp/irq.h
+++ b/bsps/sparc/leon2/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/leon.h b/bsps/sparc/leon2/include/leon.h
index 7ec6b1dcf9..7ec6b1dcf9 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/leon.h
+++ b/bsps/sparc/leon2/include/leon.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/tm27.h b/bsps/sparc/leon2/include/tm27.h
index 0d28641b9b..0d28641b9b 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/tm27.h
+++ b/bsps/sparc/leon2/include/tm27.h
diff --git a/bsps/sparc/leon3/headers.am b/bsps/sparc/leon3/headers.am
new file mode 100644
index 0000000000..755a89632d
--- /dev/null
+++ b/bsps/sparc/leon3/headers.am
@@ -0,0 +1,13 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sparc/leon3/include/amba.h
+include_HEADERS += ../../../../../../bsps/sparc/leon3/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sparc/leon3/include/leon.h
+include_HEADERS += ../../../../../../bsps/sparc/leon3/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/sparc/leon3/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/sparc/leon3/include/bsp/watchdog.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/amba.h b/bsps/sparc/leon3/include/amba.h
index 059b28ca07..059b28ca07 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/amba.h
+++ b/bsps/sparc/leon3/include/amba.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp.h b/bsps/sparc/leon3/include/bsp.h
index 3fda4edc66..3fda4edc66 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/bsp.h
+++ b/bsps/sparc/leon3/include/bsp.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h b/bsps/sparc/leon3/include/bsp/irq.h
index c3e7959139..c3e7959139 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h
+++ b/bsps/sparc/leon3/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/watchdog.h b/bsps/sparc/leon3/include/bsp/watchdog.h
index 3c63be2a8f..3c63be2a8f 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/watchdog.h
+++ b/bsps/sparc/leon3/include/bsp/watchdog.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/leon.h b/bsps/sparc/leon3/include/leon.h
index 758b760b0b..758b760b0b 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/leon.h
+++ b/bsps/sparc/leon3/include/leon.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/tm27.h b/bsps/sparc/leon3/include/tm27.h
index 00921d4880..00921d4880 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/tm27.h
+++ b/bsps/sparc/leon3/include/tm27.h
diff --git a/bsps/sparc64/headers.am b/bsps/sparc64/headers.am
new file mode 100644
index 0000000000..1a04025280
--- /dev/null
+++ b/bsps/sparc64/headers.am
@@ -0,0 +1,54 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../bsps/sparc64/include/asm.h
+include_HEADERS += ../../../../../bsps/sparc64/include/traptable.h
+
+include_archdir = $(includedir)/arch
+include_arch_HEADERS =
+include_arch_HEADERS += ../../../../../bsps/sparc64/include/arch/arch.h
+include_arch_HEADERS += ../../../../../bsps/sparc64/include/arch/boot.h
+include_arch_HEADERS += ../../../../../bsps/sparc64/include/arch/regdef.h
+include_arch_HEADERS += ../../../../../bsps/sparc64/include/arch/stack.h
+
+include_arch_mmdir = $(includedir)/arch/mm
+include_arch_mm_HEADERS =
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/cache_spec.h
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/frame.h
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/mmu.h
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/page.h
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/tlb.h
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/tte.h
+
+include_arch_mm_sun4udir = $(includedir)/arch/mm/sun4u
+include_arch_mm_sun4u_HEADERS =
+include_arch_mm_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/sun4u/frame.h
+include_arch_mm_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/sun4u/mmu.h
+include_arch_mm_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/sun4u/page.h
+include_arch_mm_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/sun4u/tlb.h
+include_arch_mm_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/sun4u/tte.h
+
+include_arch_sun4udir = $(includedir)/arch/sun4u
+include_arch_sun4u_HEADERS =
+include_arch_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/sun4u/arch.h
+
+include_bootdir = $(includedir)/boot
+include_boot_HEADERS =
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/align.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/balloc.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/gentypes.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/main.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/ofw.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/ofw_tree.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/ofwarch.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/register.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/stack.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/types.h
+
+include_genarch_ofwdir = $(includedir)/genarch/ofw
+include_genarch_ofw_HEADERS =
+include_genarch_ofw_HEADERS += ../../../../../bsps/sparc64/include/genarch/ofw/ofw_tree.h
+
+include_kerneldir = $(includedir)/kernel
+include_kernel_HEADERS =
+include_kernel_HEADERS += ../../../../../bsps/sparc64/include/kernel/align.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/arch.h b/bsps/sparc64/include/arch/arch.h
index 5fdd4a2cb2..5fdd4a2cb2 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/arch.h
+++ b/bsps/sparc64/include/arch/arch.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/boot.h b/bsps/sparc64/include/arch/boot.h
index b0a997a957..b0a997a957 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/boot.h
+++ b/bsps/sparc64/include/arch/boot.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/cache_spec.h b/bsps/sparc64/include/arch/mm/cache_spec.h
index 1d9199db33..1d9199db33 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/cache_spec.h
+++ b/bsps/sparc64/include/arch/mm/cache_spec.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/frame.h b/bsps/sparc64/include/arch/mm/frame.h
index fb66e54bf1..fb66e54bf1 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/frame.h
+++ b/bsps/sparc64/include/arch/mm/frame.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/mmu.h b/bsps/sparc64/include/arch/mm/mmu.h
index 1d445f2e24..1d445f2e24 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/mmu.h
+++ b/bsps/sparc64/include/arch/mm/mmu.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/page.h b/bsps/sparc64/include/arch/mm/page.h
index f1451a2866..f1451a2866 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/page.h
+++ b/bsps/sparc64/include/arch/mm/page.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h b/bsps/sparc64/include/arch/mm/sun4u/frame.h
index e30f504d08..e30f504d08 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h
+++ b/bsps/sparc64/include/arch/mm/sun4u/frame.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h b/bsps/sparc64/include/arch/mm/sun4u/mmu.h
index f887ebe7f4..f887ebe7f4 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h
+++ b/bsps/sparc64/include/arch/mm/sun4u/mmu.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/page.h b/bsps/sparc64/include/arch/mm/sun4u/page.h
index f1451a2866..f1451a2866 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/page.h
+++ b/bsps/sparc64/include/arch/mm/sun4u/page.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h b/bsps/sparc64/include/arch/mm/sun4u/tlb.h
index 6f6e6542e6..6f6e6542e6 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h
+++ b/bsps/sparc64/include/arch/mm/sun4u/tlb.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h b/bsps/sparc64/include/arch/mm/sun4u/tte.h
index 46acaed47c..46acaed47c 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h
+++ b/bsps/sparc64/include/arch/mm/sun4u/tte.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tlb.h b/bsps/sparc64/include/arch/mm/tlb.h
index 4adf26ca64..4adf26ca64 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tlb.h
+++ b/bsps/sparc64/include/arch/mm/tlb.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tte.h b/bsps/sparc64/include/arch/mm/tte.h
index f0b746e8c6..f0b746e8c6 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tte.h
+++ b/bsps/sparc64/include/arch/mm/tte.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/regdef.h b/bsps/sparc64/include/arch/regdef.h
index aae46fa99f..aae46fa99f 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/regdef.h
+++ b/bsps/sparc64/include/arch/regdef.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/stack.h b/bsps/sparc64/include/arch/stack.h
index 6364916912..6364916912 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/stack.h
+++ b/bsps/sparc64/include/arch/stack.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/sun4u/arch.h b/bsps/sparc64/include/arch/sun4u/arch.h
index 9e883a37ff..9e883a37ff 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/sun4u/arch.h
+++ b/bsps/sparc64/include/arch/sun4u/arch.h
diff --git a/c/src/lib/libbsp/sparc64/shared/include/asm.h b/bsps/sparc64/include/asm.h
index bd3cc1298a..bd3cc1298a 100644
--- a/c/src/lib/libbsp/sparc64/shared/include/asm.h
+++ b/bsps/sparc64/include/asm.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/align.h b/bsps/sparc64/include/boot/align.h
index 96229101ed..96229101ed 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/align.h
+++ b/bsps/sparc64/include/boot/align.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/balloc.h b/bsps/sparc64/include/boot/balloc.h
index 8e502c0c58..8e502c0c58 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/balloc.h
+++ b/bsps/sparc64/include/boot/balloc.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/gentypes.h b/bsps/sparc64/include/boot/gentypes.h
index a3e82d6eef..a3e82d6eef 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/gentypes.h
+++ b/bsps/sparc64/include/boot/gentypes.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/main.h b/bsps/sparc64/include/boot/main.h
index 5ddc814ac8..5ddc814ac8 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/main.h
+++ b/bsps/sparc64/include/boot/main.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw.h b/bsps/sparc64/include/boot/ofw.h
index c562b675a2..c562b675a2 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw.h
+++ b/bsps/sparc64/include/boot/ofw.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw_tree.h b/bsps/sparc64/include/boot/ofw_tree.h
index 5872ade261..5872ade261 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw_tree.h
+++ b/bsps/sparc64/include/boot/ofw_tree.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofwarch.h b/bsps/sparc64/include/boot/ofwarch.h
index 2d4f7643c0..2d4f7643c0 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofwarch.h
+++ b/bsps/sparc64/include/boot/ofwarch.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/register.h b/bsps/sparc64/include/boot/register.h
index 61bf34ac66..61bf34ac66 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/register.h
+++ b/bsps/sparc64/include/boot/register.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/stack.h b/bsps/sparc64/include/boot/stack.h
index 1486dd21b4..1486dd21b4 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/stack.h
+++ b/bsps/sparc64/include/boot/stack.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/types.h b/bsps/sparc64/include/boot/types.h
index 095e25233d..095e25233d 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/types.h
+++ b/bsps/sparc64/include/boot/types.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/genarch/include/ofw/ofw_tree.h b/bsps/sparc64/include/genarch/ofw/ofw_tree.h
index f62d545527..f62d545527 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/genarch/include/ofw/ofw_tree.h
+++ b/bsps/sparc64/include/genarch/ofw/ofw_tree.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/generic/include/align.h b/bsps/sparc64/include/kernel/align.h
index 6003ea9c4e..6003ea9c4e 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/generic/include/align.h
+++ b/bsps/sparc64/include/kernel/align.h
diff --git a/c/src/lib/libbsp/sparc64/shared/include/traptable.h b/bsps/sparc64/include/traptable.h
index 353c60d79c..353c60d79c 100644
--- a/c/src/lib/libbsp/sparc64/shared/include/traptable.h
+++ b/bsps/sparc64/include/traptable.h
diff --git a/bsps/sparc64/niagara/headers.am b/bsps/sparc64/niagara/headers.am
new file mode 100644
index 0000000000..24d001f919
--- /dev/null
+++ b/bsps/sparc64/niagara/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sparc64/niagara/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sparc64/niagara/include/tm27.h
diff --git a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h b/bsps/sparc64/niagara/include/bsp.h
index 81058270a9..81058270a9 100644
--- a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h
+++ b/bsps/sparc64/niagara/include/bsp.h
diff --git a/c/src/lib/libbsp/sparc64/niagara/include/tm27.h b/bsps/sparc64/niagara/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/sparc64/niagara/include/tm27.h
+++ b/bsps/sparc64/niagara/include/tm27.h
diff --git a/bsps/sparc64/usiii/headers.am b/bsps/sparc64/usiii/headers.am
new file mode 100644
index 0000000000..06129f2596
--- /dev/null
+++ b/bsps/sparc64/usiii/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sparc64/usiii/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sparc64/usiii/include/tm27.h
diff --git a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h b/bsps/sparc64/usiii/include/bsp.h
index 8051db3987..8051db3987 100644
--- a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h
+++ b/bsps/sparc64/usiii/include/bsp.h
diff --git a/c/src/lib/libbsp/sparc64/usiii/include/tm27.h b/bsps/sparc64/usiii/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/sparc64/usiii/include/tm27.h
+++ b/bsps/sparc64/usiii/include/tm27.h
diff --git a/bsps/v850/gdbv850sim/headers.am b/bsps/v850/gdbv850sim/headers.am
new file mode 100644
index 0000000000..d8acdece23
--- /dev/null
+++ b/bsps/v850/gdbv850sim/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/v850/gdbv850sim/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/v850/gdbv850sim/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/v850/gdbv850sim/include/bsp/syscall.h
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/include/bsp.h b/bsps/v850/gdbv850sim/include/bsp.h
index ac8b43024f..ac8b43024f 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/include/bsp.h
+++ b/bsps/v850/gdbv850sim/include/bsp.h
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/include/syscall.h b/bsps/v850/gdbv850sim/include/bsp/syscall.h
index d8eebdd3f9..d8eebdd3f9 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/include/syscall.h
+++ b/bsps/v850/gdbv850sim/include/bsp/syscall.h
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/include/tm27.h b/bsps/v850/gdbv850sim/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/include/tm27.h
+++ b/bsps/v850/gdbv850sim/include/tm27.h