119 files changed, 177 insertions, 0 deletions
diff --git a/bsps/sparc/erc32/headers.am b/bsps/sparc/erc32/headers.am
new file mode 100644
index 0000000000..00ad61f3e2
--- /dev/null
+++ b/bsps/sparc/erc32/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sparc/erc32/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sparc/erc32/include/erc32.h
+include_HEADERS += ../../../../../../bsps/sparc/erc32/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/sparc/erc32/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp.h b/bsps/sparc/erc32/include/bsp.h
index 71719f9cf3..71719f9cf3 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/bsp.h
+++ b/bsps/sparc/erc32/include/bsp.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp/irq.h b/bsps/sparc/erc32/include/bsp/irq.h
index 7789c9f57d..7789c9f57d 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/bsp/irq.h
+++ b/bsps/sparc/erc32/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/erc32.h b/bsps/sparc/erc32/include/erc32.h
index 7db4a6c91b..7db4a6c91b 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/erc32.h
+++ b/bsps/sparc/erc32/include/erc32.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/tm27.h b/bsps/sparc/erc32/include/tm27.h
index 958036fbf0..958036fbf0 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/tm27.h
+++ b/bsps/sparc/erc32/include/tm27.h
diff --git a/bsps/sparc/headers.am b/bsps/sparc/headers.am
new file mode 100644
index 0000000000..c561e0c06f
--- /dev/null
+++ b/bsps/sparc/headers.am
@@ -0,0 +1,75 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../bsps/sparc/include/ambapp.h
+include_HEADERS += ../../../../../bsps/sparc/include/ambapp_ids.h
+include_HEADERS += ../../../../../bsps/sparc/include/grlib.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/ahbstat.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/apbuart.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/apbuart_cons.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/apbuart_termios.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/b1553brm.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/b1553rt.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/canmux.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/cons.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/debug_defs.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/genirq.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gnatcommon.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gpiolib.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gptimer.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553b.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553bc.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553bc_list.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553bm.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553rt.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_701.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_cpci_gr740.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_leon4_n2x.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_rasta_adcdac.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_rasta_io.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_rasta_spw_router.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_rasta_tmtc.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_tmtc_1553.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gradcdac.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grascs.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grcan.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grctm.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/greth.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grgpio.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/griommu.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpci.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpci2.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpci2dma.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpwm.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grslink.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grspw.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grspw_pkt.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grspw_router.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grtc.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grtm.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/i2cmst.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/l2c.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/l4stat.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/mctrl.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/memscrub.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/network_interface_add.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/occan.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/pcif.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/satcan.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/spictrl.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/spwcuc.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/tlib.h
+
+include_drvmgrdir = $(includedir)/drvmgr
+include_drvmgr_HEADERS =
+include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/ambapp_bus.h
+include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/ambapp_bus_grlib.h
+include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/bspcommon.h
+include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/leon2_amba_bus.h
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += ../../../../../bsps/sparc/include/libcpu/access.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/ambapp.h b/bsps/sparc/include/ambapp.h
index 338602e83d..338602e83d 100644
--- a/c/src/lib/libbsp/sparc/shared/include/ambapp.h
+++ b/bsps/sparc/include/ambapp.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/ambapp_ids.h b/bsps/sparc/include/ambapp_ids.h
index c0c3547e94..c0c3547e94 100644
--- a/c/src/lib/libbsp/sparc/shared/include/ambapp_ids.h
+++ b/bsps/sparc/include/ambapp_ids.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/ahbstat.h b/bsps/sparc/include/bsp/ahbstat.h
index 71e2330f69..71e2330f69 100644
--- a/c/src/lib/libbsp/sparc/shared/include/ahbstat.h
+++ b/bsps/sparc/include/bsp/ahbstat.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart.h b/bsps/sparc/include/bsp/apbuart.h
index a324805d7d..a324805d7d 100644
--- a/c/src/lib/libbsp/sparc/shared/include/apbuart.h
+++ b/bsps/sparc/include/bsp/apbuart.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart_cons.h b/bsps/sparc/include/bsp/apbuart_cons.h
index d0ac9244af..d0ac9244af 100644
--- a/c/src/lib/libbsp/sparc/shared/include/apbuart_cons.h
+++ b/bsps/sparc/include/bsp/apbuart_cons.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart_termios.h b/bsps/sparc/include/bsp/apbuart_termios.h
index 40377c1023..40377c1023 100644
--- a/c/src/lib/libbsp/sparc/shared/include/apbuart_termios.h
+++ b/bsps/sparc/include/bsp/apbuart_termios.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553brm.h b/bsps/sparc/include/bsp/b1553brm.h
index eba0716f75..eba0716f75 100644
--- a/c/src/lib/libbsp/sparc/shared/include/b1553brm.h
+++ b/bsps/sparc/include/bsp/b1553brm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553rt.h b/bsps/sparc/include/bsp/b1553rt.h
index fbe4b706de..fbe4b706de 100644
--- a/c/src/lib/libbsp/sparc/shared/include/b1553rt.h
+++ b/bsps/sparc/include/bsp/b1553rt.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/canmux.h b/bsps/sparc/include/bsp/canmux.h
index 02727f44c7..02727f44c7 100644
--- a/c/src/lib/libbsp/sparc/shared/include/canmux.h
+++ b/bsps/sparc/include/bsp/canmux.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/cons.h b/bsps/sparc/include/bsp/cons.h
index c30e41cf14..c30e41cf14 100644
--- a/c/src/lib/libbsp/sparc/shared/include/cons.h
+++ b/bsps/sparc/include/bsp/cons.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/debug_defs.h b/bsps/sparc/include/bsp/debug_defs.h
index 58f7460f52..58f7460f52 100644
--- a/c/src/lib/libbsp/sparc/shared/include/debug_defs.h
+++ b/bsps/sparc/include/bsp/debug_defs.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/genirq.h b/bsps/sparc/include/bsp/genirq.h
index 673be173b1..673be173b1 100644
--- a/c/src/lib/libbsp/sparc/shared/include/genirq.h
+++ b/bsps/sparc/include/bsp/genirq.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gnatcommon.h b/bsps/sparc/include/bsp/gnatcommon.h
index 1a04449293..1a04449293 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gnatcommon.h
+++ b/bsps/sparc/include/bsp/gnatcommon.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gpiolib.h b/bsps/sparc/include/bsp/gpiolib.h
index f82d4fa2c2..f82d4fa2c2 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gpiolib.h
+++ b/bsps/sparc/include/bsp/gpiolib.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gptimer.h b/bsps/sparc/include/bsp/gptimer.h
index ee0120d2bd..ee0120d2bd 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gptimer.h
+++ b/bsps/sparc/include/bsp/gptimer.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553b.h b/bsps/sparc/include/bsp/gr1553b.h
index 006417b530..006417b530 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr1553b.h
+++ b/bsps/sparc/include/bsp/gr1553b.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bc.h b/bsps/sparc/include/bsp/gr1553bc.h
index ec766d2147..ec766d2147 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr1553bc.h
+++ b/bsps/sparc/include/bsp/gr1553bc.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h b/bsps/sparc/include/bsp/gr1553bc_list.h
index a89ddf58cf..a89ddf58cf 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h
+++ b/bsps/sparc/include/bsp/gr1553bc_list.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bm.h b/bsps/sparc/include/bsp/gr1553bm.h
index 058bc59a45..058bc59a45 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr1553bm.h
+++ b/bsps/sparc/include/bsp/gr1553bm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553rt.h b/bsps/sparc/include/bsp/gr1553rt.h
index 55237b5dfd..55237b5dfd 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr1553rt.h
+++ b/bsps/sparc/include/bsp/gr1553rt.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_701.h b/bsps/sparc/include/bsp/gr_701.h
index acfd9237a2..acfd9237a2 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_701.h
+++ b/bsps/sparc/include/bsp/gr_701.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_cpci_gr740.h b/bsps/sparc/include/bsp/gr_cpci_gr740.h
index 55c28acb4c..55c28acb4c 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_cpci_gr740.h
+++ b/bsps/sparc/include/bsp/gr_cpci_gr740.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_leon4_n2x.h b/bsps/sparc/include/bsp/gr_leon4_n2x.h
index 9a8041202a..9a8041202a 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_leon4_n2x.h
+++ b/bsps/sparc/include/bsp/gr_leon4_n2x.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_adcdac.h b/bsps/sparc/include/bsp/gr_rasta_adcdac.h
index 9e16cab96b..9e16cab96b 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_adcdac.h
+++ b/bsps/sparc/include/bsp/gr_rasta_adcdac.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_io.h b/bsps/sparc/include/bsp/gr_rasta_io.h
index 72a44f5151..72a44f5151 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_io.h
+++ b/bsps/sparc/include/bsp/gr_rasta_io.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_spw_router.h b/bsps/sparc/include/bsp/gr_rasta_spw_router.h
index 1cc9e41979..1cc9e41979 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_spw_router.h
+++ b/bsps/sparc/include/bsp/gr_rasta_spw_router.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_tmtc.h b/bsps/sparc/include/bsp/gr_rasta_tmtc.h
index 2b10ce2df3..2b10ce2df3 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_tmtc.h
+++ b/bsps/sparc/include/bsp/gr_rasta_tmtc.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_tmtc_1553.h b/bsps/sparc/include/bsp/gr_tmtc_1553.h
index b6ac43da00..b6ac43da00 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gr_tmtc_1553.h
+++ b/bsps/sparc/include/bsp/gr_tmtc_1553.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gradcdac.h b/bsps/sparc/include/bsp/gradcdac.h
index b52077845f..b52077845f 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gradcdac.h
+++ b/bsps/sparc/include/bsp/gradcdac.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grascs.h b/bsps/sparc/include/bsp/grascs.h
index b393e77888..b393e77888 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grascs.h
+++ b/bsps/sparc/include/bsp/grascs.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grcan.h b/bsps/sparc/include/bsp/grcan.h
index 5cdbad4b01..5cdbad4b01 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grcan.h
+++ b/bsps/sparc/include/bsp/grcan.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grctm.h b/bsps/sparc/include/bsp/grctm.h
index 5ff81559aa..5ff81559aa 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grctm.h
+++ b/bsps/sparc/include/bsp/grctm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/greth.h b/bsps/sparc/include/bsp/greth.h
index 9209d823e3..9209d823e3 100644
--- a/c/src/lib/libbsp/sparc/shared/include/greth.h
+++ b/bsps/sparc/include/bsp/greth.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grgpio.h b/bsps/sparc/include/bsp/grgpio.h
index c49054548c..c49054548c 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grgpio.h
+++ b/bsps/sparc/include/bsp/grgpio.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/griommu.h b/bsps/sparc/include/bsp/griommu.h
index 2bafe4c513..2bafe4c513 100644
--- a/c/src/lib/libbsp/sparc/shared/include/griommu.h
+++ b/bsps/sparc/include/bsp/griommu.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grpci.h b/bsps/sparc/include/bsp/grpci.h
index 2321706200..2321706200 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grpci.h
+++ b/bsps/sparc/include/bsp/grpci.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grpci2.h b/bsps/sparc/include/bsp/grpci2.h
index c356b5641f..c356b5641f 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grpci2.h
+++ b/bsps/sparc/include/bsp/grpci2.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grpci2dma.h b/bsps/sparc/include/bsp/grpci2dma.h
index c1a2663a86..c1a2663a86 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grpci2dma.h
+++ b/bsps/sparc/include/bsp/grpci2dma.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grpwm.h b/bsps/sparc/include/bsp/grpwm.h
index 6898f8ac2e..6898f8ac2e 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grpwm.h
+++ b/bsps/sparc/include/bsp/grpwm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grslink.h b/bsps/sparc/include/bsp/grslink.h
index 575a24aee4..575a24aee4 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grslink.h
+++ b/bsps/sparc/include/bsp/grslink.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw.h b/bsps/sparc/include/bsp/grspw.h
index 3270e8a5a2..3270e8a5a2 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grspw.h
+++ b/bsps/sparc/include/bsp/grspw.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw_pkt.h b/bsps/sparc/include/bsp/grspw_pkt.h
index a74a7c9f6a..a74a7c9f6a 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grspw_pkt.h
+++ b/bsps/sparc/include/bsp/grspw_pkt.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw_router.h b/bsps/sparc/include/bsp/grspw_router.h
index 2fab8d5f6c..2fab8d5f6c 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grspw_router.h
+++ b/bsps/sparc/include/bsp/grspw_router.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grtc.h b/bsps/sparc/include/bsp/grtc.h
index 3ee1fa547c..3ee1fa547c 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grtc.h
+++ b/bsps/sparc/include/bsp/grtc.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grtm.h b/bsps/sparc/include/bsp/grtm.h
index 625f8389b7..625f8389b7 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grtm.h
+++ b/bsps/sparc/include/bsp/grtm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/i2cmst.h b/bsps/sparc/include/bsp/i2cmst.h
index 3eee717524..3eee717524 100644
--- a/c/src/lib/libbsp/sparc/shared/include/i2cmst.h
+++ b/bsps/sparc/include/bsp/i2cmst.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/l2c.h b/bsps/sparc/include/bsp/l2c.h
index 52473ddf2a..52473ddf2a 100644
--- a/c/src/lib/libbsp/sparc/shared/include/l2c.h
+++ b/bsps/sparc/include/bsp/l2c.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/l4stat.h b/bsps/sparc/include/bsp/l4stat.h
index 94fbe4b095..94fbe4b095 100644
--- a/c/src/lib/libbsp/sparc/shared/include/l4stat.h
+++ b/bsps/sparc/include/bsp/l4stat.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/mctrl.h b/bsps/sparc/include/bsp/mctrl.h
index db449cb11a..db449cb11a 100644
--- a/c/src/lib/libbsp/sparc/shared/include/mctrl.h
+++ b/bsps/sparc/include/bsp/mctrl.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/memscrub.h b/bsps/sparc/include/bsp/memscrub.h
index 1e55d8e127..1e55d8e127 100644
--- a/c/src/lib/libbsp/sparc/shared/include/memscrub.h
+++ b/bsps/sparc/include/bsp/memscrub.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/network_interface_add.h b/bsps/sparc/include/bsp/network_interface_add.h
index b04a96f003..b04a96f003 100644
--- a/c/src/lib/libbsp/sparc/shared/include/network_interface_add.h
+++ b/bsps/sparc/include/bsp/network_interface_add.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/occan.h b/bsps/sparc/include/bsp/occan.h
index 0bf34dee48..0bf34dee48 100644
--- a/c/src/lib/libbsp/sparc/shared/include/occan.h
+++ b/bsps/sparc/include/bsp/occan.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/pcif.h b/bsps/sparc/include/bsp/pcif.h
index 0221fcdd50..0221fcdd50 100644
--- a/c/src/lib/libbsp/sparc/shared/include/pcif.h
+++ b/bsps/sparc/include/bsp/pcif.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/satcan.h b/bsps/sparc/include/bsp/satcan.h
index ab9f5e0cd4..ab9f5e0cd4 100644
--- a/c/src/lib/libbsp/sparc/shared/include/satcan.h
+++ b/bsps/sparc/include/bsp/satcan.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/spictrl.h b/bsps/sparc/include/bsp/spictrl.h
index 98922fbd30..98922fbd30 100644
--- a/c/src/lib/libbsp/sparc/shared/include/spictrl.h
+++ b/bsps/sparc/include/bsp/spictrl.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/spwcuc.h b/bsps/sparc/include/bsp/spwcuc.h
index e420367640..e420367640 100644
--- a/c/src/lib/libbsp/sparc/shared/include/spwcuc.h
+++ b/bsps/sparc/include/bsp/spwcuc.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/tlib.h b/bsps/sparc/include/bsp/tlib.h
index debb8c8215..debb8c8215 100644
--- a/c/src/lib/libbsp/sparc/shared/include/tlib.h
+++ b/bsps/sparc/include/bsp/tlib.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus.h b/bsps/sparc/include/drvmgr/ambapp_bus.h
index d034aae3a3..d034aae3a3 100644
--- a/c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus.h
+++ b/bsps/sparc/include/drvmgr/ambapp_bus.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus_grlib.h b/bsps/sparc/include/drvmgr/ambapp_bus_grlib.h
index 2def4bc2b4..2def4bc2b4 100644
--- a/c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus_grlib.h
+++ b/bsps/sparc/include/drvmgr/ambapp_bus_grlib.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/bspcommon.h b/bsps/sparc/include/drvmgr/bspcommon.h
index d3470009f8..d3470009f8 100644
--- a/c/src/lib/libbsp/sparc/shared/include/drvmgr/bspcommon.h
+++ b/bsps/sparc/include/drvmgr/bspcommon.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/leon2_amba_bus.h b/bsps/sparc/include/drvmgr/leon2_amba_bus.h
index ebb3a08486..ebb3a08486 100644
--- a/c/src/lib/libbsp/sparc/shared/include/drvmgr/leon2_amba_bus.h
+++ b/bsps/sparc/include/drvmgr/leon2_amba_bus.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grlib.h b/bsps/sparc/include/grlib.h
index a2d0877fb8..a2d0877fb8 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grlib.h
+++ b/bsps/sparc/include/grlib.h
diff --git a/c/src/lib/libcpu/sparc/include/libcpu/access.h b/bsps/sparc/include/libcpu/access.h
index cdf6b77122..cdf6b77122 100644
--- a/c/src/lib/libcpu/sparc/include/libcpu/access.h
+++ b/bsps/sparc/include/libcpu/access.h
diff --git a/bsps/sparc/leon2/headers.am b/bsps/sparc/leon2/headers.am
new file mode 100644
index 0000000000..73ae163778
--- /dev/null
+++ b/bsps/sparc/leon2/headers.am
@@ -0,0 +1,12 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sparc/leon2/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sparc/leon2/include/leon.h
+include_HEADERS += ../../../../../../bsps/sparc/leon2/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/sparc/leon2/include/bsp/at697_pci.h
+include_bsp_HEADERS += ../../../../../../bsps/sparc/leon2/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp.h b/bsps/sparc/leon2/include/bsp.h
index 2028ba0db3..2028ba0db3 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/bsp.h
+++ b/bsps/sparc/leon2/include/bsp.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/at697_pci.h b/bsps/sparc/leon2/include/bsp/at697_pci.h
index 9a511ec6f9..9a511ec6f9 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/at697_pci.h
+++ b/bsps/sparc/leon2/include/bsp/at697_pci.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp/irq.h b/bsps/sparc/leon2/include/bsp/irq.h
index 086bf253c4..086bf253c4 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/bsp/irq.h
+++ b/bsps/sparc/leon2/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/leon.h b/bsps/sparc/leon2/include/leon.h
index 7ec6b1dcf9..7ec6b1dcf9 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/leon.h
+++ b/bsps/sparc/leon2/include/leon.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/tm27.h b/bsps/sparc/leon2/include/tm27.h
index 0d28641b9b..0d28641b9b 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/tm27.h
+++ b/bsps/sparc/leon2/include/tm27.h
diff --git a/bsps/sparc/leon3/headers.am b/bsps/sparc/leon3/headers.am
new file mode 100644
index 0000000000..755a89632d
--- /dev/null
+++ b/bsps/sparc/leon3/headers.am
@@ -0,0 +1,13 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sparc/leon3/include/amba.h
+include_HEADERS += ../../../../../../bsps/sparc/leon3/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sparc/leon3/include/leon.h
+include_HEADERS += ../../../../../../bsps/sparc/leon3/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/sparc/leon3/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/sparc/leon3/include/bsp/watchdog.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/amba.h b/bsps/sparc/leon3/include/amba.h
index 059b28ca07..059b28ca07 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/amba.h
+++ b/bsps/sparc/leon3/include/amba.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp.h b/bsps/sparc/leon3/include/bsp.h
index 3fda4edc66..3fda4edc66 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/bsp.h
+++ b/bsps/sparc/leon3/include/bsp.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h b/bsps/sparc/leon3/include/bsp/irq.h
index c3e7959139..c3e7959139 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h
+++ b/bsps/sparc/leon3/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/watchdog.h b/bsps/sparc/leon3/include/bsp/watchdog.h
index 3c63be2a8f..3c63be2a8f 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/watchdog.h
+++ b/bsps/sparc/leon3/include/bsp/watchdog.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/leon.h b/bsps/sparc/leon3/include/leon.h
index 758b760b0b..758b760b0b 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/leon.h
+++ b/bsps/sparc/leon3/include/leon.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/tm27.h b/bsps/sparc/leon3/include/tm27.h
index 00921d4880..00921d4880 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/tm27.h
+++ b/bsps/sparc/leon3/include/tm27.h
diff --git a/bsps/sparc64/headers.am b/bsps/sparc64/headers.am
new file mode 100644
index 0000000000..1a04025280
--- /dev/null
+++ b/bsps/sparc64/headers.am
@@ -0,0 +1,54 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../bsps/sparc64/include/asm.h
+include_HEADERS += ../../../../../bsps/sparc64/include/traptable.h
+
+include_archdir = $(includedir)/arch
+include_arch_HEADERS =
+include_arch_HEADERS += ../../../../../bsps/sparc64/include/arch/arch.h
+include_arch_HEADERS += ../../../../../bsps/sparc64/include/arch/boot.h
+include_arch_HEADERS += ../../../../../bsps/sparc64/include/arch/regdef.h
+include_arch_HEADERS += ../../../../../bsps/sparc64/include/arch/stack.h
+
+include_arch_mmdir = $(includedir)/arch/mm
+include_arch_mm_HEADERS =
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/cache_spec.h
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/frame.h
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/mmu.h
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/page.h
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/tlb.h
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/tte.h
+
+include_arch_mm_sun4udir = $(includedir)/arch/mm/sun4u
+include_arch_mm_sun4u_HEADERS =
+include_arch_mm_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/sun4u/frame.h
+include_arch_mm_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/sun4u/mmu.h
+include_arch_mm_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/sun4u/page.h
+include_arch_mm_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/sun4u/tlb.h
+include_arch_mm_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/sun4u/tte.h
+
+include_arch_sun4udir = $(includedir)/arch/sun4u
+include_arch_sun4u_HEADERS =
+include_arch_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/sun4u/arch.h
+
+include_bootdir = $(includedir)/boot
+include_boot_HEADERS =
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/align.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/balloc.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/gentypes.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/main.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/ofw.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/ofw_tree.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/ofwarch.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/register.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/stack.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/types.h
+
+include_genarch_ofwdir = $(includedir)/genarch/ofw
+include_genarch_ofw_HEADERS =
+include_genarch_ofw_HEADERS += ../../../../../bsps/sparc64/include/genarch/ofw/ofw_tree.h
+
+include_kerneldir = $(includedir)/kernel
+include_kernel_HEADERS =
+include_kernel_HEADERS += ../../../../../bsps/sparc64/include/kernel/align.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/arch.h b/bsps/sparc64/include/arch/arch.h
index 5fdd4a2cb2..5fdd4a2cb2 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/arch.h
+++ b/bsps/sparc64/include/arch/arch.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/boot.h b/bsps/sparc64/include/arch/boot.h
index b0a997a957..b0a997a957 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/boot.h
+++ b/bsps/sparc64/include/arch/boot.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/cache_spec.h b/bsps/sparc64/include/arch/mm/cache_spec.h
index 1d9199db33..1d9199db33 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/cache_spec.h
+++ b/bsps/sparc64/include/arch/mm/cache_spec.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/frame.h b/bsps/sparc64/include/arch/mm/frame.h
index fb66e54bf1..fb66e54bf1 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/frame.h
+++ b/bsps/sparc64/include/arch/mm/frame.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/mmu.h b/bsps/sparc64/include/arch/mm/mmu.h
index 1d445f2e24..1d445f2e24 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/mmu.h
+++ b/bsps/sparc64/include/arch/mm/mmu.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/page.h b/bsps/sparc64/include/arch/mm/page.h
index f1451a2866..f1451a2866 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/page.h
+++ b/bsps/sparc64/include/arch/mm/page.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h b/bsps/sparc64/include/arch/mm/sun4u/frame.h
index e30f504d08..e30f504d08 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h
+++ b/bsps/sparc64/include/arch/mm/sun4u/frame.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h b/bsps/sparc64/include/arch/mm/sun4u/mmu.h
index f887ebe7f4..f887ebe7f4 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h
+++ b/bsps/sparc64/include/arch/mm/sun4u/mmu.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/page.h b/bsps/sparc64/include/arch/mm/sun4u/page.h
index f1451a2866..f1451a2866 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/page.h
+++ b/bsps/sparc64/include/arch/mm/sun4u/page.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h b/bsps/sparc64/include/arch/mm/sun4u/tlb.h
index 6f6e6542e6..6f6e6542e6 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h
+++ b/bsps/sparc64/include/arch/mm/sun4u/tlb.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h b/bsps/sparc64/include/arch/mm/sun4u/tte.h
index 46acaed47c..46acaed47c 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h
+++ b/bsps/sparc64/include/arch/mm/sun4u/tte.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tlb.h b/bsps/sparc64/include/arch/mm/tlb.h
index 4adf26ca64..4adf26ca64 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tlb.h
+++ b/bsps/sparc64/include/arch/mm/tlb.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tte.h b/bsps/sparc64/include/arch/mm/tte.h
index f0b746e8c6..f0b746e8c6 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tte.h
+++ b/bsps/sparc64/include/arch/mm/tte.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/regdef.h b/bsps/sparc64/include/arch/regdef.h
index aae46fa99f..aae46fa99f 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/regdef.h
+++ b/bsps/sparc64/include/arch/regdef.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/stack.h b/bsps/sparc64/include/arch/stack.h
index 6364916912..6364916912 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/stack.h
+++ b/bsps/sparc64/include/arch/stack.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/sun4u/arch.h b/bsps/sparc64/include/arch/sun4u/arch.h
index 9e883a37ff..9e883a37ff 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/sun4u/arch.h
+++ b/bsps/sparc64/include/arch/sun4u/arch.h
diff --git a/c/src/lib/libbsp/sparc64/shared/include/asm.h b/bsps/sparc64/include/asm.h
index bd3cc1298a..bd3cc1298a 100644
--- a/c/src/lib/libbsp/sparc64/shared/include/asm.h
+++ b/bsps/sparc64/include/asm.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/align.h b/bsps/sparc64/include/boot/align.h
index 96229101ed..96229101ed 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/align.h
+++ b/bsps/sparc64/include/boot/align.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/balloc.h b/bsps/sparc64/include/boot/balloc.h
index 8e502c0c58..8e502c0c58 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/balloc.h
+++ b/bsps/sparc64/include/boot/balloc.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/gentypes.h b/bsps/sparc64/include/boot/gentypes.h
index a3e82d6eef..a3e82d6eef 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/gentypes.h
+++ b/bsps/sparc64/include/boot/gentypes.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/main.h b/bsps/sparc64/include/boot/main.h
index 5ddc814ac8..5ddc814ac8 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/main.h
+++ b/bsps/sparc64/include/boot/main.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw.h b/bsps/sparc64/include/boot/ofw.h
index c562b675a2..c562b675a2 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw.h
+++ b/bsps/sparc64/include/boot/ofw.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw_tree.h b/bsps/sparc64/include/boot/ofw_tree.h
index 5872ade261..5872ade261 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw_tree.h
+++ b/bsps/sparc64/include/boot/ofw_tree.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofwarch.h b/bsps/sparc64/include/boot/ofwarch.h
index 2d4f7643c0..2d4f7643c0 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofwarch.h
+++ b/bsps/sparc64/include/boot/ofwarch.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/register.h b/bsps/sparc64/include/boot/register.h
index 61bf34ac66..61bf34ac66 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/register.h
+++ b/bsps/sparc64/include/boot/register.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/stack.h b/bsps/sparc64/include/boot/stack.h
index 1486dd21b4..1486dd21b4 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/stack.h
+++ b/bsps/sparc64/include/boot/stack.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/types.h b/bsps/sparc64/include/boot/types.h
index 095e25233d..095e25233d 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/types.h
+++ b/bsps/sparc64/include/boot/types.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/genarch/include/ofw/ofw_tree.h b/bsps/sparc64/include/genarch/ofw/ofw_tree.h
index f62d545527..f62d545527 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/genarch/include/ofw/ofw_tree.h
+++ b/bsps/sparc64/include/genarch/ofw/ofw_tree.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/generic/include/align.h b/bsps/sparc64/include/kernel/align.h
index 6003ea9c4e..6003ea9c4e 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/generic/include/align.h
+++ b/bsps/sparc64/include/kernel/align.h
diff --git a/c/src/lib/libbsp/sparc64/shared/include/traptable.h b/bsps/sparc64/include/traptable.h
index 353c60d79c..353c60d79c 100644
--- a/c/src/lib/libbsp/sparc64/shared/include/traptable.h
+++ b/bsps/sparc64/include/traptable.h
diff --git a/bsps/sparc64/niagara/headers.am b/bsps/sparc64/niagara/headers.am
new file mode 100644
index 0000000000..24d001f919
--- /dev/null
+++ b/bsps/sparc64/niagara/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sparc64/niagara/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sparc64/niagara/include/tm27.h
diff --git a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h b/bsps/sparc64/niagara/include/bsp.h
index 81058270a9..81058270a9 100644
--- a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h
+++ b/bsps/sparc64/niagara/include/bsp.h
diff --git a/c/src/lib/libbsp/sparc64/niagara/include/tm27.h b/bsps/sparc64/niagara/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/sparc64/niagara/include/tm27.h
+++ b/bsps/sparc64/niagara/include/tm27.h
diff --git a/bsps/sparc64/usiii/headers.am b/bsps/sparc64/usiii/headers.am
new file mode 100644
index 0000000000..06129f2596
--- /dev/null
+++ b/bsps/sparc64/usiii/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sparc64/usiii/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sparc64/usiii/include/tm27.h
diff --git a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h b/bsps/sparc64/usiii/include/bsp.h
index 8051db3987..8051db3987 100644
--- a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h
+++ b/bsps/sparc64/usiii/include/bsp.h
diff --git a/c/src/lib/libbsp/sparc64/usiii/include/tm27.h b/bsps/sparc64/usiii/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/sparc64/usiii/include/tm27.h
+++ b/bsps/sparc64/usiii/include/tm27.h