Remove make preinstall

A speciality of the RTEMS build system was the make preinstall step.  It
copied header files from arbitrary locations into the build tree.  The
header files were included via the -Bsome/build/tree/path GCC command
line option.

This has at least seven problems:

* The make preinstall step itself needs time and disk space.

* Errors in header files show up in the build tree copy.  This makes it
  hard for editors to open the right file to fix the error.

* There is no clear relationship between source and build tree header
  files.  This makes an audit of the build process difficult.

* The visibility of all header files in the build tree makes it
  difficult to enforce API barriers.  For example it is discouraged to
  use BSP-specifics in the cpukit.

* An introduction of a new build system is difficult.

* Include paths specified by the -B option are system headers.  This
  may suppress warnings.

* The parallel build had sporadic failures on some hosts.

This patch removes the make preinstall step.   All installed header
files are moved to dedicated include directories in the source tree.
Let @RTEMS_CPU@ be the target architecture, e.g. arm, powerpc, sparc,
etc.  Let @RTEMS_BSP_FAMILIY@ be a BSP family base directory, e.g.
erc32, imx, qoriq, etc.

The new cpukit include directories are:

* cpukit/include

* cpukit/score/cpu/@RTEMS_CPU@/include

* cpukit/libnetworking

The new BSP include directories are:

* bsps/include

* bsps/@RTEMS_CPU@/include

* bsps/@RTEMS_CPU@/@RTEMS_BSP_FAMILIY@/include

There are build tree include directories for generated files.

The include directory order favours the most general header file, e.g.
it is not possible to override general header files via the include path
order.

The "bootstrap -p" option was removed.  The new "bootstrap -H" option
should be used to regenerate the "headers.am" files.

Update #3254.

1550 files changed, 797 insertions, 14458 deletions

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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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
diff --git a/c/src/Makefile.am b/c/src/Makefile.am
index 8fcdd645eb..f1dd50c56d 100644
--- a/c/src/Makefile.am
+++ b/c/src/Makefile.am
@@ -3,6 +3,13 @@ ACLOCAL_AMFLAGS = -I aclocal
 _SUBDIRS = . @BSP_SUBDIRS@
 DIST_SUBDIRS = @BSP_SUBDIRS@
 
+$(PROJECT_LIB)/$(dirstamp):
+	@echo "Making project library directory: $(PROJECT_LIB)"
+	@$(MKDIR_P) $(PROJECT_LIB)
+	@: > $(PROJECT_LIB)/$(dirstamp)
+
+all-local: $(PROJECT_LIB)/$(dirstamp)
+
 clean-local:
 	$(RM) -r $(PROJECT_RELEASE)
 
@@ -23,13 +30,6 @@ DISTCLEANFILES += @CUSTOM_CFG_FILES@
 noinst_DATA += make/custom/default.cfg
 DISTCLEANFILES += make/custom/default.cfg
 
-noinst_DATA += preinstall-stamp
-
-preinstall-stamp:
-	$(MAKE) $(AM_MAKEFLAGS) preinstall
-	touch preinstall-stamp
-CLEANFILES = preinstall-stamp
-
 @host_alias@-@RTEMS_BSP@.pc: config.status bsp.pc.in
 	./config.status --file=$@:$(srcdir)/bsp.pc.in
 
@@ -42,3 +42,4 @@ include $(DEPDIR)/cfg.P
 
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/../../bsps/headers.am
diff --git a/c/src/aclocal/bsp-configure.m4 b/c/src/aclocal/bsp-configure.m4
index c6ff76319a..6f560fd3f5 100644
--- a/c/src/aclocal/bsp-configure.m4
+++ b/c/src/aclocal/bsp-configure.m4
@@ -8,7 +8,7 @@ AC_DEFUN([RTEMS_BSP_CONFIGURE],
 
   RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
-  AC_CONFIG_HEADERS([include/bspopts.tmp:include/bspopts.h.in],[
+  AC_CONFIG_HEADERS([include/bspopts.tmp:bspopts.h.in],[
 echo "/* BSP dependent options file */"         >$tmp/config.h
 echo "/* automatically generated -- DO NOT EDIT!! */" >>$tmp/config.h
 echo                                                  >>$tmp/config.h
diff --git a/c/src/aclocal/bsp-linkcmds.m4 b/c/src/aclocal/bsp-linkcmds.m4
index 397609f6e0..3e40638f88 100644
--- a/c/src/aclocal/bsp-linkcmds.m4
+++ b/c/src/aclocal/bsp-linkcmds.m4
@@ -13,5 +13,5 @@ done
 AS_IF([test -z "${LINKCMDS}"],[
   AC_MSG_ERROR([can not determine linkcmds])])
 
-AC_CONFIG_LINKS([startup/linkcmds:${LINKCMDS}])
+AC_CONFIG_LINKS([linkcmds:${LINKCMDS}])
 ])
diff --git a/c/src/aclocal/check-networking.m4 b/c/src/aclocal/check-networking.m4
index 250d669705..89e53f638e 100644
--- a/c/src/aclocal/check-networking.m4
+++ b/c/src/aclocal/check-networking.m4
@@ -2,6 +2,7 @@ AC_DEFUN([RTEMS_CHECK_NETWORKING],
 [dnl
 AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_NETWORKING])dnl
+AC_REQUIRE([RTEMS_INCLUDES])dnl
 
 AC_CACHE_CHECK([whether BSP supports networking],
   rtems_cv_HAS_NETWORKING,
@@ -21,6 +22,7 @@ AC_CACHE_CHECK([whether BSP supports networking],
     esac])
 if test "$rtems_cv_HAS_NETWORKING" = "yes"; then
   HAS_NETWORKING="yes";
+  RTEMS_CPPFLAGS="${RTEMS_CPPFLAGS} -I${RTEMS_SOURCE_ROOT}/cpukit/libnetworking";
 else
   HAS_NETWORKING="no";
 fi
diff --git a/c/src/aclocal/prog-cc.m4 b/c/src/aclocal/prog-cc.m4
index 44dfd2ddd7..ec33bc9bcf 100644
--- a/c/src/aclocal/prog-cc.m4
+++ b/c/src/aclocal/prog-cc.m4
@@ -29,18 +29,15 @@ dnl check if the compiler supports --specs
 RTEMS_GCC_SPECS
 
 AS_IF([test x"$rtems_cv_gcc_specs" = xyes],[
-GCCSPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/"
+GCCSPECS="-B\$(RTEMS_SOURCE_ROOT)/c/src/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/"
 GCCSPECS="${GCCSPECS} -specs bsp_specs -qrtems"])
 AC_SUBST(GCCSPECS)
 
-AS_IF([test x"$rtems_cv_gcc_isystem" = xyes],[
-  RTEMS_CPPFLAGS="-isystem \$(PROJECT_INCLUDE)"],[
-  RTEMS_CPPFLAGS="-I\$(PROJECT_INCLUDE)"
-])
-AC_SUBST(RTEMS_CPPFLAGS)
-
 AS_IF([test "$GCC" = yes],[
   RTEMS_RELLDFLAGS="-qnolinkcmds -nostdlib -r"
 ])
 AC_SUBST(RTEMS_RELLDFLAGS)
+
+RTEMS_INCLUDES
+RTEMS_BSP_INCLUDES
 ])
diff --git a/c/src/aclocal/rtems-bsp-includes.m4 b/c/src/aclocal/rtems-bsp-includes.m4
new file mode 100644
index 0000000000..2248211192
--- /dev/null
+++ b/c/src/aclocal/rtems-bsp-includes.m4
@@ -0,0 +1,13 @@
+dnl
+dnl RTEMS Include paths.
+dnl
+AC_DEFUN([RTEMS_BSP_INCLUDES],
+[
+AC_REQUIRE([RTEMS_SOURCE_TOP])
+AC_REQUIRE([RTEMS_BUILD_TOP])
+RTEMS_BSP_CPPFLAGS="-I${RTEMS_BUILD_ROOT}/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include \
+-I${RTEMS_SOURCE_ROOT}/bsps/include \
+-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/include \
+-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include"
+AC_SUBST([RTEMS_BSP_CPPFLAGS])
+])
diff --git a/c/src/aclocal/rtems-build-top.m4 b/c/src/aclocal/rtems-build-top.m4
new file mode 100644
index 0000000000..5708119c14
--- /dev/null
+++ b/c/src/aclocal/rtems-build-top.m4
@@ -0,0 +1,12 @@
+dnl
+dnl RTEMS_BUILD_TOP($1)
+dnl
+AC_DEFUN([RTEMS_BUILD_TOP],
+[dnl
+#
+# This is a copy of the horrible hack in rtems-top.m4 and it is simpler to
+# copy it that attempt to clean this crap up.
+#
+RTEMS_BUILD_ROOT="${with_rtems_build_top}"
+AC_SUBST([RTEMS_BUILD_ROOT])
+])dnl
diff --git a/c/src/aclocal/rtems-includes.m4 b/c/src/aclocal/rtems-includes.m4
new file mode 100644
index 0000000000..ca4ebed581
--- /dev/null
+++ b/c/src/aclocal/rtems-includes.m4
@@ -0,0 +1,23 @@
+dnl
+dnl RTEMS Include paths.
+dnl
+AC_DEFUN([RTEMS_INCLUDES],
+[
+AC_REQUIRE([RTEMS_SOURCE_TOP])
+AC_REQUIRE([RTEMS_BUILD_TOP])
+
+# Was CFLAGS set?
+rtems_cv_CFLAGS_set="${CFLAGS+set}"
+
+RTEMS_INCLUDE_CPUKIT="-I${RTEMS_SOURCE_ROOT}/cpukit/include"
+RTEMS_INCLUDE_CPUKIT_ARCH="-I${RTEMS_SOURCE_ROOT}/cpukit/score/cpu/\$(RTEMS_CPU)/include"
+
+RTEMS_CPUKIT_INCLUDE="${RTEMS_INCLUDE_CPUKIT} ${RTEMS_INCLUDE_CPUKIT_ARCH}"
+RTEMS_BUILD_INCLUDE="-I\$(top_builddir) -I${RTEMS_BUILD_ROOT}/include"
+
+RTEMS_INCLUDE="${RTEMS_BUILD_INCLUDE} ${RTEMS_CPUKIT_INCLUDE}"
+
+RTEMS_CPPFLAGS="${RTEMS_INCLUDE}"
+
+AC_SUBST([RTEMS_CPPFLAGS])
+])
diff --git a/c/src/aclocal/rtems-source-top.m4 b/c/src/aclocal/rtems-source-top.m4
new file mode 100644
index 0000000000..d1460ae82d
--- /dev/null
+++ b/c/src/aclocal/rtems-source-top.m4
@@ -0,0 +1,8 @@
+dnl
+dnl RTEMS_SOURCE_TOP
+dnl
+AC_DEFUN([RTEMS_SOURCE_TOP],
+[dnl
+RTEMS_SOURCE_ROOT="${with_rtems_source_top}"
+AC_SUBST([RTEMS_SOURCE_ROOT])
+])dnl
diff --git a/c/src/automake/compile.am b/c/src/automake/compile.am
index a42e4f3949..2cd9fd5d91 100644
--- a/c/src/automake/compile.am
+++ b/c/src/automake/compile.am
@@ -1,12 +1,14 @@
 ## -------------------------------------------------------------------------
 
-CC = @CC@ $(GCCSPECS)
-CXX = @CXX@ $(GCCSPECS)
-CPP = @CPP@ $(GCCSPECS)
-CCAS = @CCAS@ $(GCCSPECS)
+CC = @CC@
+CXX = @CXX@
+CPP = @CPP@
+CCAS = @CCAS@
 
 ##
-AM_CPPFLAGS = @RTEMS_CPPFLAGS@
+AM_CPPFLAGS = @RTEMS_CPPFLAGS@ @RTEMS_BSP_CPPFLAGS@
 AM_CFLAGS =
 AM_CXXFLAGS =
 AM_CCASFLAGS = @RTEMS_CCASFLAGS@
+
+ARFLAGS = crD
diff --git a/c/src/automake/host.am b/c/src/automake/host.am
index c25c0526a4..2f0beadd89 100644
--- a/c/src/automake/host.am
+++ b/c/src/automake/host.am
@@ -3,6 +3,3 @@
 ## Once automake is fully integrated these make targets
 ## and this file will probably be removed
 
-preinstall-am: $(PREINSTALL_FILES)
-preinstall: preinstall-am
-.PHONY: preinstall preinstall-am
diff --git a/c/src/automake/local.am b/c/src/automake/local.am
index 4de51e5197..8068b4c61c 100644
--- a/c/src/automake/local.am
+++ b/c/src/automake/local.am
@@ -1,5 +1,3 @@
-preinstall-am: $(PREINSTALL_FILES)
-preinstall: preinstall-am
-.PHONY: preinstall preinstall-am
-
 PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools
+
+all-local: $(TMPINSTALL_FILES)
diff --git a/c/src/automake/subdirs.am b/c/src/automake/subdirs.am
index 2f39d858ce..6ae7ff05a1 100644
--- a/c/src/automake/subdirs.am
+++ b/c/src/automake/subdirs.am
@@ -17,29 +17,7 @@ SUBDIRS_no_dot_no_wrapup_no_testsuites = $(filter-out testsuites,$(SUBDIRS_no_do
 SUBDIRS_wrapup                         = $(filter     wrapup,$(SUBDIRS_no_dot))
 SUBDIRS_testsuites                     = $(filter     testsuites,$(SUBDIRS_no_dot))
 
-SUBDIR_TARGET     = $(subst /,-,$1)
-PREINSTALL_TARGET = preinstall-$(call SUBDIR_TARGET,$(1))
-
-preintstall_targets  = $(if "$(SUBDIRS_dot)" ".",preinstall-dot) $(foreach D,$(SUBDIRS_no_dot),$(call PREINSTALL_TARGET,$(D)))
-
-define PREINSTALL_DIR
-.PHONY: $1
-$1:
-	@+set fnord $(MAKEFLAGS); amf=$$$$2; \
-	subdir=$(2); \
-	subdir_label=`echo $(1) | sed -e 's/preinstall-//'`; \
-	target=`echo $$@ | sed -e 's/-recursive//' -e "s/-$$$${subdir_label}//"`$(3); \
-	echo "Making $$$$target in $$$$subdir"; \
-	(cd $$$$subdir && $(MAKE) $(AM_MAKEFLAGS) $$$$target) \
-	 || case "$$$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac;
-endef
-
-$(if "$(SUBDIRS_dot)" ".",$(eval $(call PREINSTALL_DIR,preinstall-dot,.,-am)))
-
-$(foreach D,$(SUBDIRS_no_dot),$(eval $(call PREINSTALL_DIR,$(call PREINSTALL_TARGET,$(D)),$(D))))
-
 preinstall: $(preintstall_targets)
-.PHONY: preinstall
 
 define CPUKITDIR
 .PHONY: $1
@@ -84,4 +62,4 @@ $(if "$(SUBDIRS_testsuites)" "testsuites",testsuites: dot $(SUBDIRS_no_dot_no_te
 #
 # The general build all rule for automake.
 #
-all-local: preinstall $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot)
+all-local: $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot)
diff --git a/c/src/configure.ac b/c/src/configure.ac
index b55962cb65..95a216334a 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -5,6 +5,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([libchip])
 RTEMS_TOP(../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_ENABLE_CXX
 RTEMS_ENABLE_NETWORKING
@@ -14,14 +16,12 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define subdir-objects no-exeext foreign 1.12.2])
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_MULTILIB
 RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_CXX
 RTEMS_ENV_RTEMSBSP
 
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
-RTEMS_CHECK_NETWORKING(RTEMS_BSP)
 RTEMS_CHECK_POSIX_API(RTEMS_BSP)
 RTEMS_CHECK_SMP
 
@@ -111,6 +111,7 @@ RTEMS_CHECK_GCC_WEAK
 
 AC_SUBST(CUSTOM_CFG_FILES)
 
+RTEMS_CHECK_NETWORKING(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING
 
 BSP_SUBDIRS=
@@ -144,33 +145,17 @@ BSP_SUBDIRS="$BSP_SUBDIRS libchip"
 BSP_SUBDIRS="$BSP_SUBDIRS support"
 BSP_SUBDIRS="$BSP_SUBDIRS wrapup"
 
-# HACK ALERT!
-
-# FIXME: Assume multilib implies in-source-tree multilibs
-# Build testsuites multilibbed
-RTEMS_BSP_CONFIG_SUBDIR(
-  [testsuites],[../../testsuites],
-  ['--enable-rtems-root=../' \
-   '--enable-project-root=${with_project_root}../$RTEMS_BSP' \
-   '--with-project-top=${with_project_top}../' \
-   '--enable-rtemsbsp=$RTEMS_BSP' \
-   '--includedir=${exec_prefix}/${RTEMS_BSP}/lib/include' \
-   '--libdir=${exec_prefix}/${RTEMS_BSP}/lib' \
-  ],
-  [test x"$enable_tests" != x"no" && test x"$multilib" = xno])
-
-# Build testsuites non-multilibbed
+# Build testsuites
 RTEMS_BSP_CONFIG_SUBDIR(
   [testsuites],[../../testsuites],
   ['--enable-rtems-root=../' \
-   '--enable-cpukit-root=${with_project_root}..' \
    '--enable-project-root=${with_project_root}../$RTEMS_BSP' \
    '--with-project-top=${with_project_top}../' \
    '--enable-rtemsbsp=$RTEMS_BSP' \
    '--includedir=${exec_prefix}/${RTEMS_BSP}/lib/include' \
    '--libdir=${exec_prefix}/${RTEMS_BSP}/lib' \
   ],
-  [test x"$enable_tests" != x"no" && test x"$multilib" = xyes])
+  [test x"$enable_tests" != x"no"])
 
 AC_SUBST([BSP_SUBDIRS],[$BSP_SUBDIRS])
 
diff --git a/c/src/lib/libbsp/Makefile.am b/c/src/lib/libbsp/Makefile.am
index 0071a96155..486fbbe605 100644
--- a/c/src/lib/libbsp/Makefile.am
+++ b/c/src/lib/libbsp/Makefile.am
@@ -31,15 +31,5 @@ EXTRA_DIST += shared/include/bootcard.h
 EXTRA_DIST += shared/pci/pci_bus_count.c
 EXTRA_DIST += shared/pci/pci_find_device.c
 
-include_bspdir = $(includedir)/bsp
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += shared/include/default-initial-extension.h
-include_bsp_HEADERS += shared/include/fatal.h
-include_bsp_HEADERS += shared/include/fdt.h
-include_bsp_HEADERS += shared/include/console-termios.h
-include_bsp_HEADERS += shared/include/gpio.h
-
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
 include $(top_srcdir)/automake/subdirs.am
diff --git a/c/src/lib/libbsp/arm/Makefile.am b/c/src/lib/libbsp/arm/Makefile.am
index a8a0178560..ed1cf0ecab 100644
--- a/c/src/lib/libbsp/arm/Makefile.am
+++ b/c/src/lib/libbsp/arm/Makefile.am
@@ -5,9 +5,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 ## added but it is present in the source tree.
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
-include_bspdir = $(includedir)/bsp
-include_bsp_HEADERS = shared/include/linker-symbols.h
-
 dist_project_lib_DATA = shared/startup/linkcmds.base
 dist_project_lib_DATA += shared/startup/linkcmds.armv4
 dist_project_lib_DATA += shared/startup/linkcmds.armv7m
@@ -18,6 +15,6 @@ EXTRA_DIST =
 EXTRA_DIST += shared/comm/uart.h
 EXTRA_DIST += shared/comm/uart.c
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/arm/headers.am
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
index 048cb50f00..cad2171586 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
@@ -11,60 +11,13 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_bsp_socaldir = $(includedir)/bsp/socal
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_socal_HEADERS =
-
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-clock.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-irq.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-regs.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-start.h
-include_bsp_HEADERS += ../shared/include/arm-cp15-start.h
-include_bsp_HEADERS += ../shared/include/arm-errata.h
-include_bsp_HEADERS += ../shared/include/arm-gic.h
-include_bsp_HEADERS += ../shared/include/arm-gic-irq.h
-include_bsp_HEADERS += ../shared/include/arm-gic-regs.h
-include_bsp_HEADERS += ../shared/include/arm-gic-tm27.h
-include_bsp_HEADERS += ../shared/include/arm-release-id.h
-include_bsp_HEADERS += include/irq.h
-
 # Altera hwlib
-include_bsp_HEADERS += hwlib/include/alt_16550_uart.h
-include_bsp_HEADERS += hwlib/include/alt_address_space.h
-include_bsp_HEADERS += hwlib/include/alt_cache.h
-include_bsp_HEADERS += hwlib/include/alt_clock_group.h
-include_bsp_HEADERS += hwlib/include/alt_clock_manager.h
-include_bsp_HEADERS += hwlib/include/alt_dma_common.h
-include_bsp_HEADERS += hwlib/include/alt_dma.h
-include_bsp_HEADERS += hwlib/include/alt_dma_program.h
-include_bsp_HEADERS += hwlib/include/alt_generalpurpose_io.h
-include_bsp_HEADERS += hwlib/include/alt_hwlibs_ver.h
-include_bsp_HEADERS += hwlib/include/alt_i2c.h
-include_bsp_HEADERS += hwlib/include/alt_interrupt_common.h
-include_bsp_HEADERS += hwlib/include/alt_mpu_registers.h
-include_bsp_HEADERS += hwlib/include/alt_qspi_private.h
-include_bsp_HEADERS += hwlib/include/alt_reset_manager.h
-include_bsp_HEADERS += hwlib/include/hwlib.h
 #The following Altera hwlib header files have been left out because so far 
 #they are not required:
 #include_bsp_HEADERS += hwlib/include/alt_bridge_manager.h
@@ -77,22 +30,6 @@ include_bsp_HEADERS += hwlib/include/hwlib.h
 #include_bsp_HEADERS += hwlib/include/alt_interrupt.h
 
 # Some of the headers from hwlib need the files from socal. Install them.
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_acpidmap.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_clkmgr.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_dmanonsecure.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_dmasecure.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_gpio.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_i2c.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_l3.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_qspidata.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_qspi.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_rstmgr.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_sdr.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_sysmgr.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_uart.h
-include_bsp_socal_HEADERS += hwlib/include/socal/hps.h
-include_bsp_socal_HEADERS += hwlib/include/socal/socal.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -102,10 +39,10 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += startup/linkcmds.altcycv
-project_lib_DATA += startup/linkcmds.altcycv_devkit
-project_lib_DATA += startup/linkcmds.altcycv_devkit_smp
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.altcycv
+dist_project_lib_DATA += startup/linkcmds.altcycv_devkit
+dist_project_lib_DATA += startup/linkcmds.altcycv_devkit_smp
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -114,7 +51,7 @@ project_lib_DATA += startup/linkcmds.altcycv_devkit_smp
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # for the Altera hwlib
@@ -191,8 +128,6 @@ libbsp_a_SOURCES += ../shared/arm-a9mpcore-clock-config.c
 # I2C
 libbsp_a_SOURCES += i2c/i2cdrv.c
 libbsp_a_SOURCES += i2c/i2cdrv-config.c
-include_bsp_HEADERS += include/i2cdrv.h
-
 # RTC
 libbsp_a_SOURCES += ../../shared/tod.c
 libbsp_a_SOURCES += rtc/rtc.c
@@ -209,5 +144,5 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../shared/arm-l2c-310
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/altera-cyclone-v/headers.am
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac b/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac
index 8d0ecad6e3..e05f119976 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-xilinx-zynq-a9],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/altcycv_devkit.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -79,7 +82,6 @@ RTEMS_CHECK_SMP
 AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/preinstall.am b/c/src/lib/libbsp/arm/altera-cyclone-v/preinstall.am
deleted file mode 100644
index 2f1fc21bd4..0000000000
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/preinstall.am
+++ /dev/null
@@ -1,276 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/socal/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/socal
-	@: > $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h: ../shared/include/arm-a9mpcore-clock.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h: ../shared/include/arm-a9mpcore-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h: ../shared/include/arm-a9mpcore-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h: ../shared/include/arm-a9mpcore-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-cp15-start.h: ../shared/include/arm-cp15-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-errata.h: ../shared/include/arm-errata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-errata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-errata.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic.h: ../shared/include/arm-gic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-irq.h: ../shared/include/arm-gic-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-regs.h: ../shared/include/arm-gic-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h: ../shared/include/arm-gic-tm27.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-
-$(PROJECT_INCLUDE)/bsp/arm-release-id.h: ../shared/include/arm-release-id.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/alt_16550_uart.h: hwlib/include/alt_16550_uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_16550_uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_16550_uart.h
-
-$(PROJECT_INCLUDE)/bsp/alt_address_space.h: hwlib/include/alt_address_space.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_address_space.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_address_space.h
-
-$(PROJECT_INCLUDE)/bsp/alt_cache.h: hwlib/include/alt_cache.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_cache.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_cache.h
-
-$(PROJECT_INCLUDE)/bsp/alt_clock_group.h: hwlib/include/alt_clock_group.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_clock_group.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_clock_group.h
-
-$(PROJECT_INCLUDE)/bsp/alt_clock_manager.h: hwlib/include/alt_clock_manager.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_clock_manager.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_clock_manager.h
-
-$(PROJECT_INCLUDE)/bsp/alt_dma_common.h: hwlib/include/alt_dma_common.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_dma_common.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_dma_common.h
-
-$(PROJECT_INCLUDE)/bsp/alt_dma.h: hwlib/include/alt_dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_dma.h
-
-$(PROJECT_INCLUDE)/bsp/alt_dma_program.h: hwlib/include/alt_dma_program.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_dma_program.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_dma_program.h
-
-$(PROJECT_INCLUDE)/bsp/alt_generalpurpose_io.h: hwlib/include/alt_generalpurpose_io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_generalpurpose_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_generalpurpose_io.h
-
-$(PROJECT_INCLUDE)/bsp/alt_hwlibs_ver.h: hwlib/include/alt_hwlibs_ver.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_hwlibs_ver.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_hwlibs_ver.h
-
-$(PROJECT_INCLUDE)/bsp/alt_i2c.h: hwlib/include/alt_i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_i2c.h
-
-$(PROJECT_INCLUDE)/bsp/alt_interrupt_common.h: hwlib/include/alt_interrupt_common.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_interrupt_common.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_interrupt_common.h
-
-$(PROJECT_INCLUDE)/bsp/alt_mpu_registers.h: hwlib/include/alt_mpu_registers.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_mpu_registers.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_mpu_registers.h
-
-$(PROJECT_INCLUDE)/bsp/alt_qspi_private.h: hwlib/include/alt_qspi_private.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_qspi_private.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_qspi_private.h
-
-$(PROJECT_INCLUDE)/bsp/alt_reset_manager.h: hwlib/include/alt_reset_manager.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_reset_manager.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_reset_manager.h
-
-$(PROJECT_INCLUDE)/bsp/hwlib.h: hwlib/include/hwlib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/hwlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/hwlib.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_acpidmap.h: hwlib/include/socal/alt_acpidmap.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_acpidmap.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_acpidmap.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_clkmgr.h: hwlib/include/socal/alt_clkmgr.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_clkmgr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_clkmgr.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_dmanonsecure.h: hwlib/include/socal/alt_dmanonsecure.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_dmanonsecure.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_dmanonsecure.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_dmasecure.h: hwlib/include/socal/alt_dmasecure.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_dmasecure.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_dmasecure.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_gpio.h: hwlib/include/socal/alt_gpio.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_gpio.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_i2c.h: hwlib/include/socal/alt_i2c.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_i2c.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_l3.h: hwlib/include/socal/alt_l3.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_l3.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_l3.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_qspidata.h: hwlib/include/socal/alt_qspidata.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_qspidata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_qspidata.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_qspi.h: hwlib/include/socal/alt_qspi.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_qspi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_qspi.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_rstmgr.h: hwlib/include/socal/alt_rstmgr.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_rstmgr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_rstmgr.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_sdr.h: hwlib/include/socal/alt_sdr.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_sdr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_sdr.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_sysmgr.h: hwlib/include/socal/alt_sysmgr.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_sysmgr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_sysmgr.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_uart.h: hwlib/include/socal/alt_uart.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_uart.h
-
-$(PROJECT_INCLUDE)/bsp/socal/hps.h: hwlib/include/socal/hps.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/hps.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/hps.h
-
-$(PROJECT_INCLUDE)/bsp/socal/socal.h: hwlib/include/socal/socal.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/socal.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/socal.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.altcycv: startup/linkcmds.altcycv $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.altcycv
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.altcycv
-
-$(PROJECT_LIB)/linkcmds.altcycv_devkit: startup/linkcmds.altcycv_devkit $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.altcycv_devkit
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.altcycv_devkit
-
-$(PROJECT_LIB)/linkcmds.altcycv_devkit_smp: startup/linkcmds.altcycv_devkit_smp $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.altcycv_devkit_smp
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.altcycv_devkit_smp
-
-$(PROJECT_INCLUDE)/bsp/i2cdrv.h: include/i2cdrv.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2cdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2cdrv.h
-
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/bsp_specs b/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/bsp_specs
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am
index bc64530733..a41931ff78 100644
--- a/c/src/lib/libbsp/arm/atsam/Makefile.am
+++ b/c/src/lib/libbsp/arm/atsam/Makefile.am
@@ -8,319 +8,23 @@ include $(top_srcdir)/../../bsp.am
 #                  Data                                                       #
 ###############################################################################
 
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 EXTRA_DIST += ../shared/start/start.S
 start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += startup/linkcmds.memory
-project_lib_DATA += startup/linkcmds.intsram
-project_lib_DATA += startup/linkcmds.sdram
-project_lib_DATA += startup/linkcmds.qspiflash
+project_lib_DATA += linkcmds
+project_lib_DATA += linkcmds.memory
+dist_project_lib_DATA += startup/linkcmds.intsram
+dist_project_lib_DATA += startup/linkcmds.sdram
+dist_project_lib_DATA += startup/linkcmds.qspiflash
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS =
-include_HEADERS += include/tm27.h
-include_HEADERS += ../shared/CMSIS/Include/core_cm7.h
-include_HEADERS += ../shared/CMSIS/Include/core_cmInstr.h
-include_HEADERS += ../shared/CMSIS/Include/core_cmFunc.h
-include_HEADERS += ../shared/CMSIS/Include/core_cmSimd.h
-include_HEADERS += ../shared/CMSIS/Include/cmsis_gcc.h
-include_HEADERS += include/bsp.h
-
-nodist_include_HEADERS =
-nodist_include_HEADERS += include/bspopts.h
-
-include_bspdir = $(includedir)/bsp
-
-nodist_include_bsp_HEADERS =
-nodist_include_bsp_HEADERS += ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/armv7m/include/armv7m-irq.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/pin-config.h
-include_bsp_HEADERS += include/atsam-i2c.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/atsam-spi.h
-include_bsp_HEADERS += include/spi.h
-include_bsp_HEADERS += include/sc16is752.h
-include_bsp_HEADERS += include/power.h
-include_bsp_HEADERS += include/atsam-clock-config.h
-
-include_libchipdir = $(includedir)/libchip
-
-include_libchip_HEADERS =
-include_libchip_HEADERS += libraries/libchip/chip.h
-include_libchip_HEADERS += libraries/libchip/compiler.h
-
-include_libchip_includedir = $(includedir)/libchip/include
-
-include_libchip_include_HEADERS =
-include_libchip_include_HEADERS += libraries/libchip/include/acc.h
-include_libchip_include_HEADERS += libraries/libchip/include/adc.h
-include_libchip_include_HEADERS += libraries/libchip/include/aes.h
-include_libchip_include_HEADERS += libraries/libchip/include/afec.h
-include_libchip_include_HEADERS += libraries/libchip/include/afe_dma.h
-include_libchip_include_HEADERS += libraries/libchip/include/chip.h
-include_libchip_include_HEADERS += libraries/libchip/include/dac_dma.h
-include_libchip_include_HEADERS += libraries/libchip/include/efc.h
-include_libchip_include_HEADERS += libraries/libchip/include/exceptions.h
-include_libchip_include_HEADERS += libraries/libchip/include/flashd.h
-include_libchip_include_HEADERS += libraries/libchip/include/gmacd.h
-include_libchip_include_HEADERS += libraries/libchip/include/gmac.h
-include_libchip_include_HEADERS += libraries/libchip/include/hsmci.h
-include_libchip_include_HEADERS += libraries/libchip/include/icm.h
-include_libchip_include_HEADERS += libraries/libchip/include/isi.h
-include_libchip_include_HEADERS += libraries/libchip/include/iso7816_4.h
-include_libchip_include_HEADERS += libraries/libchip/include/mcan.h
-include_libchip_include_HEADERS += libraries/libchip/include/mcid.h
-include_libchip_include_HEADERS += libraries/libchip/include/mediaLB.h
-include_libchip_include_HEADERS += libraries/libchip/include/mpu.h
-include_libchip_include_HEADERS += libraries/libchip/include/pio_capture.h
-include_libchip_include_HEADERS += libraries/libchip/include/pio.h
-include_libchip_include_HEADERS += libraries/libchip/include/pio_it.h
-include_libchip_include_HEADERS += libraries/libchip/include/pmc.h
-include_libchip_include_HEADERS += libraries/libchip/include/pwmc.h
-include_libchip_include_HEADERS += libraries/libchip/include/qspi_dma.h
-include_libchip_include_HEADERS += libraries/libchip/include/qspi.h
-include_libchip_include_HEADERS += libraries/libchip/include/rstc.h
-include_libchip_include_HEADERS += libraries/libchip/include/rtc.h
-include_libchip_include_HEADERS += libraries/libchip/include/rtt.h
-include_libchip_include_HEADERS += libraries/libchip/include/sdramc.h
-include_libchip_include_HEADERS += libraries/libchip/include/smc.h
-include_libchip_include_HEADERS += libraries/libchip/include/spi_dma.h
-include_libchip_include_HEADERS += libraries/libchip/include/spi.h
-include_libchip_include_HEADERS += libraries/libchip/include/ssc.h
-include_libchip_include_HEADERS += libraries/libchip/include/supc.h
-include_libchip_include_HEADERS += libraries/libchip/include/tc.h
-include_libchip_include_HEADERS += libraries/libchip/include/timetick.h
-include_libchip_include_HEADERS += libraries/libchip/include/trace.h
-include_libchip_include_HEADERS += libraries/libchip/include/trng.h
-include_libchip_include_HEADERS += libraries/libchip/include/twid.h
-include_libchip_include_HEADERS += libraries/libchip/include/twi.h
-include_libchip_include_HEADERS += libraries/libchip/include/uart_dma.h
-include_libchip_include_HEADERS += libraries/libchip/include/uart.h
-include_libchip_include_HEADERS += libraries/libchip/include/usart_dma.h
-include_libchip_include_HEADERS += libraries/libchip/include/usart.h
-include_libchip_include_HEADERS += libraries/libchip/include/usbhs.h
-include_libchip_include_HEADERS += libraries/libchip/include/video.h
-include_libchip_include_HEADERS += libraries/libchip/include/wdt.h
-include_libchip_include_HEADERS += libraries/libchip/include/xdmac.h
-include_libchip_include_HEADERS += libraries/libchip/include/xdmad.h
-include_libchip_include_HEADERS += libraries/libchip/include/xdma_hardware_interface.h
-
-include_libchip_include_same70dir = $(includedir)/libchip/include/same70
-
-include_libchip_include_same70_HEADERS =
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70j19.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70j20.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70j21.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70n19.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70n20.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70n21.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70q19.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70q20.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70q21.h
-include_libchip_include_same70_HEADERS += libraries/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 += libraries/libchip/include/same70/component/component_acc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_aes.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_afec.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_chipid.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_dacc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_efc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_gmac.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_gpbr.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_hsmci.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_icm.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_isi.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_matrix.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_mcan.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_pio.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_pmc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_pwm.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_qspi.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_rstc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_rswdt.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_rtc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_rtt.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_sdramc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_smc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_spi.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_ssc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_supc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_tc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_trng.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_twihs.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_uart.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_usart.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_usbhs.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_utmi.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_wdt.h
-include_libchip_include_same70_component_HEADERS += libraries/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 += libraries/libchip/include/same70/pio/pio_same70j19.h
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70j20.h
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70j21.h
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70n19.h
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70n20.h
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70n21.h
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70q19.h
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70q20.h
-include_libchip_include_same70_pio_HEADERS += libraries/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 += libraries/libchip/include/sams70/sams70.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70j19.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70j20.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70j21.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70n19.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70n20.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70n21.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70q19.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70q20.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70q21.h
-include_libchip_include_sams70_HEADERS += libraries/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 += libraries/libchip/include/sams70/component/component_acc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_aes.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_afec.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_chipid.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_dacc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_efc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_gpbr.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_hsmci.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_icm.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_isi.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_matrix.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_pio.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_pmc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_pwm.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_qspi.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_rstc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_rswdt.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_rtc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_rtt.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_sdramc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_smc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_spi.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_ssc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_supc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_tc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_trng.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_twihs.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_uart.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_usart.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_usbhs.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_utmi.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_wdt.h
-include_libchip_include_sams70_component_HEADERS += libraries/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 += libraries/libchip/include/sams70/pio/pio_sams70j19.h
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70j20.h
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70j21.h
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70n19.h
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70n20.h
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70n21.h
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70q19.h
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70q20.h
-include_libchip_include_sams70_pio_HEADERS += libraries/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 += libraries/libchip/include/samv71/samv71.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71j19.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71j20.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71j21.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71n19.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71n20.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71n21.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71q19.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71q20.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71q21.h
-include_libchip_include_samv71_HEADERS += libraries/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 += libraries/libchip/include/samv71/component/component_acc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_aes.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_afec.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_chipid.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_dacc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_efc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_gmac.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_gpbr.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_hsmci.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_icm.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_isi.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_matrix.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_mcan.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_mlb.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_pio.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_pmc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_pwm.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_qspi.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_rstc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_rswdt.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_rtc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_rtt.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_sdramc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_smc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_spi.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_ssc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_supc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_tc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_trng.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_twihs.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_uart.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_usart.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_usbhs.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_utmi.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_wdt.h
-include_libchip_include_samv71_component_HEADERS += libraries/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 += libraries/libchip/include/samv71/pio/pio_samv71j19.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71j20.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71j21.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71n19.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71n20.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71n21.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71q19.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71q20.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71q21.h
-
 ###############################################################################
 #                  LibBSP                                                     #
 ###############################################################################
@@ -328,7 +32,7 @@ include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/p
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -461,11 +165,15 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/libraries/libboard/include
 libbsp_a_CPPFLAGS += -I$(srcdir)/libraries/libchip
 libbsp_a_CPPFLAGS += -I$(srcdir)/libraries/libchip/include
 
+# hack to get the BSP to build
+libbsp_a_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/bsps/arm/atsam/include/libchip
+libbsp_a_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/bsps/arm/atsam/include/libchip/include
+
 ###############################################################################
 #                  Special Rules                                              #
 ###############################################################################
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/atsam/headers.am
diff --git a/c/src/lib/libbsp/arm/atsam/configure.ac b/c/src/lib/libbsp/arm/atsam/configure.ac
index 9a688596a9..519d5237f6 100644
--- a/c/src/lib/libbsp/arm/atsam/configure.ac
+++ b/c/src/lib/libbsp/arm/atsam/configure.ac
@@ -2,6 +2,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-atsam],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/atsamv.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -101,6 +104,6 @@ ATSAM_LINKCMD([ATSAM_MEMORY_NOCACHE_SIZE],[size of NOCACHE section in bytes],[0x
 
 AC_CONFIG_FILES([
 Makefile
-startup/linkcmds.memory
+linkcmds.memory:startup/linkcmds.memory.in
 ])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/atsam/preinstall.am b/c/src/lib/libbsp/arm/atsam/preinstall.am
deleted file mode 100644
index ad68cfd591..0000000000
--- a/c/src/lib/libbsp/arm/atsam/preinstall.am
+++ /dev/null
@@ -1,1086 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.memory: startup/linkcmds.memory $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.memory
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.memory
-
-$(PROJECT_LIB)/linkcmds.intsram: startup/linkcmds.intsram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.intsram
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.intsram
-
-$(PROJECT_LIB)/linkcmds.sdram: startup/linkcmds.sdram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.sdram
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.sdram
-
-$(PROJECT_LIB)/linkcmds.qspiflash: startup/linkcmds.qspiflash $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qspiflash
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qspiflash
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/core_cm7.h: ../shared/CMSIS/Include/core_cm7.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/core_cm7.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/core_cm7.h
-
-$(PROJECT_INCLUDE)/core_cmInstr.h: ../shared/CMSIS/Include/core_cmInstr.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/core_cmInstr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/core_cmInstr.h
-
-$(PROJECT_INCLUDE)/core_cmFunc.h: ../shared/CMSIS/Include/core_cmFunc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/core_cmFunc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/core_cmFunc.h
-
-$(PROJECT_INCLUDE)/core_cmSimd.h: ../shared/CMSIS/Include/core_cmSimd.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/core_cmSimd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/core_cmSimd.h
-
-$(PROJECT_INCLUDE)/cmsis_gcc.h: ../shared/CMSIS/Include/cmsis_gcc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/cmsis_gcc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/cmsis_gcc.h
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/armv7m-irq.h: ../shared/armv7m/include/armv7m-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/pin-config.h: include/pin-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pin-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pin-config.h
-
-$(PROJECT_INCLUDE)/bsp/atsam-i2c.h: include/atsam-i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/atsam-i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/atsam-i2c.h
-
-$(PROJECT_INCLUDE)/bsp/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2c.h
-
-$(PROJECT_INCLUDE)/bsp/atsam-spi.h: include/atsam-spi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/atsam-spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/atsam-spi.h
-
-$(PROJECT_INCLUDE)/bsp/spi.h: include/spi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spi.h
-
-$(PROJECT_INCLUDE)/bsp/sc16is752.h: include/sc16is752.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/sc16is752.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/sc16is752.h
-
-$(PROJECT_INCLUDE)/bsp/power.h: include/power.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/power.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/power.h
-
-$(PROJECT_INCLUDE)/bsp/atsam-clock-config.h: include/atsam-clock-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/atsam-clock-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/atsam-clock-config.h
-
-$(PROJECT_INCLUDE)/libchip/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip
-	@: > $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/chip.h: libraries/libchip/chip.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/chip.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/chip.h
-
-$(PROJECT_INCLUDE)/libchip/compiler.h: libraries/libchip/compiler.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/compiler.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/compiler.h
-
-$(PROJECT_INCLUDE)/libchip/include/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include
-	@: > $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/acc.h: libraries/libchip/include/acc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/acc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/acc.h
-
-$(PROJECT_INCLUDE)/libchip/include/adc.h: libraries/libchip/include/adc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/adc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/adc.h
-
-$(PROJECT_INCLUDE)/libchip/include/aes.h: libraries/libchip/include/aes.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/aes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/aes.h
-
-$(PROJECT_INCLUDE)/libchip/include/afec.h: libraries/libchip/include/afec.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/afec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/afec.h
-
-$(PROJECT_INCLUDE)/libchip/include/afe_dma.h: libraries/libchip/include/afe_dma.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/afe_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/afe_dma.h
-
-$(PROJECT_INCLUDE)/libchip/include/chip.h: libraries/libchip/include/chip.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/chip.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/chip.h
-
-$(PROJECT_INCLUDE)/libchip/include/dac_dma.h: libraries/libchip/include/dac_dma.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/dac_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/dac_dma.h
-
-$(PROJECT_INCLUDE)/libchip/include/efc.h: libraries/libchip/include/efc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/efc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/efc.h
-
-$(PROJECT_INCLUDE)/libchip/include/exceptions.h: libraries/libchip/include/exceptions.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/exceptions.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/exceptions.h
-
-$(PROJECT_INCLUDE)/libchip/include/flashd.h: libraries/libchip/include/flashd.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/flashd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/flashd.h
-
-$(PROJECT_INCLUDE)/libchip/include/gmacd.h: libraries/libchip/include/gmacd.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/gmacd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/gmacd.h
-
-$(PROJECT_INCLUDE)/libchip/include/gmac.h: libraries/libchip/include/gmac.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/gmac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/gmac.h
-
-$(PROJECT_INCLUDE)/libchip/include/hsmci.h: libraries/libchip/include/hsmci.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/hsmci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/hsmci.h
-
-$(PROJECT_INCLUDE)/libchip/include/icm.h: libraries/libchip/include/icm.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/icm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/icm.h
-
-$(PROJECT_INCLUDE)/libchip/include/isi.h: libraries/libchip/include/isi.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/isi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/isi.h
-
-$(PROJECT_INCLUDE)/libchip/include/iso7816_4.h: libraries/libchip/include/iso7816_4.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/iso7816_4.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/iso7816_4.h
-
-$(PROJECT_INCLUDE)/libchip/include/mcan.h: libraries/libchip/include/mcan.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/mcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/mcan.h
-
-$(PROJECT_INCLUDE)/libchip/include/mcid.h: libraries/libchip/include/mcid.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/mcid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/mcid.h
-
-$(PROJECT_INCLUDE)/libchip/include/mediaLB.h: libraries/libchip/include/mediaLB.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/mediaLB.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/mediaLB.h
-
-$(PROJECT_INCLUDE)/libchip/include/mpu.h: libraries/libchip/include/mpu.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/mpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/mpu.h
-
-$(PROJECT_INCLUDE)/libchip/include/pio_capture.h: libraries/libchip/include/pio_capture.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/pio_capture.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/pio_capture.h
-
-$(PROJECT_INCLUDE)/libchip/include/pio.h: libraries/libchip/include/pio.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/pio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/pio.h
-
-$(PROJECT_INCLUDE)/libchip/include/pio_it.h: libraries/libchip/include/pio_it.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/pio_it.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/pio_it.h
-
-$(PROJECT_INCLUDE)/libchip/include/pmc.h: libraries/libchip/include/pmc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/pmc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/pmc.h
-
-$(PROJECT_INCLUDE)/libchip/include/pwmc.h: libraries/libchip/include/pwmc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/pwmc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/pwmc.h
-
-$(PROJECT_INCLUDE)/libchip/include/qspi_dma.h: libraries/libchip/include/qspi_dma.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/qspi_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/qspi_dma.h
-
-$(PROJECT_INCLUDE)/libchip/include/qspi.h: libraries/libchip/include/qspi.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/qspi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/qspi.h
-
-$(PROJECT_INCLUDE)/libchip/include/rstc.h: libraries/libchip/include/rstc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/rstc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/rstc.h
-
-$(PROJECT_INCLUDE)/libchip/include/rtc.h: libraries/libchip/include/rtc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/rtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/rtc.h
-
-$(PROJECT_INCLUDE)/libchip/include/rtt.h: libraries/libchip/include/rtt.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/rtt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/rtt.h
-
-$(PROJECT_INCLUDE)/libchip/include/sdramc.h: libraries/libchip/include/sdramc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sdramc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sdramc.h
-
-$(PROJECT_INCLUDE)/libchip/include/smc.h: libraries/libchip/include/smc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/smc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/smc.h
-
-$(PROJECT_INCLUDE)/libchip/include/spi_dma.h: libraries/libchip/include/spi_dma.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/spi_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/spi_dma.h
-
-$(PROJECT_INCLUDE)/libchip/include/spi.h: libraries/libchip/include/spi.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/spi.h
-
-$(PROJECT_INCLUDE)/libchip/include/ssc.h: libraries/libchip/include/ssc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/ssc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/ssc.h
-
-$(PROJECT_INCLUDE)/libchip/include/supc.h: libraries/libchip/include/supc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/supc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/supc.h
-
-$(PROJECT_INCLUDE)/libchip/include/tc.h: libraries/libchip/include/tc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/tc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/tc.h
-
-$(PROJECT_INCLUDE)/libchip/include/timetick.h: libraries/libchip/include/timetick.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/timetick.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/timetick.h
-
-$(PROJECT_INCLUDE)/libchip/include/trace.h: libraries/libchip/include/trace.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/trace.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/trace.h
-
-$(PROJECT_INCLUDE)/libchip/include/trng.h: libraries/libchip/include/trng.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/trng.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/trng.h
-
-$(PROJECT_INCLUDE)/libchip/include/twid.h: libraries/libchip/include/twid.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/twid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/twid.h
-
-$(PROJECT_INCLUDE)/libchip/include/twi.h: libraries/libchip/include/twi.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/twi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/twi.h
-
-$(PROJECT_INCLUDE)/libchip/include/uart_dma.h: libraries/libchip/include/uart_dma.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/uart_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/uart_dma.h
-
-$(PROJECT_INCLUDE)/libchip/include/uart.h: libraries/libchip/include/uart.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/uart.h
-
-$(PROJECT_INCLUDE)/libchip/include/usart_dma.h: libraries/libchip/include/usart_dma.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/usart_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/usart_dma.h
-
-$(PROJECT_INCLUDE)/libchip/include/usart.h: libraries/libchip/include/usart.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/usart.h
-
-$(PROJECT_INCLUDE)/libchip/include/usbhs.h: libraries/libchip/include/usbhs.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/usbhs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/usbhs.h
-
-$(PROJECT_INCLUDE)/libchip/include/video.h: libraries/libchip/include/video.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/video.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/video.h
-
-$(PROJECT_INCLUDE)/libchip/include/wdt.h: libraries/libchip/include/wdt.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/wdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/wdt.h
-
-$(PROJECT_INCLUDE)/libchip/include/xdmac.h: libraries/libchip/include/xdmac.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/xdmac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/xdmac.h
-
-$(PROJECT_INCLUDE)/libchip/include/xdmad.h: libraries/libchip/include/xdmad.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/xdmad.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/xdmad.h
-
-$(PROJECT_INCLUDE)/libchip/include/xdma_hardware_interface.h: libraries/libchip/include/xdma_hardware_interface.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/xdma_hardware_interface.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/xdma_hardware_interface.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/same70
-	@: > $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70.h: libraries/libchip/include/same70/same70.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70j19.h: libraries/libchip/include/same70/same70j19.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70j19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70j19.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70j20.h: libraries/libchip/include/same70/same70j20.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70j20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70j20.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70j21.h: libraries/libchip/include/same70/same70j21.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70j21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70j21.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70n19.h: libraries/libchip/include/same70/same70n19.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70n19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70n19.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70n20.h: libraries/libchip/include/same70/same70n20.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70n20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70n20.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70n21.h: libraries/libchip/include/same70/same70n21.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70n21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70n21.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70q19.h: libraries/libchip/include/same70/same70q19.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70q19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70q19.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70q20.h: libraries/libchip/include/same70/same70q20.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70q20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70q20.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70q21.h: libraries/libchip/include/same70/same70q21.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70q21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70q21.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/system_same70.h: libraries/libchip/include/same70/system_same70.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/system_same70.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/system_same70.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/same70/component
-	@: > $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_acc.h: libraries/libchip/include/same70/component/component_acc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_acc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_acc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_aes.h: libraries/libchip/include/same70/component/component_aes.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_aes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_aes.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_afec.h: libraries/libchip/include/same70/component/component_afec.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_afec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_afec.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_chipid.h: libraries/libchip/include/same70/component/component_chipid.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_chipid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_chipid.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_dacc.h: libraries/libchip/include/same70/component/component_dacc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_dacc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_dacc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_efc.h: libraries/libchip/include/same70/component/component_efc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_efc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_efc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_gmac.h: libraries/libchip/include/same70/component/component_gmac.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_gmac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_gmac.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_gpbr.h: libraries/libchip/include/same70/component/component_gpbr.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_gpbr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_gpbr.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_hsmci.h: libraries/libchip/include/same70/component/component_hsmci.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_hsmci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_hsmci.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_icm.h: libraries/libchip/include/same70/component/component_icm.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_icm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_icm.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_isi.h: libraries/libchip/include/same70/component/component_isi.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_isi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_isi.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_matrix.h: libraries/libchip/include/same70/component/component_matrix.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_matrix.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_matrix.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_mcan.h: libraries/libchip/include/same70/component/component_mcan.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_mcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_mcan.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_pio.h: libraries/libchip/include/same70/component/component_pio.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_pio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_pio.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_pmc.h: libraries/libchip/include/same70/component/component_pmc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_pmc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_pmc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_pwm.h: libraries/libchip/include/same70/component/component_pwm.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_pwm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_pwm.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_qspi.h: libraries/libchip/include/same70/component/component_qspi.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_qspi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_qspi.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_rstc.h: libraries/libchip/include/same70/component/component_rstc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rstc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rstc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_rswdt.h: libraries/libchip/include/same70/component/component_rswdt.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rswdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rswdt.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_rtc.h: libraries/libchip/include/same70/component/component_rtc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rtc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_rtt.h: libraries/libchip/include/same70/component/component_rtt.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rtt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rtt.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_sdramc.h: libraries/libchip/include/same70/component/component_sdramc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_sdramc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_sdramc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_smc.h: libraries/libchip/include/same70/component/component_smc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_smc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_smc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_spi.h: libraries/libchip/include/same70/component/component_spi.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_spi.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_ssc.h: libraries/libchip/include/same70/component/component_ssc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_ssc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_ssc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_supc.h: libraries/libchip/include/same70/component/component_supc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_supc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_supc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_tc.h: libraries/libchip/include/same70/component/component_tc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_tc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_tc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_trng.h: libraries/libchip/include/same70/component/component_trng.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_trng.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_trng.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_twihs.h: libraries/libchip/include/same70/component/component_twihs.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_twihs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_twihs.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_uart.h: libraries/libchip/include/same70/component/component_uart.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_uart.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_usart.h: libraries/libchip/include/same70/component/component_usart.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_usart.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_usbhs.h: libraries/libchip/include/same70/component/component_usbhs.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_usbhs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_usbhs.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_utmi.h: libraries/libchip/include/same70/component/component_utmi.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_utmi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_utmi.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_wdt.h: libraries/libchip/include/same70/component/component_wdt.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_wdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_wdt.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_xdmac.h: libraries/libchip/include/same70/component/component_xdmac.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_xdmac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_xdmac.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/same70/pio
-	@: > $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j19.h: libraries/libchip/include/same70/pio/pio_same70j19.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j19.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j20.h: libraries/libchip/include/same70/pio/pio_same70j20.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j20.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j21.h: libraries/libchip/include/same70/pio/pio_same70j21.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j21.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n19.h: libraries/libchip/include/same70/pio/pio_same70n19.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n19.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n20.h: libraries/libchip/include/same70/pio/pio_same70n20.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n20.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n21.h: libraries/libchip/include/same70/pio/pio_same70n21.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n21.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q19.h: libraries/libchip/include/same70/pio/pio_same70q19.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q19.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q20.h: libraries/libchip/include/same70/pio/pio_same70q20.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q20.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q21.h: libraries/libchip/include/same70/pio/pio_same70q21.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q21.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/sams70
-	@: > $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70.h: libraries/libchip/include/sams70/sams70.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70j19.h: libraries/libchip/include/sams70/sams70j19.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70j19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70j19.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70j20.h: libraries/libchip/include/sams70/sams70j20.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70j20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70j20.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70j21.h: libraries/libchip/include/sams70/sams70j21.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70j21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70j21.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70n19.h: libraries/libchip/include/sams70/sams70n19.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70n19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70n19.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70n20.h: libraries/libchip/include/sams70/sams70n20.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70n20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70n20.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70n21.h: libraries/libchip/include/sams70/sams70n21.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70n21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70n21.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70q19.h: libraries/libchip/include/sams70/sams70q19.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70q19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70q19.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70q20.h: libraries/libchip/include/sams70/sams70q20.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70q20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70q20.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70q21.h: libraries/libchip/include/sams70/sams70q21.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70q21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70q21.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/system_sams70.h: libraries/libchip/include/sams70/system_sams70.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/system_sams70.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/system_sams70.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/sams70/component
-	@: > $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_acc.h: libraries/libchip/include/sams70/component/component_acc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_acc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_acc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_aes.h: libraries/libchip/include/sams70/component/component_aes.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_aes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_aes.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_afec.h: libraries/libchip/include/sams70/component/component_afec.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_afec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_afec.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_chipid.h: libraries/libchip/include/sams70/component/component_chipid.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_chipid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_chipid.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_dacc.h: libraries/libchip/include/sams70/component/component_dacc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_dacc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_dacc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_efc.h: libraries/libchip/include/sams70/component/component_efc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_efc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_efc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_gpbr.h: libraries/libchip/include/sams70/component/component_gpbr.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_gpbr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_gpbr.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_hsmci.h: libraries/libchip/include/sams70/component/component_hsmci.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_hsmci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_hsmci.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_icm.h: libraries/libchip/include/sams70/component/component_icm.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_icm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_icm.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_isi.h: libraries/libchip/include/sams70/component/component_isi.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_isi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_isi.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_matrix.h: libraries/libchip/include/sams70/component/component_matrix.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_matrix.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_matrix.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pio.h: libraries/libchip/include/sams70/component/component_pio.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pio.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pmc.h: libraries/libchip/include/sams70/component/component_pmc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pmc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pmc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pwm.h: libraries/libchip/include/sams70/component/component_pwm.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pwm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pwm.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_qspi.h: libraries/libchip/include/sams70/component/component_qspi.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_qspi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_qspi.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rstc.h: libraries/libchip/include/sams70/component/component_rstc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rstc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rstc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rswdt.h: libraries/libchip/include/sams70/component/component_rswdt.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rswdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rswdt.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rtc.h: libraries/libchip/include/sams70/component/component_rtc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rtc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rtt.h: libraries/libchip/include/sams70/component/component_rtt.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rtt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rtt.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_sdramc.h: libraries/libchip/include/sams70/component/component_sdramc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_sdramc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_sdramc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_smc.h: libraries/libchip/include/sams70/component/component_smc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_smc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_smc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_spi.h: libraries/libchip/include/sams70/component/component_spi.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_spi.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_ssc.h: libraries/libchip/include/sams70/component/component_ssc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_ssc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_ssc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_supc.h: libraries/libchip/include/sams70/component/component_supc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_supc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_supc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_tc.h: libraries/libchip/include/sams70/component/component_tc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_tc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_tc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_trng.h: libraries/libchip/include/sams70/component/component_trng.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_trng.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_trng.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_twihs.h: libraries/libchip/include/sams70/component/component_twihs.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_twihs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_twihs.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_uart.h: libraries/libchip/include/sams70/component/component_uart.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_uart.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_usart.h: libraries/libchip/include/sams70/component/component_usart.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_usart.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_usbhs.h: libraries/libchip/include/sams70/component/component_usbhs.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_usbhs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_usbhs.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_utmi.h: libraries/libchip/include/sams70/component/component_utmi.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_utmi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_utmi.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_wdt.h: libraries/libchip/include/sams70/component/component_wdt.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_wdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_wdt.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_xdmac.h: libraries/libchip/include/sams70/component/component_xdmac.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_xdmac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_xdmac.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/sams70/pio
-	@: > $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j19.h: libraries/libchip/include/sams70/pio/pio_sams70j19.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j19.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j20.h: libraries/libchip/include/sams70/pio/pio_sams70j20.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j20.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j21.h: libraries/libchip/include/sams70/pio/pio_sams70j21.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j21.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n19.h: libraries/libchip/include/sams70/pio/pio_sams70n19.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n19.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n20.h: libraries/libchip/include/sams70/pio/pio_sams70n20.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n20.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n21.h: libraries/libchip/include/sams70/pio/pio_sams70n21.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n21.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q19.h: libraries/libchip/include/sams70/pio/pio_sams70q19.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q19.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q20.h: libraries/libchip/include/sams70/pio/pio_sams70q20.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q20.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q21.h: libraries/libchip/include/sams70/pio/pio_sams70q21.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q21.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/samv71
-	@: > $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71.h: libraries/libchip/include/samv71/samv71.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71j19.h: libraries/libchip/include/samv71/samv71j19.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71j19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71j19.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71j20.h: libraries/libchip/include/samv71/samv71j20.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71j20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71j20.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71j21.h: libraries/libchip/include/samv71/samv71j21.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71j21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71j21.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71n19.h: libraries/libchip/include/samv71/samv71n19.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71n19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71n19.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71n20.h: libraries/libchip/include/samv71/samv71n20.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71n20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71n20.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71n21.h: libraries/libchip/include/samv71/samv71n21.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71n21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71n21.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71q19.h: libraries/libchip/include/samv71/samv71q19.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71q19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71q19.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71q20.h: libraries/libchip/include/samv71/samv71q20.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71q20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71q20.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71q21.h: libraries/libchip/include/samv71/samv71q21.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71q21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71q21.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/system_samv71.h: libraries/libchip/include/samv71/system_samv71.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/system_samv71.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/system_samv71.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/samv71/component
-	@: > $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_acc.h: libraries/libchip/include/samv71/component/component_acc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_acc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_acc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_aes.h: libraries/libchip/include/samv71/component/component_aes.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_aes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_aes.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_afec.h: libraries/libchip/include/samv71/component/component_afec.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_afec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_afec.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_chipid.h: libraries/libchip/include/samv71/component/component_chipid.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_chipid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_chipid.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_dacc.h: libraries/libchip/include/samv71/component/component_dacc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_dacc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_dacc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_efc.h: libraries/libchip/include/samv71/component/component_efc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_efc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_efc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_gmac.h: libraries/libchip/include/samv71/component/component_gmac.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_gmac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_gmac.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_gpbr.h: libraries/libchip/include/samv71/component/component_gpbr.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_gpbr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_gpbr.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_hsmci.h: libraries/libchip/include/samv71/component/component_hsmci.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_hsmci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_hsmci.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_icm.h: libraries/libchip/include/samv71/component/component_icm.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_icm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_icm.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_isi.h: libraries/libchip/include/samv71/component/component_isi.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_isi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_isi.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_matrix.h: libraries/libchip/include/samv71/component/component_matrix.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_matrix.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_matrix.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_mcan.h: libraries/libchip/include/samv71/component/component_mcan.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_mcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_mcan.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_mlb.h: libraries/libchip/include/samv71/component/component_mlb.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_mlb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_mlb.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pio.h: libraries/libchip/include/samv71/component/component_pio.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pio.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pmc.h: libraries/libchip/include/samv71/component/component_pmc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pmc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pmc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pwm.h: libraries/libchip/include/samv71/component/component_pwm.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pwm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pwm.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_qspi.h: libraries/libchip/include/samv71/component/component_qspi.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_qspi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_qspi.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rstc.h: libraries/libchip/include/samv71/component/component_rstc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rstc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rstc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rswdt.h: libraries/libchip/include/samv71/component/component_rswdt.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rswdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rswdt.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rtc.h: libraries/libchip/include/samv71/component/component_rtc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rtc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rtt.h: libraries/libchip/include/samv71/component/component_rtt.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rtt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rtt.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_sdramc.h: libraries/libchip/include/samv71/component/component_sdramc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_sdramc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_sdramc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_smc.h: libraries/libchip/include/samv71/component/component_smc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_smc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_smc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_spi.h: libraries/libchip/include/samv71/component/component_spi.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_spi.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_ssc.h: libraries/libchip/include/samv71/component/component_ssc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_ssc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_ssc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_supc.h: libraries/libchip/include/samv71/component/component_supc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_supc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_supc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_tc.h: libraries/libchip/include/samv71/component/component_tc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_tc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_tc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_trng.h: libraries/libchip/include/samv71/component/component_trng.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_trng.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_trng.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_twihs.h: libraries/libchip/include/samv71/component/component_twihs.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_twihs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_twihs.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_uart.h: libraries/libchip/include/samv71/component/component_uart.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_uart.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_usart.h: libraries/libchip/include/samv71/component/component_usart.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_usart.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_usbhs.h: libraries/libchip/include/samv71/component/component_usbhs.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_usbhs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_usbhs.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_utmi.h: libraries/libchip/include/samv71/component/component_utmi.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_utmi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_utmi.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_wdt.h: libraries/libchip/include/samv71/component/component_wdt.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_wdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_wdt.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_xdmac.h: libraries/libchip/include/samv71/component/component_xdmac.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_xdmac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_xdmac.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/samv71/pio
-	@: > $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j19.h: libraries/libchip/include/samv71/pio/pio_samv71j19.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j19.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j20.h: libraries/libchip/include/samv71/pio/pio_samv71j20.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j20.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j21.h: libraries/libchip/include/samv71/pio/pio_samv71j21.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j21.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n19.h: libraries/libchip/include/samv71/pio/pio_samv71n19.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n19.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n20.h: libraries/libchip/include/samv71/pio/pio_samv71n20.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n20.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n21.h: libraries/libchip/include/samv71/pio/pio_samv71n21.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n21.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q19.h: libraries/libchip/include/samv71/pio/pio_samv71q19.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q19.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q20.h: libraries/libchip/include/samv71/pio/pio_samv71q20.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q20.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q21.h: libraries/libchip/include/samv71/pio/pio_samv71q21.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q21.h
-
diff --git a/c/src/lib/libbsp/arm/atsam/bsp_specs b/c/src/lib/libbsp/arm/atsam/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/atsam/bsp_specs
+++ b/c/src/lib/libbsp/arm/atsam/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am
index 38ac88d108..ae46cb391a 100644
--- a/c/src/lib/libbsp/arm/beagle/Makefile.am
+++ b/c/src/lib/libbsp/arm/beagle/Makefile.am
@@ -11,44 +11,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_libcpudir = $(includedir)/libcpu
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/uart-output-char.h
-include_bsp_HEADERS += ../shared/include/arm-a8core-start.h
-include_bsp_HEADERS += ../shared/include/arm-cp15-start.h
-include_bsp_HEADERS += ../shared/include/arm-errata.h
-include_bsp_HEADERS += ../shared/include/arm-release-id.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/beagleboneblack.h
-include_bsp_HEADERS += include/bbb-gpio.h
-include_bsp_HEADERS += include/bbb-pwm.h
-
-include_libcpu_HEADERS =
-include_libcpu_HEADERS += ../../../libcpu/arm/shared/include/omap3.h
-include_libcpu_HEADERS += ../../../libcpu/arm/shared/include/am335x.h
-include_libcpu_HEADERS += ../../../libcpu/arm/shared/include/omap_timer.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -58,10 +26,8 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += startup/linkcmds.beagle
-
-EXTRA_DIST += startup/linkcmds.beagle
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.beagle
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -70,7 +36,7 @@ EXTRA_DIST += startup/linkcmds.beagle
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -142,5 +108,5 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../shared/armv467ar-basic-cache
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/beagle/headers.am
diff --git a/c/src/lib/libbsp/arm/beagle/configure.ac b/c/src/lib/libbsp/arm/beagle/configure.ac
index 1dcada5eee..bcfc556ba0 100644
--- a/c/src/lib/libbsp/arm/beagle/configure.ac
+++ b/c/src/lib/libbsp/arm/beagle/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ([2.68])
 AC_INIT([rtems-c-src-lib-libbsp-arm-beagle],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
 AC_CONFIG_SRCDIR([make/custom/beagleboardorig.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.11.1])
@@ -46,7 +49,6 @@ RTEMS_BSPOPTS_SET([BBB_DEBUG],[beaglebone*],[0])
 RTEMS_BSPOPTS_HELP([BBB_DEBUG],[Enable BBB debug])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/beagle/preinstall.am b/c/src/lib/libbsp/arm/beagle/preinstall.am
deleted file mode 100644
index 831f9cfb41..0000000000
--- a/c/src/lib/libbsp/arm/beagle/preinstall.am
+++ /dev/null
@@ -1,144 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a8core-start.h: ../shared/include/arm-a8core-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a8core-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a8core-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-cp15-start.h: ../shared/include/arm-cp15-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-errata.h: ../shared/include/arm-errata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-errata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-errata.h
-
-$(PROJECT_INCLUDE)/bsp/arm-release-id.h: ../shared/include/arm-release-id.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2c.h
-
-$(PROJECT_INCLUDE)/bsp/beagleboneblack.h: include/beagleboneblack.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/beagleboneblack.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/beagleboneblack.h
-
-$(PROJECT_INCLUDE)/bsp/bbb-gpio.h: include/bbb-gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bbb-gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bbb-gpio.h
-
-$(PROJECT_INCLUDE)/bsp/bbb-pwm.h: include/bbb-pwm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bbb-pwm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bbb-pwm.h
-
-$(PROJECT_INCLUDE)/libcpu/omap3.h: ../../../libcpu/arm/shared/include/omap3.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/omap3.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/omap3.h
-
-$(PROJECT_INCLUDE)/libcpu/am335x.h: ../../../libcpu/arm/shared/include/am335x.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/am335x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/am335x.h
-
-$(PROJECT_INCLUDE)/libcpu/omap_timer.h: ../../../libcpu/arm/shared/include/omap_timer.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/omap_timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/omap_timer.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.beagle: startup/linkcmds.beagle $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.beagle
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.beagle
-
diff --git a/c/src/lib/libbsp/arm/beagle/bsp_specs b/c/src/lib/libbsp/arm/beagle/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/beagle/bsp_specs
+++ b/c/src/lib/libbsp/arm/beagle/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/configure.ac b/c/src/lib/libbsp/arm/configure.ac
index 35de7a729e..285cd3156f 100644
--- a/c/src/lib/libbsp/arm/configure.ac
+++ b/c/src/lib/libbsp/arm/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([../arm])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am
index 12cab14fa8..0dc5c54fa0 100644
--- a/c/src/lib/libbsp/arm/csb336/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb336/Makefile.am
@@ -4,19 +4,10 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_HEADERS += include/mc9328mxl.h
-
-include_bsp_HEADERS =
-libbsp_a_CPPFLAGS =
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -45,9 +36,6 @@ libbsp_a_SOURCES += timer/timer.c
 # console
 libbsp_a_SOURCES += console/uart.c
 # IRQ
-include_bsp_HEADERS += ../../shared/include/irq-generic.h \
-	../../shared/include/irq-info.h
-include_bsp_HEADERS += include/bsp/irq.h
 libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
 libbsp_a_SOURCES += ../../shared/src/irq-generic.c
 libbsp_a_SOURCES += ../../shared/src/irq-info.c
@@ -76,5 +64,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/csb336/headers.am
diff --git a/c/src/lib/libbsp/arm/csb336/configure.ac b/c/src/lib/libbsp/arm/csb336/configure.ac
index bbdf556328..11ccabf036 100644
--- a/c/src/lib/libbsp/arm/csb336/configure.ac
+++ b/c/src/lib/libbsp/arm/csb336/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-csb336],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/csb336.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/csb336/preinstall.am b/c/src/lib/libbsp/arm/csb336/preinstall.am
deleted file mode 100644
index dbdb788360..0000000000
--- a/c/src/lib/libbsp/arm/csb336/preinstall.am
+++ /dev/null
@@ -1,79 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/mc9328mxl.h: include/mc9328mxl.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mc9328mxl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mc9328mxl.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
diff --git a/c/src/lib/libbsp/arm/csb336/bsp_specs b/c/src/lib/libbsp/arm/csb336/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/csb336/bsp_specs
+++ b/c/src/lib/libbsp/arm/csb336/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 6999c0250e..a2d448c3e9 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -4,47 +4,21 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_HEADERS += include/at91rm9200_dbgu.h
-include_HEADERS += include/at91rm9200_emac.h
-include_HEADERS += include/at91rm9200_gpio.h
-include_HEADERS += include/at91rm9200.h
-include_HEADERS += include/at91rm9200_mem.h
-include_HEADERS += include/at91rm9200_pmc.h
-include_HEADERS += include/at91rm9200_usart.h
-include_HEADERS += include/bits.h
+dist_project_lib_DATA = startup/bsp_specs
 
 if ENABLE_LCD
-include_HEADERS += include/sed1356.h
 endif
 
-include_bsp_HEADERS =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 if ENABLE_UMON
-include_umondir = $(includedir)/umon
-include_umon_HEADERS  = ../../shared/umon/cli.h
-include_umon_HEADERS += ../../shared/umon/monlib.h
-include_umon_HEADERS += ../../shared/umon/tfs.h
-
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS  = ../../shared/umon/umon.h
 endif
 
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
 
 if ENABLE_LCD
-nodist_include_HEADERS += console/sed1356_16bit.h
-nodist_include_HEADERS += console/font8x16.h
 endif
 
 EXTRA_DIST += start/start.S
@@ -52,9 +26,10 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-EXTRA_DIST += startup/linkcmds.csb337
-EXTRA_DIST += startup/linkcmds.csb637
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.csb337
+dist_project_lib_DATA += startup/linkcmds.csb637
+
 EXTRA_DIST += README
 EXTRA_DIST += README.kit637_v6
 
@@ -80,9 +55,6 @@ libbsp_a_SOURCES += ../../shared/console.c console/uarts.c \
 libbsp_a_SOURCES += console/dbgu.c
 libbsp_a_SOURCES += console/usart.c
 # IRQ
-include_bsp_HEADERS += ../../shared/include/irq-generic.h \
-	../../shared/include/irq-info.h
-include_bsp_HEADERS += include/bsp/irq.h
 libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
 libbsp_a_SOURCES += ../../shared/src/irq-generic.c
 libbsp_a_SOURCES += ../../shared/src/irq-info.c
@@ -122,5 +94,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/csb337/headers.am
diff --git a/c/src/lib/libbsp/arm/csb337/configure.ac b/c/src/lib/libbsp/arm/csb337/configure.ac
index 5567bf06f4..066d425e56 100644
--- a/c/src/lib/libbsp/arm/csb337/configure.ac
+++ b/c/src/lib/libbsp/arm/csb337/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-csb337],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/csb337.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -63,7 +66,6 @@ RTEMS_BSPOPTS_HELP([ENABLE_USART3],
 AM_CONDITIONAL(ENABLE_USART3,test "$ENABLE_USART3" = "1")
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile])
diff --git a/c/src/lib/libbsp/arm/csb337/preinstall.am b/c/src/lib/libbsp/arm/csb337/preinstall.am
deleted file mode 100644
index 57ab234874..0000000000
--- a/c/src/lib/libbsp/arm/csb337/preinstall.am
+++ /dev/null
@@ -1,148 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/at91rm9200_dbgu.h: include/at91rm9200_dbgu.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_dbgu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_dbgu.h
-
-$(PROJECT_INCLUDE)/at91rm9200_emac.h: include/at91rm9200_emac.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_emac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_emac.h
-
-$(PROJECT_INCLUDE)/at91rm9200_gpio.h: include/at91rm9200_gpio.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_gpio.h
-
-$(PROJECT_INCLUDE)/at91rm9200.h: include/at91rm9200.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200.h
-
-$(PROJECT_INCLUDE)/at91rm9200_mem.h: include/at91rm9200_mem.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_mem.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_mem.h
-
-$(PROJECT_INCLUDE)/at91rm9200_pmc.h: include/at91rm9200_pmc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_pmc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_pmc.h
-
-$(PROJECT_INCLUDE)/at91rm9200_usart.h: include/at91rm9200_usart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_usart.h
-
-$(PROJECT_INCLUDE)/bits.h: include/bits.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bits.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bits.h
-
-if ENABLE_LCD
-$(PROJECT_INCLUDE)/sed1356.h: include/sed1356.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sed1356.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sed1356.h
-endif
-if ENABLE_UMON
-$(PROJECT_INCLUDE)/umon/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/umon
-	@: > $(PROJECT_INCLUDE)/umon/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/umon/$(dirstamp)
-
-$(PROJECT_INCLUDE)/umon/cli.h: ../../shared/umon/cli.h $(PROJECT_INCLUDE)/umon/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/umon/cli.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/umon/cli.h
-
-$(PROJECT_INCLUDE)/umon/monlib.h: ../../shared/umon/monlib.h $(PROJECT_INCLUDE)/umon/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/umon/monlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/umon/monlib.h
-
-$(PROJECT_INCLUDE)/umon/tfs.h: ../../shared/umon/tfs.h $(PROJECT_INCLUDE)/umon/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/umon/tfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/umon/tfs.h
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/umon.h: ../../shared/umon/umon.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/umon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/umon.h
-endif
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-if ENABLE_LCD
-$(PROJECT_INCLUDE)/sed1356_16bit.h: console/sed1356_16bit.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sed1356_16bit.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sed1356_16bit.h
-
-$(PROJECT_INCLUDE)/font8x16.h: console/font8x16.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/font8x16.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/font8x16.h
-endif
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
diff --git a/c/src/lib/libbsp/arm/csb337/bsp_specs b/c/src/lib/libbsp/arm/csb337/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/csb337/bsp_specs
+++ b/c/src/lib/libbsp/arm/csb337/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index 6cb4af3cc9..74e235cfeb 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -4,33 +4,21 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-include_bsp_HEADERS =
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
-include_HEADERS += include/ep7312.h
-
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
 
-include_HEADERS += ../../arm/shared/comm/uart.h
 # startup
 libbsp_a_SOURCES += \
     ../../shared/bspgetworkarea.c \
@@ -52,9 +40,6 @@ libbsp_a_SOURCES += console/uart.c ../../shared/console.c \
 libbsp_a_SOURCES += timer/timer.c
 
 # irq
-include_bsp_HEADERS += ../../shared/include/irq-generic.h \
-	../../shared/include/irq-info.h \
-	irq/irq.h
 libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
 libbsp_a_SOURCES += ../../shared/src/irq-generic.c
 libbsp_a_SOURCES += ../../shared/src/irq-info.c
@@ -83,5 +68,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/edb7312/headers.am
diff --git a/c/src/lib/libbsp/arm/edb7312/configure.ac b/c/src/lib/libbsp/arm/edb7312/configure.ac
index 8c8614acef..63c78230f2 100644
--- a/c/src/lib/libbsp/arm/edb7312/configure.ac
+++ b/c/src/lib/libbsp/arm/edb7312/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-edb7312],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/edb7312.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/edb7312/preinstall.am b/c/src/lib/libbsp/arm/edb7312/preinstall.am
deleted file mode 100644
index fc2049a8ed..0000000000
--- a/c/src/lib/libbsp/arm/edb7312/preinstall.am
+++ /dev/null
@@ -1,83 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/ep7312.h: include/ep7312.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ep7312.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ep7312.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/uart.h: ../../arm/shared/comm/uart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/uart.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
diff --git a/c/src/lib/libbsp/arm/edb7312/bsp_specs b/c/src/lib/libbsp/arm/edb7312/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/edb7312/bsp_specs
+++ b/c/src/lib/libbsp/arm/edb7312/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
index 8ed842ebba..328792883e 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
+++ b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
@@ -4,21 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_bsp_HEADERS = include/irq.h
-include_bsp_HEADERS += include/swi.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -28,7 +15,7 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -78,5 +65,5 @@ libbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c
 libbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/gdbarmsim/headers.am
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/configure.ac b/c/src/lib/libbsp/arm/gdbarmsim/configure.ac
index 5733553126..b5385d98c4 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/configure.ac
+++ b/c/src/lib/libbsp/arm/gdbarmsim/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-gdbarmsim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/arm1136jfs.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/preinstall.am b/c/src/lib/libbsp/arm/gdbarmsim/preinstall.am
deleted file mode 100644
index 03cc4ca9a3..0000000000
--- a/c/src/lib/libbsp/arm/gdbarmsim/preinstall.am
+++ /dev/null
@@ -1,87 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/swi.h: include/swi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/swi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/swi.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/bsp_specs b/c/src/lib/libbsp/arm/gdbarmsim/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/bsp_specs
+++ b/c/src/lib/libbsp/arm/gdbarmsim/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am
index 5fb8d708bf..d4793d6acd 100644
--- a/c/src/lib/libbsp/arm/gumstix/Makefile.am
+++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am
@@ -4,19 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_HEADERS += include/pxa255.h
-include_HEADERS += include/ffuart.h
-
-include_bsp_HEADERS =
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -26,7 +15,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 
@@ -48,9 +37,6 @@ libbsp_a_SOURCES += console/uarts.c ../../shared/console.c \
   ../../shared/console_read.c ../../shared/console_write.c 
 libbsp_a_SOURCES += console/ffuart.c
 # IRQ
-include_bsp_HEADERS += ../../shared/include/irq-generic.h \
-	../../shared/include/irq-info.h
-include_bsp_HEADERS += include/bsp/irq.h
 libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
 libbsp_a_SOURCES += ../../shared/src/irq-generic.c
 libbsp_a_SOURCES += ../../shared/src/irq-info.c
@@ -84,5 +70,5 @@ libbsp_a_LIBADD += rtl8019.rel
 endif
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/gumstix/headers.am
diff --git a/c/src/lib/libbsp/arm/gumstix/configure.ac b/c/src/lib/libbsp/arm/gumstix/configure.ac
index 037990be57..299085bb17 100644
--- a/c/src/lib/libbsp/arm/gumstix/configure.ac
+++ b/c/src/lib/libbsp/arm/gumstix/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-gumstix],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/gumstix.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/gumstix/preinstall.am b/c/src/lib/libbsp/arm/gumstix/preinstall.am
deleted file mode 100644
index 99477a8ded..0000000000
--- a/c/src/lib/libbsp/arm/gumstix/preinstall.am
+++ /dev/null
@@ -1,87 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/pxa255.h: include/pxa255.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pxa255.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pxa255.h
-
-$(PROJECT_INCLUDE)/ffuart.h: include/ffuart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ffuart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ffuart.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-if ON_SKYEYE
-endif
-if ON_SKYEYE
-endif
diff --git a/c/src/lib/libbsp/arm/gumstix/bsp_specs b/c/src/lib/libbsp/arm/gumstix/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/gumstix/bsp_specs
+++ b/c/src/lib/libbsp/arm/gumstix/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am b/c/src/lib/libbsp/arm/imx/Makefile.am
index 9addb13bc5..bc2f6acf53 100644
--- a/c/src/lib/libbsp/arm/imx/Makefile.am
+++ b/c/src/lib/libbsp/arm/imx/Makefile.am
@@ -4,50 +4,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_arm_freescale_imxdir = $(includedir)/arm/freescale/imx
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-regs.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-start.h
-include_bsp_HEADERS += ../shared/include/arm-cp15-start.h
-include_bsp_HEADERS += ../shared/include/arm-errata.h
-include_bsp_HEADERS += ../shared/include/arm-gic.h
-include_bsp_HEADERS += ../shared/include/arm-gic-irq.h
-include_bsp_HEADERS += ../shared/include/arm-gic-regs.h
-include_bsp_HEADERS += ../shared/include/arm-gic-tm27.h
-include_bsp_HEADERS += ../shared/include/arm-release-id.h
-include_bsp_HEADERS += include/irq.h
-
-include_arm_freescale_imx_HEADERS =
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_ccmvar.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_ecspireg.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_gpcreg.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_i2creg.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_iomuxreg.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_iomuxvar.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_srcreg.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_uartreg.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_wdogreg.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -57,8 +19,8 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += startup/linkcmds.imx7
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.imx7
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -67,7 +29,7 @@ project_lib_DATA += startup/linkcmds.imx7
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -134,5 +96,5 @@ libbsp_a_SOURCES += startup/bspstarthooks.c
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/imx/headers.am
diff --git a/c/src/lib/libbsp/arm/imx/configure.ac b/c/src/lib/libbsp/arm/imx/configure.ac
index bb29efd64e..318c4e9c10 100644
--- a/c/src/lib/libbsp/arm/imx/configure.ac
+++ b/c/src/lib/libbsp/arm/imx/configure.ac
@@ -2,6 +2,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-imx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/imx7.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -58,7 +61,6 @@ RTEMS_CHECK_SMP
 AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/imx/preinstall.am b/c/src/lib/libbsp/arm/imx/preinstall.am
deleted file mode 100644
index 82b3e691a5..0000000000
--- a/c/src/lib/libbsp/arm/imx/preinstall.am
+++ /dev/null
@@ -1,168 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/arm/freescale/imx
-	@: > $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h: ../shared/include/arm-a9mpcore-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h: ../shared/include/arm-a9mpcore-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-cp15-start.h: ../shared/include/arm-cp15-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-errata.h: ../shared/include/arm-errata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-errata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-errata.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic.h: ../shared/include/arm-gic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-irq.h: ../shared/include/arm-gic-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-regs.h: ../shared/include/arm-gic-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h: ../shared/include/arm-gic-tm27.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-
-$(PROJECT_INCLUDE)/bsp/arm-release-id.h: ../shared/include/arm-release-id.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_ccmvar.h: include/arm/freescale/imx/imx_ccmvar.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_ccmvar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_ccmvar.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_ecspireg.h: include/arm/freescale/imx/imx_ecspireg.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_ecspireg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_ecspireg.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_gpcreg.h: include/arm/freescale/imx/imx_gpcreg.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_gpcreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_gpcreg.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_i2creg.h: include/arm/freescale/imx/imx_i2creg.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_i2creg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_i2creg.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_iomuxreg.h: include/arm/freescale/imx/imx_iomuxreg.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_iomuxreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_iomuxreg.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_iomuxvar.h: include/arm/freescale/imx/imx_iomuxvar.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_iomuxvar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_iomuxvar.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_srcreg.h: include/arm/freescale/imx/imx_srcreg.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_srcreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_srcreg.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_uartreg.h: include/arm/freescale/imx/imx_uartreg.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_uartreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_uartreg.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_wdogreg.h: include/arm/freescale/imx/imx_wdogreg.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_wdogreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_wdogreg.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.imx7: startup/linkcmds.imx7 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.imx7
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.imx7
-
diff --git a/c/src/lib/libbsp/arm/imx/bsp_specs b/c/src/lib/libbsp/arm/imx/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/imx/bsp_specs
+++ b/c/src/lib/libbsp/arm/imx/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
index 6b950c27ab..3e5e0e1556 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
@@ -4,51 +4,26 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
 
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 EXTRA_DIST += ../shared/start/start.S
 start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-
-EXTRA_DIST += startup/linkcmds.lm3s6965 startup/linkcmds.lm3s6965_qemu startup/linkcmds.lm3s3749
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.lm3s3749
+dist_project_lib_DATA += startup/linkcmds.lm3s6965
+dist_project_lib_DATA += startup/linkcmds.lm3s6965_qemu
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS =
-include_HEADERS += include/tm27.h
-include_HEADERS += include/bsp.h
-
-nodist_include_HEADERS =
-nodist_include_HEADERS += include/bspopts.h
-
-nodist_include_bsp_HEADERS =
-nodist_include_bsp_HEADERS += ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/armv7m/include/armv7m-irq.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/uart.h
-include_bsp_HEADERS += include/io.h
-include_bsp_HEADERS += include/syscon.h
-include_bsp_HEADERS += include/ssi.h
-include_bsp_HEADERS += include/lm3s69xx.h
-
 ###############################################################################
 #                  LibBSP                                                     #
 ###############################################################################
@@ -56,7 +31,7 @@ include_bsp_HEADERS += include/lm3s69xx.h
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -119,5 +94,5 @@ libbsp_a_SOURCES += ssi/ssi.c
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/lm3s69xx/headers.am
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/configure.ac b/c/src/lib/libbsp/arm/lm3s69xx/configure.ac
index a373e2557c..b02e213b40 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/configure.ac
+++ b/c/src/lib/libbsp/arm/lm3s69xx/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-lm3s69xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/lm3s3749.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -75,7 +78,6 @@ RTEMS_BSPOPTS_SET([LM3S69XX_MCU_LM4F120],[lm4f120*],[1])
 RTEMS_BSPOPTS_HELP([LM3S69XX_MCU_LM4F120],[board has LM4F120xxx MCU])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/preinstall.am b/c/src/lib/libbsp/arm/lm3s69xx/preinstall.am
deleted file mode 100644
index e305a06ea7..0000000000
--- a/c/src/lib/libbsp/arm/lm3s69xx/preinstall.am
+++ /dev/null
@@ -1,111 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/armv7m-irq.h: ../shared/armv7m/include/armv7m-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/uart.h: include/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
-
-$(PROJECT_INCLUDE)/bsp/io.h: include/io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/io.h
-
-$(PROJECT_INCLUDE)/bsp/syscon.h: include/syscon.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/syscon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/syscon.h
-
-$(PROJECT_INCLUDE)/bsp/ssi.h: include/ssi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ssi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ssi.h
-
-$(PROJECT_INCLUDE)/bsp/lm3s69xx.h: include/lm3s69xx.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lm3s69xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lm3s69xx.h
-
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/bsp_specs b/c/src/lib/libbsp/arm/lm3s69xx/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/bsp_specs
+++ b/c/src/lib/libbsp/arm/lm3s69xx/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
index 4e2d98bfbf..634df1a609 100644
--- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
@@ -11,56 +11,13 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 
 # ----------------------------
 # ------  Headers
 # ----------------------------
 
-include_HEADERS = include/bsp.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/uart-output-char.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-i2s.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.h
-include_bsp_HEADERS += ../shared/armv7m/include/armv7m-irq.h
-include_bsp_HEADERS += include/dma.h
-include_bsp_HEADERS += include/io-defs.h
-include_bsp_HEADERS += include/io.h
-include_bsp_HEADERS += include/common-types.h
-include_bsp_HEADERS += include/gpio-defs.h
-include_bsp_HEADERS += include/lpc-gpio.h
-include_bsp_HEADERS += include/can.h
-include_bsp_HEADERS += include/can-defs.h
-include_bsp_HEADERS += include/pwmout.h
-include_bsp_HEADERS += include/pwmout-defs.h
-include_bsp_HEADERS += include/adc.h
-include_bsp_HEADERS += include/adc-defs.h
-include_bsp_HEADERS += include/timer-defs.h
-include_bsp_HEADERS += include/timer.h
-include_bsp_HEADERS += include/watchdog.h
-include_bsp_HEADERS += include/watchdog-defs.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/lpc176x.h
-include_bsp_HEADERS += include/lpc-clock-config.h
-include_bsp_HEADERS += include/system-clocks.h
-include_bsp_HEADERS += include/mbed-pinmap.h
-
-include_HEADERS += include/tm27.h
-
 
 # ----------------------------
 # ------  Data
@@ -70,12 +27,11 @@ EXTRA_DIST += ../shared/start/start.S
 start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
-project_lib_DATA += startup/linkcmds
-
-EXTRA_DIST += startup/linkcmds.lpc1768_mbed
-EXTRA_DIST += startup/linkcmds.lpc1768_mbed_ahb_ram
-EXTRA_DIST += startup/linkcmds.lpc1768_mbed_ahb_ram_eth
 
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.lpc1768_mbed
+dist_project_lib_DATA += startup/linkcmds.lpc1768_mbed_ahb_ram
+dist_project_lib_DATA += startup/linkcmds.lpc1768_mbed_ahb_ram_eth
 
 # ----------------------------
 # ------  LibBSP
@@ -84,7 +40,7 @@ EXTRA_DIST += startup/linkcmds.lpc1768_mbed_ahb_ram_eth
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -172,5 +128,5 @@ libbsp_a_SOURCES += startup/bspstarthooks.c
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/lpc176x/headers.am
diff --git a/c/src/lib/libbsp/arm/lpc176x/configure.ac b/c/src/lib/libbsp/arm/lpc176x/configure.ac
index dae4322987..b64bef7463 100644
--- a/c/src/lib/libbsp/arm/lpc176x/configure.ac
+++ b/c/src/lib/libbsp/arm/lpc176x/configure.ac
@@ -10,6 +10,9 @@ AC_INIT([rtems-c-src-lib-libbsp-arm-lpc176x],[_RTEMS_VERSION],
 				[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/lpc1768_mbed_ahb_ram.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -68,7 +71,6 @@ RTEMS_BSPOPTS_SET([LPC_DMA_CHANNEL_COUNT],[*],[2])
 RTEMS_BSPOPTS_HELP([LPC_DMA_CHANNEL_COUNT],[DMA channel count])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/lpc176x/preinstall.am b/c/src/lib/libbsp/arm/lpc176x/preinstall.am
deleted file mode 100644
index 1ecae367c7..0000000000
--- a/c/src/lib/libbsp/arm/lpc176x/preinstall.am
+++ /dev/null
@@ -1,187 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-timer.h: ../shared/lpc/include/lpc-timer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-i2s.h: ../shared/lpc/include/lpc-i2s.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-i2s.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-i2s.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-dma.h: ../shared/lpc/include/lpc-dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-
-$(PROJECT_INCLUDE)/bsp/armv7m-irq.h: ../shared/armv7m/include/armv7m-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-
-$(PROJECT_INCLUDE)/bsp/dma.h: include/dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/dma.h
-
-$(PROJECT_INCLUDE)/bsp/io-defs.h: include/io-defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/io-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/io-defs.h
-
-$(PROJECT_INCLUDE)/bsp/io.h: include/io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/io.h
-
-$(PROJECT_INCLUDE)/bsp/common-types.h: include/common-types.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/common-types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/common-types.h
-
-$(PROJECT_INCLUDE)/bsp/gpio-defs.h: include/gpio-defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpio-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpio-defs.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-gpio.h: include/lpc-gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-gpio.h
-
-$(PROJECT_INCLUDE)/bsp/can.h: include/can.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/can.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/can.h
-
-$(PROJECT_INCLUDE)/bsp/can-defs.h: include/can-defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/can-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/can-defs.h
-
-$(PROJECT_INCLUDE)/bsp/pwmout.h: include/pwmout.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pwmout.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pwmout.h
-
-$(PROJECT_INCLUDE)/bsp/pwmout-defs.h: include/pwmout-defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pwmout-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pwmout-defs.h
-
-$(PROJECT_INCLUDE)/bsp/adc.h: include/adc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/adc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/adc.h
-
-$(PROJECT_INCLUDE)/bsp/adc-defs.h: include/adc-defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/adc-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/adc-defs.h
-
-$(PROJECT_INCLUDE)/bsp/timer-defs.h: include/timer-defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/timer-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/timer-defs.h
-
-$(PROJECT_INCLUDE)/bsp/timer.h: include/timer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/timer.h
-
-$(PROJECT_INCLUDE)/bsp/watchdog.h: include/watchdog.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/watchdog.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/watchdog.h
-
-$(PROJECT_INCLUDE)/bsp/watchdog-defs.h: include/watchdog-defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/watchdog-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/watchdog-defs.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/lpc176x.h: include/lpc176x.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc176x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc176x.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-clock-config.h: include/lpc-clock-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-clock-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-clock-config.h
-
-$(PROJECT_INCLUDE)/bsp/system-clocks.h: include/system-clocks.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/system-clocks.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/system-clocks.h
-
-$(PROJECT_INCLUDE)/bsp/mbed-pinmap.h: include/mbed-pinmap.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mbed-pinmap.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mbed-pinmap.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/arm/lpc176x/bsp_specs b/c/src/lib/libbsp/arm/lpc176x/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/lpc176x/bsp_specs
+++ b/c/src/lib/libbsp/arm/lpc176x/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
index 1473a7bc56..f47733279c 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
@@ -11,50 +11,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/uart-output-char.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/arm-pl111-fb.h
-include_bsp_HEADERS += ../shared/include/arm-pl111-regs.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-i2s.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-emc.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-lcd.h
-include_bsp_HEADERS += ../shared/armv7m/include/armv7m-irq.h
-include_bsp_HEADERS += include/dma.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/io.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/lcd.h
-include_bsp_HEADERS += include/lpc17xx.h
-include_bsp_HEADERS += include/lpc24xx.h
-include_bsp_HEADERS += include/lpc-clock-config.h
-include_bsp_HEADERS += include/lpc-ethernet-config.h
-include_bsp_HEADERS += include/ssp.h
-include_bsp_HEADERS += include/start-config.h
-include_bsp_HEADERS += include/system-clocks.h
-
-include_HEADERS += include/tm27.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -64,21 +26,21 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += startup/linkcmds.lpc17xx_ea_ram
-project_lib_DATA += startup/linkcmds.lpc17xx_ea_rom_int
-project_lib_DATA += startup/linkcmds.lpc17xx_plx800_ram
-project_lib_DATA += startup/linkcmds.lpc17xx_plx800_rom_int
-project_lib_DATA += startup/linkcmds.lpc2362
-project_lib_DATA += startup/linkcmds.lpc23xx_tli800
-project_lib_DATA += startup/linkcmds.lpc24xx_ea
-project_lib_DATA += startup/linkcmds.lpc24xx_ncs_ram
-project_lib_DATA += startup/linkcmds.lpc24xx_ncs_rom_ext
-project_lib_DATA += startup/linkcmds.lpc24xx_ncs_rom_int
-project_lib_DATA += startup/linkcmds.lpc24xx_plx800_ram
-project_lib_DATA += startup/linkcmds.lpc24xx_plx800_rom_int
-project_lib_DATA += startup/linkcmds.lpc40xx_ea_ram
-project_lib_DATA += startup/linkcmds.lpc40xx_ea_rom_int
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.lpc17xx_ea_ram
+dist_project_lib_DATA += startup/linkcmds.lpc17xx_ea_rom_int
+dist_project_lib_DATA += startup/linkcmds.lpc17xx_plx800_ram
+dist_project_lib_DATA += startup/linkcmds.lpc17xx_plx800_rom_int
+dist_project_lib_DATA += startup/linkcmds.lpc2362
+dist_project_lib_DATA += startup/linkcmds.lpc23xx_tli800
+dist_project_lib_DATA += startup/linkcmds.lpc24xx_ea
+dist_project_lib_DATA += startup/linkcmds.lpc24xx_ncs_ram
+dist_project_lib_DATA += startup/linkcmds.lpc24xx_ncs_rom_ext
+dist_project_lib_DATA += startup/linkcmds.lpc24xx_ncs_rom_int
+dist_project_lib_DATA += startup/linkcmds.lpc24xx_plx800_ram
+dist_project_lib_DATA += startup/linkcmds.lpc24xx_plx800_rom_int
+dist_project_lib_DATA += startup/linkcmds.lpc40xx_ea_ram
+dist_project_lib_DATA += startup/linkcmds.lpc40xx_ea_rom_int
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -87,7 +49,7 @@ project_lib_DATA += startup/linkcmds.lpc40xx_ea_rom_int
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -192,5 +154,5 @@ endif
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/lpc24xx/headers.am
diff --git a/c/src/lib/libbsp/arm/lpc24xx/configure.ac b/c/src/lib/libbsp/arm/lpc24xx/configure.ac
index 14c242c790..50b654fd8e 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/configure.ac
+++ b/c/src/lib/libbsp/arm/lpc24xx/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-lpc24xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/lpc17xx_ea_ram.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -123,7 +126,6 @@ RTEMS_BSPOPTS_SET([BSP_USB_OTG_TRANSCEIVER_I2C_ADDR],[lpc17xx_ea* | lpc40xx_ea*]
 RTEMS_BSPOPTS_HELP([BSP_USB_OTG_TRANSCEIVER_I2C_ADDR],[USB OTG transceiver I2C address used by USB stack])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am
deleted file mode 100644
index e77853f3d7..0000000000
--- a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am
+++ /dev/null
@@ -1,223 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-pl111-fb.h: ../shared/include/arm-pl111-fb.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl111-fb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl111-fb.h
-
-$(PROJECT_INCLUDE)/bsp/arm-pl111-regs.h: ../shared/include/arm-pl111-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl111-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl111-regs.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-timer.h: ../shared/lpc/include/lpc-timer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-i2s.h: ../shared/lpc/include/lpc-i2s.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-i2s.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-i2s.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-emc.h: ../shared/lpc/include/lpc-emc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-emc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-emc.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-dma.h: ../shared/lpc/include/lpc-dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-lcd.h: ../shared/lpc/include/lpc-lcd.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-lcd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-lcd.h
-
-$(PROJECT_INCLUDE)/bsp/armv7m-irq.h: ../shared/armv7m/include/armv7m-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-
-$(PROJECT_INCLUDE)/bsp/dma.h: include/dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/dma.h
-
-$(PROJECT_INCLUDE)/bsp/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2c.h
-
-$(PROJECT_INCLUDE)/bsp/io.h: include/io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/io.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/lcd.h: include/lcd.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lcd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lcd.h
-
-$(PROJECT_INCLUDE)/bsp/lpc17xx.h: include/lpc17xx.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc17xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc17xx.h
-
-$(PROJECT_INCLUDE)/bsp/lpc24xx.h: include/lpc24xx.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc24xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc24xx.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-clock-config.h: include/lpc-clock-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-clock-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-clock-config.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-ethernet-config.h: include/lpc-ethernet-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-ethernet-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-ethernet-config.h
-
-$(PROJECT_INCLUDE)/bsp/ssp.h: include/ssp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ssp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ssp.h
-
-$(PROJECT_INCLUDE)/bsp/start-config.h: include/start-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start-config.h
-
-$(PROJECT_INCLUDE)/bsp/system-clocks.h: include/system-clocks.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/system-clocks.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/system-clocks.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.lpc17xx_ea_ram: startup/linkcmds.lpc17xx_ea_ram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc17xx_ea_ram
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc17xx_ea_ram
-
-$(PROJECT_LIB)/linkcmds.lpc17xx_ea_rom_int: startup/linkcmds.lpc17xx_ea_rom_int $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc17xx_ea_rom_int
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc17xx_ea_rom_int
-
-$(PROJECT_LIB)/linkcmds.lpc17xx_plx800_ram: startup/linkcmds.lpc17xx_plx800_ram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc17xx_plx800_ram
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc17xx_plx800_ram
-
-$(PROJECT_LIB)/linkcmds.lpc17xx_plx800_rom_int: startup/linkcmds.lpc17xx_plx800_rom_int $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc17xx_plx800_rom_int
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc17xx_plx800_rom_int
-
-$(PROJECT_LIB)/linkcmds.lpc2362: startup/linkcmds.lpc2362 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc2362
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc2362
-
-$(PROJECT_LIB)/linkcmds.lpc23xx_tli800: startup/linkcmds.lpc23xx_tli800 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc23xx_tli800
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc23xx_tli800
-
-$(PROJECT_LIB)/linkcmds.lpc24xx_ea: startup/linkcmds.lpc24xx_ea $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_ea
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_ea
-
-$(PROJECT_LIB)/linkcmds.lpc24xx_ncs_ram: startup/linkcmds.lpc24xx_ncs_ram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_ram
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_ram
-
-$(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_ext: startup/linkcmds.lpc24xx_ncs_rom_ext $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_ext
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_ext
-
-$(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_int: startup/linkcmds.lpc24xx_ncs_rom_int $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_int
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_int
-
-$(PROJECT_LIB)/linkcmds.lpc24xx_plx800_ram: startup/linkcmds.lpc24xx_plx800_ram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_plx800_ram
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_plx800_ram
-
-$(PROJECT_LIB)/linkcmds.lpc24xx_plx800_rom_int: startup/linkcmds.lpc24xx_plx800_rom_int $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_plx800_rom_int
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_plx800_rom_int
-
-$(PROJECT_LIB)/linkcmds.lpc40xx_ea_ram: startup/linkcmds.lpc40xx_ea_ram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc40xx_ea_ram
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc40xx_ea_ram
-
-$(PROJECT_LIB)/linkcmds.lpc40xx_ea_rom_int: startup/linkcmds.lpc40xx_ea_rom_int $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc40xx_ea_rom_int
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc40xx_ea_rom_int
-
diff --git a/c/src/lib/libbsp/arm/lpc24xx/bsp_specs b/c/src/lib/libbsp/arm/lpc24xx/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/bsp_specs
+++ b/c/src/lib/libbsp/arm/lpc24xx/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
index df6353da88..d92bccceac 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
@@ -11,47 +11,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/uart-output-char.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/arm-cp15-start.h
-include_bsp_HEADERS += ../shared/include/arm-errata.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-i2s.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-emc.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-lcd.h
-include_bsp_HEADERS += ../shared/include/arm-release-id.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/mmu.h
-include_bsp_HEADERS += include/lpc32xx.h
-include_bsp_HEADERS += include/lpc-clock-config.h
-include_bsp_HEADERS += include/lpc-ethernet-config.h
-include_bsp_HEADERS += include/nand-mlc.h
-include_bsp_HEADERS += include/boot.h
-include_bsp_HEADERS += include/hsu.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/emc.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -61,13 +26,12 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += startup/linkcmds.lpc32xx
-
-EXTRA_DIST += startup/linkcmds.lpc32xx_phycore \
-	startup/linkcmds.lpc32xx_mzx_stage_1 \
-	startup/linkcmds.lpc32xx_mzx_stage_2 \
-	startup/linkcmds.lpc32xx_mzx
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.lpc32xx
+dist_project_lib_DATA += startup/linkcmds.lpc32xx_phycore
+dist_project_lib_DATA += startup/linkcmds.lpc32xx_mzx_stage_1
+dist_project_lib_DATA += startup/linkcmds.lpc32xx_mzx_stage_2
+dist_project_lib_DATA += startup/linkcmds.lpc32xx_mzx
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -76,7 +40,7 @@ EXTRA_DIST += startup/linkcmds.lpc32xx_phycore \
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -170,5 +134,5 @@ endif
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/lpc32xx/headers.am
diff --git a/c/src/lib/libbsp/arm/lpc32xx/configure.ac b/c/src/lib/libbsp/arm/lpc32xx/configure.ac
index 553d1ce314..1383d97c89 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/configure.ac
+++ b/c/src/lib/libbsp/arm/lpc32xx/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-lpc32xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/lpc32xx_mzx.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -106,7 +109,6 @@ RTEMS_BSPOPTS_SET([TESTS_USE_PRINTK],[*],[1])
 RTEMS_BSPOPTS_HELP([TESTS_USE_PRINTK],[tests use printk() for output])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/lpc32xx/preinstall.am b/c/src/lib/libbsp/arm/lpc32xx/preinstall.am
deleted file mode 100644
index bc2133286c..0000000000
--- a/c/src/lib/libbsp/arm/lpc32xx/preinstall.am
+++ /dev/null
@@ -1,163 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-cp15-start.h: ../shared/include/arm-cp15-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-errata.h: ../shared/include/arm-errata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-errata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-errata.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-timer.h: ../shared/lpc/include/lpc-timer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-dma.h: ../shared/lpc/include/lpc-dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-i2s.h: ../shared/lpc/include/lpc-i2s.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-i2s.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-i2s.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-emc.h: ../shared/lpc/include/lpc-emc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-emc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-emc.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-lcd.h: ../shared/lpc/include/lpc-lcd.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-lcd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-lcd.h
-
-$(PROJECT_INCLUDE)/bsp/arm-release-id.h: ../shared/include/arm-release-id.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/mmu.h: include/mmu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mmu.h
-
-$(PROJECT_INCLUDE)/bsp/lpc32xx.h: include/lpc32xx.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc32xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc32xx.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-clock-config.h: include/lpc-clock-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-clock-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-clock-config.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-ethernet-config.h: include/lpc-ethernet-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-ethernet-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-ethernet-config.h
-
-$(PROJECT_INCLUDE)/bsp/nand-mlc.h: include/nand-mlc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/nand-mlc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/nand-mlc.h
-
-$(PROJECT_INCLUDE)/bsp/boot.h: include/boot.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/boot.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/boot.h
-
-$(PROJECT_INCLUDE)/bsp/hsu.h: include/hsu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/hsu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/hsu.h
-
-$(PROJECT_INCLUDE)/bsp/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2c.h
-
-$(PROJECT_INCLUDE)/bsp/emc.h: include/emc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/emc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/emc.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.lpc32xx: startup/linkcmds.lpc32xx $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc32xx
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc32xx
-
diff --git a/c/src/lib/libbsp/arm/lpc32xx/bsp_specs b/c/src/lib/libbsp/arm/lpc32xx/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/bsp_specs
+++ b/c/src/lib/libbsp/arm/lpc32xx/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/preinstall.am b/c/src/lib/libbsp/arm/preinstall.am
deleted file mode 100644
index 3e66ebea32..0000000000
--- a/c/src/lib/libbsp/arm/preinstall.am
+++ /dev/null
@@ -1,41 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_LIB)/linkcmds.base: shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds.armv4: shared/startup/linkcmds.armv4 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.armv4
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.armv4
-
-$(PROJECT_LIB)/linkcmds.armv7m: shared/startup/linkcmds.armv7m $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.armv7m
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.armv7m
-
diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
index 8ed1aac5be..9404677c07 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
+++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
@@ -11,50 +11,14 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 # Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
 noinst_HEADERS = console/font_data.h
 
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../../libbsp/shared/include/mm.h
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/uart-output-char.h
-include_bsp_HEADERS += ../../shared/include/gpio.h
-include_bsp_HEADERS += ../shared/include/linker-symbols.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/arm-cp15-start.h
-include_bsp_HEADERS += ../shared/include/arm-errata.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.h
-include_bsp_HEADERS += ../shared/include/arm-release-id.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/mmu.h
-include_bsp_HEADERS += include/usart.h
-include_bsp_HEADERS += include/raspberrypi.h
-include_bsp_HEADERS += include/rpi-gpio.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/spi.h
-include_bsp_HEADERS += include/mailbox.h
-include_bsp_HEADERS += include/vc.h
-include_bsp_HEADERS += include/rpi-fb.h
-include_bsp_HEADERS += console/fbcons.h
-
 ###############################################################################
 # Data                                                       #
 ###############################################################################
@@ -64,8 +28,7 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += ../shared/startup/linkcmds.base
+project_lib_DATA += linkcmds
 
 ###############################################################################
 # LibBSP                                                     #
@@ -74,7 +37,7 @@ project_lib_DATA += ../shared/startup/linkcmds.base
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -188,5 +151,5 @@ libbsp_a_SOURCES += ../shared/mminit.c
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/raspberrypi/headers.am
diff --git a/c/src/lib/libbsp/arm/raspberrypi/configure.ac b/c/src/lib/libbsp/arm/raspberrypi/configure.ac
index 6d771a4a0c..97e74d9a42 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/configure.ac
+++ b/c/src/lib/libbsp/arm/raspberrypi/configure.ac
@@ -9,6 +9,8 @@ AC_PREREQ([2.68])
 AC_INIT([rtems-c-src-lib-libbsp-arm-raspberrypi],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/raspberrypi.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -58,5 +60,5 @@ RTEMS_BSP_CLEANUP_OPTIONS
 
 AC_CONFIG_FILES([
 Makefile
-startup/linkcmds])
+linkcmds:startup/linkcmds.in])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/raspberrypi/preinstall.am b/c/src/lib/libbsp/arm/raspberrypi/preinstall.am
deleted file mode 100644
index 9dca9cfafe..0000000000
--- a/c/src/lib/libbsp/arm/raspberrypi/preinstall.am
+++ /dev/null
@@ -1,167 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/mm.h: ../../../libbsp/shared/include/mm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mm.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-
-$(PROJECT_INCLUDE)/bsp/gpio.h: ../../shared/include/gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpio.h
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-cp15-start.h: ../shared/include/arm-cp15-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-errata.h: ../shared/include/arm-errata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-errata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-errata.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-timer.h: ../shared/lpc/include/lpc-timer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-dma.h: ../shared/lpc/include/lpc-dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-
-$(PROJECT_INCLUDE)/bsp/arm-release-id.h: ../shared/include/arm-release-id.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/mmu.h: include/mmu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mmu.h
-
-$(PROJECT_INCLUDE)/bsp/usart.h: include/usart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/usart.h
-
-$(PROJECT_INCLUDE)/bsp/raspberrypi.h: include/raspberrypi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/raspberrypi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/raspberrypi.h
-
-$(PROJECT_INCLUDE)/bsp/rpi-gpio.h: include/rpi-gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/rpi-gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/rpi-gpio.h
-
-$(PROJECT_INCLUDE)/bsp/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2c.h
-
-$(PROJECT_INCLUDE)/bsp/spi.h: include/spi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spi.h
-
-$(PROJECT_INCLUDE)/bsp/mailbox.h: include/mailbox.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mailbox.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mailbox.h
-
-$(PROJECT_INCLUDE)/bsp/vc.h: include/vc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vc.h
-
-$(PROJECT_INCLUDE)/bsp/rpi-fb.h: include/rpi-fb.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/rpi-fb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/rpi-fb.h
-
-$(PROJECT_INCLUDE)/bsp/fbcons.h: console/fbcons.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/fbcons.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/fbcons.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
diff --git a/c/src/lib/libbsp/arm/raspberrypi/bsp_specs b/c/src/lib/libbsp/arm/raspberrypi/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/bsp_specs
+++ b/c/src/lib/libbsp/arm/raspberrypi/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
index 9cd72c37ab..21365156bd 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
@@ -11,46 +11,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-clock.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-irq.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-regs.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-start.h
-include_bsp_HEADERS += ../shared/include/arm-cp15-start.h
-include_bsp_HEADERS += ../shared/include/arm-errata.h
-include_bsp_HEADERS += ../shared/include/arm-gic.h
-include_bsp_HEADERS += ../shared/include/arm-gic-irq.h
-include_bsp_HEADERS += ../shared/include/arm-gic-regs.h
-include_bsp_HEADERS += ../shared/include/arm-gic-tm27.h
-include_bsp_HEADERS += ../shared/include/arm-pl011.h
-include_bsp_HEADERS += ../shared/include/arm-pl011-regs.h
-include_bsp_HEADERS += ../shared/include/arm-pl050.h
-include_bsp_HEADERS += ../shared/include/arm-pl050-regs.h
-include_bsp_HEADERS += ../shared/include/arm-pl111-fb.h
-include_bsp_HEADERS += ../shared/include/arm-pl111-regs.h
-include_bsp_HEADERS += ../shared/include/arm-release-id.h
-include_bsp_HEADERS += include/irq.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -60,9 +26,9 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += startup/linkcmds.realview_pbx_a9_qemu
-project_lib_DATA += startup/linkcmds.realview_pbx_a9_qemu_smp
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.realview_pbx_a9_qemu
+dist_project_lib_DATA += startup/linkcmds.realview_pbx_a9_qemu_smp
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -71,7 +37,7 @@ project_lib_DATA += startup/linkcmds.realview_pbx_a9_qemu_smp
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -137,5 +103,5 @@ libbsp_a_SOURCES += startup/fb-config.c
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/realview-pbx-a9/headers.am
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac b/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac
index f01e216bdf..8674da3e5a 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-realview-bpx-a9],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/realview_pbx_a9_qemu.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -50,7 +53,6 @@ RTEMS_CHECK_SMP
 AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/preinstall.am b/c/src/lib/libbsp/arm/realview-pbx-a9/preinstall.am
deleted file mode 100644
index 67516649c4..0000000000
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/preinstall.am
+++ /dev/null
@@ -1,163 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h: ../shared/include/arm-a9mpcore-clock.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h: ../shared/include/arm-a9mpcore-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h: ../shared/include/arm-a9mpcore-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h: ../shared/include/arm-a9mpcore-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-cp15-start.h: ../shared/include/arm-cp15-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-errata.h: ../shared/include/arm-errata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-errata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-errata.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic.h: ../shared/include/arm-gic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-irq.h: ../shared/include/arm-gic-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-regs.h: ../shared/include/arm-gic-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h: ../shared/include/arm-gic-tm27.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-
-$(PROJECT_INCLUDE)/bsp/arm-pl011.h: ../shared/include/arm-pl011.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl011.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl011.h
-
-$(PROJECT_INCLUDE)/bsp/arm-pl011-regs.h: ../shared/include/arm-pl011-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl011-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl011-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-pl050.h: ../shared/include/arm-pl050.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl050.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl050.h
-
-$(PROJECT_INCLUDE)/bsp/arm-pl050-regs.h: ../shared/include/arm-pl050-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl050-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl050-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-pl111-fb.h: ../shared/include/arm-pl111-fb.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl111-fb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl111-fb.h
-
-$(PROJECT_INCLUDE)/bsp/arm-pl111-regs.h: ../shared/include/arm-pl111-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl111-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl111-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-release-id.h: ../shared/include/arm-release-id.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.realview_pbx_a9_qemu: startup/linkcmds.realview_pbx_a9_qemu $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.realview_pbx_a9_qemu
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.realview_pbx_a9_qemu
-
-$(PROJECT_LIB)/linkcmds.realview_pbx_a9_qemu_smp: startup/linkcmds.realview_pbx_a9_qemu_smp $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.realview_pbx_a9_qemu_smp
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.realview_pbx_a9_qemu_smp
-
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/bsp_specs b/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/bsp_specs
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index 8be245e6a5..f4b164364d 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -4,18 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_HEADERS += include/lpc22xx.h
-
-include_bsp_HEADERS =
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
@@ -26,12 +16,11 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
 
-include_HEADERS += ../../arm/shared/comm/uart.h
 # startup
 libbsp_a_SOURCES += \
     ../../shared/bsppredriverhook.c \
@@ -49,9 +38,6 @@ libbsp_a_SOURCES += ../../shared/console.c \
     ../../shared/console_select.c ../../shared/console_control.c \
     ../../shared/console_read.c ../../shared/console_write.c
 # IRQ
-include_bsp_HEADERS += ../../shared/include/irq-generic.h \
-	../../shared/include/irq-info.h
-include_bsp_HEADERS += include/bsp/irq.h
 libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
 libbsp_a_SOURCES += ../../shared/src/irq-generic.c
 libbsp_a_SOURCES += ../../shared/src/irq-info.c
@@ -80,5 +66,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/rtl22xx/headers.am
diff --git a/c/src/lib/libbsp/arm/rtl22xx/configure.ac b/c/src/lib/libbsp/arm/rtl22xx/configure.ac
index 950d22f0f9..d8e7930004 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/configure.ac
+++ b/c/src/lib/libbsp/arm/rtl22xx/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-rtl22xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/rtl22xx.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/rtl22xx/preinstall.am b/c/src/lib/libbsp/arm/rtl22xx/preinstall.am
deleted file mode 100644
index 1748114195..0000000000
--- a/c/src/lib/libbsp/arm/rtl22xx/preinstall.am
+++ /dev/null
@@ -1,83 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/lpc22xx.h: include/lpc22xx.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/lpc22xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/lpc22xx.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/uart.h: ../../arm/shared/comm/uart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/uart.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
diff --git a/c/src/lib/libbsp/arm/rtl22xx/bsp_specs b/c/src/lib/libbsp/arm/rtl22xx/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/bsp_specs
+++ b/c/src/lib/libbsp/arm/rtl22xx/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
index 1fe3780e2a..45a280c504 100644
--- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am
+++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
@@ -4,22 +4,10 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include_HEADERS = include/bsp.h
-include_HEADERS += smc/smc.h
-include_HEADERS += include/tm27.h
-include_HEADERS += include/s3c24xx.h
-include_HEADERS += include/s3c2400.h
-include_HEADERS += include/s3c2410.h
-
-include_bsp_HEADERS =
-libbsp_a_CPPFLAGS =
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 EXTRA_DIST += start/start.S
@@ -27,7 +15,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -58,9 +46,6 @@ libbsp_a_SOURCES += ../../shared/console_read.c
 libbsp_a_SOURCES += ../../shared/console_write.c
 libbsp_a_SOURCES += ../../shared/console_control.c
 # IRQ
-include_bsp_HEADERS += ../../shared/include/irq-generic.h \
-	../../shared/include/irq-info.h
-include_bsp_HEADERS += include/bsp/irq.h
 libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
 libbsp_a_SOURCES += ../../shared/src/irq-generic.c
 libbsp_a_SOURCES += ../../shared/src/irq-info.c
@@ -80,5 +65,5 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../shared/armv467ar-basic-cache
 
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/smdk2410/headers.am
diff --git a/c/src/lib/libbsp/arm/smdk2410/configure.ac b/c/src/lib/libbsp/arm/smdk2410/configure.ac
index 7328ecb44c..c4dcf1d44d 100644
--- a/c/src/lib/libbsp/arm/smdk2410/configure.ac
+++ b/c/src/lib/libbsp/arm/smdk2410/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-smdk2410],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/smdk2410.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/smdk2410/preinstall.am b/c/src/lib/libbsp/arm/smdk2410/preinstall.am
deleted file mode 100644
index a049bab452..0000000000
--- a/c/src/lib/libbsp/arm/smdk2410/preinstall.am
+++ /dev/null
@@ -1,91 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/smc.h: smc/smc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/smc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/smc.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/s3c24xx.h: include/s3c24xx.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c24xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/s3c24xx.h
-
-$(PROJECT_INCLUDE)/s3c2400.h: include/s3c2400.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c2400.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/s3c2400.h
-
-$(PROJECT_INCLUDE)/s3c2410.h: include/s3c2410.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c2410.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/s3c2410.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
diff --git a/c/src/lib/libbsp/arm/smdk2410/bsp_specs b/c/src/lib/libbsp/arm/smdk2410/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/smdk2410/bsp_specs
+++ b/c/src/lib/libbsp/arm/smdk2410/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/stm32f4/Makefile.am b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
index b2e4544314..98abdc3415 100644
--- a/c/src/lib/libbsp/arm/stm32f4/Makefile.am
+++ b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
@@ -4,66 +4,25 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
 
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 EXTRA_DIST += ../shared/start/start.S
 start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-
-EXTRA_DIST += startup/linkcmds.stm32f4
-EXTRA_DIST += startup/linkcmds.stm32f105rc
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.stm32f105rc
+dist_project_lib_DATA += startup/linkcmds.stm32f4
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS =
-include_HEADERS += include/tm27.h
-include_HEADERS += include/bsp.h
-
-nodist_include_HEADERS =
-nodist_include_HEADERS += include/bspopts.h
-
-nodist_include_bsp_HEADERS =
-nodist_include_bsp_HEADERS += ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/armv7m/include/armv7m-irq.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/usart.h
-include_bsp_HEADERS += include/stm32f4.h
-include_bsp_HEADERS += include/stm32f10xxx_gpio.h
-include_bsp_HEADERS += include/stm32f10xxx_rcc.h
-include_bsp_HEADERS += include/stm32f10xxx_exti.h
-include_bsp_HEADERS += include/stm32f4xxxx_adc.h
-include_bsp_HEADERS += include/stm32f4xxxx_exti.h
-include_bsp_HEADERS += include/stm32f4xxxx_gpio.h
-include_bsp_HEADERS += include/stm32f4xxxx_rcc.h
-include_bsp_HEADERS += include/stm32f4xxxx_pwr.h
-include_bsp_HEADERS += include/stm32f4xxxx_syscfg.h
-include_bsp_HEADERS += include/stm32f4xxxx_tim.h
-include_bsp_HEADERS += include/stm32f4xxxx_flash.h
-include_bsp_HEADERS += include/stm32f4xxxx_otgfs.h
-include_bsp_HEADERS += include/stm32_i2c.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/stm32_usart.h
-include_bsp_HEADERS += include/io.h
-include_bsp_HEADERS += include/rcc.h
-
 ###############################################################################
 #                  LibBSP                                                     #
 ###############################################################################
@@ -71,7 +30,7 @@ include_bsp_HEADERS += include/rcc.h
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -136,5 +95,5 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../../../libcpu/arm/shared/include
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/stm32f4/headers.am
diff --git a/c/src/lib/libbsp/arm/stm32f4/configure.ac b/c/src/lib/libbsp/arm/stm32f4/configure.ac
index 4bf5871765..980a2acf79 100644
--- a/c/src/lib/libbsp/arm/stm32f4/configure.ac
+++ b/c/src/lib/libbsp/arm/stm32f4/configure.ac
@@ -2,6 +2,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-stm32f4],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/stm32f4.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -68,7 +71,6 @@ RTEMS_BSPOPTS_SET([STM32F4_ENABLE_I2C2],[*],[])
 RTEMS_BSPOPTS_HELP([STM32F4_ENABLE_I2C2],[enable I2C 2])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/stm32f4/preinstall.am b/c/src/lib/libbsp/arm/stm32f4/preinstall.am
deleted file mode 100644
index 50489450a0..0000000000
--- a/c/src/lib/libbsp/arm/stm32f4/preinstall.am
+++ /dev/null
@@ -1,167 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/armv7m-irq.h: ../shared/armv7m/include/armv7m-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/usart.h: include/usart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/usart.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4.h: include/stm32f4.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f10xxx_gpio.h: include/stm32f10xxx_gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f10xxx_gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f10xxx_gpio.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f10xxx_rcc.h: include/stm32f10xxx_rcc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f10xxx_rcc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f10xxx_rcc.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f10xxx_exti.h: include/stm32f10xxx_exti.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f10xxx_exti.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f10xxx_exti.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_adc.h: include/stm32f4xxxx_adc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_adc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_adc.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_exti.h: include/stm32f4xxxx_exti.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_exti.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_exti.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_gpio.h: include/stm32f4xxxx_gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_gpio.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_rcc.h: include/stm32f4xxxx_rcc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_rcc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_rcc.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_pwr.h: include/stm32f4xxxx_pwr.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_pwr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_pwr.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_syscfg.h: include/stm32f4xxxx_syscfg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_syscfg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_syscfg.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_tim.h: include/stm32f4xxxx_tim.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_tim.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_tim.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_flash.h: include/stm32f4xxxx_flash.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_flash.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_flash.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_otgfs.h: include/stm32f4xxxx_otgfs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_otgfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_otgfs.h
-
-$(PROJECT_INCLUDE)/bsp/stm32_i2c.h: include/stm32_i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32_i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32_i2c.h
-
-$(PROJECT_INCLUDE)/bsp/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2c.h
-
-$(PROJECT_INCLUDE)/bsp/stm32_usart.h: include/stm32_usart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32_usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32_usart.h
-
-$(PROJECT_INCLUDE)/bsp/io.h: include/io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/io.h
-
-$(PROJECT_INCLUDE)/bsp/rcc.h: include/rcc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/rcc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/rcc.h
-
diff --git a/c/src/lib/libbsp/arm/stm32f4/bsp_specs b/c/src/lib/libbsp/arm/stm32f4/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/stm32f4/bsp_specs
+++ b/c/src/lib/libbsp/arm/stm32f4/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/tms570/Makefile.am b/c/src/lib/libbsp/arm/tms570/Makefile.am
index 000e9ff44f..1ad63447d7 100644
--- a/c/src/lib/libbsp/arm/tms570/Makefile.am
+++ b/c/src/lib/libbsp/arm/tms570/Makefile.am
@@ -11,82 +11,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-include_bsp_ti_herculesdir = $(includedir)/bsp/ti_herc
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 # ----------------------------
 # ------  Headers
 # ----------------------------
 
-include_HEADERS = include/bsp.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/uart-output-char.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += include/tms570.h
-include_bsp_HEADERS += include/tms570-sci.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/tms570-rti.h
-include_bsp_HEADERS += include/tms570-vim.h
-include_bsp_HEADERS += include/tms570-pom.h
-include_bsp_HEADERS += include/tms570-sci-driver.h
-include_bsp_HEADERS += include/system-clocks.h
-include_bsp_HEADERS += include/tms570-pinmux.h
-
-include_bsp_HEADERS += include/tms570-pins.h
-include_bsp_HEADERS += include/tms570ls3137zwt-pins.h
-include_bsp_HEADERS += include/tms570lc4357-pins.h
-
-include_bsp_ti_hercules_HEADERS = include/ti_herc/reg_adc.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_ccmsr.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_crc.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dcan.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dcc.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dma.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dmm.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_efuse.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_emacc.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_emacm.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_emif.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_esm.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_flash.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_flex_ray.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_gio.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_htu.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_i2c.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_iomm.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_lin.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_mdio.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_n2het.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pbist.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pll.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pmm.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_rti.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_rtp.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_sci.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_tcr.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_tcram.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_vim.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pom.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_spi.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_stc.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_sys.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_sys2.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pcr.h
-
-include_HEADERS += include/tm27.h
-
 # ----------------------------
 # ------  Data
 # ----------------------------
@@ -95,12 +25,12 @@ EXTRA_DIST += ../shared/start/start.S
 start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
-project_lib_DATA += startup/linkcmds
 
-EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk
-EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk_with_loader
-EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk_sdram
-EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk_intram
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.tms570ls3137_hdk
+dist_project_lib_DATA += startup/linkcmds.tms570ls3137_hdk_intram
+dist_project_lib_DATA += startup/linkcmds.tms570ls3137_hdk_sdram
+dist_project_lib_DATA += startup/linkcmds.tms570ls3137_hdk_with_loader
 
 # ----------------------------
 # ------  LibBSP
@@ -109,7 +39,7 @@ EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk_intram
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -184,10 +114,6 @@ libbsp_a_SOURCES += hwinit/tms570_selftest_par_std.c
 libbsp_a_SOURCES += hwinit/tms570_selftest_parity.c
 libbsp_a_SOURCES += hwinit/tms570_tcram_tests.c
 
-include_bsp_HEADERS += hwinit/tms570_selftest_parity.h
-include_bsp_HEADERS += hwinit/tms570_hwinit.h
-include_bsp_HEADERS += hwinit/tms570_selftest.h
-
 # Start hooks
 libbsp_a_SOURCES += hwinit/bspstarthooks-hwinit.c
 else
@@ -201,5 +127,5 @@ endif
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/tms570/headers.am
diff --git a/c/src/lib/libbsp/arm/tms570/configure.ac b/c/src/lib/libbsp/arm/tms570/configure.ac
index 37c5b61fc0..8a3789f5f2 100644
--- a/c/src/lib/libbsp/arm/tms570/configure.ac
+++ b/c/src/lib/libbsp/arm/tms570/configure.ac
@@ -10,6 +10,9 @@ AC_INIT([rtems-c-src-lib-libbsp-arm-tms570],[_RTEMS_VERSION],
 				[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/tms570ls3137_hdk.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -55,7 +58,6 @@ RTEMS_BSPOPTS_HELP([TMS570_USE_HWINIT_STARTUP],[Include BSP startup code for TMS
 AM_CONDITIONAL(TMS570_USE_HWINIT_STARTUP,test "$TMS570_USE_HWINIT_STARTUP" = "1")
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/tms570/preinstall.am b/c/src/lib/libbsp/arm/tms570/preinstall.am
deleted file mode 100644
index 1f23f9ca7e..0000000000
--- a/c/src/lib/libbsp/arm/tms570/preinstall.am
+++ /dev/null
@@ -1,297 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/ti_herc
-	@: > $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/tms570.h: include/tms570.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-sci.h: include/tms570-sci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-sci.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-rti.h: include/tms570-rti.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-rti.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-rti.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-vim.h: include/tms570-vim.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-vim.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-vim.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-pom.h: include/tms570-pom.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-pom.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-pom.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-sci-driver.h: include/tms570-sci-driver.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-sci-driver.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-sci-driver.h
-
-$(PROJECT_INCLUDE)/bsp/system-clocks.h: include/system-clocks.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/system-clocks.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/system-clocks.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-pinmux.h: include/tms570-pinmux.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-pinmux.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-pinmux.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-pins.h: include/tms570-pins.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-pins.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-pins.h
-
-$(PROJECT_INCLUDE)/bsp/tms570ls3137zwt-pins.h: include/tms570ls3137zwt-pins.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570ls3137zwt-pins.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570ls3137zwt-pins.h
-
-$(PROJECT_INCLUDE)/bsp/tms570lc4357-pins.h: include/tms570lc4357-pins.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570lc4357-pins.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570lc4357-pins.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_adc.h: include/ti_herc/reg_adc.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_adc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_adc.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_ccmsr.h: include/ti_herc/reg_ccmsr.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_ccmsr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_ccmsr.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_crc.h: include/ti_herc/reg_crc.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_crc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_crc.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcan.h: include/ti_herc/reg_dcan.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcan.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcc.h: include/ti_herc/reg_dcc.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcc.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_dma.h: include/ti_herc/reg_dma.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dma.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_dmm.h: include/ti_herc/reg_dmm.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dmm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dmm.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_efuse.h: include/ti_herc/reg_efuse.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_efuse.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_efuse.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacc.h: include/ti_herc/reg_emacc.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacc.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacm.h: include/ti_herc/reg_emacm.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacm.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_emif.h: include/ti_herc/reg_emif.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emif.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emif.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_esm.h: include/ti_herc/reg_esm.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_esm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_esm.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_flash.h: include/ti_herc/reg_flash.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_flash.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_flash.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_flex_ray.h: include/ti_herc/reg_flex_ray.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_flex_ray.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_flex_ray.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_gio.h: include/ti_herc/reg_gio.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_gio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_gio.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_htu.h: include/ti_herc/reg_htu.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_htu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_htu.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_i2c.h: include/ti_herc/reg_i2c.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_i2c.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_iomm.h: include/ti_herc/reg_iomm.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_iomm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_iomm.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_lin.h: include/ti_herc/reg_lin.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_lin.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_lin.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_mdio.h: include/ti_herc/reg_mdio.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_mdio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_mdio.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_n2het.h: include/ti_herc/reg_n2het.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_n2het.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_n2het.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_pbist.h: include/ti_herc/reg_pbist.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pbist.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pbist.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_pll.h: include/ti_herc/reg_pll.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pll.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pll.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_pmm.h: include/ti_herc/reg_pmm.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pmm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pmm.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_rti.h: include/ti_herc/reg_rti.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_rti.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_rti.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_rtp.h: include/ti_herc/reg_rtp.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_rtp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_rtp.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_sci.h: include/ti_herc/reg_sci.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sci.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcr.h: include/ti_herc/reg_tcr.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcr.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcram.h: include/ti_herc/reg_tcram.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcram.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcram.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_vim.h: include/ti_herc/reg_vim.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_vim.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_vim.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_pom.h: include/ti_herc/reg_pom.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pom.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pom.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_spi.h: include/ti_herc/reg_spi.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_spi.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_stc.h: include/ti_herc/reg_stc.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_stc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_stc.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys.h: include/ti_herc/reg_sys.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys2.h: include/ti_herc/reg_sys2.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys2.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys2.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_pcr.h: include/ti_herc/reg_pcr.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pcr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pcr.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-if TMS570_USE_HWINIT_STARTUP
-$(PROJECT_INCLUDE)/bsp/tms570_selftest_parity.h: hwinit/tms570_selftest_parity.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570_selftest_parity.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570_selftest_parity.h
-
-$(PROJECT_INCLUDE)/bsp/tms570_hwinit.h: hwinit/tms570_hwinit.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570_hwinit.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570_hwinit.h
-
-$(PROJECT_INCLUDE)/bsp/tms570_selftest.h: hwinit/tms570_selftest.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570_selftest.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570_selftest.h
-endif
diff --git a/c/src/lib/libbsp/arm/tms570/bsp_specs b/c/src/lib/libbsp/arm/tms570/startup/bsp_specs
index 9c4b57c578..9c4b57c578 100644
--- a/c/src/lib/libbsp/arm/tms570/bsp_specs
+++ b/c/src/lib/libbsp/arm/tms570/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
index 8a8a693bfd..94f4e0f5ea 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
@@ -11,45 +11,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-clock.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-irq.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-regs.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-start.h
-include_bsp_HEADERS += ../shared/include/arm-cp15-start.h
-include_bsp_HEADERS += ../shared/include/arm-errata.h
-include_bsp_HEADERS += ../shared/include/arm-gic.h
-include_bsp_HEADERS += ../shared/include/arm-gic-irq.h
-include_bsp_HEADERS += ../shared/include/arm-gic-regs.h
-include_bsp_HEADERS += ../shared/include/arm-gic-tm27.h
-include_bsp_HEADERS += ../shared/include/arm-release-id.h
-include_bsp_HEADERS += include/cadence-i2c.h
-include_bsp_HEADERS += include/cadence-i2c-regs.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/zynq-uart.h
-include_bsp_HEADERS += include/zynq-uart-regs.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -59,7 +26,7 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -68,7 +35,7 @@ project_lib_DATA += startup/linkcmds
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -131,5 +98,5 @@ libbsp_a_SOURCES += startup/bspstarthooks.c startup/bspstartmmu.c
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/xilinx-zynq/headers.am
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac
index 67cdb5fd37..f5a0af51bf 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac
@@ -9,6 +9,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-xilinx-zynq-a9],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/xilinx_zynq_a9_qemu.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -149,5 +151,5 @@ RTEMS_BSP_CLEANUP_OPTIONS
 
 AC_CONFIG_FILES([
 Makefile
-startup/linkcmds])
+linkcmds:startup/linkcmds.in])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am b/c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am
deleted file mode 100644
index 0a025b3b95..0000000000
--- a/c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am
+++ /dev/null
@@ -1,151 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h: ../shared/include/arm-a9mpcore-clock.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h: ../shared/include/arm-a9mpcore-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h: ../shared/include/arm-a9mpcore-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h: ../shared/include/arm-a9mpcore-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-cp15-start.h: ../shared/include/arm-cp15-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-errata.h: ../shared/include/arm-errata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-errata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-errata.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic.h: ../shared/include/arm-gic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-irq.h: ../shared/include/arm-gic-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-regs.h: ../shared/include/arm-gic-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h: ../shared/include/arm-gic-tm27.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-
-$(PROJECT_INCLUDE)/bsp/arm-release-id.h: ../shared/include/arm-release-id.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-
-$(PROJECT_INCLUDE)/bsp/cadence-i2c.h: include/cadence-i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/cadence-i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/cadence-i2c.h
-
-$(PROJECT_INCLUDE)/bsp/cadence-i2c-regs.h: include/cadence-i2c-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/cadence-i2c-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/cadence-i2c-regs.h
-
-$(PROJECT_INCLUDE)/bsp/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2c.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/zynq-uart.h: include/zynq-uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/zynq-uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/zynq-uart.h
-
-$(PROJECT_INCLUDE)/bsp/zynq-uart-regs.h: include/zynq-uart-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/zynq-uart-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/zynq-uart-regs.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/bsp_specs b/c/src/lib/libbsp/arm/xilinx-zynq/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/bsp_specs
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/startup/bsp_specs
diff --git a/c/src/lib/libbsp/bfin/Makefile.am b/c/src/lib/libbsp/bfin/Makefile.am
index c25b2d3f99..24e386290c 100644
--- a/c/src/lib/libbsp/bfin/Makefile.am
+++ b/c/src/lib/libbsp/bfin/Makefile.am
@@ -5,3 +5,4 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/bfin/headers.am
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
index 4207c322e0..32cb3c02ee 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
+++ b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
@@ -4,16 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_HEADERS += include/cplb.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
@@ -24,7 +16,7 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 
@@ -48,5 +40,5 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/timer.rel
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/bfin/TLL6527M/headers.am
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/configure.ac b/c/src/lib/libbsp/bfin/TLL6527M/configure.ac
index 3c3d66caea..7fcdf6f904 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/configure.ac
+++ b/c/src/lib/libbsp/bfin/TLL6527M/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-bfin-TLL6527M],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/TLL6527M.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/preinstall.am b/c/src/lib/libbsp/bfin/TLL6527M/preinstall.am
deleted file mode 100644
index f36f0fe865..0000000000
--- a/c/src/lib/libbsp/bfin/TLL6527M/preinstall.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/cplb.h: include/cplb.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/cplb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/cplb.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/bsp_specs b/c/src/lib/libbsp/bfin/TLL6527M/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/bsp_specs
+++ b/c/src/lib/libbsp/bfin/TLL6527M/startup/bsp_specs
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
index 92f9795506..afa5c9cd20 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
@@ -4,15 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
@@ -23,7 +16,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -59,5 +52,5 @@ libbsp_a_LIBADD += networkconfig.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/bfin/bf537Stamp/headers.am
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac b/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac
index c1603bb23a..9628cbfad0 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-bfin-bf537Stamp],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/bf537Stamp.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/preinstall.am b/c/src/lib/libbsp/bfin/bf537Stamp/preinstall.am
deleted file mode 100644
index 0bdb6554d6..0000000000
--- a/c/src/lib/libbsp/bfin/bf537Stamp/preinstall.am
+++ /dev/null
@@ -1,63 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/bsp_specs b/c/src/lib/libbsp/bfin/bf537Stamp/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/bsp_specs
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/startup/bsp_specs
diff --git a/c/src/lib/libbsp/bfin/configure.ac b/c/src/lib/libbsp/bfin/configure.ac
index 1ad9c92a97..29669cecb8 100644
--- a/c/src/lib/libbsp/bfin/configure.ac
+++ b/c/src/lib/libbsp/bfin/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-bfin],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([../bfin])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
index f52d6ca76f..9acbd1bf8e 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
+++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
@@ -4,16 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_HEADERS += include/cplb.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
@@ -24,7 +16,7 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -49,5 +41,5 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/timer.rel
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/bfin/eZKit533/headers.am
diff --git a/c/src/lib/libbsp/bfin/eZKit533/configure.ac b/c/src/lib/libbsp/bfin/eZKit533/configure.ac
index 90c48195a2..63eb2766c9 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/configure.ac
+++ b/c/src/lib/libbsp/bfin/eZKit533/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-bfin-eZKit533],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/eZKit533.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/bfin/eZKit533/preinstall.am b/c/src/lib/libbsp/bfin/eZKit533/preinstall.am
deleted file mode 100644
index f36f0fe865..0000000000
--- a/c/src/lib/libbsp/bfin/eZKit533/preinstall.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/cplb.h: include/cplb.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/cplb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/cplb.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/bfin/eZKit533/bsp_specs b/c/src/lib/libbsp/bfin/eZKit533/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/bsp_specs
+++ b/c/src/lib/libbsp/bfin/eZKit533/startup/bsp_specs
diff --git a/c/src/lib/libbsp/epiphany/Makefile.am b/c/src/lib/libbsp/epiphany/Makefile.am
index 86705a772c..f0db9ba0b8 100644
--- a/c/src/lib/libbsp/epiphany/Makefile.am
+++ b/c/src/lib/libbsp/epiphany/Makefile.am
@@ -3,6 +3,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 ## Currently, the shared directory is not explicitly
 ## added but it is present in the source tree.
 _SUBDIRS = @RTEMS_BSP_FAMILY@
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/epiphany/headers.am
diff --git a/c/src/lib/libbsp/epiphany/configure.ac b/c/src/lib/libbsp/epiphany/configure.ac
index bba5440ca9..f351e1820f 100644
--- a/c/src/lib/libbsp/epiphany/configure.ac
+++ b/c/src/lib/libbsp/epiphany/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-epiphany],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
 AC_CONFIG_SRCDIR([epiphany_sim])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.12.2])
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
index 3645c024dc..3401b9a4d6 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
+++ b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
@@ -9,31 +9,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_libcpudir = $(includedir)/libcpu
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-include_bsp_HEADERS = ../shared/include/linker-symbols.h
-
-include_bsp_HEADERS += ../../../libbsp/shared/include/mm.h
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/console-polled.h
-include_bsp_HEADERS += include/irq.h
-
-nodist_include_HEADERS = include/bspopts.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -43,7 +24,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -90,5 +71,5 @@ libbsp_a_SOURCES += console/console-io.c
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/epiphany/epiphany_sim/headers.am
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac b/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac
index 05d29d7471..b5448a7ae3 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac
+++ b/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ(2.69)
 AC_INIT([rtems-c-src-lib-libbsp-epiphany-sim],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
 AC_CONFIG_SRCDIR([make/custom/epiphany_sim.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign subdir-objects 1.12.2])
@@ -30,7 +33,6 @@ RTEMS_CHECK_SMP
 AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/include/bspopts.h b/c/src/lib/libbsp/epiphany/epiphany_sim/include/bspopts.h
deleted file mode 100644
index c5d9a60f92..0000000000
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/include/bspopts.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * @ingroup bsp_epiphany
- *
- * @brief Epiphany BSP Options
- */
-
-/*
- *
- * Copyright (c) 2015 University of York.
- * Hesham ALMatary <hmka501@york.ac.uk>
- *
- * COPYRIGHT (c) 1989-1999.
- * On-Line Applications Research Corporation (OAR).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* include/bspopts.h.in.  Generated from configure.ac by autoheader.  */
-
-#ifndef LIBBSP_EPIPHANY_EPIPHANY_SIM_OPTS_H
-#define LIBBSP_EPIPHANY_EPIPHANY_SIM_OPTS_H
-
-/**
- * @name Options
- *
- * @{
- */
-
-/**
- * @brief Dirties memory to test for programs that assume zeroed memory.
- *
- * If defined, then the BSP Framework will put a non-zero pattern into the
- * RTEMS Workspace and C program heap. This should assist in finding code that
- * assumes memory starts set to zero.
- */
-#undef BSP_DIRTY_MEMORY
-
-/**
- * @brief Print and wait for key press for reset.
- *
- * If defined, print a message and wait until pressed before resetting board
- * when application exits.
- */
-#undef BSP_PRESS_KEY_FOR_RESET
-
-/**
- * @brief Prints exception context upon unexpected exceptions
- *
- * If defined, prints the exception context when an unexpected exception occurs.
- */
-#undef BSP_PRINT_EXCEPTION_CONTEXT
-
-/**
- * @brief Resets on application exit.
- *
- * If defined, reset the board when the application exits.
- */
-#undef BSP_RESET_BOARD_AT_EXIT
-
-/**
- * @brief Reset vector address for BSP start
- */
-#undef BSP_START_RESET_VECTOR
-
-/**
- * @brief Define to the address where bug reports for this package should be
- * sent.
- */
-#undef PACKAGE_BUGREPORT
-
-/**
- * @brief Define to the full name of this package.
- */
-#undef PACKAGE_NAME
-
-/**
- * @brief Define to the full name and version of this package.
- */
-#undef PACKAGE_STRING
-
-/**
- * @brief Define to the one symbol short name of this package.
- */
-#undef PACKAGE_TARNAME
-
-/**
- * @brief Define to the home page for this package.
- */
-#undef PACKAGE_URL
-
-/**
- * @brief Define to the version of this package.
- */
-#undef PACKAGE_VERSION
-
-/** @} */
-
-#endif /* LIBBSP_EPIPHANY_EPIPHANY_SIM_OPTS_H */
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/preinstall.am b/c/src/lib/libbsp/epiphany/epiphany_sim/preinstall.am
deleted file mode 100644
index e35a2e7a5f..0000000000
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/preinstall.am
+++ /dev/null
@@ -1,100 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_INCLUDE)/bsp/mm.h: ../../../libbsp/shared/include/mm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mm.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/bsp_specs b/c/src/lib/libbsp/epiphany/epiphany_sim/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/bsp_specs
+++ b/c/src/lib/libbsp/epiphany/epiphany_sim/startup/bsp_specs
diff --git a/c/src/lib/libbsp/epiphany/preinstall.am b/c/src/lib/libbsp/epiphany/preinstall.am
deleted file mode 100644
index dba6cc4d81..0000000000
--- a/c/src/lib/libbsp/epiphany/preinstall.am
+++ /dev/null
@@ -1,7 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
diff --git a/c/src/lib/libbsp/i386/Makefile.am b/c/src/lib/libbsp/i386/Makefile.am
index 959646762f..b395cd615d 100644
--- a/c/src/lib/libbsp/i386/Makefile.am
+++ b/c/src/lib/libbsp/i386/Makefile.am
@@ -27,3 +27,4 @@ EXTRA_DIST += shared/pci/pci_io.c
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/i386/headers.am
diff --git a/c/src/lib/libbsp/i386/configure.ac b/c/src/lib/libbsp/i386/configure.ac
index ca40d3c882..18aa96be19 100644
--- a/c/src/lib/libbsp/i386/configure.ac
+++ b/c/src/lib/libbsp/i386/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-i386],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([pc386])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index bf6412563f..0fc36a6cb9 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -12,38 +12,15 @@ CLEANFILES =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
 _SUBDIRS = . tools
 
-nodist_include_bsp_HEADERS += include/bspimpl.h
-include_bsp_HEADERS  = ../../i386/shared/irq/irq.h
-include_bsp_HEADERS += ../../i386/shared/irq/irq_asm.h
-include_bsp_HEADERS += ../../i386/shared/comm/tty_drv.h
-include_bsp_HEADERS += ../../i386/shared/realmode_int/realmode_int.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += console/rtd316.h
-include_bsp_HEADERS += console/exar17d15x.h
-include_bsp_HEADERS += include/tblsizes.h
-
-if HAS_SMP
-include_bsp_HEADERS += ../../i386/shared/irq/apic.h
-include_bsp_HEADERS += ../../i386/shared/smp/smp-imps.h
-endif
-
-include_HEADERS += include/crt.h
+TMPINSTALL_FILES =
 
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
@@ -63,9 +40,13 @@ start16.bin: start16-elf32.$(OBJEXT)
 	$(OBJCOPY) -O binary $< $@
 CLEANFILES += start16.bin
 
+$(PROJECT_LIB)/start16.bin: start16.bin $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/start16.bin
+TMPINSTALL_FILES += $(PROJECT_LIB)/start16.bin
+
 project_lib_DATA += start16.bin
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -76,14 +57,7 @@ libbsp_a_SOURCES += ../../shared/clockdrv_shell.h
 libbsp_a_SOURCES += clock/todcfg.c
 libbsp_a_SOURCES += ../../shared/tod.c
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS  =
-
 if RTEMS_VGA
-include_rtems_HEADERS += console/keyboard.h
-include_rtems_HEADERS += console/kd.h
-include_rtems_HEADERS += console/ps2_drv.h
-include_rtems_HEADERS += console/vgacons.h
 libbsp_a_SOURCES += console/inch.c
 libbsp_a_SOURCES += console/outch.c
 libbsp_a_SOURCES += console/defkeymap.c
@@ -95,7 +69,6 @@ libbsp_a_SOURCES += console/vt.c
 libbsp_a_SOURCES += console/videoAsm.S
 libbsp_a_SOURCES += console/kbd_parser.c
 libbsp_a_SOURCES += console/vgacons.c
-include_bsp_HEADERS += console/fb_default_mode.h
 if USE_VGA
 libbsp_a_SOURCES += console/fb_vga.c
 endif
@@ -103,15 +76,11 @@ if USE_CIRRUS_GD5446
 libbsp_a_SOURCES += console/fb_cirrus.c
 endif
 if USE_VBE_RM
-include_bsp_HEADERS += include/vbe3.h
-include_HEADERS += include/edid.h
-include_bsp_HEADERS += include/fb_vesa.h
 libbsp_a_SOURCES += console/fb_vesa_rm.c
 endif
 endif
 
 # console (non-graphics support)
-include_HEADERS += ../../i386/shared/comm/i386_io.h
 libbsp_a_SOURCES += console/serial_mouse_config.c
 libbsp_a_SOURCES += ../../i386/shared/comm/uart.c
 libbsp_a_SOURCES += ../../i386/shared/comm/tty_drv.c
@@ -142,7 +111,6 @@ libbsp_a_SOURCES += ../../i386/shared/pci/pci_io.c
 libbsp_a_SOURCES += ../../shared/pci/pci_bus_count.c
 libbsp_a_SOURCES += ../../shared/pci/pci_find_device.c
 
-include_HEADERS += ../../i386/shared/comm/uart.h
 # startup
 libbsp_a_SOURCES += ../../shared/bsppredriverhook.c
 libbsp_a_SOURCES += startup/bsp_fatal_halt.c
@@ -246,6 +214,6 @@ EXTRA_DIST += STATUS
 EXTRA_DIST += times_i486dx
 EXTRA_DIST += times_p5
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
 include $(top_srcdir)/../../../../automake/subdirs.am
+include $(srcdir)/../../../../../../bsps/i386/pc386/headers.am
diff --git a/c/src/lib/libbsp/i386/pc386/configure.ac b/c/src/lib/libbsp/i386/pc386/configure.ac
index 83969b4f58..74cf64c493 100644
--- a/c/src/lib/libbsp/i386/pc386/configure.ac
+++ b/c/src/lib/libbsp/i386/pc386/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-i386-pc386],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/pc386.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/i386/pc386/preinstall.am b/c/src/lib/libbsp/i386/pc386/preinstall.am
deleted file mode 100644
index 7476a70703..0000000000
--- a/c/src/lib/libbsp/i386/pc386/preinstall.am
+++ /dev/null
@@ -1,173 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES += $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/bspimpl.h: include/bspimpl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspimpl.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: ../../i386/shared/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq_asm.h: ../../i386/shared/irq/irq_asm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_asm.h
-
-$(PROJECT_INCLUDE)/bsp/tty_drv.h: ../../i386/shared/comm/tty_drv.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tty_drv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tty_drv.h
-
-$(PROJECT_INCLUDE)/bsp/realmode_int.h: ../../i386/shared/realmode_int/realmode_int.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/realmode_int.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/realmode_int.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/rtd316.h: console/rtd316.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/rtd316.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/rtd316.h
-
-$(PROJECT_INCLUDE)/bsp/exar17d15x.h: console/exar17d15x.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/exar17d15x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/exar17d15x.h
-
-$(PROJECT_INCLUDE)/bsp/tblsizes.h: include/tblsizes.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tblsizes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tblsizes.h
-
-if HAS_SMP
-$(PROJECT_INCLUDE)/bsp/apic.h: ../../i386/shared/irq/apic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apic.h
-
-$(PROJECT_INCLUDE)/bsp/smp-imps.h: ../../i386/shared/smp/smp-imps.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/smp-imps.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/smp-imps.h
-endif
-$(PROJECT_INCLUDE)/crt.h: include/crt.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/crt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/crt.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/start16.bin: start16.bin $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start16.bin
-TMPINSTALL_FILES += $(PROJECT_LIB)/start16.bin
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-if RTEMS_VGA
-$(PROJECT_INCLUDE)/rtems/keyboard.h: console/keyboard.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/keyboard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/keyboard.h
-
-$(PROJECT_INCLUDE)/rtems/kd.h: console/kd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/kd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/kd.h
-
-$(PROJECT_INCLUDE)/rtems/ps2_drv.h: console/ps2_drv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ps2_drv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ps2_drv.h
-
-$(PROJECT_INCLUDE)/rtems/vgacons.h: console/vgacons.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/vgacons.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/vgacons.h
-
-$(PROJECT_INCLUDE)/bsp/fb_default_mode.h: console/fb_default_mode.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/fb_default_mode.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/fb_default_mode.h
-
-if USE_VBE_RM
-$(PROJECT_INCLUDE)/bsp/vbe3.h: include/vbe3.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vbe3.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vbe3.h
-
-$(PROJECT_INCLUDE)/edid.h: include/edid.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/edid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/edid.h
-
-$(PROJECT_INCLUDE)/bsp/fb_vesa.h: include/fb_vesa.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/fb_vesa.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/fb_vesa.h
-endif
-endif
-$(PROJECT_INCLUDE)/i386_io.h: ../../i386/shared/comm/i386_io.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i386_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/i386_io.h
-
-$(PROJECT_INCLUDE)/uart.h: ../../i386/shared/comm/uart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/uart.h
-
-if HAS_SMP
-$(PROJECT_LIB)/appstart.$(OBJEXT): appstart.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/appstart.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/appstart.$(OBJEXT)
-endif
diff --git a/c/src/lib/libbsp/i386/pc386/bsp_specs b/c/src/lib/libbsp/i386/pc386/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/i386/pc386/bsp_specs
+++ b/c/src/lib/libbsp/i386/pc386/startup/bsp_specs
diff --git a/c/src/lib/libbsp/i386/pc386/tools/configure.ac b/c/src/lib/libbsp/i386/pc386/tools/configure.ac
index 7824833bfc..7a7c981f60 100644
--- a/c/src/lib/libbsp/i386/pc386/tools/configure.ac
+++ b/c/src/lib/libbsp/i386/pc386/tools/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-i386-pc386-tools],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([Spec.doc])
 RTEMS_TOP(../../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 CFLAGS="-g -O2 -Wall"
 
diff --git a/c/src/lib/libbsp/lm32/Makefile.am b/c/src/lib/libbsp/lm32/Makefile.am
index c25b2d3f99..ae304be3e8 100644
--- a/c/src/lib/libbsp/lm32/Makefile.am
+++ b/c/src/lib/libbsp/lm32/Makefile.am
@@ -5,3 +5,4 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/lm32/headers.am
diff --git a/c/src/lib/libbsp/lm32/configure.ac b/c/src/lib/libbsp/lm32/configure.ac
index 79debe1a36..ce06e84b0d 100644
--- a/c/src/lib/libbsp/lm32/configure.ac
+++ b/c/src/lib/libbsp/lm32/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-lm32],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([../lm32])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
index c2bbe61944..1cc202819a 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
+++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
@@ -4,27 +4,19 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
-include_HEADERS += include/system_conf.h
 
 EXTRA_DIST += ../../lm32/shared/start/start.S
 start.$(OBJEXT): ../../lm32/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -62,5 +54,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/lm32/lm32_evr/headers.am
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/configure.ac b/c/src/lib/libbsp/lm32/lm32_evr/configure.ac
index 9a23e7cacc..93426ffdbc 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/configure.ac
+++ b/c/src/lib/libbsp/lm32/lm32_evr/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-lm32-lm32_evr],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/lm32_evr.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/preinstall.am b/c/src/lib/libbsp/lm32/lm32_evr/preinstall.am
deleted file mode 100644
index 2e6ad01d11..0000000000
--- a/c/src/lib/libbsp/lm32/lm32_evr/preinstall.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/system_conf.h: include/system_conf.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/system_conf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/system_conf.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/bsp_specs b/c/src/lib/libbsp/lm32/lm32_evr/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/bsp_specs
+++ b/c/src/lib/libbsp/lm32/lm32_evr/startup/bsp_specs
diff --git a/c/src/lib/libbsp/lm32/milkymist/Makefile.am b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
index c120caa3b2..ee3161a86d 100644
--- a/c/src/lib/libbsp/lm32/milkymist/Makefile.am
+++ b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
@@ -4,43 +4,19 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS  = include/bsp.h
-include_HEADERS += include/tm27.h
-
-include_bsp_HEADERS  = ../../lm32/shared/include/irq.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_gpio/milkymist_gpio.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_buttons/milkymist_buttons.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_ac97/milkymist_ac97.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_usbinput/milkymist_usbinput.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_pfpu/milkymist_pfpu.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_tmu/milkymist_tmu.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_memcard/milkymist_memcard.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_flash/milkymist_flash.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_dmx/milkymist_dmx.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_midi/milkymist_midi.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_ir/milkymist_ir.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_video/milkymist_video.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_versions/milkymist_versions.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
+dist_project_lib_DATA = startup/bsp_specs
+
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
-include_HEADERS += include/system_conf.h
 
 EXTRA_DIST += ../../lm32/shared/start/start.S
 start.$(OBJEXT): ../../lm32/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -124,5 +100,5 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/lm32/milkymist/headers.am
diff --git a/c/src/lib/libbsp/lm32/milkymist/configure.ac b/c/src/lib/libbsp/lm32/milkymist/configure.ac
index eb41c95255..7bd05a6edd 100644
--- a/c/src/lib/libbsp/lm32/milkymist/configure.ac
+++ b/c/src/lib/libbsp/lm32/milkymist/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-lm32-milkymist],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/milkymist.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/lm32/milkymist/preinstall.am b/c/src/lib/libbsp/lm32/milkymist/preinstall.am
deleted file mode 100644
index efdddba6c8..0000000000
--- a/c/src/lib/libbsp/lm32/milkymist/preinstall.am
+++ /dev/null
@@ -1,127 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: ../../lm32/shared/include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_gpio.h: ../../lm32/shared/milkymist_gpio/milkymist_gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_gpio.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_buttons.h: ../../lm32/shared/milkymist_buttons/milkymist_buttons.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_buttons.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_buttons.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_ac97.h: ../../lm32/shared/milkymist_ac97/milkymist_ac97.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_ac97.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_ac97.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_usbinput.h: ../../lm32/shared/milkymist_usbinput/milkymist_usbinput.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_usbinput.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_usbinput.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_pfpu.h: ../../lm32/shared/milkymist_pfpu/milkymist_pfpu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_pfpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_pfpu.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_tmu.h: ../../lm32/shared/milkymist_tmu/milkymist_tmu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_tmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_tmu.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_memcard.h: ../../lm32/shared/milkymist_memcard/milkymist_memcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_memcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_memcard.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_flash.h: ../../lm32/shared/milkymist_flash/milkymist_flash.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_flash.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_flash.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_dmx.h: ../../lm32/shared/milkymist_dmx/milkymist_dmx.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_dmx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_dmx.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_midi.h: ../../lm32/shared/milkymist_midi/milkymist_midi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_midi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_midi.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_ir.h: ../../lm32/shared/milkymist_ir/milkymist_ir.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_ir.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_ir.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_video.h: ../../lm32/shared/milkymist_video/milkymist_video.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_video.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_video.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_versions.h: ../../lm32/shared/milkymist_versions/milkymist_versions.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_versions.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_versions.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/system_conf.h: include/system_conf.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/system_conf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/system_conf.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/lm32/milkymist/bsp_specs b/c/src/lib/libbsp/lm32/milkymist/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/lm32/milkymist/bsp_specs
+++ b/c/src/lib/libbsp/lm32/milkymist/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m32c/configure.ac b/c/src/lib/libbsp/m32c/configure.ac
index ee3f84078e..0ae91b3584 100644
--- a/c/src/lib/libbsp/m32c/configure.ac
+++ b/c/src/lib/libbsp/m32c/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m32c],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([m32cbsp])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
index ef8056bcf0..a10f56cf47 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
+++ b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
@@ -4,16 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -23,7 +15,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 startup_SOURCES = ../../shared/bspclean.c \
     ../../shared/bsppredriverhook.c \
@@ -46,5 +38,5 @@ libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c
 libbsp_a_SOURCES += ../../shared/include/cache_.h
 libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m32c/m32cbsp/headers.am
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/configure.ac b/c/src/lib/libbsp/m32c/m32cbsp/configure.ac
index 83bc49e028..2037af8d87 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/configure.ac
+++ b/c/src/lib/libbsp/m32c/m32cbsp/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m32c-m32csim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/m32csim.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/preinstall.am b/c/src/lib/libbsp/m32c/m32cbsp/preinstall.am
deleted file mode 100644
index 67ab64c592..0000000000
--- a/c/src/lib/libbsp/m32c/m32cbsp/preinstall.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/bsp_specs b/c/src/lib/libbsp/m32c/m32cbsp/startup/bsp_specs
index afa9f6badb..afa9f6badb 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/bsp_specs
+++ b/c/src/lib/libbsp/m32c/m32cbsp/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/Makefile.am b/c/src/lib/libbsp/m68k/Makefile.am
index e03929f5e7..4beada2f35 100644
--- a/c/src/lib/libbsp/m68k/Makefile.am
+++ b/c/src/lib/libbsp/m68k/Makefile.am
@@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 ## Descend into the @RTEMS_BSP_FAMILY@ directory
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
-include_bspdir = $(includedir)/bsp
-include_bsp_HEADERS = shared/include/linker-symbols.h
-
 dist_project_lib_DATA = shared/startup/linkcmds.base
 
 EXTRA_DIST =
@@ -14,10 +11,8 @@ EXTRA_DIST += shared/start.S
 
 EXTRA_DIST += shared/bspspuriousinit.c shared/m68000spurious.c
 
-include_HEADERS = shared/mvme/mvme16x_hw.h
-
 EXTRA_DIST += shared/gdbstub/m68k-stub.c shared/gdbstub/gdb_if.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/m68k/headers.am
diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am
index 6e9ed76bee..a3d051a365 100644
--- a/c/src/lib/libbsp/m68k/av5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am
@@ -4,15 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -22,7 +15,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -59,5 +52,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/av5282/headers.am
diff --git a/c/src/lib/libbsp/m68k/av5282/configure.ac b/c/src/lib/libbsp/m68k/av5282/configure.ac
index 7282407061..4d5e885e95 100644
--- a/c/src/lib/libbsp/m68k/av5282/configure.ac
+++ b/c/src/lib/libbsp/m68k/av5282/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-av5282],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/av5282.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/av5282/preinstall.am b/c/src/lib/libbsp/m68k/av5282/preinstall.am
deleted file mode 100644
index 0bdb6554d6..0000000000
--- a/c/src/lib/libbsp/m68k/av5282/preinstall.am
+++ /dev/null
@@ -1,63 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/m68k/av5282/bsp_specs b/c/src/lib/libbsp/m68k/av5282/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/av5282/bsp_specs
+++ b/c/src/lib/libbsp/m68k/av5282/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/configure.ac b/c/src/lib/libbsp/m68k/configure.ac
index 4f26893934..8c5e064f3c 100644
--- a/c/src/lib/libbsp/m68k/configure.ac
+++ b/c/src/lib/libbsp/m68k/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([shared])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am
index 70278e70ff..ce4afb155b 100644
--- a/c/src/lib/libbsp/m68k/csb360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am
@@ -4,16 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 
 
@@ -24,7 +16,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -51,5 +43,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/mcf5272/clock.rel \
     ../../../libcpu/@RTEMS_CPU@/mcf5272/timer.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/csb360/headers.am
diff --git a/c/src/lib/libbsp/m68k/csb360/configure.ac b/c/src/lib/libbsp/m68k/csb360/configure.ac
index f2611c546b..74cdcdeb49 100644
--- a/c/src/lib/libbsp/m68k/csb360/configure.ac
+++ b/c/src/lib/libbsp/m68k/csb360/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-csb360],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/csb360.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/csb360/preinstall.am b/c/src/lib/libbsp/m68k/csb360/preinstall.am
deleted file mode 100644
index 67ab64c592..0000000000
--- a/c/src/lib/libbsp/m68k/csb360/preinstall.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/m68k/csb360/bsp_specs b/c/src/lib/libbsp/m68k/csb360/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/csb360/bsp_specs
+++ b/c/src/lib/libbsp/m68k/csb360/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
index 58c75f7262..bbb1f63c17 100644
--- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
@@ -4,30 +4,18 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
-include_HEADERS += include/m340uart.h
-include_HEADERS += include/m340timer.h
-include_HEADERS += include/m68340.h
-include_HEADERS += include/m68340.inc
-include_HEADERS += include/m68349.inc
 
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -53,5 +41,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/gen68340/headers.am
diff --git a/c/src/lib/libbsp/m68k/gen68340/configure.ac b/c/src/lib/libbsp/m68k/gen68340/configure.ac
index 6a13816349..a984f2dc35 100644
--- a/c/src/lib/libbsp/m68k/gen68340/configure.ac
+++ b/c/src/lib/libbsp/m68k/gen68340/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-gen68340],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/gen68340.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/gen68340/preinstall.am b/c/src/lib/libbsp/m68k/gen68340/preinstall.am
deleted file mode 100644
index d4174d005d..0000000000
--- a/c/src/lib/libbsp/m68k/gen68340/preinstall.am
+++ /dev/null
@@ -1,83 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/m340uart.h: include/m340uart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m340uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/m340uart.h
-
-$(PROJECT_INCLUDE)/m340timer.h: include/m340timer.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m340timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/m340timer.h
-
-$(PROJECT_INCLUDE)/m68340.h: include/m68340.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68340.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68340.h
-
-$(PROJECT_INCLUDE)/m68340.inc: include/m68340.inc $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68340.inc
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68340.inc
-
-$(PROJECT_INCLUDE)/m68349.inc: include/m68349.inc $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68349.inc
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68349.inc
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/m68k/gen68340/bsp_specs b/c/src/lib/libbsp/m68k/gen68340/startup/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/gen68340/bsp_specs
+++ b/c/src/lib/libbsp/m68k/gen68340/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
index a134d792a8..9bb4369caa 100644
--- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
@@ -4,25 +4,21 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
-dist_project_lib_DATA += startup/linkcmds startup/linkcmds.prom \
-    startup/linkcmds.bootp
 
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.bootp
+dist_project_lib_DATA += startup/linkcmds.prom
+
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
 
@@ -60,5 +56,5 @@ if HAS_FPSP
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/gen68360/headers.am
diff --git a/c/src/lib/libbsp/m68k/gen68360/configure.ac b/c/src/lib/libbsp/m68k/gen68360/configure.ac
index 965e491c78..5a0e72cb21 100644
--- a/c/src/lib/libbsp/m68k/gen68360/configure.ac
+++ b/c/src/lib/libbsp/m68k/gen68360/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-gen68360],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/gen68360.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/gen68360/preinstall.am b/c/src/lib/libbsp/m68k/gen68360/preinstall.am
deleted file mode 100644
index 17d061f6b9..0000000000
--- a/c/src/lib/libbsp/m68k/gen68360/preinstall.am
+++ /dev/null
@@ -1,71 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.prom: startup/linkcmds.prom $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.prom
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.prom
-
-$(PROJECT_LIB)/linkcmds.bootp: startup/linkcmds.bootp $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.bootp
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.bootp
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
diff --git a/c/src/lib/libbsp/m68k/gen68360/bsp_specs b/c/src/lib/libbsp/m68k/gen68360/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/gen68360/bsp_specs
+++ b/c/src/lib/libbsp/m68k/gen68360/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
index 6259cedae5..fd9eac00f3 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
@@ -4,18 +4,7 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.h
+dist_project_lib_DATA = startup/bsp_specs
 
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
@@ -26,16 +15,14 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA = bsp_specs
-dist_project_lib_DATA += startup/linkcmds.m5484FireEngine.flash
+project_lib_DATA += linkcmds
 dist_project_lib_DATA += startup/linkcmds.COBRA5475
 dist_project_lib_DATA += startup/linkcmds.m5484FireEngine
-
-project_lib_DATA += startup/linkcmds
+dist_project_lib_DATA += startup/linkcmds.m5484FireEngine.flash
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 # startup
 libbsp_a_SOURCES += \
@@ -82,5 +69,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/genmcf548x/headers.am
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac
index ce1804c3d2..d7ec6702b9 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac
+++ b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-genmcf548x],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/COBRA5475.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -43,7 +46,6 @@ RTEMS_BSPOPTS_HELP([HAS_LOW_LEVEL_INIT],
 [If defined, we will do all the low level init of the chip (like bus/memory...).])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile])
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am b/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am
deleted file mode 100644
index 7308faf0d1..0000000000
--- a/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am
+++ /dev/null
@@ -1,87 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_LIB)/linkcmds.m5484FireEngine.flash: startup/linkcmds.m5484FireEngine.flash $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.m5484FireEngine.flash
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.m5484FireEngine.flash
-
-$(PROJECT_LIB)/linkcmds.COBRA5475: startup/linkcmds.COBRA5475 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.COBRA5475
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.COBRA5475
-
-$(PROJECT_LIB)/linkcmds.m5484FireEngine: startup/linkcmds.m5484FireEngine $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.m5484FireEngine
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.m5484FireEngine
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/bsp_specs b/c/src/lib/libbsp/m68k/genmcf548x/startup/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/bsp_specs
+++ b/c/src/lib/libbsp/m68k/genmcf548x/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
index 90937076c6..7e0c38902b 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
@@ -4,23 +4,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 _SUBDIRS = . tools
 
-include_HEADERS += include/i2c.h
-include_HEADERS += include/i2cdrv.h
-include_HEADERS += include/ds1307.h
-include_HEADERS += include/nvram.h
 
 EXTRA_DIST += times
 
@@ -29,8 +18,10 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds startup/gdbinit \
-    startup/linkcmds.flash
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.flash
+
+dist_project_lib_DATA += startup/gdbinit
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -64,5 +55,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/mcf5206/timer.rel \
     ../../../libcpu/@RTEMS_CPU@/mcf5206/mbus.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mcf5206elite/headers.am
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac
index 5c46002976..ccb3625138 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf5206elite],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mcf5206elite.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am b/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am
deleted file mode 100644
index c08f87dd0a..0000000000
--- a/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am
+++ /dev/null
@@ -1,87 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2c.h
-
-$(PROJECT_INCLUDE)/i2cdrv.h: include/i2cdrv.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2cdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2cdrv.h
-
-$(PROJECT_INCLUDE)/ds1307.h: include/ds1307.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ds1307.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ds1307.h
-
-$(PROJECT_INCLUDE)/nvram.h: include/nvram.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nvram.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/nvram.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/gdbinit: startup/gdbinit $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/gdbinit
-PREINSTALL_FILES += $(PROJECT_LIB)/gdbinit
-
-$(PROJECT_LIB)/linkcmds.flash: startup/linkcmds.flash $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.flash
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.flash
-
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/bsp_specs b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac b/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac
index 39e9682157..c2654a5ca9 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf5206elite-tools],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([runtest])
 RTEMS_TOP(../../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
 AM_MAINTAINER_MODE
diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
index e1e840966e..5c51afeb58 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
@@ -4,15 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -22,7 +15,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -50,5 +43,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/mcf5223x/cachepd.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mcf52235/headers.am
diff --git a/c/src/lib/libbsp/m68k/mcf52235/configure.ac b/c/src/lib/libbsp/m68k/mcf52235/configure.ac
index 3054b0d441..da0b172536 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf52235/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf52235],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mcf52235.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mcf52235/preinstall.am b/c/src/lib/libbsp/m68k/mcf52235/preinstall.am
deleted file mode 100644
index 0bdb6554d6..0000000000
--- a/c/src/lib/libbsp/m68k/mcf52235/preinstall.am
+++ /dev/null
@@ -1,63 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/m68k/mcf52235/bsp_specs b/c/src/lib/libbsp/m68k/mcf52235/startup/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mcf52235/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
index e753379b41..b33adc2ef0 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
@@ -4,15 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -22,7 +15,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES = \
@@ -45,5 +38,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/mcf5225x/cachepd.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mcf5225x/headers.am
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/configure.ac b/c/src/lib/libbsp/m68k/mcf5225x/configure.ac
index 4a7371fd87..fab934b3f5 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf5225x/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-dpu],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mcf5225x.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/preinstall.am b/c/src/lib/libbsp/m68k/mcf5225x/preinstall.am
deleted file mode 100644
index 0bdb6554d6..0000000000
--- a/c/src/lib/libbsp/m68k/mcf5225x/preinstall.am
+++ /dev/null
@@ -1,63 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/bsp_specs b/c/src/lib/libbsp/m68k/mcf5225x/startup/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mcf5225x/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
index 95de41ccb1..8a9027883a 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
@@ -4,26 +4,21 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
-dist_project_lib_DATA += startup/linkcmds startup/linkcmdsflash \
-    startup/linkcmdsram
-
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds
+dist_project_lib_DATA += startup/linkcmdsflash
+dist_project_lib_DATA += startup/linkcmdsram
+
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
 
@@ -60,5 +55,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mcf5235/headers.am
diff --git a/c/src/lib/libbsp/m68k/mcf5235/configure.ac b/c/src/lib/libbsp/m68k/mcf5235/configure.ac
index 82df518466..07838cd677 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf5235/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf5235],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mcf5235.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mcf5235/preinstall.am b/c/src/lib/libbsp/m68k/mcf5235/preinstall.am
deleted file mode 100644
index 1f590e7235..0000000000
--- a/c/src/lib/libbsp/m68k/mcf5235/preinstall.am
+++ /dev/null
@@ -1,71 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmdsflash: startup/linkcmdsflash $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmdsflash
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmdsflash
-
-$(PROJECT_LIB)/linkcmdsram: startup/linkcmdsram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmdsram
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmdsram
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
diff --git a/c/src/lib/libbsp/m68k/mcf5235/bsp_specs b/c/src/lib/libbsp/m68k/mcf5235/startup/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mcf5235/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
index 49595e90f6..b6527dbe77 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
@@ -4,15 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -22,7 +15,8 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds startup/linkcmdsflash
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmdsflash
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -61,5 +55,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mcf5329/headers.am
diff --git a/c/src/lib/libbsp/m68k/mcf5329/configure.ac b/c/src/lib/libbsp/m68k/mcf5329/configure.ac
index ca49b5e7c7..99eb6f5ea4 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf5329/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf52235],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mcf5329.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mcf5329/preinstall.am b/c/src/lib/libbsp/m68k/mcf5329/preinstall.am
deleted file mode 100644
index c521ac75e6..0000000000
--- a/c/src/lib/libbsp/m68k/mcf5329/preinstall.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmdsflash: startup/linkcmdsflash $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmdsflash
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmdsflash
-
diff --git a/c/src/lib/libbsp/m68k/mcf5329/bsp_specs b/c/src/lib/libbsp/m68k/mcf5329/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mcf5329/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
index 0d06beaeaf..0cd22f2c0d 100644
--- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
@@ -4,19 +4,10 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
-include_HEADERS += include/mrm332.h
-
 EXTRA_DIST += times
 
 EXTRA_DIST += start/start.S
@@ -24,7 +15,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -51,5 +42,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mrm332/headers.am
diff --git a/c/src/lib/libbsp/m68k/mrm332/configure.ac b/c/src/lib/libbsp/m68k/mrm332/configure.ac
index a00483fcd0..c8fb1c1ac3 100644
--- a/c/src/lib/libbsp/m68k/mrm332/configure.ac
+++ b/c/src/lib/libbsp/m68k/mrm332/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mrm332],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mrm332.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mrm332/preinstall.am b/c/src/lib/libbsp/m68k/mrm332/preinstall.am
deleted file mode 100644
index 7bf1c0166a..0000000000
--- a/c/src/lib/libbsp/m68k/mrm332/preinstall.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/mrm332.h: include/mrm332.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mrm332.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mrm332.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/m68k/mrm332/bsp_specs b/c/src/lib/libbsp/m68k/mrm332/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/mrm332/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mrm332/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
index 2314474475..6b1ec396dd 100644
--- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
@@ -4,29 +4,20 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
 
 ## Zilog component header files
-include_rtems_zilogdir = $(includedir)/rtems/zilog
-include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8530.h
 
 EXTRA_DIST += ../../m68k/shared/start/start.S
 start.$(OBJEXT): ../../m68k/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -52,5 +43,5 @@ libbsp_a_LIBADD = \
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mvme147/headers.am
diff --git a/c/src/lib/libbsp/m68k/mvme147/configure.ac b/c/src/lib/libbsp/m68k/mvme147/configure.ac
index e6b583d0f3..eaec21faa9 100644
--- a/c/src/lib/libbsp/m68k/mvme147/configure.ac
+++ b/c/src/lib/libbsp/m68k/mvme147/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme147],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mvme147.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mvme147/preinstall.am b/c/src/lib/libbsp/m68k/mvme147/preinstall.am
deleted file mode 100644
index a7c23bbc1b..0000000000
--- a/c/src/lib/libbsp/m68k/mvme147/preinstall.am
+++ /dev/null
@@ -1,72 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog
-	@: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/zilog/z8530.h: ../../shared/include/zilog/z8530.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8530.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8530.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/m68k/mvme147/bsp_specs b/c/src/lib/libbsp/m68k/mvme147/startup/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/mvme147/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme147/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
index 1e663ceeeb..c4d5f5f89d 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
@@ -4,29 +4,20 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
 
 ## Zilog component header files
-include_rtems_zilogdir = $(includedir)/rtems/zilog
-include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8530.h
 
 EXTRA_DIST += ../../m68k/shared/start/start.S
 start.$(OBJEXT): ../../m68k/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -60,5 +51,5 @@ libbsp_a_LIBADD = \
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mvme147s/headers.am
diff --git a/c/src/lib/libbsp/m68k/mvme147s/configure.ac b/c/src/lib/libbsp/m68k/mvme147s/configure.ac
index 86dc3b4867..14f9a8bac5 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/configure.ac
+++ b/c/src/lib/libbsp/m68k/mvme147s/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme147s],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mvme147s.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mvme147s/preinstall.am b/c/src/lib/libbsp/m68k/mvme147s/preinstall.am
deleted file mode 100644
index a7c23bbc1b..0000000000
--- a/c/src/lib/libbsp/m68k/mvme147s/preinstall.am
+++ /dev/null
@@ -1,72 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog
-	@: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/zilog/z8530.h: ../../shared/include/zilog/z8530.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8530.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8530.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/m68k/mvme147s/bsp_specs b/c/src/lib/libbsp/m68k/mvme147s/startup/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme147s/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index 2ea3f528fe..9ecf9f56e0 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -4,30 +4,19 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
-include_HEADERS += include/page_table.h
-
 ## Zilog component header files
-include_rtems_zilogdir = $(includedir)/rtems/zilog
-include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8036.h
 
 EXTRA_DIST += ../../m68k/shared/start/start.S
 start.$(OBJEXT): ../../m68k/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -71,5 +60,5 @@ endif
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mvme162/headers.am
diff --git a/c/src/lib/libbsp/m68k/mvme162/configure.ac b/c/src/lib/libbsp/m68k/mvme162/configure.ac
index f3ade4ee33..aef42983a9 100644
--- a/c/src/lib/libbsp/m68k/mvme162/configure.ac
+++ b/c/src/lib/libbsp/m68k/mvme162/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme162],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mvme162.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mvme162/preinstall.am b/c/src/lib/libbsp/m68k/mvme162/preinstall.am
deleted file mode 100644
index fe2fdb9359..0000000000
--- a/c/src/lib/libbsp/m68k/mvme162/preinstall.am
+++ /dev/null
@@ -1,76 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/page_table.h: include/page_table.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/page_table.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/page_table.h
-
-$(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog
-	@: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/zilog/z8036.h: ../../shared/include/zilog/z8036.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8036.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8036.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/m68k/mvme162/bsp_specs b/c/src/lib/libbsp/m68k/mvme162/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/mvme162/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme162/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
index a295731802..fdea7cb506 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
@@ -4,26 +4,18 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
-include_HEADERS += include/page_table.h
 
 EXTRA_DIST += ../../m68k/shared/start/start.S
 start.$(OBJEXT): ../../m68k/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -63,5 +55,5 @@ endif
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mvme167/headers.am
diff --git a/c/src/lib/libbsp/m68k/mvme167/configure.ac b/c/src/lib/libbsp/m68k/mvme167/configure.ac
index d93f1b4ae5..20120fc1b9 100644
--- a/c/src/lib/libbsp/m68k/mvme167/configure.ac
+++ b/c/src/lib/libbsp/m68k/mvme167/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme167],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mvme167.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mvme167/preinstall.am b/c/src/lib/libbsp/m68k/mvme167/preinstall.am
deleted file mode 100644
index 60f6c0ba9f..0000000000
--- a/c/src/lib/libbsp/m68k/mvme167/preinstall.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/page_table.h: include/page_table.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/page_table.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/page_table.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/m68k/mvme167/bsp_specs b/c/src/lib/libbsp/m68k/mvme167/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/mvme167/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme167/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/preinstall.am b/c/src/lib/libbsp/m68k/preinstall.am
deleted file mode 100644
index 2e2ec9e167..0000000000
--- a/c/src/lib/libbsp/m68k/preinstall.am
+++ /dev/null
@@ -1,42 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_LIB)/linkcmds.base: shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_INCLUDE)/mvme16x_hw.h: shared/mvme/mvme16x_hw.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h
-
diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
index 86b75950dd..5572d3f3dc 100644
--- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
@@ -4,15 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -22,7 +15,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -57,5 +50,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/uC5282/headers.am
diff --git a/c/src/lib/libbsp/m68k/uC5282/configure.ac b/c/src/lib/libbsp/m68k/uC5282/configure.ac
index a01db32e8f..3025976b40 100644
--- a/c/src/lib/libbsp/m68k/uC5282/configure.ac
+++ b/c/src/lib/libbsp/m68k/uC5282/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-uC5282],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/uC5282.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/uC5282/preinstall.am b/c/src/lib/libbsp/m68k/uC5282/preinstall.am
deleted file mode 100644
index 0bdb6554d6..0000000000
--- a/c/src/lib/libbsp/m68k/uC5282/preinstall.am
+++ /dev/null
@@ -1,63 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/m68k/uC5282/bsp_specs b/c/src/lib/libbsp/m68k/uC5282/startup/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/uC5282/bsp_specs
+++ b/c/src/lib/libbsp/m68k/uC5282/startup/bsp_specs
diff --git a/c/src/lib/libbsp/mips/Makefile.am b/c/src/lib/libbsp/mips/Makefile.am
index 526453030c..6d42748b21 100644
--- a/c/src/lib/libbsp/mips/Makefile.am
+++ b/c/src/lib/libbsp/mips/Makefile.am
@@ -5,3 +5,4 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/mips/headers.am
diff --git a/c/src/lib/libbsp/mips/configure.ac b/c/src/lib/libbsp/mips/configure.ac
index 81973700ae..288be9e96e 100644
--- a/c/src/lib/libbsp/mips/configure.ac
+++ b/c/src/lib/libbsp/mips/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-mips],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([csb350])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am
index 33ec193629..fba96dc185 100644
--- a/c/src/lib/libbsp/mips/csb350/Makefile.am
+++ b/c/src/lib/libbsp/mips/csb350/Makefile.am
@@ -4,21 +4,9 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_bsp_HEADERS = ../shared/liblnk/regs.h
 #isr
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
@@ -28,7 +16,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -76,5 +64,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/mips/csb350/headers.am
diff --git a/c/src/lib/libbsp/mips/csb350/configure.ac b/c/src/lib/libbsp/mips/csb350/configure.ac
index ba49c66884..ca7f3dc11d 100644
--- a/c/src/lib/libbsp/mips/csb350/configure.ac
+++ b/c/src/lib/libbsp/mips/csb350/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-mips-csb350],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/csb350.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/mips/csb350/preinstall.am b/c/src/lib/libbsp/mips/csb350/preinstall.am
deleted file mode 100644
index 71be6d1258..0000000000
--- a/c/src/lib/libbsp/mips/csb350/preinstall.am
+++ /dev/null
@@ -1,83 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp/regs.h: ../shared/liblnk/regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/regs.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/mips/csb350/bsp_specs b/c/src/lib/libbsp/mips/csb350/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/mips/csb350/bsp_specs
+++ b/c/src/lib/libbsp/mips/csb350/startup/bsp_specs
diff --git a/c/src/lib/libbsp/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am
index c675d9f038..a634a84582 100644
--- a/c/src/lib/libbsp/mips/hurricane/Makefile.am
+++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am
@@ -4,21 +4,9 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_HEADERS += include/usc.h
-include_bsp_HEADERS = ../shared/liblnk/regs.h
 #isr
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 
@@ -27,7 +15,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -71,5 +59,5 @@ libbsp_a_LIBADD  = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/rm52xx/timer.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/mips/hurricane/headers.am
diff --git a/c/src/lib/libbsp/mips/hurricane/configure.ac b/c/src/lib/libbsp/mips/hurricane/configure.ac
index e66e8d2794..99d16d95b8 100644
--- a/c/src/lib/libbsp/mips/hurricane/configure.ac
+++ b/c/src/lib/libbsp/mips/hurricane/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-mips-hurricane],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/hurricane.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/mips/hurricane/preinstall.am b/c/src/lib/libbsp/mips/hurricane/preinstall.am
deleted file mode 100644
index 8ad1e3f332..0000000000
--- a/c/src/lib/libbsp/mips/hurricane/preinstall.am
+++ /dev/null
@@ -1,83 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/usc.h: include/usc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/usc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/usc.h
-
-$(PROJECT_INCLUDE)/bsp/regs.h: ../shared/liblnk/regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/regs.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/mips/hurricane/bsp_specs b/c/src/lib/libbsp/mips/hurricane/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/mips/hurricane/bsp_specs
+++ b/c/src/lib/libbsp/mips/hurricane/startup/bsp_specs
diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
index 6e5154d5b8..5d599cf64f 100644
--- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
@@ -4,21 +4,9 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_bsp_HEADERS = ../shared/liblnk/regs.h
 #isr
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 
 
@@ -27,7 +15,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -62,5 +50,5 @@ libbsp_a_SOURCES += ../shared/irq/interruptmask.c
 libbsp_a_LIBADD  = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/mips/jmr3904/headers.am
diff --git a/c/src/lib/libbsp/mips/jmr3904/configure.ac b/c/src/lib/libbsp/mips/jmr3904/configure.ac
index edd2420d4a..7fc9bbd0cd 100644
--- a/c/src/lib/libbsp/mips/jmr3904/configure.ac
+++ b/c/src/lib/libbsp/mips/jmr3904/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-mips-jmr3904],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/jmr3904.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/mips/jmr3904/preinstall.am b/c/src/lib/libbsp/mips/jmr3904/preinstall.am
deleted file mode 100644
index 71be6d1258..0000000000
--- a/c/src/lib/libbsp/mips/jmr3904/preinstall.am
+++ /dev/null
@@ -1,83 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp/regs.h: ../shared/liblnk/regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/regs.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/mips/jmr3904/bsp_specs b/c/src/lib/libbsp/mips/jmr3904/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/mips/jmr3904/bsp_specs
+++ b/c/src/lib/libbsp/mips/jmr3904/startup/bsp_specs
diff --git a/c/src/lib/libbsp/mips/malta/Makefile.am b/c/src/lib/libbsp/mips/malta/Makefile.am
index b73ce85d1c..38b902cd0a 100644
--- a/c/src/lib/libbsp/mips/malta/Makefile.am
+++ b/c/src/lib/libbsp/mips/malta/Makefile.am
@@ -7,23 +7,11 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_bsp_HEADERS = ../shared/liblnk/regs.h
 #isr
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.h
 #pci
-include_bsp_HEADERS += include/pci.h
 #irq
-include_bsp_HEADERS += ../shared/irq/i8259.h
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 
@@ -32,7 +20,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -85,5 +73,5 @@ libbsp_a_SOURCES += irq/vectorisrs.c
 libbsp_a_SOURCES += irq/interruptmask.c
 libbsp_a_SOURCES += ../shared/irq/i8259.c
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/mips/malta/headers.am
diff --git a/c/src/lib/libbsp/mips/malta/configure.ac b/c/src/lib/libbsp/mips/malta/configure.ac
index 248734f85b..6633da14fe 100644
--- a/c/src/lib/libbsp/mips/malta/configure.ac
+++ b/c/src/lib/libbsp/mips/malta/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-mips-malta],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/malta.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/mips/malta/preinstall.am b/c/src/lib/libbsp/mips/malta/preinstall.am
deleted file mode 100644
index e725a6b4b8..0000000000
--- a/c/src/lib/libbsp/mips/malta/preinstall.am
+++ /dev/null
@@ -1,87 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp/regs.h: ../shared/liblnk/regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/regs.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/pci.h: include/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h
-
-$(PROJECT_INCLUDE)/bsp/i8259.h: ../shared/irq/i8259.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i8259.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i8259.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/mips/malta/bsp_specs b/c/src/lib/libbsp/mips/malta/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/mips/malta/bsp_specs
+++ b/c/src/lib/libbsp/mips/malta/startup/bsp_specs
diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
index b4ba01be96..3ea41e411a 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
@@ -4,20 +4,9 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_bsp_HEADERS = ../shared/liblnk/regs.h
 #isr
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
@@ -28,7 +17,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -70,5 +59,5 @@ libbsp_a_LIBADD  = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tx49/timer.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/mips/rbtx4925/headers.am
diff --git a/c/src/lib/libbsp/mips/rbtx4925/configure.ac b/c/src/lib/libbsp/mips/rbtx4925/configure.ac
index fe8eaacd43..b99751d8f4 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/configure.ac
+++ b/c/src/lib/libbsp/mips/rbtx4925/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-mips-rbtx4925],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/rbtx4925.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/mips/rbtx4925/preinstall.am b/c/src/lib/libbsp/mips/rbtx4925/preinstall.am
deleted file mode 100644
index 5cb075cf07..0000000000
--- a/c/src/lib/libbsp/mips/rbtx4925/preinstall.am
+++ /dev/null
@@ -1,79 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp/regs.h: ../shared/liblnk/regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/regs.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/mips/rbtx4925/bsp_specs b/c/src/lib/libbsp/mips/rbtx4925/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/bsp_specs
+++ b/c/src/lib/libbsp/mips/rbtx4925/startup/bsp_specs
diff --git a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
index b4ba01be96..3a8443a2ea 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
@@ -4,20 +4,9 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_bsp_HEADERS = ../shared/liblnk/regs.h
 #isr
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
@@ -28,7 +17,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -70,5 +59,5 @@ libbsp_a_LIBADD  = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tx49/timer.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/mips/rbtx4938/headers.am
diff --git a/c/src/lib/libbsp/mips/rbtx4938/configure.ac b/c/src/lib/libbsp/mips/rbtx4938/configure.ac
index 9d3ce56fa5..e48c697695 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/configure.ac
+++ b/c/src/lib/libbsp/mips/rbtx4938/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-mips-rbtx4938],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/rbtx4938.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/mips/rbtx4938/preinstall.am b/c/src/lib/libbsp/mips/rbtx4938/preinstall.am
deleted file mode 100644
index 5cb075cf07..0000000000
--- a/c/src/lib/libbsp/mips/rbtx4938/preinstall.am
+++ /dev/null
@@ -1,79 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp/regs.h: ../shared/liblnk/regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/regs.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/mips/rbtx4938/bsp_specs b/c/src/lib/libbsp/mips/rbtx4938/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/bsp_specs
+++ b/c/src/lib/libbsp/mips/rbtx4938/startup/bsp_specs
diff --git a/c/src/lib/libbsp/moxie/configure.ac b/c/src/lib/libbsp/moxie/configure.ac
index 7aca32868e..ac8468f765 100644
--- a/c/src/lib/libbsp/moxie/configure.ac
+++ b/c/src/lib/libbsp/moxie/configure.ac
@@ -6,6 +6,8 @@ AC_PREREQ(2.60)
 AC_INIT([rtems-c-src-lib-libbsp-moxie],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([moxiesim])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.10])
diff --git a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
index a98628599d..60d4678558 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
+++ b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
@@ -8,16 +8,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 
 
@@ -26,7 +18,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -54,5 +46,5 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/moxie/moxiesim/headers.am
diff --git a/c/src/lib/libbsp/moxie/moxiesim/configure.ac b/c/src/lib/libbsp/moxie/moxiesim/configure.ac
index aeb95b0ce7..23dda64126 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/configure.ac
+++ b/c/src/lib/libbsp/moxie/moxiesim/configure.ac
@@ -6,6 +6,9 @@ AC_PREREQ(2.60)
 AC_INIT([rtems-c-src-lib-libbsp-moxie-moxiesim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/moxiesim.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.10])
diff --git a/c/src/lib/libbsp/moxie/moxiesim/preinstall.am b/c/src/lib/libbsp/moxie/moxiesim/preinstall.am
deleted file mode 100644
index 67ab64c592..0000000000
--- a/c/src/lib/libbsp/moxie/moxiesim/preinstall.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/moxie/moxiesim/bsp_specs b/c/src/lib/libbsp/moxie/moxiesim/startup/bsp_specs
index afa9f6badb..afa9f6badb 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/bsp_specs
+++ b/c/src/lib/libbsp/moxie/moxiesim/startup/bsp_specs
diff --git a/c/src/lib/libbsp/nios2/configure.ac b/c/src/lib/libbsp/nios2/configure.ac
index b6f084b05b..ae0c31cd44 100644
--- a/c/src/lib/libbsp/nios2/configure.ac
+++ b/c/src/lib/libbsp/nios2/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-nios2],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([nios2_iss])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
index dcaa894afe..b3f66752a1 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
+++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
@@ -4,16 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
-include_bspdir = $(includedir)/bsp
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 
 
@@ -26,11 +18,11 @@ crtnn.$(OBJEXT): start/crtnn.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT) crtnn.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 # startup
 libbsp_a_SOURCES += ../../shared/bspclean.c
@@ -54,5 +46,5 @@ libbsp_a_SOURCES += timer/timer.c
 # Cache
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/nios2/nios2_iss/headers.am
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/configure.ac b/c/src/lib/libbsp/nios2/nios2_iss/configure.ac
index 3f0a261e11..2dd6eb202b 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/configure.ac
+++ b/c/src/lib/libbsp/nios2/nios2_iss/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-nios2-nios2_iss],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/nios2_iss.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am b/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am
deleted file mode 100644
index 5f3e9a19ba..0000000000
--- a/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am
+++ /dev/null
@@ -1,71 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/crtnn.$(OBJEXT): crtnn.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/crtnn.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/crtnn.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/bsp_specs b/c/src/lib/libbsp/nios2/nios2_iss/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/bsp_specs
+++ b/c/src/lib/libbsp/nios2/nios2_iss/startup/bsp_specs
diff --git a/c/src/lib/libbsp/no_cpu/configure.ac b/c/src/lib/libbsp/no_cpu/configure.ac
index b2feaa9b33..cf347b406f 100644
--- a/c/src/lib/libbsp/no_cpu/configure.ac
+++ b/c/src/lib/libbsp/no_cpu/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-no_cpu],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([no_bsp])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
index c92c13f5a8..339870f03b 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
@@ -4,20 +4,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
-
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA = linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -42,5 +34,5 @@ libbsp_a_SOURCES += shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/no_cpu/no_bsp/headers.am
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac b/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac
index 1c8fb3c2c9..f39164358a 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-no_cpu-no_bsp],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/no_bsp.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/preinstall.am b/c/src/lib/libbsp/no_cpu/no_bsp/preinstall.am
deleted file mode 100644
index e9ea1300df..0000000000
--- a/c/src/lib/libbsp/no_cpu/no_bsp/preinstall.am
+++ /dev/null
@@ -1,54 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/bsp_specs b/c/src/lib/libbsp/no_cpu/no_bsp/startup/bsp_specs
index 140802f2c0..140802f2c0 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/bsp_specs
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/startup/bsp_specs
diff --git a/c/src/lib/libbsp/or1k/Makefile.am b/c/src/lib/libbsp/or1k/Makefile.am
index 6d6feb2699..8f3cbcbf7b 100644
--- a/c/src/lib/libbsp/or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/Makefile.am
@@ -5,6 +5,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 ## added but it is present in the source tree.
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/or1k/headers.am
diff --git a/c/src/lib/libbsp/or1k/configure.ac b/c/src/lib/libbsp/or1k/configure.ac
index e809e40958..e3ee8ad9d3 100644
--- a/c/src/lib/libbsp/or1k/configure.ac
+++ b/c/src/lib/libbsp/or1k/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-or1k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([generic_or1k])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
index 015391522a..d5a4b74b33 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
@@ -10,34 +10,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_libcpudir = $(includedir)/libcpu
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_bsp_HEADERS =
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-include_bsp_HEADERS += ../shared/include/linker-symbols.h
-include_bsp_HEADERS += ../../../libbsp/shared/include/mm.h
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/uart-output-char.h
-include_bsp_HEADERS += ../shared/include/cache_.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/uart.h
-include_bsp_HEADERS += include/generic_or1k.h
-
-nodist_include_HEADERS = include/bspopts.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -47,8 +25,8 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += ../shared/startup/linkcmds.base
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += ../shared/startup/linkcmds.base
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -57,7 +35,7 @@ project_lib_DATA += ../shared/startup/linkcmds.base
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Startup
@@ -104,5 +82,5 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/or1k/generic_or1k/headers.am
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/configure.ac b/c/src/lib/libbsp/or1k/generic_or1k/configure.ac
index a24e219a9e..d519fc4381 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/configure.ac
+++ b/c/src/lib/libbsp/or1k/generic_or1k/configure.ac
@@ -8,6 +8,9 @@ AC_PREREQ(2.69)
 AC_INIT([rtems-c-src-lib-libbsp-or1k-generic],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/generic_or1k.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -24,7 +27,6 @@ RTEMS_CANONICALIZE_TOOLS
 RTEMS_PROG_CCAS
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/preinstall.am b/c/src/lib/libbsp/or1k/generic_or1k/preinstall.am
deleted file mode 100644
index c11fdb9fbf..0000000000
--- a/c/src/lib/libbsp/or1k/generic_or1k/preinstall.am
+++ /dev/null
@@ -1,116 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_INCLUDE)/bsp/mm.h: ../../../libbsp/shared/include/mm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mm.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-
-$(PROJECT_INCLUDE)/bsp/cache_.h: ../shared/include/cache_.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/cache_.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/cache_.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/uart.h: include/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
-
-$(PROJECT_INCLUDE)/bsp/generic_or1k.h: include/generic_or1k.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/generic_or1k.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/generic_or1k.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/bsp_specs b/c/src/lib/libbsp/or1k/generic_or1k/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/bsp_specs
+++ b/c/src/lib/libbsp/or1k/generic_or1k/startup/bsp_specs
diff --git a/c/src/lib/libbsp/or1k/preinstall.am b/c/src/lib/libbsp/or1k/preinstall.am
deleted file mode 100644
index dba6cc4d81..0000000000
--- a/c/src/lib/libbsp/or1k/preinstall.am
+++ /dev/null
@@ -1,7 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
diff --git a/c/src/lib/libbsp/powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/Makefile.am
index b28f6d5851..eb482794a4 100644
--- a/c/src/lib/libbsp/powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/Makefile.am
@@ -69,3 +69,4 @@ EXTRA_DIST += shared/vme/vmeconfig.c \
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/powerpc/headers.am
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index d0eafbf86c..c51965b9a8 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -8,21 +8,13 @@ noinst_PROGRAMS =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
 project_lib_DATA      = 
 
 #include
-include_HEADERS = include/bsp.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_HEADERS += include/tm27.h
 DISTCLEANFILES += include/bspopts.h
 
-include_bsp_HEADERS =
-
 #start
 EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S
 rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
@@ -50,8 +42,8 @@ project_lib_DATA += motld_start.$(OBJEXT)
 
 #startup
 
+project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.share
-dist_project_lib_DATA += startup/linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -69,15 +61,10 @@ libbsp_a_SOURCES += startup/bspstart.c \
     startup/bspclean.c \
     ../../shared/gnatinstallhandler.c
 
-include_bsp_HEADERS += ../shared/motorola/vpd.h
-
 #pclock
 libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
 #console
-include_bsp_HEADERS += ../../powerpc/shared/console/consoleIo.h
-include_bsp_HEADERS += ../../powerpc/shared/console/uart.h
-
 libbsp_a_SOURCES +=  \
     ../../powerpc/shared/console/uart.c \
     ../../powerpc/shared/console/console.c \
@@ -85,43 +72,22 @@ libbsp_a_SOURCES +=  \
     ../../powerpc/shared/console/uart.h
 
 #irq
-include_bsp_HEADERS += irq/irq.h
-
 libbsp_a_SOURCES += irq/irq_init.c irq/discovery_pic.c 
 
 #marvell
-include_bsp_HEADERS += marvell/gtreg.h marvell/gtintrreg.h \
-    marvell/gti2creg.h marvell/gti2c_busdrv.h marvell/gt_timer.h \
-    marvell/gtpcireg.h
-
 libbsp_a_SOURCES += marvell/discovery.c marvell/gti2c.c marvell/gt_timer.c
 
 #flash
-include_bsp_HEADERS += ../shared/flash/flashPgm.h
-include_bsp_HEADERS += ../shared/flash/flashPgmPvt.h
-
 libbsp_a_SOURCES += ../shared/flash/flash.c \
     ../shared/flash/intelFlash.c \
     flash/flashcfg.c
 
 #pci
-include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h
-
 libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
     pci/gt_pci_init.c pci/pci_io_remap.c pci/motload_fixup.c \
     ../../powerpc/shared/pci/pcifinddevice.c
 
 #vme
-include_bsp_HEADERS += vme/VMEConfig.h \
-    ../../shared/vmeUniverse/vmeUniverse.h \
-    ../../shared/vmeUniverse/vmeUniverseDMA.h \
-    ../../shared/vmeUniverse/vme_am_defs.h \
-    ../../shared/vmeUniverse/vmeTsi148.h \
-    ../../shared/vmeUniverse/vmeTsi148DMA.h \
-    ../../shared/vmeUniverse/bspVmeDmaList.h \
-    ../../shared/vmeUniverse/VME.h \
-    ../../shared/vmeUniverse/VMEDMA.h
-
 libbsp_a_SOURCES += ../shared/vme/vmeconfig.c \
     ../shared/vme/vme_universe.c \
     ../../shared/vmeUniverse/vmeUniverse.c \
@@ -130,17 +96,12 @@ libbsp_a_SOURCES += ../shared/vme/vmeconfig.c \
 
 #network
 if HAS_NETWORKING
-include_bsp_HEADERS += network/support/early_enet_link_status.h \
-    network/support/bsp_bsdnet_attach.h
-
 noinst_PROGRAMS += network_support.rel
 network_support_rel_SOURCES = network/support/early_link_status.c \
     network/support/bsp_attach.c
 network_support_rel_CPPFLAGS = $(AM_CPPFLAGS)
 network_support_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include_bsp_HEADERS += network/if_mve/if_mve_pub.h
-
 noinst_PROGRAMS += network_if_mve_tmp.rel
 network_if_mve_tmp_rel_SOURCES  = network/if_mve/mv643xx_eth.c
 network_if_mve_tmp_rel_CPPFLAGS = $(AM_CPPFLAGS) -DDISABLE_DETACHING
@@ -169,8 +130,6 @@ network_if_mve.rel: network_if_mve_tmp.rel
                    -G mveth_serial_ctrl_config_val \
 	           $^ $@
 
-include_bsp_HEADERS += network/if_gfe/if_gfe_pub.h
-
 noinst_PROGRAMS += network_if_gfe_tmp.rel
 network_if_gfe_tmp_rel_SOURCES = network/if_gfe/if_gfe.c network/if_gfe/if_gfe_rtems.c
 network_if_gfe_tmp_rel_CPPFLAGS = $(AM_CPPFLAGS) \
@@ -186,8 +145,6 @@ network_if_gfe.rel: network_if_gfe_tmp.rel
                    $^ $@
 
 
-include_bsp_HEADERS += network/if_em/if_em_pub.h
-
 noinst_PROGRAMS += network_if_em_tmp.rel
 network_if_em_tmp_rel_SOURCES = network/if_em/if_em.c \
     network/if_em/if_em_hw.c \
@@ -224,5 +181,5 @@ endif
 
 EXTRA_DIST += README LICENSE
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/beatnik/headers.am
diff --git a/c/src/lib/libbsp/powerpc/beatnik/configure.ac b/c/src/lib/libbsp/powerpc/beatnik/configure.ac
index 82c73b03ec..2c6a813fa5 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/configure.ac
+++ b/c/src/lib/libbsp/powerpc/beatnik/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-beatnik],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/beatnik.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/beatnik/preinstall.am b/c/src/lib/libbsp/powerpc/beatnik/preinstall.am
deleted file mode 100644
index aaf5448354..0000000000
--- a/c/src/lib/libbsp/powerpc/beatnik/preinstall.am
+++ /dev/null
@@ -1,180 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES += $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/motld_start.$(OBJEXT): motld_start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/motld_start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/motld_start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds.share: ../shared/startup/linkcmds.share $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.share
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.share
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/vpd.h: ../shared/motorola/vpd.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vpd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vpd.h
-
-$(PROJECT_INCLUDE)/bsp/consoleIo.h: ../../powerpc/shared/console/consoleIo.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/consoleIo.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/consoleIo.h
-
-$(PROJECT_INCLUDE)/bsp/uart.h: ../../powerpc/shared/console/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/gtreg.h: marvell/gtreg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gtreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gtreg.h
-
-$(PROJECT_INCLUDE)/bsp/gtintrreg.h: marvell/gtintrreg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gtintrreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gtintrreg.h
-
-$(PROJECT_INCLUDE)/bsp/gti2creg.h: marvell/gti2creg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gti2creg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gti2creg.h
-
-$(PROJECT_INCLUDE)/bsp/gti2c_busdrv.h: marvell/gti2c_busdrv.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gti2c_busdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gti2c_busdrv.h
-
-$(PROJECT_INCLUDE)/bsp/gt_timer.h: marvell/gt_timer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gt_timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gt_timer.h
-
-$(PROJECT_INCLUDE)/bsp/gtpcireg.h: marvell/gtpcireg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gtpcireg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gtpcireg.h
-
-$(PROJECT_INCLUDE)/bsp/flashPgm.h: ../shared/flash/flashPgm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/flashPgm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/flashPgm.h
-
-$(PROJECT_INCLUDE)/bsp/flashPgmPvt.h: ../shared/flash/flashPgmPvt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/flashPgmPvt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/flashPgmPvt.h
-
-$(PROJECT_INCLUDE)/bsp/pci.h: ../../powerpc/shared/pci/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h
-
-$(PROJECT_INCLUDE)/bsp/VMEConfig.h: vme/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-
-$(PROJECT_INCLUDE)/bsp/vmeUniverse.h: ../../shared/vmeUniverse/vmeUniverse.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
-
-$(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h: ../../shared/vmeUniverse/vmeUniverseDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h
-
-$(PROJECT_INCLUDE)/bsp/vme_am_defs.h: ../../shared/vmeUniverse/vme_am_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-
-$(PROJECT_INCLUDE)/bsp/vmeTsi148.h: ../../shared/vmeUniverse/vmeTsi148.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeTsi148.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeTsi148.h
-
-$(PROJECT_INCLUDE)/bsp/vmeTsi148DMA.h: ../../shared/vmeUniverse/vmeTsi148DMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeTsi148DMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeTsi148DMA.h
-
-$(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h: ../../shared/vmeUniverse/bspVmeDmaList.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-
-$(PROJECT_INCLUDE)/bsp/VME.h: ../../shared/vmeUniverse/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h
-
-$(PROJECT_INCLUDE)/bsp/VMEDMA.h: ../../shared/vmeUniverse/VMEDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/bsp/early_enet_link_status.h: network/support/early_enet_link_status.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/early_enet_link_status.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/early_enet_link_status.h
-
-$(PROJECT_INCLUDE)/bsp/bsp_bsdnet_attach.h: network/support/bsp_bsdnet_attach.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bsp_bsdnet_attach.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bsp_bsdnet_attach.h
-
-$(PROJECT_INCLUDE)/bsp/if_mve_pub.h: network/if_mve/if_mve_pub.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/if_mve_pub.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/if_mve_pub.h
-
-$(PROJECT_INCLUDE)/bsp/if_gfe_pub.h: network/if_gfe/if_gfe_pub.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/if_gfe_pub.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/if_gfe_pub.h
-
-$(PROJECT_INCLUDE)/bsp/if_em_pub.h: network/if_em/if_em_pub.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/if_em_pub.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/if_em_pub.h
-endif
diff --git a/c/src/lib/libbsp/powerpc/beatnik/bsp_specs b/c/src/lib/libbsp/powerpc/beatnik/startup/bsp_specs
index 99ca0adb61..99ca0adb61 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/beatnik/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/configure.ac b/c/src/lib/libbsp/powerpc/configure.ac
index bf3947cd11..2725b86d1c 100644
--- a/c/src/lib/libbsp/powerpc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([qoriq])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 88e8d5191b..a727020c0a 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -4,18 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_bestcommdir = $(include_bspdir)/bestcomm
-include_bestcomm_includedir = $(include_bestcommdir)/include
-include_bestcomm_include_mgt5200dir = $(include_bestcomm_includedir)/mgt5200
-include_bestcomm_task_apidir = $(include_bestcommdir)/task_api
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
@@ -31,14 +21,14 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.brs5l
+dist_project_lib_DATA += startup/linkcmds.brs6l
+dist_project_lib_DATA += startup/linkcmds.dp2
 dist_project_lib_DATA += startup/linkcmds.gen5200_base
-project_lib_DATA += startup/linkcmds
-EXTRA_DIST += startup/linkcmds.brs5l
-EXTRA_DIST += startup/linkcmds.brs6l
-EXTRA_DIST += startup/linkcmds.icecube
-EXTRA_DIST += startup/linkcmds.pm520_cr825
-EXTRA_DIST += startup/linkcmds.pm520_ze30
-EXTRA_DIST += startup/linkcmds.dp2
+dist_project_lib_DATA += startup/linkcmds.icecube
+dist_project_lib_DATA += startup/linkcmds.pm520_cr825
+dist_project_lib_DATA += startup/linkcmds.pm520_ze30
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -61,19 +51,6 @@ libbsp_a_SOURCES += bestcomm/include/ppctypes.h \
     bestcomm/task_api/bestcomm_api_mem.h bestcomm/task_api/bestcomm_cntrl.h \
     bestcomm/task_api/tasksetup_bdtable.h \
     bestcomm/task_api/tasksetup_general.h
-include_bestcomm_HEADERS = bestcomm/bestcomm_priv.h \
-	bestcomm/dma_image.h \
-	bestcomm/dma_image.capi.h \
-	bestcomm/bestcomm_api.h \
-	bestcomm/bestcomm_glue.h
-include_bestcomm_include_HEADERS = bestcomm/include/ppctypes.h
-include_bestcomm_include_mgt5200_HEADERS = bestcomm/include/mgt5200/mgt5200.h \
-	bestcomm/include/mgt5200/sdma.h
-include_bestcomm_task_api_HEADERS = bestcomm/task_api/tasksetup_general.h \
-	bestcomm/task_api/tasksetup_bdtable.h \
-	bestcomm/task_api/bestcomm_cntrl.h \
-	bestcomm/task_api/bestcomm_api_mem.h
-
 # clock
 # clock
 libbsp_a_SOURCES += ../shared/clock/clock.c
@@ -87,24 +64,6 @@ libbsp_a_SOURCES += ide/ata.c
 libbsp_a_SOURCES += ide/ata-instance.c
 libbsp_a_SOURCES += ide/ata-dma-pio-single.c
 
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/bootcard.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/u-boot.h
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../shared/include/u-boot-board-info.h
-include_bsp_HEADERS += include/ata.h
-include_bsp_HEADERS += include/bestcomm.h
-include_bsp_HEADERS += include/bestcomm_ops.h
-include_bsp_HEADERS += include/i2cdrv.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/mpc5200.h
-include_bsp_HEADERS += include/mscan-base.h
-include_bsp_HEADERS += include/u-boot-config.h
-include_bsp_HEADERS += mscan/mscan.h
-
 # irq
 libbsp_a_SOURCES += include/irq.h \
 	irq/irq.c \
@@ -117,11 +76,9 @@ libbsp_a_SOURCES += include/irq.h \
 # mscan
 libbsp_a_SOURCES += mscan/mscan.c mscan/mscan-base.c mscan/mscan.h mscan/mscan_int.h
 
-include_bsp_HEADERS += nvram/nvram.h
 # nvram
 libbsp_a_SOURCES += nvram/nvram.c nvram/nvram.h nvram/m93cxx.h
 
-include_bsp_HEADERS += slicetimer/slicetimer.h
 # slicetimer
 libbsp_a_SOURCES += slicetimer/slicetimer.c slicetimer/slicetimer.h
 
@@ -161,5 +118,5 @@ libbsp_a_LIBADD =  ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
 	../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
 	../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/gen5200/headers.am
diff --git a/c/src/lib/libbsp/powerpc/gen5200/configure.ac b/c/src/lib/libbsp/powerpc/gen5200/configure.ac
index 74b7440f44..b5cf38f8de 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/configure.ac
+++ b/c/src/lib/libbsp/powerpc/gen5200/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-gen5200],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/brs5l.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -129,7 +132,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 AC_CONFIG_FILES([Makefile])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 RTEMS_PPC_EXCEPTIONS
 
diff --git a/c/src/lib/libbsp/powerpc/gen5200/preinstall.am b/c/src/lib/libbsp/powerpc/gen5200/preinstall.am
deleted file mode 100644
index 73c986eacc..0000000000
--- a/c/src/lib/libbsp/powerpc/gen5200/preinstall.am
+++ /dev/null
@@ -1,207 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm
-	@: > $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm/include
-	@: > $(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200
-	@: > $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm/task_api
-	@: > $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds.gen5200_base: startup/linkcmds.gen5200_base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.gen5200_base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.gen5200_base
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_priv.h: bestcomm/bestcomm_priv.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_priv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_priv.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.h: bestcomm/dma_image.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.capi.h: bestcomm/dma_image.capi.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.capi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.capi.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_api.h: bestcomm/bestcomm_api.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_api.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_api.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_glue.h: bestcomm/bestcomm_glue.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_glue.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_glue.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/include/ppctypes.h: bestcomm/include/ppctypes.h $(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/include/ppctypes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/include/ppctypes.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/mgt5200.h: bestcomm/include/mgt5200/mgt5200.h $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/mgt5200.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/mgt5200.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/sdma.h: bestcomm/include/mgt5200/sdma.h $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/sdma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/sdma.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_general.h: bestcomm/task_api/tasksetup_general.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_general.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_general.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_bdtable.h: bestcomm/task_api/tasksetup_bdtable.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_bdtable.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_bdtable.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_cntrl.h: bestcomm/task_api/bestcomm_cntrl.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_cntrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_cntrl.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_api_mem.h: bestcomm/task_api/bestcomm_api_mem.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_api_mem.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_api_mem.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/u-boot.h: ../../shared/include/u-boot.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/u-boot-board-info.h: ../shared/include/u-boot-board-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
-
-$(PROJECT_INCLUDE)/bsp/ata.h: include/ata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ata.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm.h: include/bestcomm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm_ops.h: include/bestcomm_ops.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm_ops.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm_ops.h
-
-$(PROJECT_INCLUDE)/bsp/i2cdrv.h: include/i2cdrv.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2cdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2cdrv.h
-
-$(PROJECT_INCLUDE)/bsp/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2c.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/mpc5200.h: include/mpc5200.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mpc5200.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mpc5200.h
-
-$(PROJECT_INCLUDE)/bsp/mscan-base.h: include/mscan-base.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mscan-base.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mscan-base.h
-
-$(PROJECT_INCLUDE)/bsp/u-boot-config.h: include/u-boot-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-config.h
-
-$(PROJECT_INCLUDE)/bsp/mscan.h: mscan/mscan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mscan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mscan.h
-
-$(PROJECT_INCLUDE)/bsp/nvram.h: nvram/nvram.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/nvram.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/nvram.h
-
-$(PROJECT_INCLUDE)/bsp/slicetimer.h: slicetimer/slicetimer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/slicetimer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/slicetimer.h
-
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bsp_specs b/c/src/lib/libbsp/powerpc/gen5200/startup/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index d6aaf3c6c4..5f9bad706e 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -4,31 +4,10 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/u-boot.h
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../shared/include/linker-symbols.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/tictac.h
-include_bsp_HEADERS += ../shared/include/u-boot-board-info.h
-include_bsp_HEADERS += include/hwreg_vals.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/tsec-config.h
-include_bsp_HEADERS += include/u-boot-config.h
-
 noinst_PROGRAMS =
 
 
@@ -42,14 +21,14 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds \
-    ../shared/startup/linkcmds.base \
-    startup/linkcmds.mpc83xx \
-    startup/linkcmds.mpc8309som \
-    startup/linkcmds.mpc8313erdb \
-    startup/linkcmds.br_uid \
-    startup/linkcmds.mpc8349eamds \
-    startup/linkcmds.hsc_cm01
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += ../shared/startup/linkcmds.base
+dist_project_lib_DATA += startup/linkcmds.br_uid
+dist_project_lib_DATA += startup/linkcmds.hsc_cm01
+dist_project_lib_DATA += startup/linkcmds.mpc8309som
+dist_project_lib_DATA += startup/linkcmds.mpc8313erdb
+dist_project_lib_DATA += startup/linkcmds.mpc8349eamds
+dist_project_lib_DATA += startup/linkcmds.mpc83xx
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -119,5 +98,5 @@ endif
 
 EXTRA_DIST += README.mpc8349eamds
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/gen83xx/headers.am
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/configure.ac b/c/src/lib/libbsp/powerpc/gen83xx/configure.ac
index 7764d2ef9e..fd96450522 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/configure.ac
+++ b/c/src/lib/libbsp/powerpc/gen83xx/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-gen83xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/br_uid.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -92,7 +95,6 @@ AC_CONFIG_FILES([Makefile])
 
 RTEMS_BSP_BOOTCARD_OPTIONS
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 RTEMS_PPC_EXCEPTIONS
 
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am b/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am
deleted file mode 100644
index 69ee597190..0000000000
--- a/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am
+++ /dev/null
@@ -1,143 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/u-boot.h: ../../shared/include/u-boot.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/tictac.h: ../shared/include/tictac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tictac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tictac.h
-
-$(PROJECT_INCLUDE)/bsp/u-boot-board-info.h: ../shared/include/u-boot-board-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
-
-$(PROJECT_INCLUDE)/bsp/hwreg_vals.h: include/hwreg_vals.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/hwreg_vals.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/hwreg_vals.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/tsec-config.h: include/tsec-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec-config.h
-
-$(PROJECT_INCLUDE)/bsp/u-boot-config.h: include/u-boot-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-config.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds.mpc83xx: startup/linkcmds.mpc83xx $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc83xx
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc83xx
-
-$(PROJECT_LIB)/linkcmds.mpc8309som: startup/linkcmds.mpc8309som $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc8309som
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc8309som
-
-$(PROJECT_LIB)/linkcmds.mpc8313erdb: startup/linkcmds.mpc8313erdb $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc8313erdb
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc8313erdb
-
-$(PROJECT_LIB)/linkcmds.br_uid: startup/linkcmds.br_uid $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.br_uid
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.br_uid
-
-$(PROJECT_LIB)/linkcmds.mpc8349eamds: startup/linkcmds.mpc8349eamds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc8349eamds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc8349eamds
-
-$(PROJECT_LIB)/linkcmds.hsc_cm01: startup/linkcmds.hsc_cm01 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.hsc_cm01
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.hsc_cm01
-
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/bsp_specs b/c/src/lib/libbsp/powerpc/gen83xx/startup/bsp_specs
index a37ec281c8..a37ec281c8 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index 1a835adaed..24b30661a1 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -4,16 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/mmu_405.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 
@@ -22,7 +14,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = rtems_crti.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -39,14 +31,10 @@ libbsp_a_SOURCES += ../../shared/bspclean.c \
 # dlentry
 libbsp_a_SOURCES += dlentry/dlentry.S
 
-include_bsp_HEADERS = ../../powerpc/shared/console/uart.h \
-    ../../powerpc/shared/console/consoleIo.h
 # console
 libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
     ../../powerpc/shared/console/console.c
 
-include_bsp_HEADERS += irq/irq.h
-
 # irq
 libbsp_a_SOURCES += irq/irq_init.c irq/irq.c
 
@@ -70,5 +58,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/haleakala/headers.am
diff --git a/c/src/lib/libbsp/powerpc/haleakala/configure.ac b/c/src/lib/libbsp/powerpc/haleakala/configure.ac
index 63111bc435..c6b116f234 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/configure.ac
+++ b/c/src/lib/libbsp/powerpc/haleakala/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-haleakala],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/haleakala.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/haleakala/preinstall.am b/c/src/lib/libbsp/powerpc/haleakala/preinstall.am
deleted file mode 100644
index 81d3386443..0000000000
--- a/c/src/lib/libbsp/powerpc/haleakala/preinstall.am
+++ /dev/null
@@ -1,79 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/mmu_405.h: include/mmu_405.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mmu_405.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mmu_405.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/uart.h: ../../powerpc/shared/console/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
-
-$(PROJECT_INCLUDE)/bsp/consoleIo.h: ../../powerpc/shared/console/consoleIo.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/consoleIo.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/consoleIo.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
diff --git a/c/src/lib/libbsp/powerpc/haleakala/bsp_specs b/c/src/lib/libbsp/powerpc/haleakala/startup/bsp_specs
index 5752caaca0..5752caaca0 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/haleakala/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 8196c9d2af..96ec40e15f 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -10,20 +10,12 @@ endif
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
-include_HEADERS += ../../powerpc/shared/include/nvram.h
 
 EXTRA_DIST += ../../powerpc/shared/start/start.S
 start.$(OBJEXT): ../../powerpc/shared/start/start.S
@@ -40,8 +32,8 @@ vectors_entry.$(OBJEXT): ../../powerpc/shared/start/vectors_entry.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += vectors_entry.$(OBJEXT)
 
+project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.share
-dist_project_lib_DATA += startup/linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -67,9 +59,6 @@ libbsp_a_SOURCES += ../../shared/tod.c ../../powerpc/shared/tod/todcfg.c
 # pclock
 libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
-include_bsp_HEADERS = ../../powerpc/shared/console/consoleIo.h
-include_bsp_HEADERS += ../../powerpc/shared/console/uart.h
-
 # Needs conditional compilation
 polledIO_CPPFLAGS = -DSTATIC_LOG_ALLOC
 noinst_PROGRAMS += polledIO.rel
@@ -84,25 +73,20 @@ libbsp_a_SOURCES += ../../powerpc/shared/console/consoleIo.h
 libbsp_a_SOURCES += ../../powerpc/shared/console/keyboard.h
 libbsp_a_SOURCES += ../../powerpc/shared/console/uart.h
 
-include_bsp_HEADERS += include/bsp/irq.h
-
 # irq
 libbsp_a_SOURCES += ../../powerpc/shared/irq/irq_init.c
 libbsp_a_SOURCES += ../../powerpc/shared/irq/openpic_i8259_irq.c
 libbsp_a_SOURCES += ../../powerpc/shared/irq/i8259.c
 
-include_bsp_HEADERS += ../../powerpc/shared/motorola/motorola.h
 # motorola
 libbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.h
 libbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.c
 
-include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h
 # openpic
 libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h
 libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.c
 libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h
 
-include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h
 # pci
 libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c
 libbsp_a_SOURCES += ../../powerpc/shared/pci/detect_raven_bridge.c
@@ -110,20 +94,11 @@ libbsp_a_SOURCES += ../../powerpc/shared/pci/generic_clear_hberrs.c
 libbsp_a_SOURCES += ../../powerpc/shared/pci/pcifinddevice.c
 libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.h
 
-include_bsp_HEADERS += ../../powerpc/shared/residual/residual.h \
-    ../../powerpc/shared/residual/pnp.h
 # residual
 libbsp_a_SOURCES += ../../powerpc/shared/residual/pnp.h
 libbsp_a_SOURCES += ../../powerpc/shared/residual/residual.h
 libbsp_a_SOURCES += ../../powerpc/shared/residual/residual.c
 
-include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \
-    ../../shared/vmeUniverse/vme_am_defs.h \
-    ../../shared/vmeUniverse/VME.h \
-    include/bsp/VMEConfig.h \
-    ../../shared/vmeUniverse/vmeUniverseDMA.h\
-    ../../shared/vmeUniverse/bspVmeDmaList.h\
-    ../../shared/vmeUniverse/VMEDMA.h
 # vme
 libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.c
 libbsp_a_SOURCES += ../../shared/vmeUniverse/bspVmeDmaList.c
@@ -169,6 +144,6 @@ EXTRA_DIST += BOOTING README.mtx603e README.MVME2100 README.MVME2300 \
 EXTRA_DIST += README.dec21140
 EXTRA_DIST += times.mcp750 times.mvme2307
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
 include $(top_srcdir)/../../../../automake/subdirs.am
+include $(srcdir)/../../../../../../bsps/powerpc/motorola_powerpc/headers.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
index dd832f07f4..97f4925f0e 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
@@ -23,11 +23,11 @@ bootloader_SOURCES = ../../../powerpc/shared/bootloader/head.S \
 # ----
 # Remove references to EABI when compiling bootloader
 BOOTLOADER_CPU_CFLAGS=$(subst -msdata=eabi,,$(subst -meabi,,$(CPU_CFLAGS)))
-AM_CPPFLAGS = -D__BOOT__
-AM_CFLAGS = $(GCCSPECS) -mrelocatable -msoft-float \
+AM_CPPFLAGS = -D__BOOT__ @RTEMS_CPPFLAGS@ @RTEMS_BSP_CPPFLAGS@
+AM_CFLAGS = -mrelocatable -msoft-float \
     -mstrict-align -fno-builtin -Wall -mmultiple -mstring -O2 \
     -fomit-frame-pointer -ffixed-r13 -mno-sdata $(BOOTLOADER_CPU_CFLAGS)
-AM_CCASFLAGS = $(AM_CPPFLAGS) $(GCCSPECS) \
+AM_CCASFLAGS = $(AM_CPPFLAGS) \
     -mrelocatable -DASM $(BOOTLOADER_CPU_CFLAGS)
 
 #
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
index 2670d0df57..8dd21e4d68 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-motorola_powerpc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mcp750.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am
deleted file mode 100644
index 362a026dd6..0000000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am
+++ /dev/null
@@ -1,143 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/nvram.h: ../../powerpc/shared/include/nvram.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nvram.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/nvram.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/vectors_entry.$(OBJEXT): vectors_entry.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/vectors_entry.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/vectors_entry.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds.share: ../shared/startup/linkcmds.share $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.share
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.share
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/consoleIo.h: ../../powerpc/shared/console/consoleIo.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/consoleIo.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/consoleIo.h
-
-$(PROJECT_INCLUDE)/bsp/uart.h: ../../powerpc/shared/console/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/motorola.h: ../../powerpc/shared/motorola/motorola.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/motorola.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.h
-
-$(PROJECT_INCLUDE)/bsp/openpic.h: ../../powerpc/shared/openpic/openpic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/openpic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/openpic.h
-
-$(PROJECT_INCLUDE)/bsp/pci.h: ../../powerpc/shared/pci/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h
-
-$(PROJECT_INCLUDE)/bsp/residual.h: ../../powerpc/shared/residual/residual.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/residual.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/residual.h
-
-$(PROJECT_INCLUDE)/bsp/pnp.h: ../../powerpc/shared/residual/pnp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pnp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pnp.h
-
-$(PROJECT_INCLUDE)/bsp/vmeUniverse.h: ../../shared/vmeUniverse/vmeUniverse.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
-
-$(PROJECT_INCLUDE)/bsp/vme_am_defs.h: ../../shared/vmeUniverse/vme_am_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-
-$(PROJECT_INCLUDE)/bsp/VME.h: ../../shared/vmeUniverse/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h
-
-$(PROJECT_INCLUDE)/bsp/VMEConfig.h: include/bsp/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-
-$(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h: ../../shared/vmeUniverse/vmeUniverseDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h
-
-$(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h: ../../shared/vmeUniverse/bspVmeDmaList.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-
-$(PROJECT_INCLUDE)/bsp/VMEDMA.h: ../../shared/vmeUniverse/VMEDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-
-if QEMU
-endif
-if QEMU
-endif
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index fa8eb58fe8..6cf6acc7e7 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -4,11 +4,9 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
 
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
@@ -24,47 +22,27 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
 # Link commands
-project_lib_DATA += startup/linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.base	
-dist_project_lib_DATA += startup/linkcmds.mpc55xx
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += ../shared/startup/linkcmds.base
 dist_project_lib_DATA += startup/linkcmds.gwlcfm
 dist_project_lib_DATA += startup/linkcmds.mpc5566evb
 dist_project_lib_DATA += startup/linkcmds.mpc5566evb_spe
-dist_project_lib_DATA += startup/linkcmds.mpc5643l_evb
+dist_project_lib_DATA += startup/linkcmds.mpc55xx
 dist_project_lib_DATA += startup/linkcmds.mpc5643l_dpu
-dist_project_lib_DATA += startup/linkcmds.mpc5674fevb
-dist_project_lib_DATA += startup/linkcmds.mpc5674fevb_spe
-dist_project_lib_DATA += startup/linkcmds.phycore_mpc5554
+dist_project_lib_DATA += startup/linkcmds.mpc5643l_evb
 dist_project_lib_DATA += startup/linkcmds.mpc5668g
 dist_project_lib_DATA += startup/linkcmds.mpc5674f_ecu508
-dist_project_lib_DATA += startup/linkcmds.mpc5674f_ecu508_boot
 dist_project_lib_DATA += startup/linkcmds.mpc5674f_ecu508_app
+dist_project_lib_DATA += startup/linkcmds.mpc5674f_ecu508_boot
+dist_project_lib_DATA += startup/linkcmds.mpc5674fevb
+dist_project_lib_DATA += startup/linkcmds.mpc5674fevb_spe
 dist_project_lib_DATA += startup/linkcmds.mpc5674f_rsm6
 dist_project_lib_DATA += startup/linkcmds.mpc5674f_rsm6_base
+dist_project_lib_DATA += startup/linkcmds.phycore_mpc5554
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
 
-# Includes
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../shared/include/linker-symbols.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/tictac.h
-include_bsp_HEADERS += include/bsp/irq.h
-include_bsp_HEADERS += include/mpc55xx-config.h
-include_bsp_HEADERS += include/smsc9218i.h
-include_bsp_HEADERS += include/console-esci.h
-include_bsp_HEADERS += include/console-generic.h
-include_bsp_HEADERS += include/console-linflex.h
-
 # startup
 libbsp_a_SOURCES += ../../shared/bootcard.c
 libbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
@@ -141,5 +119,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
     ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/mpc55xxevb/headers.am
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
index caa630e609..f32c89e8fb 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
@@ -11,6 +11,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-mpc55xxevb],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/gwlcfm.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -220,7 +223,6 @@ RTEMS_BSPOPTS_HELP([MPC55XX_ENABLE_START_PROLOGUE],[if defined, enable start pro
 AC_CONFIG_FILES([Makefile])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 RTEMS_PPC_EXCEPTIONS
 
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am
deleted file mode 100644
index b6238a58c3..0000000000
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am
+++ /dev/null
@@ -1,183 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds.mpc55xx: startup/linkcmds.mpc55xx $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc55xx
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc55xx
-
-$(PROJECT_LIB)/linkcmds.gwlcfm: startup/linkcmds.gwlcfm $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.gwlcfm
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.gwlcfm
-
-$(PROJECT_LIB)/linkcmds.mpc5566evb: startup/linkcmds.mpc5566evb $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5566evb
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5566evb
-
-$(PROJECT_LIB)/linkcmds.mpc5566evb_spe: startup/linkcmds.mpc5566evb_spe $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5566evb_spe
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5566evb_spe
-
-$(PROJECT_LIB)/linkcmds.mpc5643l_evb: startup/linkcmds.mpc5643l_evb $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5643l_evb
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5643l_evb
-
-$(PROJECT_LIB)/linkcmds.mpc5643l_dpu: startup/linkcmds.mpc5643l_dpu $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5643l_dpu
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5643l_dpu
-
-$(PROJECT_LIB)/linkcmds.mpc5674fevb: startup/linkcmds.mpc5674fevb $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674fevb
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674fevb
-
-$(PROJECT_LIB)/linkcmds.mpc5674fevb_spe: startup/linkcmds.mpc5674fevb_spe $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674fevb_spe
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674fevb_spe
-
-$(PROJECT_LIB)/linkcmds.phycore_mpc5554: startup/linkcmds.phycore_mpc5554 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.phycore_mpc5554
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.phycore_mpc5554
-
-$(PROJECT_LIB)/linkcmds.mpc5668g: startup/linkcmds.mpc5668g $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5668g
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5668g
-
-$(PROJECT_LIB)/linkcmds.mpc5674f_ecu508: startup/linkcmds.mpc5674f_ecu508 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674f_ecu508
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_ecu508
-
-$(PROJECT_LIB)/linkcmds.mpc5674f_ecu508_boot: startup/linkcmds.mpc5674f_ecu508_boot $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674f_ecu508_boot
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_ecu508_boot
-
-$(PROJECT_LIB)/linkcmds.mpc5674f_ecu508_app: startup/linkcmds.mpc5674f_ecu508_app $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674f_ecu508_app
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_ecu508_app
-
-$(PROJECT_LIB)/linkcmds.mpc5674f_rsm6: startup/linkcmds.mpc5674f_rsm6 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6
-
-$(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_base: startup/linkcmds.mpc5674f_rsm6_base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_base
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/tictac.h: ../shared/include/tictac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tictac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tictac.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/mpc55xx-config.h: include/mpc55xx-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mpc55xx-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mpc55xx-config.h
-
-$(PROJECT_INCLUDE)/bsp/smsc9218i.h: include/smsc9218i.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/smsc9218i.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/smsc9218i.h
-
-$(PROJECT_INCLUDE)/bsp/console-esci.h: include/console-esci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-esci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-esci.h
-
-$(PROJECT_INCLUDE)/bsp/console-generic.h: include/console-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-generic.h
-
-$(PROJECT_INCLUDE)/bsp/console-linflex.h: include/console-linflex.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-linflex.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-linflex.h
-
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/bsp_specs b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index 5436770e52..bd84c6c0cc 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -4,27 +4,19 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
-
-dist_project_lib_DATA += startup/linkcmds
-
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
+project_lib_DATA += linkcmds
+
 EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S
 rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
@@ -39,10 +31,6 @@ libbsp_a_SOURCES += ../shared/clock/clock.c
 # console
 libbsp_a_SOURCES += console/console.c
 
-include_bsp_HEADERS = irq/irq.h \
-	../../shared/include/irq-generic.h \
-	../../shared/include/irq-info.h
-
 # irq
 libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
 libbsp_a_SOURCES += ../../shared/src/irq-generic.c
@@ -84,5 +72,5 @@ endif
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/mpc8260ads/headers.am
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac
index b1f1c27631..96a4af7697 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-mpc8260ads],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mpc8260ads.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am b/c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am
deleted file mode 100644
index 7c3f1a39fd..0000000000
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am
+++ /dev/null
@@ -1,79 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/bsp_specs b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index 83b63c2374..a9c1cea0f1 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -4,15 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
@@ -43,8 +36,8 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
+project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.share
-dist_project_lib_DATA += startup/linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -64,39 +57,27 @@ libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
 # pclock
 libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
-include_bsp_HEADERS = ../../powerpc/shared/console/uart.h
 # console
 libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
     ../../powerpc/shared/console/console.c \
     ../../powerpc/shared/console/consoleIo.h \
     ../../powerpc/shared/console/uart.h
 
-include_bsp_HEADERS += irq/irq.h
 # irq
 libbsp_a_SOURCES += irq/irq_init.c \
     ../../powerpc/shared/irq/openpic_i8259_irq.c
 
-include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h
 # openpic
 libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h \
     ../../powerpc/shared/openpic/openpic.c \
     ../../powerpc/shared/openpic/openpic.h
 
-include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h
 # pci
 libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
     pci/detect_host_bridge.c \
     ../../powerpc/shared/pci/generic_clear_hberrs.c \
     ../../powerpc/shared/pci/pcifinddevice.c ../../powerpc/shared/pci/pci.h
 
-include_bsp_HEADERS += vme/VMEConfig.h \
-    ../../shared/vmeUniverse/vmeTsi148.h \
-    ../../shared/vmeUniverse/vme_am_defs.h \
-    ../../shared/vmeUniverse/VME.h \
-    ../../shared/vmeUniverse/vmeTsi148DMA.h\
-    ../../shared/vmeUniverse/bspVmeDmaList.h\
-    ../../shared/vmeUniverse/VMEDMA.h
-
 # vme
 libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeTsi148.c \
     ../../shared/vmeUniverse/bspVmeDmaList.c \
@@ -106,23 +87,18 @@ libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeTsi148.c \
     ../../powerpc/shared/vme/vmeconfig.c \
     ../../powerpc/shared/vme/vme_universe.c
 
-include_bsp_HEADERS += ../shared/flash/flashPgm.h \
-    ../shared/flash/flashPgmPvt.h
 # flash
 libbsp_a_SOURCES += ../shared/flash/flash.c \
     ../shared/flash/spansionFlash.c \
     flash/flashcfg.c
 
-include_bsp_HEADERS += i2c/mpc8540_i2c_busdrv.h
 # i2c
 libbsp_a_SOURCES += i2c/mpc8540_i2c.c i2c/i2c_init.c
 
-include_bsp_HEADERS += ../shared/motorola/vpd.h
 # vpd
 libbsp_a_SOURCES += ../shared/motorola/vpd.c
 
 if HAS_NETWORKING
-include_bsp_HEADERS += network/if_tsec_pub.h
 noinst_PROGRAMS += network.rel
 network_rel_SOURCES = network/tsec.c
 network_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -145,5 +121,5 @@ endif
 
 EXTRA_DIST += LICENSE README KNOWN_PROBLEMS
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/mvme3100/headers.am
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/configure.ac b/c/src/lib/libbsp/powerpc/mvme3100/configure.ac
index f19e6c6164..ec58a87c88 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mvme3100/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-mvme3100],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mvme3100.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/preinstall.am b/c/src/lib/libbsp/powerpc/mvme3100/preinstall.am
deleted file mode 100644
index b9c491762d..0000000000
--- a/c/src/lib/libbsp/powerpc/mvme3100/preinstall.am
+++ /dev/null
@@ -1,136 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/motld_start.$(OBJEXT): motld_start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/motld_start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/motld_start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds.share: ../shared/startup/linkcmds.share $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.share
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.share
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/uart.h: ../../powerpc/shared/console/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/openpic.h: ../../powerpc/shared/openpic/openpic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/openpic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/openpic.h
-
-$(PROJECT_INCLUDE)/bsp/pci.h: ../../powerpc/shared/pci/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h
-
-$(PROJECT_INCLUDE)/bsp/VMEConfig.h: vme/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-
-$(PROJECT_INCLUDE)/bsp/vmeTsi148.h: ../../shared/vmeUniverse/vmeTsi148.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeTsi148.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeTsi148.h
-
-$(PROJECT_INCLUDE)/bsp/vme_am_defs.h: ../../shared/vmeUniverse/vme_am_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-
-$(PROJECT_INCLUDE)/bsp/VME.h: ../../shared/vmeUniverse/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h
-
-$(PROJECT_INCLUDE)/bsp/vmeTsi148DMA.h: ../../shared/vmeUniverse/vmeTsi148DMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeTsi148DMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeTsi148DMA.h
-
-$(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h: ../../shared/vmeUniverse/bspVmeDmaList.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-
-$(PROJECT_INCLUDE)/bsp/VMEDMA.h: ../../shared/vmeUniverse/VMEDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-
-$(PROJECT_INCLUDE)/bsp/flashPgm.h: ../shared/flash/flashPgm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/flashPgm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/flashPgm.h
-
-$(PROJECT_INCLUDE)/bsp/flashPgmPvt.h: ../shared/flash/flashPgmPvt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/flashPgmPvt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/flashPgmPvt.h
-
-$(PROJECT_INCLUDE)/bsp/mpc8540_i2c_busdrv.h: i2c/mpc8540_i2c_busdrv.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mpc8540_i2c_busdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mpc8540_i2c_busdrv.h
-
-$(PROJECT_INCLUDE)/bsp/vpd.h: ../shared/motorola/vpd.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vpd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vpd.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/bsp/if_tsec_pub.h: network/if_tsec_pub.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/if_tsec_pub.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/if_tsec_pub.h
-endif
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/bsp_specs b/c/src/lib/libbsp/powerpc/mvme3100/startup/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/mvme3100/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 4b1c464502..4d7e0d4733 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -4,22 +4,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
-dist_project_lib_DATA += ../shared/startup/linkcmds.share
-dist_project_lib_DATA += startup/linkcmds
-
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
 
@@ -41,54 +31,35 @@ libbsp_a_SOURCES += startup/bspstart.c \
 # pclock
 libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
-include_bsp_HEADERS = ../../powerpc/shared/console/uart.h
-include_bsp_HEADERS += ../../powerpc/shared/console/consoleIo.h
 # console
 libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
     ../../powerpc/shared/console/console.c
 
-include_bsp_HEADERS += pci/gtpcireg.h
-include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h
 # pci
 libbsp_a_SOURCES += pci/pci.c
 libbsp_a_SOURCES += pci/pci_interface.c
 libbsp_a_SOURCES += pci/detect_host_bridge.c
 libbsp_a_SOURCES += ../../shared/pci/pci_find_device.c
 
-include_bsp_HEADERS += irq/irq.h
 # irq
 libbsp_a_SOURCES += irq/irq_init.c irq/BSP_irq.c
 
 # tod
 libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
 
-include_bsp_HEADERS += vectors/bspException.h
-
 # vectors
 libbsp_a_SOURCES += vectors/exceptionhandler.c \
     ../../powerpc/shared/start/vectors_entry.S
 
-include_bsp_HEADERS += GT64260/bspMvme5500.h GT64260/gtreg.h \
-    GT64260/GT64260TWSI.h GT64260/VPD.h
 # GT64260
 libbsp_a_SOURCES += GT64260/GT64260TWSI.c GT64260/MVME5500I2C.c
 
-include_bsp_HEADERS += ../../shared/vmeUniverse/VME.h vme/VMEConfig.h \
-	../../shared/vmeUniverse/vmeUniverse.h \
-	../../shared/vmeUniverse/vmeUniverseDMA.h\
-	../../shared/vmeUniverse/bspVmeDmaList.h\
-	../../shared/vmeUniverse/VMEDMA.h \
-	../../shared/vmeUniverse/vme_am_defs.h
 # vme
 libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.c\
 	../shared/vme/vmeconfig.c ../../shared/vmeUniverse/bspVmeDmaList.c\
 	../shared/vme/vme_universe.c
 
 if HAS_NETWORKING
-include_bsp_HEADERS += network/if_100MHz/GT64260eth.h \
-    network/if_100MHz/GT64260ethreg.h network/if_1GHz/if_wmreg.h \
-    network/if_1GHz/pcireg.h
-
 network_CPPFLAGS = -D_KERNEL -D__BSD_VISIBLE
 noinst_PROGRAMS += network.rel
 network_rel_SOURCES = network/if_100MHz/GT64260eth.c \
@@ -109,6 +80,9 @@ mvme5500start___OBJEXT__LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 project_lib_DATA += mvme5500start.$(OBJEXT)
 
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += ../shared/startup/linkcmds.share
+
 libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
@@ -125,5 +99,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/mvme5500/headers.am
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/configure.ac b/c/src/lib/libbsp/powerpc/mvme5500/configure.ac
index 2e93857cff..5da9add985 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mvme5500/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-mvme5500],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mvme5500.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/preinstall.am b/c/src/lib/libbsp/powerpc/mvme5500/preinstall.am
deleted file mode 100644
index 282acf416a..0000000000
--- a/c/src/lib/libbsp/powerpc/mvme5500/preinstall.am
+++ /dev/null
@@ -1,156 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/linkcmds.share: ../shared/startup/linkcmds.share $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.share
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.share
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/uart.h: ../../powerpc/shared/console/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
-
-$(PROJECT_INCLUDE)/bsp/consoleIo.h: ../../powerpc/shared/console/consoleIo.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/consoleIo.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/consoleIo.h
-
-$(PROJECT_INCLUDE)/bsp/gtpcireg.h: pci/gtpcireg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gtpcireg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gtpcireg.h
-
-$(PROJECT_INCLUDE)/bsp/pci.h: ../../powerpc/shared/pci/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/bspException.h: vectors/bspException.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspException.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspException.h
-
-$(PROJECT_INCLUDE)/bsp/bspMvme5500.h: GT64260/bspMvme5500.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspMvme5500.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspMvme5500.h
-
-$(PROJECT_INCLUDE)/bsp/gtreg.h: GT64260/gtreg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gtreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gtreg.h
-
-$(PROJECT_INCLUDE)/bsp/GT64260TWSI.h: GT64260/GT64260TWSI.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/GT64260TWSI.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/GT64260TWSI.h
-
-$(PROJECT_INCLUDE)/bsp/VPD.h: GT64260/VPD.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VPD.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VPD.h
-
-$(PROJECT_INCLUDE)/bsp/VME.h: ../../shared/vmeUniverse/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h
-
-$(PROJECT_INCLUDE)/bsp/VMEConfig.h: vme/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-
-$(PROJECT_INCLUDE)/bsp/vmeUniverse.h: ../../shared/vmeUniverse/vmeUniverse.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
-
-$(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h: ../../shared/vmeUniverse/vmeUniverseDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h
-
-$(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h: ../../shared/vmeUniverse/bspVmeDmaList.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-
-$(PROJECT_INCLUDE)/bsp/VMEDMA.h: ../../shared/vmeUniverse/VMEDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-
-$(PROJECT_INCLUDE)/bsp/vme_am_defs.h: ../../shared/vmeUniverse/vme_am_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/bsp/GT64260eth.h: network/if_100MHz/GT64260eth.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/GT64260eth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/GT64260eth.h
-
-$(PROJECT_INCLUDE)/bsp/GT64260ethreg.h: network/if_100MHz/GT64260ethreg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/GT64260ethreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/GT64260ethreg.h
-
-$(PROJECT_INCLUDE)/bsp/if_wmreg.h: network/if_1GHz/if_wmreg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/if_wmreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/if_wmreg.h
-
-$(PROJECT_INCLUDE)/bsp/pcireg.h: network/if_1GHz/pcireg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pcireg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pcireg.h
-endif
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/mvme5500start.$(OBJEXT): mvme5500start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/mvme5500start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/mvme5500start.$(OBJEXT)
-
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/bsp_specs b/c/src/lib/libbsp/powerpc/mvme5500/startup/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/mvme5500/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index 66150472d6..61f78140c3 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -4,19 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_HEADERS += include/psim.h
-
-include_bsp_HEADERS = ../shared/include/linker-symbols.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 
 
@@ -30,8 +19,8 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
+project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.base
-dist_project_lib_DATA += startup/linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -52,8 +41,6 @@ libbsp_a_SOURCES += ../../shared/console-polled.c
 libbsp_a_SOURCES += console/console-io.c console/consupp.S
 
 # irq
-include_bsp_HEADERS += irq/irq.h ../shared/openpic/openpic.h \
-    ../../shared/include/irq-generic.h
 libbsp_a_SOURCES += irq/irq_init.c ../shared/irq/openpic_i8259_irq.c \
     ../shared/openpic/openpic.c ../../shared/src/irq-server.c  \
     ../../shared/src/irq-generic.c ../../shared/src/irq-default-handler.c
@@ -84,5 +71,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/psim/headers.am
diff --git a/c/src/lib/libbsp/powerpc/psim/configure.ac b/c/src/lib/libbsp/powerpc/psim/configure.ac
index d97ac6c8c3..11f58874e3 100644
--- a/c/src/lib/libbsp/powerpc/psim/configure.ac
+++ b/c/src/lib/libbsp/powerpc/psim/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-psim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/psim.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/psim/preinstall.am b/c/src/lib/libbsp/powerpc/psim/preinstall.am
deleted file mode 100644
index dd18989cb3..0000000000
--- a/c/src/lib/libbsp/powerpc/psim/preinstall.am
+++ /dev/null
@@ -1,95 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/psim.h: include/psim.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/psim.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/psim.h
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/openpic.h: ../shared/openpic/openpic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/openpic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/openpic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
diff --git a/c/src/lib/libbsp/powerpc/psim/bsp_specs b/c/src/lib/libbsp/powerpc/psim/startup/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/psim/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/psim/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index 7be4f11de3..6d887f2d47 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -4,16 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -28,7 +20,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 # startup
 startup_SOURCES = ../../shared/bspclean.c \
@@ -46,9 +38,6 @@ clock_SOURCES = ../shared/clock/clock.c
 console_SOURCES = ../../shared/console-polled.c console/console-io.c
 
 # irq
-include_bsp_HEADERS = irq/irq.h \
-    ../../shared/include/irq-generic.h \
-    ../../shared/include/irq-info.h
 irq_SOURCES =
 irq_SOURCES += ../../shared/src/irq-default-handler.c
 irq_SOURCES += ../../shared/src/irq-generic.c
@@ -70,5 +59,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/qemuppc/headers.am
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/configure.ac b/c/src/lib/libbsp/powerpc/qemuppc/configure.ac
index 3209a0073c..0dab820017 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/qemuppc/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-qemuppc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/qemuppc.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/preinstall.am b/c/src/lib/libbsp/powerpc/qemuppc/preinstall.am
deleted file mode 100644
index 3867c4eed9..0000000000
--- a/c/src/lib/libbsp/powerpc/qemuppc/preinstall.am
+++ /dev/null
@@ -1,83 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/bsp_specs b/c/src/lib/libbsp/powerpc/qemuppc/startup/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/qemuppc/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index 646dbfbc28..6760cece35 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -4,16 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_asmdir = $(includedir)/asm
-include_uapi_asmdir = $(includedir)/uapi/asm
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
 DISTCLEANFILES = include/bspopts.h
 
 EXTRA_DIST += README
@@ -21,27 +13,6 @@ EXTRA_DIST += README
 noinst_PROGRAMS =
 
 
-include_bsp_HEADERS = include/irq.h \
-	../../shared/include/irq-generic.h \
-	../../shared/include/irq-info.h \
-	../../shared/include/bootcard.h \
-	../../shared/include/utility.h \
-	../shared/include/start.h \
-	../shared/include/tictac.h \
-	../shared/include/linker-symbols.h \
-	include/tsec-config.h \
-	include/mmu.h \
-	include/intercom.h \
-	include/uart-bridge.h \
-	include/qoriq.h
-
-include_asm_HEADERS =
-include_asm_HEADERS += include/asm/epapr_hcalls.h
-include_asm_HEADERS += include/asm/fsl_hcalls.h
-
-include_uapi_asm_HEADERS =
-include_uapi_asm_HEADERS += include/uapi/asm/epapr_hcalls.h
-
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
@@ -57,13 +28,13 @@ rtems_crtn.$(OBJEXT): ../../powerpc/shared/start/rtems_crtn.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crtn.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds \
-	../shared/startup/linkcmds.base \
-	startup/linkcmds.qoriq_core_0 \
-	startup/linkcmds.qoriq_core_1 \
-	startup/linkcmds.qoriq_e500 \
-	startup/linkcmds.qoriq_e6500_32 \
-	startup/linkcmds.qoriq_e6500_64
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += ../shared/startup/linkcmds.base
+dist_project_lib_DATA += startup/linkcmds.qoriq_core_0
+dist_project_lib_DATA += startup/linkcmds.qoriq_core_1
+dist_project_lib_DATA += startup/linkcmds.qoriq_e500
+dist_project_lib_DATA += startup/linkcmds.qoriq_e6500_32
+dist_project_lib_DATA += startup/linkcmds.qoriq_e6500_64
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -141,5 +112,5 @@ if HAS_SMP
 libbsp_a_SOURCES += startup/bspsmp.c
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/qoriq/headers.am
diff --git a/c/src/lib/libbsp/powerpc/qoriq/configure.ac b/c/src/lib/libbsp/powerpc/qoriq/configure.ac
index f0e8af62d7..02fffa7e7a 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/configure.ac
+++ b/c/src/lib/libbsp/powerpc/qoriq/configure.ac
@@ -2,6 +2,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-qoriq],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/qoriq_core_0.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.10])
@@ -168,7 +171,6 @@ AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"])
 
 RTEMS_BSP_CLEANUP_OPTIONS
 RTEMS_PPC_EXCEPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/powerpc/qoriq/preinstall.am b/c/src/lib/libbsp/powerpc/qoriq/preinstall.am
deleted file mode 100644
index 5fe3411548..0000000000
--- a/c/src/lib/libbsp/powerpc/qoriq/preinstall.am
+++ /dev/null
@@ -1,165 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/asm/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/asm
-	@: > $(PROJECT_INCLUDE)/asm/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/asm/$(dirstamp)
-
-$(PROJECT_INCLUDE)/uapi/asm/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/uapi/asm
-	@: > $(PROJECT_INCLUDE)/uapi/asm/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/uapi/asm/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/tictac.h: ../shared/include/tictac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tictac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tictac.h
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_INCLUDE)/bsp/tsec-config.h: include/tsec-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec-config.h
-
-$(PROJECT_INCLUDE)/bsp/mmu.h: include/mmu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mmu.h
-
-$(PROJECT_INCLUDE)/bsp/intercom.h: include/intercom.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/intercom.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/intercom.h
-
-$(PROJECT_INCLUDE)/bsp/uart-bridge.h: include/uart-bridge.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-bridge.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-bridge.h
-
-$(PROJECT_INCLUDE)/bsp/qoriq.h: include/qoriq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/qoriq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/qoriq.h
-
-$(PROJECT_INCLUDE)/asm/epapr_hcalls.h: include/asm/epapr_hcalls.h $(PROJECT_INCLUDE)/asm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm/epapr_hcalls.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm/epapr_hcalls.h
-
-$(PROJECT_INCLUDE)/asm/fsl_hcalls.h: include/asm/fsl_hcalls.h $(PROJECT_INCLUDE)/asm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm/fsl_hcalls.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm/fsl_hcalls.h
-
-$(PROJECT_INCLUDE)/uapi/asm/epapr_hcalls.h: include/uapi/asm/epapr_hcalls.h $(PROJECT_INCLUDE)/uapi/asm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uapi/asm/epapr_hcalls.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/uapi/asm/epapr_hcalls.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crtn.$(OBJEXT): rtems_crtn.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crtn.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crtn.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds.qoriq_core_0: startup/linkcmds.qoriq_core_0 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_core_0
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_core_0
-
-$(PROJECT_LIB)/linkcmds.qoriq_core_1: startup/linkcmds.qoriq_core_1 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_core_1
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_core_1
-
-$(PROJECT_LIB)/linkcmds.qoriq_e500: startup/linkcmds.qoriq_e500 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_e500
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_e500
-
-$(PROJECT_LIB)/linkcmds.qoriq_e6500_32: startup/linkcmds.qoriq_e6500_32 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_e6500_32
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_e6500_32
-
-$(PROJECT_LIB)/linkcmds.qoriq_e6500_64: startup/linkcmds.qoriq_e6500_64 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_e6500_64
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_e6500_64
-
diff --git a/c/src/lib/libbsp/powerpc/qoriq/bsp_specs b/c/src/lib/libbsp/powerpc/qoriq/startup/bsp_specs
index 001c45b3c4..001c45b3c4 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/qoriq/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
index a2cd12f4f2..afa059e5a3 100644
--- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
@@ -4,28 +4,19 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
-include_bsp_HEADERS = irq/irq.h
-
 EXTRA_DIST += times
 
-dist_project_lib_DATA += startup/linkcmds
-
 EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S
 rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = rtems_crti.$(OBJEXT)
 
+project_lib_DATA += linkcmds
+
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
 
@@ -55,5 +46,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/mpc5xx/timer.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc5xx/vectors.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/ss555/headers.am
diff --git a/c/src/lib/libbsp/powerpc/ss555/configure.ac b/c/src/lib/libbsp/powerpc/ss555/configure.ac
index f586a58bc2..159755d8eb 100644
--- a/c/src/lib/libbsp/powerpc/ss555/configure.ac
+++ b/c/src/lib/libbsp/powerpc/ss555/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-mbx5xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/ss555.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/ss555/preinstall.am b/c/src/lib/libbsp/powerpc/ss555/preinstall.am
deleted file mode 100644
index c051571ead..0000000000
--- a/c/src/lib/libbsp/powerpc/ss555/preinstall.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
diff --git a/c/src/lib/libbsp/powerpc/ss555/bsp_specs b/c/src/lib/libbsp/powerpc/ss555/startup/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/ss555/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/ss555/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
index 811e244dfb..bb7b7875ad 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
@@ -4,14 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
 DISTCLEANFILES = include/bspopts.h
 
 EXTRA_DIST += README
@@ -19,15 +13,6 @@ EXTRA_DIST += README
 noinst_PROGRAMS =
 
 
-include_bsp_HEADERS = include/irq.h \
-	../../shared/include/irq-generic.h \
-	../../shared/include/irq-info.h \
-	../../shared/include/bootcard.h \
-	../../shared/include/utility.h \
-	../shared/include/start.h \
-	../shared/include/tictac.h \
-	../shared/include/linker-symbols.h
-
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
@@ -38,9 +23,9 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds \
-	../shared/startup/linkcmds.base \
-	startup/linkcmds.t32mppc
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += ../shared/startup/linkcmds.base
+dist_project_lib_DATA += startup/linkcmds.t32mppc
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -88,5 +73,5 @@ if HAS_SMP
 libbsp_a_SOURCES += ../../shared/bspsmp.c
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/t32mppc/headers.am
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/configure.ac b/c/src/lib/libbsp/powerpc/t32mppc/configure.ac
index efaf446f73..bb86f6149d 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/t32mppc/configure.ac
@@ -2,6 +2,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-qoriq],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/t32mppc.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.10])
@@ -33,7 +36,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 
 RTEMS_BSP_CLEANUP_OPTIONS
 RTEMS_PPC_EXCEPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/preinstall.am b/c/src/lib/libbsp/powerpc/t32mppc/preinstall.am
deleted file mode 100644
index 0dfb26fa4c..0000000000
--- a/c/src/lib/libbsp/powerpc/t32mppc/preinstall.am
+++ /dev/null
@@ -1,103 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/tictac.h: ../shared/include/tictac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tictac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tictac.h
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds.t32mppc: startup/linkcmds.t32mppc $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.t32mppc
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.t32mppc
-
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/bsp_specs b/c/src/lib/libbsp/powerpc/t32mppc/startup/bsp_specs
index f8bbffbdf6..f8bbffbdf6 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/t32mppc/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 5b21dc1b7a..5531021385 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -4,24 +4,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
-include_bsp_HEADERS = include/tqm.h include/8xx_immap.h \
-    include/irq.h \
-    ../../shared/include/irq-generic.h \
-    ../../shared/include/irq-info.h \
-    spi/spi.h
 
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
@@ -33,9 +21,9 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.tqm8xx
 dist_project_lib_DATA += startup/linkcmds.tqm8xx_base
-EXTRA_DIST += startup/linkcmds.tqm8xx
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -92,5 +80,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/tqm8xx/headers.am
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac b/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac
index e94c509ae6..57216624f1 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-tqm8xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/pghplus.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -95,7 +98,6 @@ RTEMS_BSPOPTS_HELP([BSP_USE_NETWORK_SCC],
 AC_CONFIG_FILES([Makefile])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 RTEMS_PPC_EXCEPTIONS
 
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am b/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am
deleted file mode 100644
index 5b27200561..0000000000
--- a/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am
+++ /dev/null
@@ -1,95 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/tqm.h: include/tqm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tqm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tqm.h
-
-$(PROJECT_INCLUDE)/bsp/8xx_immap.h: include/8xx_immap.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/8xx_immap.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/8xx_immap.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/spi.h: spi/spi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spi.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.tqm8xx_base: startup/linkcmds.tqm8xx_base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.tqm8xx_base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.tqm8xx_base
-
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/bsp_specs b/c/src/lib/libbsp/powerpc/tqm8xx/startup/bsp_specs
index b5cd6764ce..b5cd6764ce 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index 9b6de34f50..232ec7b190 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -4,29 +4,16 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_HEADERS += include/xparameters_dflt.h
 if HAS_NETWORKING
-include_HEADERS += network/xiltemac.h
 endif
 
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
 
-include_bsp_HEADERS += ../shared/include/linker-symbols.h
-
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
@@ -38,7 +25,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
 # Link commands
-project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.base
 
 noinst_LIBRARIES = libbsp.a
@@ -60,10 +47,6 @@ libbsp_a_SOURCES += console/consolelite.c ../../shared/console.c \
     ../../shared/console_read.c ../../shared/console_write.c 
 
 # irq
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/opbintctrl.h
-include_bsp_HEADERS += irq/irq.h
 libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
 libbsp_a_SOURCES += ../../shared/src/irq-generic.c
 libbsp_a_SOURCES += ../../shared/src/irq-info.c
@@ -98,5 +81,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/virtex/headers.am
diff --git a/c/src/lib/libbsp/powerpc/virtex/configure.ac b/c/src/lib/libbsp/powerpc/virtex/configure.ac
index 323d9759ed..8c910b5b3a 100644
--- a/c/src/lib/libbsp/powerpc/virtex/configure.ac
+++ b/c/src/lib/libbsp/powerpc/virtex/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-virtex],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/virtex.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -45,7 +47,7 @@ RTEMS_BSP_CLEANUP_OPTIONS
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([
 Makefile
-startup/linkcmds
+linkcmds:startup/linkcmds.in
 ])
 
 RTEMS_PPC_EXCEPTIONS
diff --git a/c/src/lib/libbsp/powerpc/virtex/preinstall.am b/c/src/lib/libbsp/powerpc/virtex/preinstall.am
deleted file mode 100644
index 9263f7a4d1..0000000000
--- a/c/src/lib/libbsp/powerpc/virtex/preinstall.am
+++ /dev/null
@@ -1,100 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/xparameters_dflt.h: include/xparameters_dflt.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/xparameters_dflt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/xparameters_dflt.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/xiltemac.h: network/xiltemac.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/xiltemac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/xiltemac.h
-endif
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/opbintctrl.h: include/opbintctrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/opbintctrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/opbintctrl.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
diff --git a/c/src/lib/libbsp/powerpc/virtex/bsp_specs b/c/src/lib/libbsp/powerpc/virtex/startup/bsp_specs
index 6cb546f392..6cb546f392 100644
--- a/c/src/lib/libbsp/powerpc/virtex/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/virtex/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index 28411c1fd0..c5a2a32632 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -5,18 +5,9 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 # include
-include_HEADERS     = include/bsp.h
-include_HEADERS    += include/tm27.h
-
-include_bsp_HEADERS =
-
-nodist_include_HEADERS     = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES             = include/bspopts.h
 
 # start
@@ -25,7 +16,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = rtems_crti.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 
@@ -49,11 +40,9 @@ libbsp_a_SOURCES += startup/dummy_console.c \
                     ../../shared/dummy_printk_support.c
 
 # irq
-include_bsp_HEADERS += include/irq.h
 libbsp_a_SOURCES += irq/irq_init.c
 
 # mmu
-include_bsp_HEADERS += include/mmu.h
 libbsp_a_SOURCES += mmu/mmu.c
 
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
@@ -65,5 +54,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/virtex4/headers.am
diff --git a/c/src/lib/libbsp/powerpc/virtex4/configure.ac b/c/src/lib/libbsp/powerpc/virtex4/configure.ac
index 8546bfc3a9..75e3c3bd15 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/configure.ac
+++ b/c/src/lib/libbsp/powerpc/virtex4/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-virtex4],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/virtex4.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/virtex4/preinstall.am b/c/src/lib/libbsp/powerpc/virtex4/preinstall.am
deleted file mode 100644
index 62df611471..0000000000
--- a/c/src/lib/libbsp/powerpc/virtex4/preinstall.am
+++ /dev/null
@@ -1,71 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/mmu.h: include/mmu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mmu.h
-
diff --git a/c/src/lib/libbsp/powerpc/virtex4/bsp_specs b/c/src/lib/libbsp/powerpc/virtex4/startup/bsp_specs
index ccbea2690c..ccbea2690c 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/virtex4/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
index 5466edf088..ffc9c7eaea 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
@@ -4,18 +4,9 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 # include
-include_HEADERS     = include/bsp.h
-include_HEADERS    += include/tm27.h
-
-include_bsp_HEADERS =
-
-nodist_include_HEADERS     = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES             = include/bspopts.h
 
 # start
@@ -24,7 +15,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = rtems_crti.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 
@@ -51,11 +42,9 @@ libbsp_a_SOURCES += startup/dummy_console.c \
                     ../../shared/dummy_printk_support.c
 
 # irq
-include_bsp_HEADERS += include/irq.h
 libbsp_a_SOURCES += irq/irq_init.c
 
 # mmu
-include_bsp_HEADERS += include/mmu.h
 libbsp_a_SOURCES += mmu/mmu.c
 
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
@@ -67,5 +56,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/virtex5/headers.am
diff --git a/c/src/lib/libbsp/powerpc/virtex5/configure.ac b/c/src/lib/libbsp/powerpc/virtex5/configure.ac
index f3a156cb44..0c5481d772 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/configure.ac
+++ b/c/src/lib/libbsp/powerpc/virtex5/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-virtex5],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/virtex5.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/virtex5/preinstall.am b/c/src/lib/libbsp/powerpc/virtex5/preinstall.am
deleted file mode 100644
index 62df611471..0000000000
--- a/c/src/lib/libbsp/powerpc/virtex5/preinstall.am
+++ /dev/null
@@ -1,71 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/mmu.h: include/mmu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mmu.h
-
diff --git a/c/src/lib/libbsp/powerpc/virtex5/bsp_specs b/c/src/lib/libbsp/powerpc/virtex5/startup/bsp_specs
index ccbea2690c..ccbea2690c 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/virtex5/startup/bsp_specs
diff --git a/c/src/lib/libbsp/preinstall.am b/c/src/lib/libbsp/preinstall.am
deleted file mode 100644
index 505803f998..0000000000
--- a/c/src/lib/libbsp/preinstall.am
+++ /dev/null
@@ -1,40 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/default-initial-extension.h: shared/include/default-initial-extension.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/default-initial-extension.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/default-initial-extension.h
-
-$(PROJECT_INCLUDE)/bsp/fatal.h: shared/include/fatal.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/fatal.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/fatal.h
-
-$(PROJECT_INCLUDE)/bsp/fdt.h: shared/include/fdt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/fdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/fdt.h
-
-$(PROJECT_INCLUDE)/bsp/console-termios.h: shared/include/console-termios.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-termios.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-termios.h
-
-$(PROJECT_INCLUDE)/bsp/gpio.h: shared/include/gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpio.h
-
diff --git a/c/src/lib/libbsp/riscv/Makefile.am b/c/src/lib/libbsp/riscv/Makefile.am
index 9c319b6fd4..368310143c 100644
--- a/c/src/lib/libbsp/riscv/Makefile.am
+++ b/c/src/lib/libbsp/riscv/Makefile.am
@@ -6,9 +6,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
-include_bspdir = $(includedir)/bsp
-include_bsp_HEADERS = shared/include/linker-symbols.h
-
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/riscv/headers.am
diff --git a/c/src/lib/libbsp/riscv/configure.ac b/c/src/lib/libbsp/riscv/configure.ac
index 4479d9ab48..b8c432cb47 100644
--- a/c/src/lib/libbsp/riscv/configure.ac
+++ b/c/src/lib/libbsp/riscv/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-riscv],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
 AC_CONFIG_SRCDIR([../riscv])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.12.2])
diff --git a/c/src/lib/libbsp/riscv/preinstall.am b/c/src/lib/libbsp/riscv/preinstall.am
deleted file mode 100644
index e055b4da8a..0000000000
--- a/c/src/lib/libbsp/riscv/preinstall.am
+++ /dev/null
@@ -1,24 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
index 91f7204296..030cb473e7 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
+++ b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
@@ -9,31 +9,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_libcpudir = $(includedir)/libcpu
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-include_bsp_HEADERS = ../shared/include/linker-symbols.h
-
-include_bsp_HEADERS += ../../../libbsp/shared/include/mm.h
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/console-polled.h
-include_bsp_HEADERS += include/irq.h
-
-nodist_include_HEADERS = include/bspopts.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -43,7 +24,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -91,5 +72,5 @@ libbsp_a_SOURCES += console/console-io.c
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/riscv/riscv_generic/headers.am
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/configure.ac b/c/src/lib/libbsp/riscv/riscv_generic/configure.ac
index e2a02a3e9f..20759ce0dc 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/configure.ac
+++ b/c/src/lib/libbsp/riscv/riscv_generic/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-riscv_generic],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
 AC_CONFIG_SRCDIR([make/custom/riscv_generic.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -30,7 +33,6 @@ RTEMS_CHECK_SMP
 AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/include/bspopts.h b/c/src/lib/libbsp/riscv/riscv_generic/include/bspopts.h
deleted file mode 100644
index 7858ce0426..0000000000
--- a/c/src/lib/libbsp/riscv/riscv_generic/include/bspopts.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *
- * Copyright (c) 2015 University of York.
- * Hesham Almatary <hesham@alumni.york.ac.uk>
- *
- * COPYRIGHT (c) 1989-1999.
- * On-Line Applications Research Corporation (OAR).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* include/bspopts.h.in.  Generated from configure.ac by autoheader.  */
-
-/* If defined, then the BSP Framework will put a non-zero pattern into the
-   RTEMS Workspace and C program heap. This should assist in finding code that
-   assumes memory starts set to zero. */
-#undef BSP_DIRTY_MEMORY
-
-/* If defined, print a message and wait until pressed before resetting board
-   when application exits. */
-#undef BSP_PRESS_KEY_FOR_RESET
-
-/* If defined, prints the exception context when an unexpected exception
-   occurs. */
-#undef BSP_PRINT_EXCEPTION_CONTEXT
-
-/* If defined, reset the board when the application exits. */
-#undef BSP_RESET_BOARD_AT_EXIT
-
-/* reset vector address for BSP start */
-#undef BSP_START_RESET_VECTOR
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/preinstall.am b/c/src/lib/libbsp/riscv/riscv_generic/preinstall.am
deleted file mode 100644
index e35a2e7a5f..0000000000
--- a/c/src/lib/libbsp/riscv/riscv_generic/preinstall.am
+++ /dev/null
@@ -1,100 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_INCLUDE)/bsp/mm.h: ../../../libbsp/shared/include/mm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mm.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/bsp_specs b/c/src/lib/libbsp/riscv/riscv_generic/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/bsp_specs
+++ b/c/src/lib/libbsp/riscv/riscv_generic/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sh/configure.ac b/c/src/lib/libbsp/sh/configure.ac
index e54378682b..79df52f9a9 100644
--- a/c/src/lib/libbsp/sh/configure.ac
+++ b/c/src/lib/libbsp/sh/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-sh],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([gensh1])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am
index 50bf67569e..f2e2993f18 100644
--- a/c/src/lib/libbsp/sh/gensh1/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am
@@ -4,24 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_shdir = $(includedir)/sh
-include_rtems_scoredir = $(includedir)/rtems/score
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_sh_HEADERS = include/sh/sci.h
-include_sh_HEADERS += include/sh/sh7_pfc.h
-include_sh_HEADERS += include/sh/sh7_sci.h
-
-include_rtems_score_HEADERS = include/rtems/score/ispsh7032.h
-include_rtems_score_HEADERS += include/rtems/score/iosh7032.h
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 
@@ -30,7 +14,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -69,5 +53,5 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sh/gensh1/headers.am
diff --git a/c/src/lib/libbsp/sh/gensh1/configure.ac b/c/src/lib/libbsp/sh/gensh1/configure.ac
index 6d49847588..71f2c2c28b 100644
--- a/c/src/lib/libbsp/sh/gensh1/configure.ac
+++ b/c/src/lib/libbsp/sh/gensh1/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-sh-gensh1],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/gensh1.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sh/gensh1/preinstall.am b/c/src/lib/libbsp/sh/gensh1/preinstall.am
deleted file mode 100644
index 8132cc2d64..0000000000
--- a/c/src/lib/libbsp/sh/gensh1/preinstall.am
+++ /dev/null
@@ -1,93 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES += $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/sh/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/sh
-	@: > $(PROJECT_INCLUDE)/sh/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
-	@: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/sh/sci.h: include/sh/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h
-
-$(PROJECT_INCLUDE)/sh/sh7_pfc.h: include/sh/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h
-
-$(PROJECT_INCLUDE)/sh/sh7_sci.h: include/sh/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h
-
-$(PROJECT_INCLUDE)/rtems/score/ispsh7032.h: include/rtems/score/ispsh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h
-
-$(PROJECT_INCLUDE)/rtems/score/iosh7032.h: include/rtems/score/iosh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7032.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7032.h
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/sh/gensh1/bsp_specs b/c/src/lib/libbsp/sh/gensh1/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/sh/gensh1/bsp_specs
+++ b/c/src/lib/libbsp/sh/gensh1/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am
index 57f0ab7b3b..131ee3f58c 100644
--- a/c/src/lib/libbsp/sh/gensh2/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am
@@ -4,26 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_shdir = $(includedir)/sh
-include_rtems_scoredir = $(includedir)/rtems/score
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-include_sh_HEADERS = include/sh/io_types.h
-include_sh_HEADERS += include/sh/sci.h
-include_sh_HEADERS += include/sh/sh7_pfc.h
-include_sh_HEADERS += include/sh/sh7_sci.h
-include_sh_HEADERS += include/sh/sci_termios.h
-
-include_rtems_score_HEADERS = include/rtems/score/ispsh7045.h
-include_rtems_score_HEADERS += include/rtems/score/iosh7045.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 
@@ -33,8 +15,9 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds startup/linkcmds.ram \
-    startup/linkcmds.rom
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.ram
+dist_project_lib_DATA += startup/linkcmds.rom
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -72,5 +55,5 @@ libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c
 libbsp_a_SOURCES += ../../shared/include/cache_.h
 libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sh/gensh2/headers.am
diff --git a/c/src/lib/libbsp/sh/gensh2/configure.ac b/c/src/lib/libbsp/sh/gensh2/configure.ac
index 4fdd7e5717..2d6f3492fa 100644
--- a/c/src/lib/libbsp/sh/gensh2/configure.ac
+++ b/c/src/lib/libbsp/sh/gensh2/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-sh-gensh2],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/gensh2.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sh/gensh2/preinstall.am b/c/src/lib/libbsp/sh/gensh2/preinstall.am
deleted file mode 100644
index 742998fee3..0000000000
--- a/c/src/lib/libbsp/sh/gensh2/preinstall.am
+++ /dev/null
@@ -1,109 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES += $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/sh/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/sh
-	@: > $(PROJECT_INCLUDE)/sh/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
-	@: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/sh/io_types.h: include/sh/io_types.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/io_types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/io_types.h
-
-$(PROJECT_INCLUDE)/sh/sci.h: include/sh/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h
-
-$(PROJECT_INCLUDE)/sh/sh7_pfc.h: include/sh/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h
-
-$(PROJECT_INCLUDE)/sh/sh7_sci.h: include/sh/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h
-
-$(PROJECT_INCLUDE)/sh/sci_termios.h: include/sh/sci_termios.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci_termios.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci_termios.h
-
-$(PROJECT_INCLUDE)/rtems/score/ispsh7045.h: include/rtems/score/ispsh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h
-
-$(PROJECT_INCLUDE)/rtems/score/iosh7045.h: include/rtems/score/iosh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7045.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7045.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.ram: startup/linkcmds.ram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.ram
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.ram
-
-$(PROJECT_LIB)/linkcmds.rom: startup/linkcmds.rom $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.rom
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.rom
-
diff --git a/c/src/lib/libbsp/sh/gensh2/bsp_specs b/c/src/lib/libbsp/sh/gensh2/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/sh/gensh2/bsp_specs
+++ b/c/src/lib/libbsp/sh/gensh2/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am
index f31be5acb3..42539aa8cc 100644
--- a/c/src/lib/libbsp/sh/gensh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am
@@ -4,36 +4,18 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_shdir = $(includedir)/sh
-include_rtems_scoredir = $(includedir)/rtems/score
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-include_sh_HEADERS = include/sh/sh4uart.h
-
-include_rtems_score_HEADERS = include/rtems/score/sh7750_regs.h
-include_rtems_score_HEADERS += include/rtems/score/ipl.h
-include_rtems_score_HEADERS += include/rtems/score/iosh7750.h
-include_rtems_score_HEADERS += include/rtems/score/ispsh7750.h
-include_rtems_score_HEADERS += include/rtems/score/sh4_regs.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
-include_HEADERS += include/sdram.h
-
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds startup/linkcmds.rom \
-    startup/linkcmds.rom2ram
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.rom
+dist_project_lib_DATA += startup/linkcmds.rom2ram
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -62,5 +44,5 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sh/gensh4/headers.am
diff --git a/c/src/lib/libbsp/sh/gensh4/configure.ac b/c/src/lib/libbsp/sh/gensh4/configure.ac
index 002f8ff75c..461a054033 100644
--- a/c/src/lib/libbsp/sh/gensh4/configure.ac
+++ b/c/src/lib/libbsp/sh/gensh4/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-sh-gensh4],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/gensh4.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sh/gensh4/preinstall.am b/c/src/lib/libbsp/sh/gensh4/preinstall.am
deleted file mode 100644
index 70723c34fe..0000000000
--- a/c/src/lib/libbsp/sh/gensh4/preinstall.am
+++ /dev/null
@@ -1,109 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/sh/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/sh
-	@: > $(PROJECT_INCLUDE)/sh/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
-	@: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/sh/sh4uart.h: include/sh/sh4uart.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh4uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh4uart.h
-
-$(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h: include/rtems/score/sh7750_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h
-
-$(PROJECT_INCLUDE)/rtems/score/ipl.h: include/rtems/score/ipl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ipl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ipl.h
-
-$(PROJECT_INCLUDE)/rtems/score/iosh7750.h: include/rtems/score/iosh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7750.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7750.h
-
-$(PROJECT_INCLUDE)/rtems/score/ispsh7750.h: include/rtems/score/ispsh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h
-
-$(PROJECT_INCLUDE)/rtems/score/sh4_regs.h: include/rtems/score/sh4_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/sdram.h: include/sdram.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sdram.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sdram.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.rom: startup/linkcmds.rom $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.rom
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.rom
-
-$(PROJECT_LIB)/linkcmds.rom2ram: startup/linkcmds.rom2ram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.rom2ram
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.rom2ram
-
diff --git a/c/src/lib/libbsp/sh/gensh4/bsp_specs b/c/src/lib/libbsp/sh/gensh4/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/sh/gensh4/bsp_specs
+++ b/c/src/lib/libbsp/sh/gensh4/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am
index 98839139fe..9cd43bac4a 100644
--- a/c/src/lib/libbsp/sh/shsim/Makefile.am
+++ b/c/src/lib/libbsp/sh/shsim/Makefile.am
@@ -4,17 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_bsp_HEADERS = include/syscall.h
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 
 
@@ -23,7 +14,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -60,5 +51,5 @@ libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c
 libbsp_a_SOURCES += ../../shared/include/cache_.h
 libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sh/shsim/headers.am
diff --git a/c/src/lib/libbsp/sh/shsim/configure.ac b/c/src/lib/libbsp/sh/shsim/configure.ac
index 25fa949461..a1d3a95b7b 100644
--- a/c/src/lib/libbsp/sh/shsim/configure.ac
+++ b/c/src/lib/libbsp/sh/shsim/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-sh-shsim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/simsh1.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sh/shsim/preinstall.am b/c/src/lib/libbsp/sh/shsim/preinstall.am
deleted file mode 100644
index 738a41badc..0000000000
--- a/c/src/lib/libbsp/sh/shsim/preinstall.am
+++ /dev/null
@@ -1,71 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/syscall.h: include/syscall.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/syscall.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/syscall.h
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/sh/shsim/bsp_specs b/c/src/lib/libbsp/sh/shsim/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/sh/shsim/bsp_specs
+++ b/c/src/lib/libbsp/sh/shsim/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sparc/Makefile.am b/c/src/lib/libbsp/sparc/Makefile.am
index 30ea8497b5..7a23cbb3a8 100644
--- a/c/src/lib/libbsp/sparc/Makefile.am
+++ b/c/src/lib/libbsp/sparc/Makefile.am
@@ -191,3 +191,4 @@ EXTRA_DIST += shared/include/l4stat.h
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/sparc/headers.am
diff --git a/c/src/lib/libbsp/sparc/configure.ac b/c/src/lib/libbsp/sparc/configure.ac
index a3adc185e0..29b7f8408d 100644
--- a/c/src/lib/libbsp/sparc/configure.ac
+++ b/c/src/lib/libbsp/sparc/configure.ac
@@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc],
 [_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([shared])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
@@ -12,6 +14,8 @@ AM_MAINTAINER_MODE
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_PROJECT_ROOT
+AC_SUBST(RTEMS_CPU)
+AC_SUBST(RTEMS_BSP_FAMILIY)
 
 RTEMS_CHECK_BSPDIR([$RTEMS_BSP_FAMILY])
 
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index cf019faa95..cf499de0d5 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -4,27 +4,20 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
-include_HEADERS += include/erc32.h
 
 EXTRA_DIST += ../../sparc/shared/start/start.S
 start.$(OBJEXT): ../../sparc/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds ../shared/startup/linkcmds.base
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += ../shared/startup/linkcmds.base
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -51,7 +44,6 @@ libbsp_a_SOURCES += ../../sparc/shared/cpu.c
 libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
 # gnatsupp
 libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
-include_bsp_HEADERS = ../shared/include/gnatcommon.h
 # console
 libbsp_a_SOURCES += console/erc32_console.c ../../shared/console.c \
     ../../shared/console_select.c  ../../shared/console_control.c \
@@ -65,10 +57,6 @@ libbsp_a_SOURCES += ../../shared/clockdrv_shell.h
 libbsp_a_SOURCES += timer/timer.c
 
 # IRQ
-include_bsp_HEADERS += \
-    ../../shared/include/irq-generic.h \
-    ../../shared/include/irq-info.h \
-    include/bsp/irq.h
 libbsp_a_SOURCES += \
     ../../sparc/shared/irq/irq-shared.c \
     ../../sparc/shared/irq/bsp_isr_handler.c \
@@ -103,5 +91,5 @@ endif
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sparc/erc32/headers.am
diff --git a/c/src/lib/libbsp/sparc/erc32/configure.ac b/c/src/lib/libbsp/sparc/erc32/configure.ac
index 566a959b10..6e58139f95 100644
--- a/c/src/lib/libbsp/sparc/erc32/configure.ac
+++ b/c/src/lib/libbsp/sparc/erc32/configure.ac
@@ -5,6 +5,9 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc-erc32],
 [_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/erc32.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sparc/erc32/preinstall.am b/c/src/lib/libbsp/sparc/erc32/preinstall.am
deleted file mode 100644
index 831c8e4169..0000000000
--- a/c/src/lib/libbsp/sparc/erc32/preinstall.am
+++ /dev/null
@@ -1,87 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/erc32.h: include/erc32.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/erc32.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/erc32.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_INCLUDE)/bsp/gnatcommon.h: ../shared/include/gnatcommon.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gnatcommon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gnatcommon.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
diff --git a/c/src/lib/libbsp/sparc/erc32/bsp_specs b/c/src/lib/libbsp/sparc/erc32/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/sparc/erc32/bsp_specs
+++ b/c/src/lib/libbsp/sparc/erc32/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index 3a5845c8c9..1914c6956f 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -4,31 +4,22 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_bsp_HEADERS = ../../sparc/shared/include/debug_defs.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
-include_HEADERS += include/leon.h
 
 EXTRA_DIST += ../../sparc/shared/start/start.S
 start.$(OBJEXT): ../../sparc/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
+project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.base
-dist_project_lib_DATA += startup/linkcmds
-dist_project_lib_DATA += startup/linkcmds.leon2
 dist_project_lib_DATA += startup/linkcmds.at697f
+dist_project_lib_DATA += startup/linkcmds.leon2
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -54,19 +45,13 @@ libbsp_a_SOURCES += ../../sparc/shared/cpu.c
 libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
 # gnatsupp
 libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
-include_bsp_HEADERS += ../shared/include/gnatcommon.h
 # console
 libbsp_a_SOURCES += console/console.c console/debugputs.c
 # clock
 libbsp_a_SOURCES += clock/ckinit.c
 libbsp_a_SOURCES += ../../shared/clockdrv_shell.h
 # IRQ
-include_bsp_HEADERS += ../../sparc/shared/include/genirq.h
 libbsp_a_SOURCES += ../../sparc/shared/irq/genirq.c
-include_bsp_HEADERS += \
-    ../../shared/include/irq-generic.h \
-    ../../shared/include/irq-info.h \
-    include/bsp/irq.h
 libbsp_a_SOURCES += \
     ../../sparc/shared/irq/irq-shared.c \
     ../../sparc/shared/irq/bsp_isr_handler.c \
@@ -78,10 +63,6 @@ libbsp_a_SOURCES += \
     ../../shared/src/irq-shell.c
 
 # AMBA bus
-include_HEADERS += ../../sparc/shared/include/ambapp.h
-include_HEADERS += ../../sparc/shared/include/ambapp_ids.h
-include_HEADERS += ../../sparc/shared/include/grlib.h
-include_bsp_HEADERS += ../../sparc/shared/include/ahbstat.h
 libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c
 libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_alloc.c
 libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_count.c
@@ -95,17 +76,10 @@ libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_show.c
 libbsp_a_SOURCES += ../../sparc/shared/amba/ahbstat.c
 
 # Clock Driver and Timer Library
-include_bsp_HEADERS += ../../sparc/shared/include/gptimer.h
-include_bsp_HEADERS += ../../sparc/shared/include/tlib.h
 libbsp_a_SOURCES += ../../sparc/shared/timer/gptimer.c
 libbsp_a_SOURCES += ../../sparc/shared/timer/tlib.c
 
 # PCI
-include_bsp_HEADERS += ../../sparc/shared/include/grpci.h
-include_bsp_HEADERS += ../../sparc/shared/include/grpci2.h
-include_bsp_HEADERS += ../../sparc/shared/include/grpci2dma.h
-include_bsp_HEADERS += ../../sparc/shared/include/pcif.h
-include_bsp_HEADERS += include/at697_pci.h
 libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c
 libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2dma.c
 libbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c
@@ -115,13 +89,6 @@ libbsp_a_SOURCES +=  ../../sparc/shared/pci/pci_memreg_sparc_be.c
 libbsp_a_SOURCES +=  pci/at697_pci.c
 
 # PCI target devices
-include_bsp_HEADERS += ../../sparc/shared/include/gr_701.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_adcdac.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_io.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_spw_router.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_tmtc.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_leon4_n2x.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_cpci_gr740.h
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_701.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_rasta_adcdac.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_rasta_io.c
@@ -131,104 +98,66 @@ libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_leon4_n2x.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_cpci_gr740.c
 
 # B1553BRM
-include_bsp_HEADERS += ../../sparc/shared/include/b1553brm.h
-include_bsp_HEADERS += ../../sparc/shared/include/b1553rt.h
 libbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/b1553rt.c
 
 # GR1553B
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553b.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc_list.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553bm.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553rt.h
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553b.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bc.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bm.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553rt.c
 
 # CAN
-include_bsp_HEADERS += ../../sparc/shared/include/occan.h
-include_bsp_HEADERS += ../../sparc/shared/include/grcan.h
 libbsp_a_SOURCES += ../../sparc/shared/can/occan.c \
     ../../sparc/shared/can/grcan.c
 
 # SpaceWire
 if !HAS_SMP
-include_bsp_HEADERS += ../../sparc/shared/include/grspw.h
 libbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c
 endif
-include_bsp_HEADERS += ../../sparc/shared/include/grspw_pkt.h
-include_bsp_HEADERS += ../../sparc/shared/include/grspw_router.h
 libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_pkt.c
 libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_router.c
 
 # UART (RAW)
-include_bsp_HEADERS += ../../sparc/shared/include/apbuart.h
-
 # I2CMST
-include_bsp_HEADERS += ../../sparc/shared/include/i2cmst.h
 libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c
 
 # SPI
-include_bsp_HEADERS += ../../sparc/shared/include/spictrl.h
 libbsp_a_SOURCES += ../../sparc/shared/spi/spictrl.c
 
 # TIME
-include_bsp_HEADERS += ../../sparc/shared/include/spwcuc.h
-include_bsp_HEADERS += ../../sparc/shared/include/grctm.h
 libbsp_a_SOURCES += ../../sparc/shared/time/spwcuc.c
 libbsp_a_SOURCES += ../../sparc/shared/time/grctm.c
 
 # GPIO
-include_bsp_HEADERS += ../../sparc/shared/include/grgpio.h
-include_bsp_HEADERS += ../../sparc/shared/include/gpiolib.h
 libbsp_a_SOURCES += ../../sparc/shared/gpio/grgpio.c
 libbsp_a_SOURCES += ../../sparc/shared/gpio/gpiolib.c
 
 # PWM
-include_bsp_HEADERS += ../../sparc/shared/include/grpwm.h
 libbsp_a_SOURCES += ../../sparc/shared/pwm/grpwm.c
 
 # ADC and DAC
-include_bsp_HEADERS += ../../sparc/shared/include/gradcdac.h
 libbsp_a_SOURCES += ../../sparc/shared/analog/gradcdac.c
 
 # Memory controllers
 libbsp_a_SOURCES += ../../sparc/shared/mem/mctrl.c
-include_bsp_HEADERS += ../../sparc/shared/include/mctrl.h
-
 # l2cache
 libbsp_a_SOURCES += ../../sparc/shared/l2c/l2c.c
-include_bsp_HEADERS += ../../sparc/shared/include/l2c.h
-
 # griommu
 libbsp_a_SOURCES += ../../sparc/shared/iommu/griommu.c
-include_bsp_HEADERS += ../../sparc/shared/include/griommu.h
-
 # timer
 libbsp_a_SOURCES += timer/timer.c
 
 # TM/TC
-include_bsp_HEADERS += ../../sparc/shared/include/grtc.h
-include_bsp_HEADERS += ../../sparc/shared/include/grtm.h
 libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtc.c
 libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtm.c
 
 # MEMSCRUB
 libbsp_a_SOURCES += ../../sparc/shared/scrub/memscrub.c
-include_bsp_HEADERS += ../../sparc/shared/include/memscrub.h
-
 # L4STAT
 libbsp_a_SOURCES += ../../sparc/shared/stat/l4stat.c
-include_bsp_HEADERS += ../../sparc/shared/include/l4stat.h
-
 
 # Driver Manager
-include_drvmgrdir = $(includedir)/drvmgr
-include_drvmgr_HEADERS = ../../sparc/shared/include/drvmgr/ambapp_bus.h
-include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/leon2_amba_bus.h
-include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/bspcommon.h
 libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus.c
 libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus_leon2.c
 libbsp_a_SOURCES += ../../sparc/shared/drvmgr/leon2_amba_bus.c
@@ -258,13 +187,11 @@ endif
 if HAS_NETWORKING
 noinst_PROGRAMS += leon_greth.rel
 leon_greth_rel_SOURCES = ../../sparc/shared/net/greth.c
-include_bsp_HEADERS += ../../sparc/shared/include/greth.h
 leon_greth_rel_CPPFLAGS = $(AM_CPPFLAGS)
 leon_greth_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 leon_greth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # BSP Network configuration
-include_bsp_HEADERS += ../../sparc/shared/include/network_interface_add.h
 libbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c
 endif
 
@@ -282,5 +209,5 @@ endif
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sparc/leon2/headers.am
diff --git a/c/src/lib/libbsp/sparc/leon2/configure.ac b/c/src/lib/libbsp/sparc/leon2/configure.ac
index 5ca4a1353a..cb12706219 100644
--- a/c/src/lib/libbsp/sparc/leon2/configure.ac
+++ b/c/src/lib/libbsp/sparc/leon2/configure.ac
@@ -5,6 +5,9 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc-leon2],
 [_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/leon2.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -36,7 +39,6 @@ RTEMS_BSPOPTS_HELP([BSP_POWER_DOWN_AT_FATAL_HALT],
  error which will hand over to debugger, simulator, etc.])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile])
diff --git a/c/src/lib/libbsp/sparc/leon2/preinstall.am b/c/src/lib/libbsp/sparc/leon2/preinstall.am
deleted file mode 100644
index 7f44269d58..0000000000
--- a/c/src/lib/libbsp/sparc/leon2/preinstall.am
+++ /dev/null
@@ -1,314 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/debug_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/debug_defs.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/leon.h: include/leon.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/leon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/leon.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.leon2: startup/linkcmds.leon2 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.leon2
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.leon2
-
-$(PROJECT_LIB)/linkcmds.at697f: startup/linkcmds.at697f $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.at697f
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.at697f
-
-$(PROJECT_INCLUDE)/bsp/gnatcommon.h: ../shared/include/gnatcommon.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gnatcommon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gnatcommon.h
-
-$(PROJECT_INCLUDE)/bsp/genirq.h: ../../sparc/shared/include/genirq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/genirq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/genirq.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/ambapp.h: ../../sparc/shared/include/ambapp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp.h
-
-$(PROJECT_INCLUDE)/ambapp_ids.h: ../../sparc/shared/include/ambapp_ids.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp_ids.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp_ids.h
-
-$(PROJECT_INCLUDE)/grlib.h: ../../sparc/shared/include/grlib.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grlib.h
-
-$(PROJECT_INCLUDE)/bsp/ahbstat.h: ../../sparc/shared/include/ahbstat.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ahbstat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ahbstat.h
-
-$(PROJECT_INCLUDE)/bsp/gptimer.h: ../../sparc/shared/include/gptimer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gptimer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gptimer.h
-
-$(PROJECT_INCLUDE)/bsp/tlib.h: ../../sparc/shared/include/tlib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tlib.h
-
-$(PROJECT_INCLUDE)/bsp/grpci.h: ../../sparc/shared/include/grpci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci.h
-
-$(PROJECT_INCLUDE)/bsp/grpci2.h: ../../sparc/shared/include/grpci2.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci2.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci2.h
-
-$(PROJECT_INCLUDE)/bsp/grpci2dma.h: ../../sparc/shared/include/grpci2dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci2dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci2dma.h
-
-$(PROJECT_INCLUDE)/bsp/pcif.h: ../../sparc/shared/include/pcif.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pcif.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pcif.h
-
-$(PROJECT_INCLUDE)/bsp/at697_pci.h: include/at697_pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/at697_pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/at697_pci.h
-
-$(PROJECT_INCLUDE)/bsp/gr_701.h: ../../sparc/shared/include/gr_701.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_701.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_701.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h: ../../sparc/shared/include/gr_rasta_adcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_io.h: ../../sparc/shared/include/gr_rasta_io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h: ../../sparc/shared/include/gr_rasta_spw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h: ../../sparc/shared/include/gr_rasta_tmtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h
-
-$(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h: ../../sparc/shared/include/gr_leon4_n2x.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h
-
-$(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h: ../../sparc/shared/include/gr_cpci_gr740.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h
-
-$(PROJECT_INCLUDE)/bsp/b1553brm.h: ../../sparc/shared/include/b1553brm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553brm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553brm.h
-
-$(PROJECT_INCLUDE)/bsp/b1553rt.h: ../../sparc/shared/include/b1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553rt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553rt.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553b.h: ../../sparc/shared/include/gr1553b.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553b.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553b.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553bc.h: ../../sparc/shared/include/gr1553bc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553bc_list.h: ../../sparc/shared/include/gr1553bc_list.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553bm.h: ../../sparc/shared/include/gr1553bm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bm.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553rt.h: ../../sparc/shared/include/gr1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553rt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553rt.h
-
-$(PROJECT_INCLUDE)/bsp/occan.h: ../../sparc/shared/include/occan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/occan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/occan.h
-
-$(PROJECT_INCLUDE)/bsp/grcan.h: ../../sparc/shared/include/grcan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grcan.h
-
-if !HAS_SMP
-$(PROJECT_INCLUDE)/bsp/grspw.h: ../../sparc/shared/include/grspw.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw.h
-endif
-$(PROJECT_INCLUDE)/bsp/grspw_pkt.h: ../../sparc/shared/include/grspw_pkt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_pkt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_pkt.h
-
-$(PROJECT_INCLUDE)/bsp/grspw_router.h: ../../sparc/shared/include/grspw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_router.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_router.h
-
-$(PROJECT_INCLUDE)/bsp/apbuart.h: ../../sparc/shared/include/apbuart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart.h
-
-$(PROJECT_INCLUDE)/bsp/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2cmst.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2cmst.h
-
-$(PROJECT_INCLUDE)/bsp/spictrl.h: ../../sparc/shared/include/spictrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spictrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spictrl.h
-
-$(PROJECT_INCLUDE)/bsp/spwcuc.h: ../../sparc/shared/include/spwcuc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spwcuc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spwcuc.h
-
-$(PROJECT_INCLUDE)/bsp/grctm.h: ../../sparc/shared/include/grctm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grctm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grctm.h
-
-$(PROJECT_INCLUDE)/bsp/grgpio.h: ../../sparc/shared/include/grgpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grgpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grgpio.h
-
-$(PROJECT_INCLUDE)/bsp/gpiolib.h: ../../sparc/shared/include/gpiolib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpiolib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpiolib.h
-
-$(PROJECT_INCLUDE)/bsp/grpwm.h: ../../sparc/shared/include/grpwm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpwm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpwm.h
-
-$(PROJECT_INCLUDE)/bsp/gradcdac.h: ../../sparc/shared/include/gradcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gradcdac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gradcdac.h
-
-$(PROJECT_INCLUDE)/bsp/mctrl.h: ../../sparc/shared/include/mctrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mctrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mctrl.h
-
-$(PROJECT_INCLUDE)/bsp/l2c.h: ../../sparc/shared/include/l2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/l2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/l2c.h
-
-$(PROJECT_INCLUDE)/bsp/griommu.h: ../../sparc/shared/include/griommu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/griommu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/griommu.h
-
-$(PROJECT_INCLUDE)/bsp/grtc.h: ../../sparc/shared/include/grtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtc.h
-
-$(PROJECT_INCLUDE)/bsp/grtm.h: ../../sparc/shared/include/grtm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtm.h
-
-$(PROJECT_INCLUDE)/bsp/memscrub.h: ../../sparc/shared/include/memscrub.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/memscrub.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/memscrub.h
-
-$(PROJECT_INCLUDE)/bsp/l4stat.h: ../../sparc/shared/include/l4stat.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/l4stat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/l4stat.h
-
-$(PROJECT_INCLUDE)/drvmgr/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/drvmgr
-	@: > $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-
-$(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h: ../../sparc/shared/include/drvmgr/ambapp_bus.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h
-
-$(PROJECT_INCLUDE)/drvmgr/leon2_amba_bus.h: ../../sparc/shared/include/drvmgr/leon2_amba_bus.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/leon2_amba_bus.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/leon2_amba_bus.h
-
-$(PROJECT_INCLUDE)/drvmgr/bspcommon.h: ../../sparc/shared/include/drvmgr/bspcommon.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/bspcommon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/bspcommon.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/bsp/greth.h: ../../sparc/shared/include/greth.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/greth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/greth.h
-
-$(PROJECT_INCLUDE)/bsp/network_interface_add.h: ../../sparc/shared/include/network_interface_add.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/network_interface_add.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/network_interface_add.h
-endif
diff --git a/c/src/lib/libbsp/sparc/leon2/bsp_specs b/c/src/lib/libbsp/sparc/leon2/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/sparc/leon2/bsp_specs
+++ b/c/src/lib/libbsp/sparc/leon2/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index b73569d222..60e2a9044a 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -4,34 +4,25 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_bsp_HEADERS = ../../sparc/shared/include/debug_defs.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
-include_HEADERS += include/leon.h
 
 EXTRA_DIST += ../../sparc/shared/start/start.S
 start.$(OBJEXT): ../../sparc/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
+project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.base
-dist_project_lib_DATA += startup/linkcmds
+dist_project_lib_DATA += startup/linkcmds.gr712rc
+dist_project_lib_DATA += startup/linkcmds.gr740
 dist_project_lib_DATA += startup/linkcmds.leon3
 dist_project_lib_DATA += startup/linkcmds.ut699
-dist_project_lib_DATA += startup/linkcmds.gr712rc
 dist_project_lib_DATA += startup/linkcmds.ut700
-dist_project_lib_DATA += startup/linkcmds.gr740
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -55,13 +46,7 @@ libbsp_a_SOURCES += ../../sparc/shared/cpu.c
 libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
 # gnatsupp
 libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
-include_bsp_HEADERS += ../shared/include/gnatcommon.h
 # AMBA bus
-include_HEADERS += include/amba.h
-include_HEADERS += ../../sparc/shared/include/ambapp.h
-include_HEADERS += ../../sparc/shared/include/ambapp_ids.h
-include_HEADERS += ../../sparc/shared/include/grlib.h
-include_bsp_HEADERS += ../../sparc/shared/include/ahbstat.h
 libbsp_a_SOURCES += amba/amba.c
 libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c
 libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_alloc.c
@@ -76,8 +61,6 @@ libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_show.c
 libbsp_a_SOURCES += ../../sparc/shared/amba/ahbstat.c
 
 # Clock Driver and Timer Library
-include_bsp_HEADERS += ../../sparc/shared/include/gptimer.h
-include_bsp_HEADERS += ../../sparc/shared/include/tlib.h
 libbsp_a_SOURCES += ../../sparc/shared/timer/gptimer.c
 libbsp_a_SOURCES += ../../sparc/shared/timer/tlib.c
 libbsp_a_SOURCES += ../../sparc/shared/timer/tlib_ckinit.c
@@ -90,17 +73,10 @@ libbsp_a_SOURCES += ../../shared/console-termios.c
 libbsp_a_SOURCES += console/console.c
 libbsp_a_SOURCES += ../../sparc/shared/uart/cons.c
 libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart_cons.c
-include_bsp_HEADERS += ../../sparc/shared/include/cons.h
-include_bsp_HEADERS += ../../sparc/shared/include/apbuart_cons.h
 # debugio
 libbsp_a_SOURCES += console/printk_support.c
 
 # IRQ
-include_bsp_HEADERS += ../../sparc/shared/include/genirq.h
-include_bsp_HEADERS += \
-    ../../shared/include/irq-generic.h \
-    ../../shared/include/irq-info.h \
-    include/bsp/irq.h
 libbsp_a_SOURCES += \
     startup/eirq.c \
     ../../sparc/shared/irq/genirq.c  \
@@ -114,10 +90,6 @@ libbsp_a_SOURCES += \
     ../../shared/src/irq-shell.c
 
 # PCI
-include_bsp_HEADERS += ../../sparc/shared/include/grpci.h
-include_bsp_HEADERS += ../../sparc/shared/include/grpci2.h
-include_bsp_HEADERS += ../../sparc/shared/include/grpci2dma.h
-include_bsp_HEADERS += ../../sparc/shared/include/pcif.h
 libbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c
 libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c
 libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2dma.c
@@ -126,14 +98,6 @@ libbsp_a_SOURCES +=  ../../sparc/shared/pci/pci_memreg_sparc_le.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/pci_memreg_sparc_be.c
 
 # PCI target devices
-include_bsp_HEADERS += ../../sparc/shared/include/gr_701.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_adcdac.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_io.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_spw_router.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_tmtc.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_tmtc_1553.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_leon4_n2x.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_cpci_gr740.h
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_701.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_rasta_adcdac.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_rasta_io.c
@@ -144,122 +108,78 @@ libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_leon4_n2x.c
 libbsp_a_SOURCES +=  ../../sparc/shared/pci/gr_cpci_gr740.c
 
 # B1553BRM
-include_bsp_HEADERS += ../../sparc/shared/include/b1553brm.h
-include_bsp_HEADERS += ../../sparc/shared/include/b1553rt.h
 libbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/b1553rt.c
 
 # GR1553B
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553b.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc_list.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553bm.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553rt.h
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553b.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bc.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bm.c
 libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553rt.c
 
 # CAN
-include_bsp_HEADERS += ../../sparc/shared/include/occan.h \
-    ../../sparc/shared/include/grcan.h
 libbsp_a_SOURCES += ../../sparc/shared/can/occan.c \
     ../../sparc/shared/can/grcan.c
 
 # SpaceWire
 if !HAS_SMP
-include_bsp_HEADERS += ../../sparc/shared/include/grspw.h
 libbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c
 endif
-include_bsp_HEADERS += ../../sparc/shared/include/grspw_pkt.h
-include_bsp_HEADERS += ../../sparc/shared/include/grspw_router.h
 libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_pkt.c
 libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_router.c
 
 # UART
-include_bsp_HEADERS += ../../sparc/shared/include/apbuart.h \
-    ../../sparc/shared/include/apbuart_termios.h
 libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart_termios.c
 
 # I2CMST
-include_bsp_HEADERS += ../../sparc/shared/include/i2cmst.h
 libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c
 
 # SPI
-include_bsp_HEADERS += ../../sparc/shared/include/spictrl.h
 libbsp_a_SOURCES += ../../sparc/shared/spi/spictrl.c
 
 # TIME
-include_bsp_HEADERS += ../../sparc/shared/include/spwcuc.h
-include_bsp_HEADERS += ../../sparc/shared/include/grctm.h
 libbsp_a_SOURCES += ../../sparc/shared/time/spwcuc.c
 libbsp_a_SOURCES += ../../sparc/shared/time/grctm.c
 
 # GPIO
-include_bsp_HEADERS += ../../sparc/shared/include/grgpio.h
-include_bsp_HEADERS += ../../sparc/shared/include/gpiolib.h
 libbsp_a_SOURCES += ../../sparc/shared/gpio/grgpio.c
 libbsp_a_SOURCES += ../../sparc/shared/gpio/gpiolib.c
 
 # PWM
-include_bsp_HEADERS += ../../sparc/shared/include/grpwm.h
 libbsp_a_SOURCES += ../../sparc/shared/pwm/grpwm.c
 
 # ADC and DAC
-include_bsp_HEADERS += ../../sparc/shared/include/gradcdac.h
 libbsp_a_SOURCES += ../../sparc/shared/analog/gradcdac.c
 
 # Memory controllers
 libbsp_a_SOURCES += ../../sparc/shared/mem/mctrl.c
-include_bsp_HEADERS += ../../sparc/shared/include/mctrl.h
-
 # l2cache
 libbsp_a_SOURCES += ../../sparc/shared/l2c/l2c.c
-include_bsp_HEADERS += ../../sparc/shared/include/l2c.h
-
 # griommu
 libbsp_a_SOURCES += ../../sparc/shared/iommu/griommu.c
-include_bsp_HEADERS += ../../sparc/shared/include/griommu.h
-
 # timer
 libbsp_a_SOURCES += timer/timer.c
 libbsp_a_SOURCES += timer/watchdog.c
-include_bsp_HEADERS += include/watchdog.h
-
 # Cache
 libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c
 libbsp_a_SOURCES += include/cache_.h
 libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include
 
 # GR712
-include_bsp_HEADERS += ../../sparc/shared/include/grascs.h
-include_bsp_HEADERS += ../../sparc/shared/include/satcan.h 
-include_bsp_HEADERS += ../../sparc/shared/include/canmux.h
-include_bsp_HEADERS += ../../sparc/shared/include/grslink.h
 libbsp_a_SOURCES += ../../sparc/shared/ascs/grascs.c
 libbsp_a_SOURCES += ../../sparc/shared/can/satcan.c
 libbsp_a_SOURCES += ../../sparc/shared/can/canmux.c
 libbsp_a_SOURCES += ../../sparc/shared/slink/grslink.c
 
 # TM/TC
-include_bsp_HEADERS += ../../sparc/shared/include/grtc.h
-include_bsp_HEADERS += ../../sparc/shared/include/grtm.h
 libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtc.c
 libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtm.c
 
 # MEMSCRUB
 libbsp_a_SOURCES += ../../sparc/shared/scrub/memscrub.c
-include_bsp_HEADERS += ../../sparc/shared/include/memscrub.h
-
 # L4STAT
 libbsp_a_SOURCES += ../../sparc/shared/stat/l4stat.c
-include_bsp_HEADERS += ../../sparc/shared/include/l4stat.h
-
 # Driver Manager 
-include_drvmgrdir = $(includedir)/drvmgr
-include_drvmgr_HEADERS = ../../sparc/shared/include/drvmgr/ambapp_bus_grlib.h
-include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/ambapp_bus.h
-include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/bspcommon.h
 libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus.c
 libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus_grlib.c
 libbsp_a_SOURCES += ../../sparc/shared/drvmgr/get_resarray_count.c
@@ -290,7 +210,6 @@ if !HAS_SMP
 libbsp_a_SOURCES += leon_greth/leon_greth.c
 endif
 leon_greth_rel_SOURCES = ../../sparc/shared/net/greth.c
-include_bsp_HEADERS += ../../sparc/shared/include/greth.h
 leon_greth_rel_CPPFLAGS = $(AM_CPPFLAGS)
 leon_greth_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 leon_greth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
@@ -298,7 +217,6 @@ endif
 
 # BSP Network configuration
 if HAS_NETWORKING
-include_bsp_HEADERS += ../../sparc/shared/include/network_interface_add.h
 libbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c
 endif
 
@@ -322,5 +240,5 @@ endif
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sparc/leon3/headers.am
diff --git a/c/src/lib/libbsp/sparc/leon3/configure.ac b/c/src/lib/libbsp/sparc/leon3/configure.ac
index 83e754688c..c972868a8d 100644
--- a/c/src/lib/libbsp/sparc/leon3/configure.ac
+++ b/c/src/lib/libbsp/sparc/leon3/configure.ac
@@ -5,6 +5,9 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc-leon3],
 [_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/leon3.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -38,7 +41,6 @@ RTEMS_BSPOPTS_HELP([BSP_POWER_DOWN_AT_FATAL_HALT],
  error which will hand over to debugger, simulator, etc.])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile])
diff --git a/c/src/lib/libbsp/sparc/leon3/preinstall.am b/c/src/lib/libbsp/sparc/leon3/preinstall.am
deleted file mode 100644
index 4d00a43c18..0000000000
--- a/c/src/lib/libbsp/sparc/leon3/preinstall.am
+++ /dev/null
@@ -1,363 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/debug_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/debug_defs.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/leon.h: include/leon.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/leon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/leon.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.leon3: startup/linkcmds.leon3 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.leon3
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.leon3
-
-$(PROJECT_LIB)/linkcmds.ut699: startup/linkcmds.ut699 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.ut699
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.ut699
-
-$(PROJECT_LIB)/linkcmds.gr712rc: startup/linkcmds.gr712rc $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.gr712rc
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.gr712rc
-
-$(PROJECT_LIB)/linkcmds.ut700: startup/linkcmds.ut700 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.ut700
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.ut700
-
-$(PROJECT_LIB)/linkcmds.gr740: startup/linkcmds.gr740 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.gr740
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.gr740
-
-$(PROJECT_INCLUDE)/bsp/gnatcommon.h: ../shared/include/gnatcommon.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gnatcommon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gnatcommon.h
-
-$(PROJECT_INCLUDE)/amba.h: include/amba.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/amba.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/amba.h
-
-$(PROJECT_INCLUDE)/ambapp.h: ../../sparc/shared/include/ambapp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp.h
-
-$(PROJECT_INCLUDE)/ambapp_ids.h: ../../sparc/shared/include/ambapp_ids.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp_ids.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp_ids.h
-
-$(PROJECT_INCLUDE)/grlib.h: ../../sparc/shared/include/grlib.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grlib.h
-
-$(PROJECT_INCLUDE)/bsp/ahbstat.h: ../../sparc/shared/include/ahbstat.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ahbstat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ahbstat.h
-
-$(PROJECT_INCLUDE)/bsp/gptimer.h: ../../sparc/shared/include/gptimer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gptimer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gptimer.h
-
-$(PROJECT_INCLUDE)/bsp/tlib.h: ../../sparc/shared/include/tlib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tlib.h
-
-$(PROJECT_INCLUDE)/bsp/cons.h: ../../sparc/shared/include/cons.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/cons.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/cons.h
-
-$(PROJECT_INCLUDE)/bsp/apbuart_cons.h: ../../sparc/shared/include/apbuart_cons.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart_cons.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart_cons.h
-
-$(PROJECT_INCLUDE)/bsp/genirq.h: ../../sparc/shared/include/genirq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/genirq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/genirq.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/grpci.h: ../../sparc/shared/include/grpci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci.h
-
-$(PROJECT_INCLUDE)/bsp/grpci2.h: ../../sparc/shared/include/grpci2.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci2.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci2.h
-
-$(PROJECT_INCLUDE)/bsp/grpci2dma.h: ../../sparc/shared/include/grpci2dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci2dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci2dma.h
-
-$(PROJECT_INCLUDE)/bsp/pcif.h: ../../sparc/shared/include/pcif.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pcif.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pcif.h
-
-$(PROJECT_INCLUDE)/bsp/gr_701.h: ../../sparc/shared/include/gr_701.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_701.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_701.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h: ../../sparc/shared/include/gr_rasta_adcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_io.h: ../../sparc/shared/include/gr_rasta_io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h: ../../sparc/shared/include/gr_rasta_spw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h: ../../sparc/shared/include/gr_rasta_tmtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h
-
-$(PROJECT_INCLUDE)/bsp/gr_tmtc_1553.h: ../../sparc/shared/include/gr_tmtc_1553.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_tmtc_1553.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_tmtc_1553.h
-
-$(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h: ../../sparc/shared/include/gr_leon4_n2x.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h
-
-$(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h: ../../sparc/shared/include/gr_cpci_gr740.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h
-
-$(PROJECT_INCLUDE)/bsp/b1553brm.h: ../../sparc/shared/include/b1553brm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553brm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553brm.h
-
-$(PROJECT_INCLUDE)/bsp/b1553rt.h: ../../sparc/shared/include/b1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553rt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553rt.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553b.h: ../../sparc/shared/include/gr1553b.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553b.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553b.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553bc.h: ../../sparc/shared/include/gr1553bc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553bc_list.h: ../../sparc/shared/include/gr1553bc_list.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553bm.h: ../../sparc/shared/include/gr1553bm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bm.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553rt.h: ../../sparc/shared/include/gr1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553rt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553rt.h
-
-$(PROJECT_INCLUDE)/bsp/occan.h: ../../sparc/shared/include/occan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/occan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/occan.h
-
-$(PROJECT_INCLUDE)/bsp/grcan.h: ../../sparc/shared/include/grcan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grcan.h
-
-if !HAS_SMP
-$(PROJECT_INCLUDE)/bsp/grspw.h: ../../sparc/shared/include/grspw.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw.h
-endif
-$(PROJECT_INCLUDE)/bsp/grspw_pkt.h: ../../sparc/shared/include/grspw_pkt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_pkt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_pkt.h
-
-$(PROJECT_INCLUDE)/bsp/grspw_router.h: ../../sparc/shared/include/grspw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_router.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_router.h
-
-$(PROJECT_INCLUDE)/bsp/apbuart.h: ../../sparc/shared/include/apbuart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart.h
-
-$(PROJECT_INCLUDE)/bsp/apbuart_termios.h: ../../sparc/shared/include/apbuart_termios.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart_termios.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart_termios.h
-
-$(PROJECT_INCLUDE)/bsp/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2cmst.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2cmst.h
-
-$(PROJECT_INCLUDE)/bsp/spictrl.h: ../../sparc/shared/include/spictrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spictrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spictrl.h
-
-$(PROJECT_INCLUDE)/bsp/spwcuc.h: ../../sparc/shared/include/spwcuc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spwcuc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spwcuc.h
-
-$(PROJECT_INCLUDE)/bsp/grctm.h: ../../sparc/shared/include/grctm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grctm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grctm.h
-
-$(PROJECT_INCLUDE)/bsp/grgpio.h: ../../sparc/shared/include/grgpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grgpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grgpio.h
-
-$(PROJECT_INCLUDE)/bsp/gpiolib.h: ../../sparc/shared/include/gpiolib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpiolib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpiolib.h
-
-$(PROJECT_INCLUDE)/bsp/grpwm.h: ../../sparc/shared/include/grpwm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpwm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpwm.h
-
-$(PROJECT_INCLUDE)/bsp/gradcdac.h: ../../sparc/shared/include/gradcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gradcdac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gradcdac.h
-
-$(PROJECT_INCLUDE)/bsp/mctrl.h: ../../sparc/shared/include/mctrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mctrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mctrl.h
-
-$(PROJECT_INCLUDE)/bsp/l2c.h: ../../sparc/shared/include/l2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/l2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/l2c.h
-
-$(PROJECT_INCLUDE)/bsp/griommu.h: ../../sparc/shared/include/griommu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/griommu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/griommu.h
-
-$(PROJECT_INCLUDE)/bsp/watchdog.h: include/watchdog.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/watchdog.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/watchdog.h
-
-$(PROJECT_INCLUDE)/bsp/grascs.h: ../../sparc/shared/include/grascs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grascs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grascs.h
-
-$(PROJECT_INCLUDE)/bsp/satcan.h: ../../sparc/shared/include/satcan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/satcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/satcan.h
-
-$(PROJECT_INCLUDE)/bsp/canmux.h: ../../sparc/shared/include/canmux.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/canmux.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/canmux.h
-
-$(PROJECT_INCLUDE)/bsp/grslink.h: ../../sparc/shared/include/grslink.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grslink.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grslink.h
-
-$(PROJECT_INCLUDE)/bsp/grtc.h: ../../sparc/shared/include/grtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtc.h
-
-$(PROJECT_INCLUDE)/bsp/grtm.h: ../../sparc/shared/include/grtm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtm.h
-
-$(PROJECT_INCLUDE)/bsp/memscrub.h: ../../sparc/shared/include/memscrub.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/memscrub.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/memscrub.h
-
-$(PROJECT_INCLUDE)/bsp/l4stat.h: ../../sparc/shared/include/l4stat.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/l4stat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/l4stat.h
-
-$(PROJECT_INCLUDE)/drvmgr/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/drvmgr
-	@: > $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-
-$(PROJECT_INCLUDE)/drvmgr/ambapp_bus_grlib.h: ../../sparc/shared/include/drvmgr/ambapp_bus_grlib.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/ambapp_bus_grlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/ambapp_bus_grlib.h
-
-$(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h: ../../sparc/shared/include/drvmgr/ambapp_bus.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h
-
-$(PROJECT_INCLUDE)/drvmgr/bspcommon.h: ../../sparc/shared/include/drvmgr/bspcommon.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/bspcommon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/bspcommon.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/bsp/greth.h: ../../sparc/shared/include/greth.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/greth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/greth.h
-endif
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/bsp/network_interface_add.h: ../../sparc/shared/include/network_interface_add.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/network_interface_add.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/network_interface_add.h
-endif
diff --git a/c/src/lib/libbsp/sparc/leon3/bsp_specs b/c/src/lib/libbsp/sparc/leon3/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/sparc/leon3/bsp_specs
+++ b/c/src/lib/libbsp/sparc/leon3/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sparc64/Makefile.am b/c/src/lib/libbsp/sparc64/Makefile.am
index 526453030c..b0e0689014 100644
--- a/c/src/lib/libbsp/sparc64/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/Makefile.am
@@ -5,3 +5,4 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/sparc64/headers.am
diff --git a/c/src/lib/libbsp/sparc64/configure.ac b/c/src/lib/libbsp/sparc64/configure.ac
index dc62789228..4c696899f3 100644
--- a/c/src/lib/libbsp/sparc64/configure.ac
+++ b/c/src/lib/libbsp/sparc64/configure.ac
@@ -7,6 +7,8 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc64],[_RTEMS_VERSION],[https://devel.rtems.o
 # AC_CONFIG_SRCDIR([shared])
 
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
index 0267cc9a6c..717dfdc638 100644
--- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
@@ -4,28 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h 
-include_HEADERS += include/tm27.h
-include_HEADERS += ../shared/include/asm.h
-
-include_bootdir = $(includedir)/boot
-include_boot_HEADERS = ../shared/helenos/boot/include/align.h \
-  ../shared/helenos/boot/include/balloc.h \
-  ../shared/helenos/boot/include/gentypes.h \
-  ../shared/helenos/boot/include/main.h \
-  ../shared/helenos/boot/include/ofwarch.h \
-  ../shared/helenos/boot/include/ofw.h \
-  ../shared/helenos/boot/include/ofw_tree.h \
-  ../shared/helenos/boot/include/register.h \
-  ../shared/helenos/boot/include/stack.h \
-  ../shared/helenos/boot/include/types.h
-
-nodist_include_HEADERS = include/bspopts.h    
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h 
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -75,5 +55,5 @@ libbsp_a_LIBADD = \
       ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
       ../../../libcpu/@RTEMS_CPU@/shared/sparc64-syscall.rel 
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sparc64/niagara/headers.am
diff --git a/c/src/lib/libbsp/sparc64/niagara/configure.ac b/c/src/lib/libbsp/sparc64/niagara/configure.ac
index 761700175e..cd5d26121e 100644
--- a/c/src/lib/libbsp/sparc64/niagara/configure.ac
+++ b/c/src/lib/libbsp/sparc64/niagara/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-sparc64-sun4v],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/niagara.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sparc64/niagara/preinstall.am b/c/src/lib/libbsp/sparc64/niagara/preinstall.am
deleted file mode 100644
index d2c8f3b3b8..0000000000
--- a/c/src/lib/libbsp/sparc64/niagara/preinstall.am
+++ /dev/null
@@ -1,112 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/asm.h: ../shared/include/asm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
-
-$(PROJECT_INCLUDE)/boot/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/boot
-	@: > $(PROJECT_INCLUDE)/boot/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/boot/$(dirstamp)
-
-$(PROJECT_INCLUDE)/boot/align.h: ../shared/helenos/boot/include/align.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/align.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/align.h
-
-$(PROJECT_INCLUDE)/boot/balloc.h: ../shared/helenos/boot/include/balloc.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/balloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/balloc.h
-
-$(PROJECT_INCLUDE)/boot/gentypes.h: ../shared/helenos/boot/include/gentypes.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/gentypes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/gentypes.h
-
-$(PROJECT_INCLUDE)/boot/main.h: ../shared/helenos/boot/include/main.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/main.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/main.h
-
-$(PROJECT_INCLUDE)/boot/ofwarch.h: ../shared/helenos/boot/include/ofwarch.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofwarch.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofwarch.h
-
-$(PROJECT_INCLUDE)/boot/ofw.h: ../shared/helenos/boot/include/ofw.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw.h
-
-$(PROJECT_INCLUDE)/boot/ofw_tree.h: ../shared/helenos/boot/include/ofw_tree.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw_tree.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw_tree.h
-
-$(PROJECT_INCLUDE)/boot/register.h: ../shared/helenos/boot/include/register.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/register.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/register.h
-
-$(PROJECT_INCLUDE)/boot/stack.h: ../shared/helenos/boot/include/stack.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/stack.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/stack.h
-
-$(PROJECT_INCLUDE)/boot/types.h: ../shared/helenos/boot/include/types.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/types.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: ../shared/startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/sparc64/niagara/bsp_specs b/c/src/lib/libbsp/sparc64/niagara/startup/bsp_specs
index 0b4b0db932..0b4b0db932 100644
--- a/c/src/lib/libbsp/sparc64/niagara/bsp_specs
+++ b/c/src/lib/libbsp/sparc64/niagara/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
index 90be322b0d..cf2828a015 100644
--- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
@@ -4,74 +4,16 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h 
-include_HEADERS += include/tm27.h
-include_HEADERS += ../shared/include/asm.h 
-include_HEADERS += ../shared/include/traptable.h 
+dist_project_lib_DATA = startup/bsp_specs
 
 ## these are the include files used by the boot process from HelenOS Sparc64
-include_bootdir = $(includedir)/boot
-include_boot_HEADERS = \
-  ../shared/helenos/boot/include/align.h \
-  ../shared/helenos/boot/include/balloc.h \
-  ../shared/helenos/boot/include/gentypes.h \
-  ../shared/helenos/boot/include/main.h \
-  ../shared/helenos/boot/include/ofwarch.h \
-  ../shared/helenos/boot/include/ofw.h \
-  ../shared/helenos/boot/include/ofw_tree.h \
-  ../shared/helenos/boot/include/register.h \
-  ../shared/helenos/boot/include/stack.h \
-  ../shared/helenos/boot/include/types.h 
-
 ## These include files mimic the HelenOS kernel include layout, which 
 ## in HelenOS-0.4.2 is more complicated than the boot include dirs.
 
 # assumed by the HelenOS sources to be in the root includedir. We place them
 # in a kernel include directory.
-include_kerneldir = $(includedir)/kernel
-include_kernel_HEADERS = \
-  ../shared/helenos/kernel/generic/include/align.h
-
-include_archdir = $(includedir)/arch
-include_arch_HEADERS = \
-  ../shared/helenos/kernel/sparc64/include/arch.h \
-  ../shared/helenos/kernel/sparc64/include/boot.h \
-  ../shared/helenos/kernel/sparc64/include/regdef.h \
-  ../shared/helenos/kernel/sparc64/include/stack.h 
-
-include_arch_sun4udir = $(includedir)/arch/sun4u
-include_arch_sun4u_HEADERS = \
-  ../shared/helenos/kernel/sparc64/include/sun4u/arch.h 
-
-include_arch_mmdir = $(includedir)/arch/mm
-include_arch_mm_HEADERS = \
-  ../shared/helenos/kernel/sparc64/include/mm/cache_spec.h \
-  ../shared/helenos/kernel/sparc64/include/mm/frame.h \
-  ../shared/helenos/kernel/sparc64/include/mm/mmu.h \
-  ../shared/helenos/kernel/sparc64/include/mm/page.h \
-  ../shared/helenos/kernel/sparc64/include/mm/tlb.h \
-  ../shared/helenos/kernel/sparc64/include/mm/tte.h
-
-
-include_arch_mm_sun4udir = $(includedir)/arch/mm/sun4u
-include_arch_mm_sun4u_HEADERS = \
-  ../shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h \
-  ../shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h \
-  ../shared/helenos/kernel/sparc64/include/mm/sun4u/page.h \
-  ../shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h \
-  ../shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h
-
-include_genarch_ofwdir = $(includedir)/genarch/ofw
-include_genarch_ofw_HEADERS = \
-  ../shared/helenos/kernel/genarch/include/ofw/ofw_tree.h
-
-
-nodist_include_HEADERS = include/bspopts.h    
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h 
+
+
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -127,5 +69,5 @@ libbsp_a_LIBADD = \
       ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
       ../../../libcpu/@RTEMS_CPU@/shared/sparc64-syscall.rel 
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sparc64/usiii/headers.am
diff --git a/c/src/lib/libbsp/sparc64/usiii/configure.ac b/c/src/lib/libbsp/sparc64/usiii/configure.ac
index 1d183d2a63..a95c48fd8b 100644
--- a/c/src/lib/libbsp/sparc64/usiii/configure.ac
+++ b/c/src/lib/libbsp/sparc64/usiii/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-sparc64-sun4u],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/usiii.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sparc64/usiii/preinstall.am b/c/src/lib/libbsp/sparc64/usiii/preinstall.am
deleted file mode 100644
index fa403a3842..0000000000
--- a/c/src/lib/libbsp/sparc64/usiii/preinstall.am
+++ /dev/null
@@ -1,218 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/asm.h: ../shared/include/asm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
-
-$(PROJECT_INCLUDE)/traptable.h: ../shared/include/traptable.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/traptable.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/traptable.h
-
-$(PROJECT_INCLUDE)/boot/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/boot
-	@: > $(PROJECT_INCLUDE)/boot/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/boot/$(dirstamp)
-
-$(PROJECT_INCLUDE)/boot/align.h: ../shared/helenos/boot/include/align.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/align.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/align.h
-
-$(PROJECT_INCLUDE)/boot/balloc.h: ../shared/helenos/boot/include/balloc.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/balloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/balloc.h
-
-$(PROJECT_INCLUDE)/boot/gentypes.h: ../shared/helenos/boot/include/gentypes.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/gentypes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/gentypes.h
-
-$(PROJECT_INCLUDE)/boot/main.h: ../shared/helenos/boot/include/main.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/main.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/main.h
-
-$(PROJECT_INCLUDE)/boot/ofwarch.h: ../shared/helenos/boot/include/ofwarch.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofwarch.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofwarch.h
-
-$(PROJECT_INCLUDE)/boot/ofw.h: ../shared/helenos/boot/include/ofw.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw.h
-
-$(PROJECT_INCLUDE)/boot/ofw_tree.h: ../shared/helenos/boot/include/ofw_tree.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw_tree.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw_tree.h
-
-$(PROJECT_INCLUDE)/boot/register.h: ../shared/helenos/boot/include/register.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/register.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/register.h
-
-$(PROJECT_INCLUDE)/boot/stack.h: ../shared/helenos/boot/include/stack.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/stack.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/stack.h
-
-$(PROJECT_INCLUDE)/boot/types.h: ../shared/helenos/boot/include/types.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/types.h
-
-$(PROJECT_INCLUDE)/kernel/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/kernel
-	@: > $(PROJECT_INCLUDE)/kernel/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/kernel/$(dirstamp)
-
-$(PROJECT_INCLUDE)/kernel/align.h: ../shared/helenos/kernel/generic/include/align.h $(PROJECT_INCLUDE)/kernel/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/kernel/align.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/kernel/align.h
-
-$(PROJECT_INCLUDE)/arch/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/arch
-	@: > $(PROJECT_INCLUDE)/arch/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/$(dirstamp)
-
-$(PROJECT_INCLUDE)/arch/arch.h: ../shared/helenos/kernel/sparc64/include/arch.h $(PROJECT_INCLUDE)/arch/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/arch.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/arch.h
-
-$(PROJECT_INCLUDE)/arch/boot.h: ../shared/helenos/kernel/sparc64/include/boot.h $(PROJECT_INCLUDE)/arch/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/boot.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/boot.h
-
-$(PROJECT_INCLUDE)/arch/regdef.h: ../shared/helenos/kernel/sparc64/include/regdef.h $(PROJECT_INCLUDE)/arch/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/regdef.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/regdef.h
-
-$(PROJECT_INCLUDE)/arch/stack.h: ../shared/helenos/kernel/sparc64/include/stack.h $(PROJECT_INCLUDE)/arch/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/stack.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/stack.h
-
-$(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/arch/sun4u
-	@: > $(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp)
-
-$(PROJECT_INCLUDE)/arch/sun4u/arch.h: ../shared/helenos/kernel/sparc64/include/sun4u/arch.h $(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/sun4u/arch.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/sun4u/arch.h
-
-$(PROJECT_INCLUDE)/arch/mm/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/arch/mm
-	@: > $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-
-$(PROJECT_INCLUDE)/arch/mm/cache_spec.h: ../shared/helenos/kernel/sparc64/include/mm/cache_spec.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/cache_spec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/cache_spec.h
-
-$(PROJECT_INCLUDE)/arch/mm/frame.h: ../shared/helenos/kernel/sparc64/include/mm/frame.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/frame.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/frame.h
-
-$(PROJECT_INCLUDE)/arch/mm/mmu.h: ../shared/helenos/kernel/sparc64/include/mm/mmu.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/mmu.h
-
-$(PROJECT_INCLUDE)/arch/mm/page.h: ../shared/helenos/kernel/sparc64/include/mm/page.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/page.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/page.h
-
-$(PROJECT_INCLUDE)/arch/mm/tlb.h: ../shared/helenos/kernel/sparc64/include/mm/tlb.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/tlb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/tlb.h
-
-$(PROJECT_INCLUDE)/arch/mm/tte.h: ../shared/helenos/kernel/sparc64/include/mm/tte.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/tte.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/tte.h
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/arch/mm/sun4u
-	@: > $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/frame.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/frame.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/frame.h
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/mmu.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/mmu.h
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/page.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/page.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/page.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/page.h
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/tlb.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/tlb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/tlb.h
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/tte.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/tte.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/tte.h
-
-$(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/genarch/ofw
-	@: > $(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp)
-
-$(PROJECT_INCLUDE)/genarch/ofw/ofw_tree.h: ../shared/helenos/kernel/genarch/include/ofw/ofw_tree.h $(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/genarch/ofw/ofw_tree.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/genarch/ofw/ofw_tree.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: ../shared/startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/sparc64/usiii/bsp_specs b/c/src/lib/libbsp/sparc64/usiii/startup/bsp_specs
index 0b4b0db932..0b4b0db932 100644
--- a/c/src/lib/libbsp/sparc64/usiii/bsp_specs
+++ b/c/src/lib/libbsp/sparc64/usiii/startup/bsp_specs
diff --git a/c/src/lib/libbsp/v850/Makefile.am b/c/src/lib/libbsp/v850/Makefile.am
index 15054fee72..169d11d284 100644
--- a/c/src/lib/libbsp/v850/Makefile.am
+++ b/c/src/lib/libbsp/v850/Makefile.am
@@ -10,6 +10,5 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 EXTRA_DIST =
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libbsp/v850/configure.ac b/c/src/lib/libbsp/v850/configure.ac
index 0c9d1eaa9c..01b8360510 100644
--- a/c/src/lib/libbsp/v850/configure.ac
+++ b/c/src/lib/libbsp/v850/configure.ac
@@ -5,6 +5,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-v850],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([gdbv850sim])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
index ebddaf8af3..2f06d2ccd2 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
+++ b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
@@ -7,17 +7,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_bsp_HEADERS = include/syscall.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -27,7 +18,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 libbsp_a_SOURCES = ../../shared/bspclean.c
 libbsp_a_SOURCES += ../../shared/bsppredriverhook.c
@@ -53,5 +44,5 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
 
 noinst_LIBRARIES = libbsp.a
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/v850/gdbv850sim/headers.am
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/configure.ac b/c/src/lib/libbsp/v850/gdbv850sim/configure.ac
index 26d8fa4384..a22f163461 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/configure.ac
+++ b/c/src/lib/libbsp/v850/gdbv850sim/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-v850-gdbv850sim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/v850e1sim.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/preinstall.am b/c/src/lib/libbsp/v850/gdbv850sim/preinstall.am
deleted file mode 100644
index 32e0c260ef..0000000000
--- a/c/src/lib/libbsp/v850/gdbv850sim/preinstall.am
+++ /dev/null
@@ -1,71 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp/syscall.h: include/syscall.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/syscall.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/syscall.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/bsp_specs b/c/src/lib/libbsp/v850/gdbv850sim/startup/bsp_specs
index 13be8e3f41..13be8e3f41 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/bsp_specs
+++ b/c/src/lib/libbsp/v850/gdbv850sim/startup/bsp_specs
diff --git a/c/src/lib/libbsp/v850/preinstall.am b/c/src/lib/libbsp/v850/preinstall.am
deleted file mode 100644
index dba6cc4d81..0000000000
--- a/c/src/lib/libbsp/v850/preinstall.am
+++ /dev/null
@@ -1,7 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
diff --git a/c/src/lib/libcpu/Makefile.am b/c/src/lib/libcpu/Makefile.am
index 38de255d1a..9cc2ece050 100644
--- a/c/src/lib/libcpu/Makefile.am
+++ b/c/src/lib/libcpu/Makefile.am
@@ -1,5 +1,3 @@
-include_libcpudir = $(includedir)/libcpu
-
 EXTRA_DIST =
 EXTRA_DIST += shared/include/cache.h
 EXTRA_DIST += shared/src/cache_manager.c
diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am
index 7f76673cfd..35b08e2495 100644
--- a/c/src/lib/libcpu/arm/Makefile.am
+++ b/c/src/lib/libcpu/arm/Makefile.am
@@ -6,17 +6,9 @@ EXTRA_DIST =
 
 noinst_PROGRAMS =
 
-include_bspdir = $(includedir)/bsp
-include_libcpudir = $(includedir)/libcpu
-
-include_bsp_HEADERS =
-include_libcpu_HEADERS =
-
 ## shared/include
 if shared
 
-include_libcpu_HEADERS += shared/include/mmu.h
-
 ## shared/arm920
 noinst_PROGRAMS += shared/arm920.rel
 shared_arm920_rel_SOURCES = shared/arm920/mmu.c
@@ -24,5 +16,4 @@ shared_arm920_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/src
 shared_arm920_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/arm/configure.ac b/c/src/lib/libcpu/arm/configure.ac
index c72c34eb19..a5e3e1cc88 100644
--- a/c/src/lib/libcpu/arm/configure.ac
+++ b/c/src/lib/libcpu/arm/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libcpu-arm],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([shared])
 RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/c/src/lib/libcpu/arm/preinstall.am b/c/src/lib/libcpu/arm/preinstall.am
deleted file mode 100644
index 31e0da295b..0000000000
--- a/c/src/lib/libcpu/arm/preinstall.am
+++ /dev/null
@@ -1,30 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-if shared
-$(PROJECT_INCLUDE)/libcpu/mmu.h: shared/include/mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h
-endif
diff --git a/c/src/lib/libcpu/bfin/Makefile.am b/c/src/lib/libcpu/bfin/Makefile.am
index 1dc90d481b..5f981657f7 100644
--- a/c/src/lib/libcpu/bfin/Makefile.am
+++ b/c/src/lib/libcpu/bfin/Makefile.am
@@ -6,21 +6,12 @@ EXTRA_DIST =
 
 noinst_PROGRAMS =
 
-include_bspdir = $(includedir)/bsp
-include_libcpudir = $(includedir)/libcpu
-
-include_bsp_HEADERS =
-include_libcpu_HEADERS =
-
 
 ############
 # Start of bf52x files
 if bf52x
 
-include_HEADERS = bf52x/include/bf52x.h
-
 ## INTERRUPT
-include_bsp_HEADERS += bf52x/interrupt/interrupt.h
 noinst_PROGRAMS += bf52x/interrupt.rel
 bf52x_interrupt_rel_SOURCES = bf52x/interrupt/interrupt.c \
                               bf52x/interrupt/interrupt.h
@@ -31,33 +22,12 @@ endif
 # endof bf52x
 ############
 
-include_libcpu_HEADERS += include/bf533.h
-include_libcpu_HEADERS += include/bf537.h
-include_libcpu_HEADERS += include/cecRegs.h
-include_libcpu_HEADERS += include/memoryRegs.h
-include_libcpu_HEADERS += include/mmuRegs.h
-include_libcpu_HEADERS += include/sicRegs.h
-include_libcpu_HEADERS += include/ebiuRegs.h
-include_libcpu_HEADERS += include/ppiRegs.h
-include_libcpu_HEADERS += include/coreTimerRegs.h
-include_libcpu_HEADERS += include/wdogRegs.h
-include_libcpu_HEADERS += include/timerRegs.h
-include_libcpu_HEADERS += include/dmaRegs.h
-include_libcpu_HEADERS += include/ethernetRegs.h
-include_libcpu_HEADERS += include/uartRegs.h
-include_libcpu_HEADERS += include/sportRegs.h
-include_libcpu_HEADERS += include/twiRegs.h
-include_libcpu_HEADERS += include/spiRegs.h
-include_libcpu_HEADERS += include/rtcRegs.h
-include_libcpu_HEADERS += include/gpioRegs.h
-
 noinst_PROGRAMS += cache.rel
 cache_rel_SOURCES = cache/cache.c \
     ../shared/src/cache_manager.c cache/cache_.h
 cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/cache
 cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include_libcpu_HEADERS += mmu/mmu.h
 noinst_PROGRAMS += mmu.rel
 mmu_rel_SOURCES = mmu/mmu.c
 mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -66,7 +36,6 @@ mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 if bf52x
 
 else
-include_libcpu_HEADERS += interrupt/interrupt.h
 noinst_PROGRAMS += interrupt.rel
 interrupt_rel_SOURCES = interrupt/interrupt.c
 interrupt_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -84,25 +53,21 @@ rtc_rel_SOURCES = clock/rtc.c clock/rtc.h
 rtc_rel_CPPFLAGS = $(AM_CPPFLAGS)
 rtc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include_libcpu_HEADERS += serial/uart.h
 noinst_PROGRAMS += uart.rel
 uart_rel_SOURCES = serial/uart.c
 uart_rel_CPPFLAGS = $(AM_CPPFLAGS)
 uart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include_libcpu_HEADERS += serial/sport.h
 noinst_PROGRAMS += sport.rel
 sport_rel_SOURCES = serial/sport.c
 sport_rel_CPPFLAGS = $(AM_CPPFLAGS)
 sport_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include_libcpu_HEADERS += serial/spi.h
 noinst_PROGRAMS += spi.rel
 spi_rel_SOURCES = serial/spi.c
 spi_rel_CPPFLAGS = $(AM_CPPFLAGS)
 spi_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include_libcpu_HEADERS += serial/twi.h
 noinst_PROGRAMS += twi.rel
 twi_rel_SOURCES = serial/twi.c
 twi_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -115,7 +80,6 @@ timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 if HAS_NETWORKING
 ## network
-include_libcpu_HEADERS += network/ethernet.h
 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 noinst_PROGRAMS += network.rel
 network_rel_SOURCES = network/ethernet.c
@@ -123,5 +87,4 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
 network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/bfin/configure.ac b/c/src/lib/libcpu/bfin/configure.ac
index 7888b083ea..4330957698 100644
--- a/c/src/lib/libcpu/bfin/configure.ac
+++ b/c/src/lib/libcpu/bfin/configure.ac
@@ -3,6 +3,8 @@
 AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libcpu-bfin],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/c/src/lib/libcpu/bfin/preinstall.am b/c/src/lib/libcpu/bfin/preinstall.am
deleted file mode 100644
index c7298742e3..0000000000
--- a/c/src/lib/libcpu/bfin/preinstall.am
+++ /dev/null
@@ -1,146 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-if bf52x
-$(PROJECT_INCLUDE)/bf52x.h: bf52x/include/bf52x.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bf52x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bf52x.h
-
-$(PROJECT_INCLUDE)/bsp/interrupt.h: bf52x/interrupt/interrupt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/interrupt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/interrupt.h
-endif
-$(PROJECT_INCLUDE)/libcpu/bf533.h: include/bf533.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/bf533.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/bf533.h
-
-$(PROJECT_INCLUDE)/libcpu/bf537.h: include/bf537.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/bf537.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/bf537.h
-
-$(PROJECT_INCLUDE)/libcpu/cecRegs.h: include/cecRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cecRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cecRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/memoryRegs.h: include/memoryRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/memoryRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/memoryRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/mmuRegs.h: include/mmuRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmuRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmuRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/sicRegs.h: include/sicRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/sicRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/sicRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/ebiuRegs.h: include/ebiuRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/ebiuRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/ebiuRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/ppiRegs.h: include/ppiRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/ppiRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/ppiRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/coreTimerRegs.h: include/coreTimerRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/coreTimerRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/coreTimerRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/wdogRegs.h: include/wdogRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/wdogRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/wdogRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/timerRegs.h: include/timerRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/timerRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/timerRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/dmaRegs.h: include/dmaRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/dmaRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/dmaRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/ethernetRegs.h: include/ethernetRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/ethernetRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/ethernetRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/uartRegs.h: include/uartRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/uartRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/uartRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/sportRegs.h: include/sportRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/sportRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/sportRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/twiRegs.h: include/twiRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/twiRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/twiRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/spiRegs.h: include/spiRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/spiRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/spiRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/rtcRegs.h: include/rtcRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/rtcRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/rtcRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/gpioRegs.h: include/gpioRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/gpioRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/gpioRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/mmu.h: mmu/mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h
-
-if bf52x
-else
-$(PROJECT_INCLUDE)/libcpu/interrupt.h: interrupt/interrupt.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/interrupt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/interrupt.h
-endif
-$(PROJECT_INCLUDE)/libcpu/uart.h: serial/uart.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/uart.h
-
-$(PROJECT_INCLUDE)/libcpu/sport.h: serial/sport.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/sport.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/sport.h
-
-$(PROJECT_INCLUDE)/libcpu/spi.h: serial/spi.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/spi.h
-
-$(PROJECT_INCLUDE)/libcpu/twi.h: serial/twi.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/twi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/twi.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/libcpu/ethernet.h: network/ethernet.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/ethernet.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/ethernet.h
-endif
diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am
index c47b9dfc39..6f1e9fe3ec 100644
--- a/c/src/lib/libcpu/i386/Makefile.am
+++ b/c/src/lib/libcpu/i386/Makefile.am
@@ -4,11 +4,6 @@ noinst_PROGRAMS =
 
 include $(top_srcdir)/../../../automake/compile.am
 
-include_libcpudir = $(includedir)/libcpu
-
-include_libcpu_HEADERS = page.h cpuModel.h
-include_libcpu_HEADERS += byteorder.h
-
 noinst_PROGRAMS += cache.rel
 cache_rel_SOURCES = cache.c cache_.h \
     ../shared/src/cache_manager.c ../shared/include/cache.h
@@ -25,5 +20,4 @@ page_rel_SOURCES = page.c page.h
 page_rel_CPPFLAGS = $(AM_CPPFLAGS)
 page_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/i386/configure.ac b/c/src/lib/libcpu/i386/configure.ac
index e03af4824a..3f0f59543a 100644
--- a/c/src/lib/libcpu/i386/configure.ac
+++ b/c/src/lib/libcpu/i386/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libcpu-i386],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([idtr.S])
 RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/c/src/lib/libcpu/i386/preinstall.am b/c/src/lib/libcpu/i386/preinstall.am
deleted file mode 100644
index 1e6c1dfdba..0000000000
--- a/c/src/lib/libcpu/i386/preinstall.am
+++ /dev/null
@@ -1,32 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/page.h: page.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/page.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/page.h
-
-$(PROJECT_INCLUDE)/libcpu/cpuModel.h: cpuModel.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpuModel.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpuModel.h
-
-$(PROJECT_INCLUDE)/libcpu/byteorder.h: byteorder.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h
-
diff --git a/c/src/lib/libcpu/lm32/Makefile.am b/c/src/lib/libcpu/lm32/Makefile.am
index 5de23de6cb..1e609cabf6 100644
--- a/c/src/lib/libcpu/lm32/Makefile.am
+++ b/c/src/lib/libcpu/lm32/Makefile.am
@@ -21,6 +21,5 @@ shared_misc_rel_CPPFLAGS = $(AM_CPPFLAGS) $(LM32_CPPFLAGS)
 shared_misc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-include $(srcdir)/preinstall.am
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/lm32/configure.ac b/c/src/lib/libcpu/lm32/configure.ac
index 53a2e4bcf4..295ae91ee2 100644
--- a/c/src/lib/libcpu/lm32/configure.ac
+++ b/c/src/lib/libcpu/lm32/configure.ac
@@ -3,6 +3,8 @@
 AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libcpu-lm32],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/c/src/lib/libcpu/lm32/preinstall.am b/c/src/lib/libcpu/lm32/preinstall.am
deleted file mode 100644
index dba6cc4d81..0000000000
--- a/c/src/lib/libcpu/lm32/preinstall.am
+++ /dev/null
@@ -1,7 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
diff --git a/c/src/lib/libcpu/m68k/Makefile.am b/c/src/lib/libcpu/m68k/Makefile.am
index 18724352d6..2800e421c4 100644
--- a/c/src/lib/libcpu/m68k/Makefile.am
+++ b/c/src/lib/libcpu/m68k/Makefile.am
@@ -67,10 +67,6 @@ EXTRA_DIST = m68040/fpsp/README
 
 if mcf5206
 # mcf5206/include
-include_mcf5206dir = $(includedir)/mcf5206
-include_mcf5206_HEADERS = mcf5206/include/mcf5206e.h mcf5206/include/mcfmbus.h \
-    mcf5206/include/mcfuart.h
-
 ## mcf5206/clock
 noinst_PROGRAMS += mcf5206/clock.rel
 mcf5206_clock_rel_SOURCES = mcf5206/clock/ckinit.c
@@ -98,9 +94,6 @@ endif
 
 if mcf5223x
 ## mcf5223x/include
-include_mcf5223xdir = $(includedir)/mcf5223x
-include_mcf5223x_HEADERS = mcf5223x/include/mcf5223x.h
-
 ## mcf5223x/cache
 noinst_PROGRAMS += mcf5223x/cachepd.rel
 mcf5223x_cachepd_rel_SOURCES = mcf5223x/cache/cachepd.c
@@ -110,9 +103,6 @@ endif
 
 if mcf5225x
 ## mcf5225x/include
-include_mcf5225xdir = $(includedir)/mcf5225x
-include_mcf5225x_HEADERS = mcf5225x/include/mcf5225x.h
-
 # mcf5225x/cache
 noinst_PROGRAMS += mcf5225x/cachepd.rel
 mcf5225x_cachepd_rel_SOURCES = mcf5225x/cache/cachepd.c
@@ -121,15 +111,11 @@ mcf5225x_cachepd_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # Network
 if HAS_NETWORKING
-include_mcf5225x_HEADERS += mcf5225x/include/fec.h
 endif ## HAS_NETWORKING
 endif
 
 if mcf5235
 ## mcf5235/include
-include_mcf5235dir = $(includedir)/mcf5235
-include_mcf5235_HEADERS = mcf5235/include/mcf5235.h
-
 ## mcf5235/cache
 noinst_PROGRAMS += mcf5235/cachepd.rel
 mcf5235_cachepd_rel_SOURCES = mcf5235/cache/cachepd.c
@@ -139,9 +125,6 @@ endif
 
 if mcf532x
 ## mcf532x/include
-include_mcf532xdir = $(includedir)/mcf532x
-include_mcf532x_HEADERS = mcf532x/include/mcf532x.h
-
 ## mcf532x/cache
 noinst_PROGRAMS += mcf532x/cachepd.rel
 mcf532x_cachepd_rel_SOURCES = mcf532x/cache/cachepd.c
@@ -151,9 +134,6 @@ endif
 
 if mcf5272
 ## mcf5272/include
-include_mcf5272dir = $(includedir)/mcf5272
-include_mcf5272_HEADERS = mcf5272/include/mcf5272.h
-
 ## clock
 noinst_PROGRAMS += mcf5272/clock.rel
 mcf5272_clock_rel_SOURCES = mcf5272/clock/ckinit.c
@@ -169,9 +149,6 @@ endif
 
 if mcf5282
 ## mcf5282/include
-include_mcf5282dir = $(includedir)/mcf5282
-include_mcf5282_HEADERS = mcf5282/include/mcf5282.h
-
 noinst_PROGRAMS += mcf5282/cachepd.rel
 mcf5282_cachepd_rel_SOURCES = mcf5282/cache/cachepd.c
 mcf5282_cachepd_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/cache
@@ -180,13 +157,8 @@ endif
 
 if mcf548x
 ## mcf548x/include
-include_mcf548xdir = $(includedir)/mcf548x
-include_mcf548x_HEADERS = mcf548x/include/mcf548x.h
-
 ## mcf548x/mcdma
 noinst_PROGRAMS += mcf548x/mcdma.rel
-include_mcf548x_HEADERS +=  mcf548x/mcdma/MCD_progCheck.h mcf548x/mcdma/MCD_dma.h \
-                            mcf548x/mcdma/MCD_tasksInit.h mcf548x/mcdma/mcdma_glue.h
 mcf548x_mcdma_rel_SOURCES = mcf548x/mcdma/MCD_dmaApi.c mcf548x/mcdma/MCD_tasksInit.c \
                             mcf548x/mcdma/MCD_tasks.c  mcf548x/mcdma/mcdma_glue.c
 
@@ -194,5 +166,4 @@ mcf548x_mcdma_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mcf548x_mcdma_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/m68k/configure.ac b/c/src/lib/libcpu/m68k/configure.ac
index 99596c1a3e..5f24e9efd4 100644
--- a/c/src/lib/libcpu/m68k/configure.ac
+++ b/c/src/lib/libcpu/m68k/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libcpu-m68k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([m68040])
 RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/c/src/lib/libcpu/m68k/preinstall.am b/c/src/lib/libcpu/m68k/preinstall.am
deleted file mode 100644
index 258f0cb6ca..0000000000
--- a/c/src/lib/libcpu/m68k/preinstall.am
+++ /dev/null
@@ -1,127 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-if shared
-endif
-if mcf5206
-$(PROJECT_INCLUDE)/mcf5206/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5206
-	@: > $(PROJECT_INCLUDE)/mcf5206/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5206/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5206/mcf5206e.h: mcf5206/include/mcf5206e.h $(PROJECT_INCLUDE)/mcf5206/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcf5206e.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcf5206e.h
-
-$(PROJECT_INCLUDE)/mcf5206/mcfmbus.h: mcf5206/include/mcfmbus.h $(PROJECT_INCLUDE)/mcf5206/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcfmbus.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcfmbus.h
-
-$(PROJECT_INCLUDE)/mcf5206/mcfuart.h: mcf5206/include/mcfuart.h $(PROJECT_INCLUDE)/mcf5206/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcfuart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcfuart.h
-endif
-if mcf5223x
-$(PROJECT_INCLUDE)/mcf5223x/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5223x
-	@: > $(PROJECT_INCLUDE)/mcf5223x/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5223x/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5223x/mcf5223x.h: mcf5223x/include/mcf5223x.h $(PROJECT_INCLUDE)/mcf5223x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5223x/mcf5223x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5223x/mcf5223x.h
-endif
-if mcf5225x
-$(PROJECT_INCLUDE)/mcf5225x/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5225x
-	@: > $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5225x/mcf5225x.h: mcf5225x/include/mcf5225x.h $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5225x/mcf5225x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5225x/mcf5225x.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/mcf5225x/fec.h: mcf5225x/include/fec.h $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5225x/fec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5225x/fec.h
-endif ## HAS_NETWORKING
-endif
-if mcf5235
-$(PROJECT_INCLUDE)/mcf5235/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5235
-	@: > $(PROJECT_INCLUDE)/mcf5235/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5235/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5235/mcf5235.h: mcf5235/include/mcf5235.h $(PROJECT_INCLUDE)/mcf5235/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5235/mcf5235.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5235/mcf5235.h
-endif
-if mcf532x
-$(PROJECT_INCLUDE)/mcf532x/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf532x
-	@: > $(PROJECT_INCLUDE)/mcf532x/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf532x/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf532x/mcf532x.h: mcf532x/include/mcf532x.h $(PROJECT_INCLUDE)/mcf532x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf532x/mcf532x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf532x/mcf532x.h
-endif
-if mcf5272
-$(PROJECT_INCLUDE)/mcf5272/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5272
-	@: > $(PROJECT_INCLUDE)/mcf5272/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5272/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5272/mcf5272.h: mcf5272/include/mcf5272.h $(PROJECT_INCLUDE)/mcf5272/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5272/mcf5272.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5272/mcf5272.h
-endif
-if mcf5282
-$(PROJECT_INCLUDE)/mcf5282/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5282
-	@: > $(PROJECT_INCLUDE)/mcf5282/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5282/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5282/mcf5282.h: mcf5282/include/mcf5282.h $(PROJECT_INCLUDE)/mcf5282/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5282/mcf5282.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5282/mcf5282.h
-endif
-if mcf548x
-$(PROJECT_INCLUDE)/mcf548x/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf548x
-	@: > $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf548x/mcf548x.h: mcf548x/include/mcf548x.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/mcf548x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/mcf548x.h
-
-$(PROJECT_INCLUDE)/mcf548x/MCD_progCheck.h: mcf548x/mcdma/MCD_progCheck.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/MCD_progCheck.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/MCD_progCheck.h
-
-$(PROJECT_INCLUDE)/mcf548x/MCD_dma.h: mcf548x/mcdma/MCD_dma.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/MCD_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/MCD_dma.h
-
-$(PROJECT_INCLUDE)/mcf548x/MCD_tasksInit.h: mcf548x/mcdma/MCD_tasksInit.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/MCD_tasksInit.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/MCD_tasksInit.h
-
-$(PROJECT_INCLUDE)/mcf548x/mcdma_glue.h: mcf548x/mcdma/mcdma_glue.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/mcdma_glue.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/mcdma_glue.h
-endif
diff --git a/c/src/lib/libcpu/mips/Makefile.am b/c/src/lib/libcpu/mips/Makefile.am
index 2630fc29d7..84dc521fac 100644
--- a/c/src/lib/libcpu/mips/Makefile.am
+++ b/c/src/lib/libcpu/mips/Makefile.am
@@ -7,10 +7,6 @@ EXTRA_DIST =
 noinst_PROGRAMS =
 
 ## cache
-include_libcpudir = $(includedir)/libcpu
-
-include_libcpu_HEADERS =
-
 noinst_PROGRAMS += shared/cache.rel
 shared_cache_rel_SOURCES = shared/cache/cache.c \
     ../shared/src/cache_manager.c shared/cache/cache_.h
@@ -36,15 +32,10 @@ shared_interrupts_rel_SOURCES = shared/interrupts/installisrentries.c \
     shared/interrupts/isr_entries.S shared/interrupts/isr_entries.h
 shared_interrupts_rel_CPPFLAGS = $(AM_CPPFLAGS) $(interrupts_CPPFLAGS)
 shared_interrupts_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-include_libcpu_HEADERS += shared/interrupts/isr_entries.h
-
 if tx39
-include_libcpu_HEADERS += tx39/include/tx3904.h
 endif
 
 if tx49
-include_libcpu_HEADERS += tx49/include/tx4925.h tx49/include/tx4938.h
-
 noinst_PROGRAMS += tx49/timer.rel
 tx49_timer_rel_SOURCES = timer/timer.c timer/gettime.S
 tx49_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -52,18 +43,13 @@ tx49_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
 if au1x00
-include_libcpu_HEADERS += au1x00/include/au1x00.h
-
 endif
 
 if rm52xx
-include_libcpu_HEADERS += rm52xx/include/rm5231.h
-
 noinst_PROGRAMS += rm52xx/timer.rel
 rm52xx_timer_rel_SOURCES = timer/timer.c timer/gettime.S
 rm52xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
 rm52xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/configure.ac b/c/src/lib/libcpu/mips/configure.ac
index 324dd312f7..6a9e2665d9 100644
--- a/c/src/lib/libcpu/mips/configure.ac
+++ b/c/src/lib/libcpu/mips/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libcpu-mips],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([timer])
 RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/c/src/lib/libcpu/mips/preinstall.am b/c/src/lib/libcpu/mips/preinstall.am
deleted file mode 100644
index 6d302e501b..0000000000
--- a/c/src/lib/libcpu/mips/preinstall.am
+++ /dev/null
@@ -1,48 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/isr_entries.h: shared/interrupts/isr_entries.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/isr_entries.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/isr_entries.h
-
-if tx39
-$(PROJECT_INCLUDE)/libcpu/tx3904.h: tx39/include/tx3904.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx3904.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx3904.h
-endif
-if tx49
-$(PROJECT_INCLUDE)/libcpu/tx4925.h: tx49/include/tx4925.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx4925.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx4925.h
-
-$(PROJECT_INCLUDE)/libcpu/tx4938.h: tx49/include/tx4938.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx4938.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx4938.h
-endif
-if au1x00
-$(PROJECT_INCLUDE)/libcpu/au1x00.h: au1x00/include/au1x00.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/au1x00.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/au1x00.h
-endif
-if rm52xx
-$(PROJECT_INCLUDE)/libcpu/rm5231.h: rm52xx/include/rm5231.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/rm5231.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/rm5231.h
-endif
diff --git a/c/src/lib/libcpu/nios2/Makefile.am b/c/src/lib/libcpu/nios2/Makefile.am
index fee88258c7..7641afb335 100644
--- a/c/src/lib/libcpu/nios2/Makefile.am
+++ b/c/src/lib/libcpu/nios2/Makefile.am
@@ -22,6 +22,5 @@ shared_misc_rel_CPPFLAGS = $(AM_CPPFLAGS) $(NIOS2_CPPFLAGS)
 shared_misc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-include $(srcdir)/preinstall.am
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/nios2/configure.ac b/c/src/lib/libcpu/nios2/configure.ac
index c37ad5509e..ce7fe1b4e9 100644
--- a/c/src/lib/libcpu/nios2/configure.ac
+++ b/c/src/lib/libcpu/nios2/configure.ac
@@ -3,6 +3,8 @@
 AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libcpu-nios2],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/c/src/lib/libcpu/nios2/preinstall.am b/c/src/lib/libcpu/nios2/preinstall.am
deleted file mode 100644
index dba6cc4d81..0000000000
--- a/c/src/lib/libcpu/nios2/preinstall.am
+++ /dev/null
@@ -1,7 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
diff --git a/c/src/lib/libcpu/or1k/Makefile.am b/c/src/lib/libcpu/or1k/Makefile.am
index 9c9921a100..e34d580982 100644
--- a/c/src/lib/libcpu/or1k/Makefile.am
+++ b/c/src/lib/libcpu/or1k/Makefile.am
@@ -12,6 +12,5 @@ shared_cache_rel_SOURCES = shared/cache/cache.c ../shared/src/cache_manager.c
 shared_cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/cache
 shared_cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include $(srcdir)/preinstall.am
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/or1k/configure.ac b/c/src/lib/libcpu/or1k/configure.ac
index a089a82838..80c67b63c3 100644
--- a/c/src/lib/libcpu/or1k/configure.ac
+++ b/c/src/lib/libcpu/or1k/configure.ac
@@ -3,6 +3,8 @@
 AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libcpu-or1k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/c/src/lib/libcpu/or1k/preinstall.am b/c/src/lib/libcpu/or1k/preinstall.am
deleted file mode 100644
index dba6cc4d81..0000000000
--- a/c/src/lib/libcpu/or1k/preinstall.am
+++ /dev/null
@@ -1,7 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am
index 5f8ee9f6c6..b56ce691bf 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/Makefile.am
@@ -2,26 +2,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 
 include $(top_srcdir)/../../../automake/compile.am
 
-include_rtems_powerpcdir = $(includedir)/rtems/powerpc
-include_rtems_powerpc_HEADERS = rtems/powerpc/cache.h \
-    rtems/powerpc/debugmod.h rtems/powerpc/powerpc.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_libcpudir = $(includedir)/libcpu
-
-include_libcpu_HEADERS = shared/include/powerpc-utility.h
-
-include_bspdir = $(includedir)/bsp
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += new-exceptions/bspsupport/irq_supp.h
-include_bsp_HEADERS += new-exceptions/bspsupport/vectors.h
-
-include_mpc83xxdir = $(includedir)/mpc83xx
-
-include_mpc83xx_HEADERS =
-include_mpc83xx_HEADERS += mpc83xx/i2c/mpc83xx_i2cdrv.h
-
 EXTRA_DIST =
 
 noinst_PROGRAMS = new-exceptions/rtems-cpu.rel
@@ -66,17 +46,11 @@ EXTRA_DIST += new-exceptions/bspsupport/ppc_exc_test.c
 
 # shared/include
 if shared
-include_libcpu_HEADERS += shared/include/io.h shared/include/mmu.h \
-    shared/include/page.h \
-    shared/include/byteorder.h shared/include/pgtable.h
-
 noinst_PROGRAMS += shared/cpuIdent.rel
 shared_cpuIdent_rel_SOURCES = shared/include/cpuIdent.c shared/include/cpuIdent.h
 shared_cpuIdent_rel_CPPFLAGS = $(AM_CPPFLAGS)
 shared_cpuIdent_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include_libcpu_HEADERS += shared/include/cpuIdent.h
-
 # shared/cache
 noinst_PROGRAMS += shared/cache.rel
 shared_cache_rel_SOURCES = shared/src/cache_.h \
@@ -91,8 +65,6 @@ shared_stack_rel_SOURCES = shared/src/stack.c shared/include/spr.h shared/src/st
 shared_stack_rel_CPPFLAGS = $(AM_CPPFLAGS)
 shared_stack_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include_libcpu_HEADERS += shared/include/spr.h
-include_libcpu_HEADERS += shared/src/stackTrace.h
 endif
 
 EXTRA_DIST += ppc403/README ppc403/vectors/README
@@ -113,7 +85,6 @@ endif
 ppc403_console_rel_CPPFLAGS = $(AM_CPPFLAGS)
 ppc403_console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include_HEADERS =
 shared_cpuIdent_rel_SOURCES = shared/include/cpuIdent.c
 shared_cpuIdent_rel_CPPFLAGS = $(AM_CPPFLAGS)
 shared_cpuIdent_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
@@ -126,8 +97,6 @@ ppc403_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # ppc403/tty_drv
 if ppc405
-include_HEADERS += ppc403/tty_drv/tty_drv.h
-
 noinst_PROGRAMS += ppc403/tty_drv.rel
 ppc403_tty_drv_rel_SOURCES = ppc403/tty_drv/tty_drv.c ppc403/tty_drv/tty_drv.h
 ppc403_tty_drv_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -139,20 +108,12 @@ endif # ppc4xx
 if ppc405
 
 ## ppc4xx/include
-include_ppc4xxdir = $(includedir)/ppc4xx
-include_ppc4xx_HEADERS = ppc403/include/ppc405gp.h \
-		         ppc403/include/ppc405ex.h
-
 endif # ppc405
 
 
 ## mpc5xx
 EXTRA_DIST += mpc5xx/README
 if mpc5xx
-include_mpc5xxdir = $(includedir)/mpc5xx
-
-include_HEADERS = mpc5xx/include/mpc5xx.h
-
 # mpc5xx/clock
 noinst_PROGRAMS += mpc5xx/clock.rel
 mpc5xx_clock_rel_SOURCES = mpc5xx/clock/clock.c
@@ -160,24 +121,18 @@ mpc5xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc5xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc5xx/console-generic
-include_mpc5xx_HEADERS = mpc5xx/include/console.h
-
 noinst_PROGRAMS += mpc5xx/console-generic.rel
 mpc5xx_console_generic_rel_SOURCES = mpc5xx/console-generic/console-generic.c
 mpc5xx_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc5xx_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc5xx/exceptions
-include_libcpu_HEADERS += mpc5xx/exceptions/raw_exception.h
-
 noinst_PROGRAMS += mpc5xx/exceptions.rel
 mpc5xx_exceptions_rel_SOURCES = mpc5xx/exceptions/raw_exception.c
 mpc5xx_exceptions_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc5xx_exceptions_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc5xx/irq
-include_libcpu_HEADERS += mpc5xx/irq/irq.h
-
 noinst_PROGRAMS += mpc5xx/irq.rel
 mpc5xx_irq_rel_SOURCES = mpc5xx/irq/irq.c mpc5xx/irq/irq_init.c mpc5xx/irq/irq_asm.S
 mpc5xx_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -190,8 +145,6 @@ mpc5xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc5xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc5xx/vectors
-include_libcpu_HEADERS += mpc5xx/vectors/vectors.h
-
 noinst_PROGRAMS += mpc5xx/vectors.rel
 mpc5xx_vectors_rel_SOURCES = mpc5xx/vectors/vectors_init.c mpc5xx/vectors/vectors.S \
     new-exceptions/bspsupport/ppc_exc_print.c
@@ -201,8 +154,6 @@ endif
 
 if mpc505
 # mpc505/ictrl
-include_HEADERS = mpc505/ictrl/ictrl.h
-
 noinst_PROGRAMS += mpc505/ictrl.rel
 mpc505_ictrl_rel_SOURCES = mpc505/ictrl/ictrl.c
 mpc505_ictrl_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -224,8 +175,6 @@ endif
 if mpc6xx
 
 # mpc6xx/mmu
-include_libcpu_HEADERS += mpc6xx/mmu/bat.h mpc6xx/mmu/pte121.h
-
 noinst_PROGRAMS += mpc6xx/mmu.rel
 mpc6xx_mmu_rel_SOURCES = mpc6xx/mmu/bat.c mpc6xx/mmu/bat.h \
     mpc6xx/mmu/pte121.c mpc6xx/mmu/pte121.h \
@@ -234,8 +183,6 @@ mpc6xx_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc6xx_mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc6xx/clock
-include_libcpu_HEADERS += mpc6xx/clock/c_clock.h
-
 noinst_PROGRAMS += mpc6xx/clock.rel
 mpc6xx_clock_rel_SOURCES = mpc6xx/clock/c_clock.c mpc6xx/clock/c_clock.h
 mpc6xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -257,8 +204,6 @@ EXTRA_DIST      += mpc6xx/altivec/README
 
 # e500/clock
 if e500_clock
-include_libcpu_HEADERS += mpc6xx/clock/c_clock.h
-
 noinst_PROGRAMS += e500/clock.rel
 e500_clock_rel_SOURCES = mpc6xx/clock/c_clock.c mpc6xx/clock/c_clock.h
 e500_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -275,7 +220,6 @@ endif
 
 # e500/mmu
 if e500_mmu
-include_libcpu_HEADERS += e500/mmu/e500_mmu.h
 noinst_PROGRAMS += e500/mmu.rel
 e500_mmu_rel_SOURCES = e500/mmu/mmu.c e500/mmu/e500_mmu.h
 e500_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -284,10 +228,6 @@ endif
 
 EXTRA_DIST += mpc8xx/README
 if mpc8xx
-include_mpc8xxdir = $(includedir)/mpc8xx
-
-include_HEADERS = mpc8xx/include/mpc8xx.h
-
 # mpc8xx/clock
 noinst_PROGRAMS += mpc8xx/clock.rel
 mpc8xx_clock_rel_SOURCES = mpc8xx/clock/clock.c
@@ -295,24 +235,18 @@ mpc8xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc8xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc8xx/console-generic
-include_mpc8xx_HEADERS = mpc8xx/include/console.h
-
 noinst_PROGRAMS += mpc8xx/console-generic.rel
 mpc8xx_console_generic_rel_SOURCES = mpc8xx/console-generic/console-generic.c
 mpc8xx_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc8xx_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc8xx/cpm
-include_mpc8xx_HEADERS += mpc8xx/include/cpm.h
-
 noinst_PROGRAMS += mpc8xx/cpm.rel
 mpc8xx_cpm_rel_SOURCES = mpc8xx/cpm/cp.c mpc8xx/cpm/dpram.c
 mpc8xx_cpm_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc8xx_cpm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc8xx/mmu
-include_mpc8xx_HEADERS += mpc8xx/include/mmu.h
-
 noinst_PROGRAMS += mpc8xx/mmu.rel
 mpc8xx_mmu_rel_SOURCES = mpc8xx/mmu/mmu.c
 mpc8xx_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -327,13 +261,7 @@ endif
 
 EXTRA_DIST += mpc8260/README
 if mpc8260
-include_mpc8260dir = $(includedir)/mpc8260
-
-include_HEADERS = mpc8260/include/mpc8260.h
-
 # mpc8260/console-generic
-include_mpc8260_HEADERS = mpc8260/include/console.h
-
 noinst_PROGRAMS += mpc8260/console-generic.rel
 mpc8260_console_generic_rel_SOURCES = mpc8260/console-generic/console-generic.c \
     mpc8260/include/console.h
@@ -341,8 +269,6 @@ mpc8260_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc8260_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc8260/cpm
-include_mpc8260_HEADERS += mpc8260/include/cpm.h
-
 noinst_PROGRAMS += mpc8260/cpm.rel
 mpc8260_cpm_rel_SOURCES = mpc8260/cpm/cp.c mpc8260/cpm/dpram.c mpc8260/cpm/brg.c \
     mpc8260/include/cpm.h
@@ -350,8 +276,6 @@ mpc8260_cpm_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mpc8260_cpm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # mpc8260/mmu
-include_mpc8260_HEADERS += mpc8260/include/mmu.h
-
 noinst_PROGRAMS += mpc8260/mmu.rel
 mpc8260_mmu_rel_SOURCES = mpc8260/mmu/mmu.c \
                           mpc8260/include/mmu.h
@@ -372,10 +296,7 @@ if mpc83xx
 
 # Includes
 
-include_mpc83xx_HEADERS += mpc83xx/include/mpc83xx.h
-
 # Network
-include_bsp_HEADERS += mpc83xx/network/tsec.h
 if HAS_NETWORKING
 noinst_PROGRAMS += mpc83xx/tsec.rel
 mpc83xx_tsec_rel_SOURCES = mpc83xx/network/tsec.c
@@ -390,14 +311,12 @@ mpc83xx_i2c_rel_SOURCES = mpc83xx/i2c/mpc83xx_i2cdrv.c \
 mpc83xx_i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # SPI
-include_mpc83xx_HEADERS += mpc83xx/spi/mpc83xx_spidrv.h
 noinst_PROGRAMS += mpc83xx/spi.rel
 mpc83xx_spi_rel_SOURCES = mpc83xx/spi/mpc83xx_spidrv.c \
 	mpc83xx/spi/mpc83xx_spidrv.h
 mpc83xx_spi_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # GTM
-include_mpc83xx_HEADERS += mpc83xx/include/gtm.h
 noinst_PROGRAMS += mpc83xx/gtm.rel
 mpc83xx_gtm_rel_SOURCES = mpc83xx/gtm/gtm.c \
 	mpc83xx/include/gtm.h
@@ -413,27 +332,6 @@ endif
 ##############################################################################
 if mpc55xx
 
-# Includes
-include_mpc55xxdir = $(includedir)/mpc55xx
-
-include_mpc55xx_HEADERS =
-include_mpc55xx_HEADERS += mpc55xx/include/regs.h
-include_mpc55xx_HEADERS += mpc55xx/include/reg-defs.h
-include_mpc55xx_HEADERS += mpc55xx/include/dspi.h
-include_mpc55xx_HEADERS += mpc55xx/include/edma.h
-include_mpc55xx_HEADERS += mpc55xx/include/emios.h
-include_mpc55xx_HEADERS += mpc55xx/include/mpc55xx.h
-include_mpc55xx_HEADERS += mpc55xx/include/siu.h
-include_mpc55xx_HEADERS += mpc55xx/include/watchdog.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc551x.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc555x.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc556x.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc564xL.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc5668.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc567x.h
-include_mpc55xx_HEADERS += mpc55xx/include/regs-edma.h
-include_mpc55xx_HEADERS += mpc55xx/include/regs-mmu.h
-
 # IRQ
 noinst_PROGRAMS += mpc55xx/irq.rel
 mpc55xx_irq_rel_SOURCES = mpc55xx/irq/irq.c
@@ -487,7 +385,6 @@ endif
 if qoriq
 
 # Network
-include_bsp_HEADERS += mpc83xx/network/tsec.h
 if HAS_NETWORKING
 noinst_PROGRAMS += tsec.rel
 tsec_rel_SOURCES = mpc83xx/network/tsec.c
@@ -500,5 +397,4 @@ endif
 # END: QorIQ                                                                 #
 ##############################################################################
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/configure.ac b/c/src/lib/libcpu/powerpc/configure.ac
index 81e6bfab2c..ba654372f1 100644
--- a/c/src/lib/libcpu/powerpc/configure.ac
+++ b/c/src/lib/libcpu/powerpc/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libcpu-powerpc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([mpc6xx])
 RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/c/src/lib/libcpu/powerpc/preinstall.am b/c/src/lib/libcpu/powerpc/preinstall.am
deleted file mode 100644
index 178763b3ab..0000000000
--- a/c/src/lib/libcpu/powerpc/preinstall.am
+++ /dev/null
@@ -1,320 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/powerpc
-	@: > $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/powerpc/cache.h: rtems/powerpc/cache.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/cache.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/cache.h
-
-$(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h: rtems/powerpc/debugmod.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h
-
-$(PROJECT_INCLUDE)/rtems/powerpc/powerpc.h: rtems/powerpc/powerpc.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/powerpc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/powerpc.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
-	@: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/powerpc-utility.h: shared/include/powerpc-utility.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/powerpc-utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/powerpc-utility.h
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/irq_supp.h: new-exceptions/bspsupport/irq_supp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h
-
-$(PROJECT_INCLUDE)/bsp/vectors.h: new-exceptions/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
-
-$(PROJECT_INCLUDE)/mpc83xx/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mpc83xx
-	@: > $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h: mpc83xx/i2c/mpc83xx_i2cdrv.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h
-
-if !mpc5xx
-endif
-if shared
-$(PROJECT_INCLUDE)/libcpu/io.h: shared/include/io.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/io.h
-
-$(PROJECT_INCLUDE)/libcpu/mmu.h: shared/include/mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h
-
-$(PROJECT_INCLUDE)/libcpu/page.h: shared/include/page.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/page.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/page.h
-
-$(PROJECT_INCLUDE)/libcpu/byteorder.h: shared/include/byteorder.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h
-
-$(PROJECT_INCLUDE)/libcpu/pgtable.h: shared/include/pgtable.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/pgtable.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/pgtable.h
-
-$(PROJECT_INCLUDE)/libcpu/cpuIdent.h: shared/include/cpuIdent.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpuIdent.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpuIdent.h
-
-$(PROJECT_INCLUDE)/libcpu/spr.h: shared/include/spr.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/spr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/spr.h
-
-$(PROJECT_INCLUDE)/libcpu/stackTrace.h: shared/src/stackTrace.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/stackTrace.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/stackTrace.h
-endif
-if ppc4xx
-if ppc405
-$(PROJECT_INCLUDE)/tty_drv.h: ppc403/tty_drv/tty_drv.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tty_drv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tty_drv.h
-endif
-endif # ppc4xx
-if ppc405
-$(PROJECT_INCLUDE)/ppc4xx/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/ppc4xx
-	@: > $(PROJECT_INCLUDE)/ppc4xx/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/ppc4xx/$(dirstamp)
-
-$(PROJECT_INCLUDE)/ppc4xx/ppc405gp.h: ppc403/include/ppc405gp.h $(PROJECT_INCLUDE)/ppc4xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ppc4xx/ppc405gp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ppc4xx/ppc405gp.h
-
-$(PROJECT_INCLUDE)/ppc4xx/ppc405ex.h: ppc403/include/ppc405ex.h $(PROJECT_INCLUDE)/ppc4xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ppc4xx/ppc405ex.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ppc4xx/ppc405ex.h
-endif # ppc405
-if mpc5xx
-$(PROJECT_INCLUDE)/mpc5xx/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mpc5xx
-	@: > $(PROJECT_INCLUDE)/mpc5xx/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc5xx/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mpc5xx.h: mpc5xx/include/mpc5xx.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc5xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc5xx.h
-
-$(PROJECT_INCLUDE)/mpc5xx/console.h: mpc5xx/include/console.h $(PROJECT_INCLUDE)/mpc5xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc5xx/console.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc5xx/console.h
-
-$(PROJECT_INCLUDE)/libcpu/raw_exception.h: mpc5xx/exceptions/raw_exception.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/raw_exception.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/raw_exception.h
-
-$(PROJECT_INCLUDE)/libcpu/irq.h: mpc5xx/irq/irq.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/irq.h
-
-$(PROJECT_INCLUDE)/libcpu/vectors.h: mpc5xx/vectors/vectors.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/vectors.h
-endif
-if mpc505
-$(PROJECT_INCLUDE)/ictrl.h: mpc505/ictrl/ictrl.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ictrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ictrl.h
-endif
-if mpc6xx
-$(PROJECT_INCLUDE)/libcpu/bat.h: mpc6xx/mmu/bat.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/bat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/bat.h
-
-$(PROJECT_INCLUDE)/libcpu/pte121.h: mpc6xx/mmu/pte121.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/pte121.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/pte121.h
-
-$(PROJECT_INCLUDE)/libcpu/c_clock.h: mpc6xx/clock/c_clock.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/c_clock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/c_clock.h
-endif
-if e500_clock
-$(PROJECT_INCLUDE)/libcpu/c_clock.h: mpc6xx/clock/c_clock.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/c_clock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/c_clock.h
-endif
-if e500_mmu
-$(PROJECT_INCLUDE)/libcpu/e500_mmu.h: e500/mmu/e500_mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/e500_mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/e500_mmu.h
-endif
-if mpc8xx
-$(PROJECT_INCLUDE)/mpc8xx/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mpc8xx
-	@: > $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mpc8xx.h: mpc8xx/include/mpc8xx.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx.h
-
-$(PROJECT_INCLUDE)/mpc8xx/console.h: mpc8xx/include/console.h $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx/console.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/console.h
-
-$(PROJECT_INCLUDE)/mpc8xx/cpm.h: mpc8xx/include/cpm.h $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx/cpm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/cpm.h
-
-$(PROJECT_INCLUDE)/mpc8xx/mmu.h: mpc8xx/include/mmu.h $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/mmu.h
-endif
-if mpc8260
-$(PROJECT_INCLUDE)/mpc8260/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mpc8260
-	@: > $(PROJECT_INCLUDE)/mpc8260/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc8260/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mpc8260.h: mpc8260/include/mpc8260.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260.h
-
-$(PROJECT_INCLUDE)/mpc8260/console.h: mpc8260/include/console.h $(PROJECT_INCLUDE)/mpc8260/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260/console.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/console.h
-
-$(PROJECT_INCLUDE)/mpc8260/cpm.h: mpc8260/include/cpm.h $(PROJECT_INCLUDE)/mpc8260/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260/cpm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/cpm.h
-
-$(PROJECT_INCLUDE)/mpc8260/mmu.h: mpc8260/include/mmu.h $(PROJECT_INCLUDE)/mpc8260/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/mmu.h
-endif
-if mpc83xx
-$(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h: mpc83xx/include/mpc83xx.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h
-
-$(PROJECT_INCLUDE)/bsp/tsec.h: mpc83xx/network/tsec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec.h
-
-$(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h: mpc83xx/spi/mpc83xx_spidrv.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h
-
-$(PROJECT_INCLUDE)/mpc83xx/gtm.h: mpc83xx/include/gtm.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/gtm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/gtm.h
-endif
-if mpc55xx
-$(PROJECT_INCLUDE)/mpc55xx/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mpc55xx
-	@: > $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mpc55xx/regs.h: mpc55xx/include/regs.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/regs.h
-
-$(PROJECT_INCLUDE)/mpc55xx/reg-defs.h: mpc55xx/include/reg-defs.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/reg-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/reg-defs.h
-
-$(PROJECT_INCLUDE)/mpc55xx/dspi.h: mpc55xx/include/dspi.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/dspi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/dspi.h
-
-$(PROJECT_INCLUDE)/mpc55xx/edma.h: mpc55xx/include/edma.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/edma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/edma.h
-
-$(PROJECT_INCLUDE)/mpc55xx/emios.h: mpc55xx/include/emios.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/emios.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/emios.h
-
-$(PROJECT_INCLUDE)/mpc55xx/mpc55xx.h: mpc55xx/include/mpc55xx.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/mpc55xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/mpc55xx.h
-
-$(PROJECT_INCLUDE)/mpc55xx/siu.h: mpc55xx/include/siu.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/siu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/siu.h
-
-$(PROJECT_INCLUDE)/mpc55xx/watchdog.h: mpc55xx/include/watchdog.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/watchdog.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/watchdog.h
-
-$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc551x.h: mpc55xx/include/fsl-mpc551x.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc551x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc551x.h
-
-$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc555x.h: mpc55xx/include/fsl-mpc555x.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc555x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc555x.h
-
-$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc556x.h: mpc55xx/include/fsl-mpc556x.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc556x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc556x.h
-
-$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc564xL.h: mpc55xx/include/fsl-mpc564xL.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc564xL.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc564xL.h
-
-$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc5668.h: mpc55xx/include/fsl-mpc5668.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc5668.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc5668.h
-
-$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc567x.h: mpc55xx/include/fsl-mpc567x.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc567x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc567x.h
-
-$(PROJECT_INCLUDE)/mpc55xx/regs-edma.h: mpc55xx/include/regs-edma.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/regs-edma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/regs-edma.h
-
-$(PROJECT_INCLUDE)/mpc55xx/regs-mmu.h: mpc55xx/include/regs-mmu.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/regs-mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/regs-mmu.h
-endif
-if qoriq
-$(PROJECT_INCLUDE)/bsp/tsec.h: mpc83xx/network/tsec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec.h
-
-endif
diff --git a/c/src/lib/libcpu/sparc/Makefile.am b/c/src/lib/libcpu/sparc/Makefile.am
index 67a35ee4b8..4d957dac04 100644
--- a/c/src/lib/libcpu/sparc/Makefile.am
+++ b/c/src/lib/libcpu/sparc/Makefile.am
@@ -4,10 +4,6 @@ include $(top_srcdir)/../../../automake/compile.am
 
 noinst_PROGRAMS =
 
-include_libcpudir = $(includedir)/libcpu
-include_libcpu_HEADERS =
-include_libcpu_HEADERS += include/libcpu/access.h
-
 noinst_PROGRAMS += cache.rel
 cache_rel_SOURCES = cache/cache_.h \
     ../shared/src/cache_manager.c
@@ -33,5 +29,4 @@ access_rel_SOURCES = access/access.S access/access_le.c
 access_rel_CPPFLAGS = $(AM_CPPFLAGS)
 access_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/sparc/configure.ac b/c/src/lib/libcpu/sparc/configure.ac
index 40085add95..98b2ce8c4b 100644
--- a/c/src/lib/libcpu/sparc/configure.ac
+++ b/c/src/lib/libcpu/sparc/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libcpu-sparc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([reg_win])
 RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/c/src/lib/libcpu/sparc/preinstall.am b/c/src/lib/libcpu/sparc/preinstall.am
deleted file mode 100644
index ec35254581..0000000000
--- a/c/src/lib/libcpu/sparc/preinstall.am
+++ /dev/null
@@ -1,24 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/access.h: include/libcpu/access.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/access.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/access.h
-
diff --git a/c/src/lib/libcpu/sparc64/Makefile.am b/c/src/lib/libcpu/sparc64/Makefile.am
index f7b3beb350..81d07d4617 100644
--- a/c/src/lib/libcpu/sparc64/Makefile.am
+++ b/c/src/lib/libcpu/sparc64/Makefile.am
@@ -56,5 +56,4 @@ endif
 #endif
 ### End of example.
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/sparc64/configure.ac b/c/src/lib/libcpu/sparc64/configure.ac
index 5604c4215c..08607a53e7 100644
--- a/c/src/lib/libcpu/sparc64/configure.ac
+++ b/c/src/lib/libcpu/sparc64/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libcpu-sparc64],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([shared])
 RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/c/src/lib/libcpu/sparc64/preinstall.am b/c/src/lib/libcpu/sparc64/preinstall.am
deleted file mode 100644
index dba6cc4d81..0000000000
--- a/c/src/lib/libcpu/sparc64/preinstall.am
+++ /dev/null
@@ -1,7 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am
index 3eab714687..21892f1736 100644
--- a/c/src/libchip/Makefile.am
+++ b/c/src/libchip/Makefile.am
@@ -1,30 +1,20 @@
 include $(top_srcdir)/automake/compile.am
 
-include_libchipdir = $(includedir)/libchip
-include_libchip_HEADERS =
-
 EXTRA_DIST =
 noinst_LIBRARIES =
 noinst_PROGRAMS =
 
 # display
-include_libchip_HEADERS += display/disp_hcms29xx.h
-
 noinst_LIBRARIES += libdisplay.a
 libdisplay_a_SOURCES = display/disp_hcms29xx.c display/font_hcms29xx.c
 libdisplay_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 # flash
-include_libchip_HEADERS += flash/am29lv160.h
-
 noinst_LIBRARIES += libflash.a
 libflash_a_SOURCES = flash/am29lv160.c
 libflash_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 # ide
-include_libchip_HEADERS += ide/ata.h ide/ide_ctrl_cfg.h ide/ide_ctrl.h \
-    ide/ide_ctrl_io.h ide/ata_internal.h
-
 noinst_LIBRARIES += libide.a
 libide_a_SOURCES = ide/ata.c ide/ata_util.c ide/ide_controller.c
 libide_a_CPPFLAGS = $(AM_CPPFLAGS)
@@ -34,17 +24,12 @@ if HAS_NETWORKING
 noinst_LIBRARIES += libnetchip.a
 libnetchip_a_CPPFLAGS = $(AM_CPPFLAGS)
 libnetchip_a_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-include_libchip_HEADERS += network/cs8900.h network/i82586var.h \
-    network/if_fxpvar.h network/sonic.h network/wd80x3.h
-include_libchip_HEADERS += network/open_eth.h network/if_dcreg.h
 libnetchip_a_SOURCES = network/cs8900.c network/dec21140.c network/i82586.c \
     network/sonic.c network/if_fxp.c network/elnk.c network/open_eth.c \
     network/if_dc.c
 if !HAS_SMP
 libnetchip_a_SOURCES += network/greth.c
-include_libchip_HEADERS += network/greth.h
 endif
-include_libchip_HEADERS += network/smc91111.h network/smc91111exp.h
 libnetchip_a_SOURCES += network/smc91111.c network/smc91111config.h
 endif
 
@@ -53,9 +38,6 @@ EXTRA_DIST += network/README network/README.cs8900 network/README.dec21140 \
     network/cs8900.c.bsp network/README.tulipclone
 
 # rtc
-include_libchip_HEADERS += rtc/rtc.h rtc/icm7170.h rtc/m48t08.h \
-    rtc/mc146818a.h rtc/ds1375-rtc.h
-
 noinst_LIBRARIES += librtcio.a
 librtcio_a_CPPFLAGS = $(AM_CPPFLAGS)
 librtcio_a_SOURCES = rtc/rtcprobe.c rtc/icm7170.c rtc/icm7170_reg.c \
@@ -67,14 +49,6 @@ EXTRA_DIST += rtc/README.ds1643 rtc/README.icm7170 rtc/README.m48t08 \
     rtc/README.m48t18 rtc/STATUS
 
 # i2c
-include_libchip_HEADERS += i2c/i2c-ds1621.h \
-	i2c/i2c-2b-eeprom.h \
-	i2c/i2c-sc620.h \
-	i2c/spi-memdrv.h \
-	i2c/spi-flash-m25p40.h \
-	i2c/spi-fram-fm25l256.h \
-	i2c/spi-sd-card.h
-
 noinst_LIBRARIES += libi2cio.a
 
 libi2cio_a_CPPFLAGS = $(AM_CPPFLAGS)
@@ -92,10 +66,6 @@ libi2cio_a_SOURCES = i2c/i2c-ds1621.h \
 	i2c/spi-sd-card.c
 
 # serial
-include_libchip_HEADERS += serial/mc68681.h serial/ns16550.h serial/z85c30.h \
-    serial/serial.h serial/sersupp.h
-include_libchip_HEADERS += serial/ns16550_p.h
-
 noinst_LIBRARIES += libserialio.a
 libserialio_a_CPPFLAGS = $(AM_CPPFLAGS)
 libserialio_a_SOURCES = serial/mc68681.c serial/mc68681_baud.c \
@@ -110,8 +80,6 @@ EXTRA_DIST += serial/README.mc68681 serial/README.ns16550 \
 
 ## shmdr
 if HAS_MP
-include_HEADERS = shmdr/shm_driver.h shmdr/mpci.h
-
 project_lib_PROGRAMS = shmdr.rel
 shmdr_rel_SOURCES = shmdr/addlq.c shmdr/cnvpkt.c shmdr/getlq.c shmdr/dump.c \
     shmdr/fatal.c shmdr/getpkt.c shmdr/init.c shmdr/initlq.c shmdr/intr.c \
@@ -124,5 +92,4 @@ EXTRA_DIST += shmdr/README
 
 ## --
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/c/src/libchip/preinstall.am b/c/src/libchip/preinstall.am
deleted file mode 100644
index 82bb281633..0000000000
--- a/c/src/libchip/preinstall.am
+++ /dev/null
@@ -1,190 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip
-	@: > $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/disp_hcms29xx.h: display/disp_hcms29xx.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/disp_hcms29xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/disp_hcms29xx.h
-
-$(PROJECT_INCLUDE)/libchip/am29lv160.h: flash/am29lv160.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/am29lv160.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/am29lv160.h
-
-$(PROJECT_INCLUDE)/libchip/ata.h: ide/ata.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ata.h
-
-$(PROJECT_INCLUDE)/libchip/ide_ctrl_cfg.h: ide/ide_ctrl_cfg.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ide_ctrl_cfg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ide_ctrl_cfg.h
-
-$(PROJECT_INCLUDE)/libchip/ide_ctrl.h: ide/ide_ctrl.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ide_ctrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ide_ctrl.h
-
-$(PROJECT_INCLUDE)/libchip/ide_ctrl_io.h: ide/ide_ctrl_io.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ide_ctrl_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ide_ctrl_io.h
-
-$(PROJECT_INCLUDE)/libchip/ata_internal.h: ide/ata_internal.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ata_internal.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ata_internal.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/libchip/cs8900.h: network/cs8900.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/cs8900.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/cs8900.h
-
-$(PROJECT_INCLUDE)/libchip/i82586var.h: network/i82586var.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/i82586var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/i82586var.h
-
-$(PROJECT_INCLUDE)/libchip/if_fxpvar.h: network/if_fxpvar.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/if_fxpvar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/if_fxpvar.h
-
-$(PROJECT_INCLUDE)/libchip/sonic.h: network/sonic.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/sonic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/sonic.h
-
-$(PROJECT_INCLUDE)/libchip/wd80x3.h: network/wd80x3.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/wd80x3.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/wd80x3.h
-
-$(PROJECT_INCLUDE)/libchip/open_eth.h: network/open_eth.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/open_eth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/open_eth.h
-
-$(PROJECT_INCLUDE)/libchip/if_dcreg.h: network/if_dcreg.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/if_dcreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/if_dcreg.h
-
-if !HAS_SMP
-$(PROJECT_INCLUDE)/libchip/greth.h: network/greth.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/greth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/greth.h
-endif
-$(PROJECT_INCLUDE)/libchip/smc91111.h: network/smc91111.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/smc91111.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/smc91111.h
-
-$(PROJECT_INCLUDE)/libchip/smc91111exp.h: network/smc91111exp.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/smc91111exp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/smc91111exp.h
-endif
-$(PROJECT_INCLUDE)/libchip/rtc.h: rtc/rtc.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/rtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/rtc.h
-
-$(PROJECT_INCLUDE)/libchip/icm7170.h: rtc/icm7170.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/icm7170.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/icm7170.h
-
-$(PROJECT_INCLUDE)/libchip/m48t08.h: rtc/m48t08.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/m48t08.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/m48t08.h
-
-$(PROJECT_INCLUDE)/libchip/mc146818a.h: rtc/mc146818a.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/mc146818a.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mc146818a.h
-
-$(PROJECT_INCLUDE)/libchip/ds1375-rtc.h: rtc/ds1375-rtc.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ds1375-rtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ds1375-rtc.h
-
-$(PROJECT_INCLUDE)/libchip/i2c-ds1621.h: i2c/i2c-ds1621.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/i2c-ds1621.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/i2c-ds1621.h
-
-$(PROJECT_INCLUDE)/libchip/i2c-2b-eeprom.h: i2c/i2c-2b-eeprom.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/i2c-2b-eeprom.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/i2c-2b-eeprom.h
-
-$(PROJECT_INCLUDE)/libchip/i2c-sc620.h: i2c/i2c-sc620.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/i2c-sc620.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/i2c-sc620.h
-
-$(PROJECT_INCLUDE)/libchip/spi-memdrv.h: i2c/spi-memdrv.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/spi-memdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/spi-memdrv.h
-
-$(PROJECT_INCLUDE)/libchip/spi-flash-m25p40.h: i2c/spi-flash-m25p40.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/spi-flash-m25p40.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/spi-flash-m25p40.h
-
-$(PROJECT_INCLUDE)/libchip/spi-fram-fm25l256.h: i2c/spi-fram-fm25l256.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/spi-fram-fm25l256.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/spi-fram-fm25l256.h
-
-$(PROJECT_INCLUDE)/libchip/spi-sd-card.h: i2c/spi-sd-card.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/spi-sd-card.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/spi-sd-card.h
-
-$(PROJECT_INCLUDE)/libchip/mc68681.h: serial/mc68681.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/mc68681.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mc68681.h
-
-$(PROJECT_INCLUDE)/libchip/ns16550.h: serial/ns16550.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ns16550.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ns16550.h
-
-$(PROJECT_INCLUDE)/libchip/z85c30.h: serial/z85c30.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/z85c30.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/z85c30.h
-
-$(PROJECT_INCLUDE)/libchip/serial.h: serial/serial.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/serial.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/serial.h
-
-$(PROJECT_INCLUDE)/libchip/sersupp.h: serial/sersupp.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/sersupp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/sersupp.h
-
-$(PROJECT_INCLUDE)/libchip/ns16550_p.h: serial/ns16550_p.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ns16550_p.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ns16550_p.h
-
-if HAS_MP
-$(PROJECT_INCLUDE)/shm_driver.h: shmdr/shm_driver.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/shm_driver.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/shm_driver.h
-
-$(PROJECT_INCLUDE)/mpci.h: shmdr/mpci.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpci.h
-
-$(PROJECT_LIB)/shmdr.rel: shmdr.rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/shmdr.rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/shmdr.rel
-endif
diff --git a/c/src/make/configure.ac b/c/src/make/configure.ac
index 10c47a06d8..11f2102ec5 100644
--- a/c/src/make/configure.ac
+++ b/c/src/make/configure.ac
@@ -8,6 +8,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-make],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([bsp.cfg.in])
 RTEMS_TOP(../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 AC_SUBST(RTEMS_TOPdir,../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am
index b6760dd859..02713d7fc4 100644
--- a/c/src/wrapup/Makefile.am
+++ b/c/src/wrapup/Makefile.am
@@ -6,6 +6,11 @@ include $(top_srcdir)/automake/compile.am
 
 ## Setup the variant build subdirectory
 project_lib_DATA = o-optimize/librtemsbsp.a
+
+$(PROJECT_LIB)/librtemsbsp.a: o-optimize/librtemsbsp.a
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/librtemsbsp.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/librtemsbsp.a
+
 CLEANFILES = o-optimize/librtemsbsp.a
 
 SRCS = ../support/libsupport.a
@@ -62,5 +67,4 @@ o-optimize/librtemsbsp.a: $(SRCS)
 	rm -f $@-list o-optimize/*.$(OBJEXT) o-optimize/*.rel
 	$(RANLIB) $@
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/c/src/wrapup/preinstall.am b/c/src/wrapup/preinstall.am
deleted file mode 100644
index 6bc2534051..0000000000
--- a/c/src/wrapup/preinstall.am
+++ /dev/null
@@ -1,24 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_LIB)/librtemsbsp.a: o-optimize/librtemsbsp.a $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/librtemsbsp.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/librtemsbsp.a
-