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.

654 files changed, 1089 insertions, 5250 deletions

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index d317fbba1c..636663e93e 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -29,292 +29,67 @@ _SUBDIRS += telnetd
 _SUBDIRS += pppd
 _SUBDIRS += mghttpd
 
-noinst_DATA = preinstall-stamp
-preinstall-stamp:
-	$(MAKE) $(AM_MAKEFLAGS) preinstall
-	touch preinstall-stamp
-CLEANFILES = preinstall-stamp
-
-include_HEADERS =
-include_HEADERS += include/endian.h
-include_HEADERS += include/zconf.h
-
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS =
-
-include_rtems_rtemsdir = $(includedir)/rtems/rtems
-include_rtems_rtems_HEADERS =
-
-include_uuiddir = $(includedir)/uuid
-include_uuid_HEADERS = libmisc/uuid/uuid.h
-
-include_utf8procdir = $(includedir)/utf8proc
-include_utf8proc_HEADERS = libmisc/utf8proc/utf8proc.h
-
-include_sysdir = $(includedir)/sys
-include_sys_HEADERS =
-
-include_HEADERS += include/crypt.h
-include_HEADERS += include/memory.h
-
-include_HEADERS += libmisc/xz/xz.h
-
-include_sys_HEADERS += libcsupport/include/sys/event.h
-include_sys_HEADERS += libcsupport/include/sys/poll.h
-include_sys_HEADERS += libcsupport/include/sys/statvfs.h
-include_sys_HEADERS += libcsupport/include/sys/utsname.h
-
-include_sys_HEADERS += include/sys/endian.h
-include_sys_HEADERS += include/sys/priority.h
-
 if LIBNETWORKING
-include_rtems_bsdnetdir = $(includedir)/rtems/bsdnet
-include_rtems_bsdnet_HEADERS = libnetworking/rtems/bsdnet/servers.h
-include_rtems_bsdnet_HEADERS += libnetworking/rtems/bsdnet/_types.h
 endif
 
 if LIBDL
-include_HEADERS += libdl/dlfcn.h
-include_HEADERS += libdl/include/link.h
-include_HEADERS += libdl/include/link_elf.h
-include_sys_HEADERS += libdl/include/sys/cdefs_elf.h
-include_sys_HEADERS += libdl/include/sys/exec_elf.h
-include_arch_machinedir = $(includedir)/machine
-include_arch_machine_HEADERS =
-include_arch_machine_HEADERS += libdl/include/arch/@RTEMS_CPU@/machine/elf_machdep.h
-include_rtems_rtldir = $(includedir)/rtems/rtl
-include_rtems_rtl_HEADERS =
-include_rtems_rtl_HEADERS += libdl/dlfcn-shell.h
-include_rtems_rtl_HEADERS += libdl/rtl.h libdl/rtl-allocator.h libdl/rtl-obj-fwd.h
-include_rtems_rtl_HEADERS += libdl/rtl-fwd.h libdl/rtl-obj.h libdl/rtl-obj-cache.h
-include_rtems_rtl_HEADERS += libdl/rtl-obj-comp.h libdl/rtl-unresolved.h
-include_rtems_rtl_HEADERS += libdl/rtl-indirect-ptr.h libdl/rtl-sym.h libdl/rtl-trace.h
-include_rtems_rtl_HEADERS += libdl/rap.h libdl/rap-shell.h
 endif
 
 if LIBDEBUGGER
-include_rtems_HEADERS += libdebugger/rtems-debugger.h
-include_rtems_debuggerdir = $(includedir)/rtems/debugger
-include_rtems_debugger_HEADERS  =
-include_rtems_debugger_HEADERS += libdebugger/rtems-debugger-server.h
-include_rtems_debugger_HEADERS +=  libdebugger/rtems-debugger-remote.h
 endif
 
-include_rtems_HEADERS += include/rtems/bspIo.h
-include_rtems_HEADERS += include/rtems/inttypes.h
-include_rtems_HEADERS += include/rtems/print.h
-include_rtems_HEADERS += include/rtems/printer.h
-include_rtems_HEADERS += include/rtems/userenv.h
-include_rtems_HEADERS += include/rtems/fs.h
 if !LIBPCI
-include_rtems_HEADERS += include/rtems/pci.h
 endif
-include_rtems_HEADERS += include/rtems/concat.h
-include_rtems_HEADERS += include/rtems/status-checks.h
-
-include_rtems_HEADERS += include/rtems/endian.h
-
-include_rtems_HEADERS += include/rtems/btimer.h
-include_rtems_HEADERS += include/rtems/console.h
-include_rtems_HEADERS += include/rtems/clockdrv.h
-include_rtems_HEADERS += include/rtems/framebuffer.h
-include_rtems_HEADERS += include/rtems/rtc.h
-include_rtems_HEADERS += include/rtems/watchdogdrv.h
-
 ## should be conditional and only installed for PowerPC, x86, and ARM
-include_rtems_HEADERS += include/rtems/irq.h
-
-include_rtems_HEADERS += include/rtems/irq-extension.h
-
 ## libfs
-include_rtems_HEADERS += libfs/src/imfs/imfs.h
-
 ## POSIX FIFO/pipe
-include_rtems_HEADERS += libfs/src/pipe/pipe.h
-
 ## devfs
-include_rtems_HEADERS += libfs/src/devfs/devfs.h
-
 if LIBDOSFS
-include_rtems_HEADERS += libfs/src/dosfs/dosfs.h
 endif
 
 # RFS
-include_rtems_HEADERS += libfs/src/rfs/rtems-rfs.h
-include_rtems_HEADERS += libfs/src/rfs/rtems-rfs-format.h
-include_rtems_HEADERS += libfs/src/rfs/rtems-rfs-shell.h
-
-include_rtems_rfsdir = $(include_rtemsdir)/rfs
-include_rtems_rfs_HEADERS =
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-bitmaps.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-block-pos.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-block.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-buffer.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-data.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-dir.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-dir-hash.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-file.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-file-system-fwd.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-file-system.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-group.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-inode.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-link.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-mutex.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-trace.h
-
 # JFFS2
-include_rtems_HEADERS += libfs/src/jffs2/include/rtems/jffs2.h
-
 ## libblock
-include_rtems_HEADERS += libblock/include/rtems/bdbuf.h
-include_rtems_HEADERS += libblock/include/rtems/blkdev.h
-include_rtems_HEADERS += libblock/include/rtems/diskdevs.h
-include_rtems_HEADERS += libblock/include/rtems/flashdisk.h
-include_rtems_HEADERS += libblock/include/rtems/ramdisk.h
-include_rtems_HEADERS += libblock/include/rtems/nvdisk.h
-include_rtems_HEADERS += libblock/include/rtems/nvdisk-sram.h
-include_rtems_HEADERS += libblock/include/rtems/sparse-disk.h
-include_rtems_HEADERS += libblock/include/rtems/ide_part_table.h
-include_rtems_HEADERS += libblock/include/rtems/bdpart.h
-include_rtems_HEADERS += libblock/include/rtems/media.h
-
 ## ftpd
 if LIBNETWORKING
-include_rtems_HEADERS += ftpd/ftpd.h
 endif
 
 ## bspcmdline
-include_rtems_HEADERS += libmisc/bspcmdline/bspcmdline.h
-
 ## capture
-include_rtems_HEADERS += libmisc/capture/capture.h
-include_rtems_HEADERS += libmisc/capture/capture-cli.h
-include_rtems_HEADERS += libmisc/capture/captureimpl.h
-
 # tracing headers
-include_rtems_tracedir = $(include_rtemsdir)/trace
-include_rtems_trace_HEADERS =
-include_rtems_trace_HEADERS += libmisc/capture/rtems-trace-buffer-vars.h
-
 ## cpuuse
-include_rtems_HEADERS += libmisc/cpuuse/cpuuse.h
-
 ## devnull
-include_rtems_HEADERS += libmisc/devnull/devnull.h
-include_rtems_HEADERS += libmisc/devnull/devzero.h
-
 ## dumpbuf
-include_rtems_HEADERS += libmisc/dumpbuf/dumpbuf.h
-
 ## rtemsfdt
-include_rtems_HEADERS += libmisc/rtems-fdt/rtems-fdt.h
-include_rtems_HEADERS += libmisc/rtems-fdt/rtems-fdt-shell.h
-
 ## monitor
-include_rtems_HEADERS += libmisc/monitor/monitor.h
-
 ## fb
-include_rtems_HEADERS += libmisc/fb/fb.h
-include_rtems_HEADERS += libmisc/fb/mw_uid.h
-
 ## mouse
-include_rtems_HEADERS += libmisc/mouse/mouse_parser.h
-include_rtems_HEADERS += libmisc/mouse/serial_mouse.h
-
 ## libqos
-include_rtems_HEADERS += libqos/qreslib.h
-
 ## redirector
-include_rtems_HEADERS += libmisc/redirector/stdio-redirect.h
 ## shell
 if LIBSHELL
-include_rtems_HEADERS += libmisc/shell/shell.h
-include_rtems_HEADERS += libmisc/shell/shellconfig.h
 endif
 
 ## stringto
-include_rtems_HEADERS += libmisc/stringto/stringto.h
-
 ## testsupport
-include_rtems_HEADERS += libmisc/testsupport/test.h
-
 ## i2c
-include_rtems_HEADERS += libi2c/libi2c.h
-
 ## serdbg
 if LIBSERDBG
-include_rtems_HEADERS += libmisc/serdbg/serdbgcnf.h
-include_rtems_HEADERS += libmisc/serdbg/serdbg.h
-include_rtems_HEADERS += libmisc/serdbg/termios_printk_cnf.h
-include_rtems_HEADERS += libmisc/serdbg/termios_printk.h
 endif
 
 ## stackchk
-include_rtems_HEADERS += libmisc/stackchk/stackchk.h
-
 ## libuntar
-include_rtems_HEADERS += libmisc/untar/untar.h
-
 ## fsmount
-include_rtems_HEADERS += libmisc/fsmount/fsmount.h
-
-include_rtems_HEADERS += include/rtems/tm27-default.h
-
 ## Driver manager
 if LIBDRVMGR
-include_drvmgrdir = $(includedir)/drvmgr
-include_drvmgr_HEADERS = libdrvmgr/drvmgr.h
-include_drvmgr_HEADERS += libdrvmgr/drvmgr_confdefs.h
-include_drvmgr_HEADERS += libdrvmgr/drvmgr_list.h
 endif
 
 if LIBGNAT
-include_adaincludedir = $(includedir)/adainclude
-include_adainclude_HEADERS =
-include_adainclude_HEADERS += include/adainclude/rtems.adb
-include_adainclude_HEADERS += include/adainclude/rtems.ads
-include_adainclude_HEADERS += include/adainclude/rtems-barrier.adb
-include_adainclude_HEADERS += include/adainclude/rtems-barrier.ads
-include_adainclude_HEADERS += include/adainclude/rtems-clock.adb
-include_adainclude_HEADERS += include/adainclude/rtems-clock.ads
-include_adainclude_HEADERS += include/adainclude/rtems-cpu_usage.ads
-include_adainclude_HEADERS += include/adainclude/rtems-event.adb
-include_adainclude_HEADERS += include/adainclude/rtems-event.ads
-include_adainclude_HEADERS += include/adainclude/rtems-extension.adb
-include_adainclude_HEADERS += include/adainclude/rtems-extension.ads
-include_adainclude_HEADERS += include/adainclude/rtems-fatal.adb
-include_adainclude_HEADERS += include/adainclude/rtems-fatal.ads
-include_adainclude_HEADERS += include/adainclude/rtems-interrupt.ads
-include_adainclude_HEADERS += include/adainclude/rtems-io.adb
-include_adainclude_HEADERS += include/adainclude/rtems-io.ads
-include_adainclude_HEADERS += include/adainclude/rtems-message_queue.adb
-include_adainclude_HEADERS += include/adainclude/rtems-message_queue.ads
-include_adainclude_HEADERS += include/adainclude/rtems-multiprocessing.adb
-include_adainclude_HEADERS += include/adainclude/rtems-multiprocessing.ads
-include_adainclude_HEADERS += include/adainclude/rtems-object.adb
-include_adainclude_HEADERS += include/adainclude/rtems-object.ads
-include_adainclude_HEADERS += include/adainclude/rtems-partition.adb
-include_adainclude_HEADERS += include/adainclude/rtems-partition.ads
-include_adainclude_HEADERS += include/adainclude/rtems-port.adb
-include_adainclude_HEADERS += include/adainclude/rtems-port.ads
-include_adainclude_HEADERS += include/adainclude/rtems-rate_monotonic.adb
-include_adainclude_HEADERS += include/adainclude/rtems-rate_monotonic.ads
-include_adainclude_HEADERS += include/adainclude/rtems-region.adb
-include_adainclude_HEADERS += include/adainclude/rtems-region.ads
-include_adainclude_HEADERS += include/adainclude/rtems-semaphore.adb
-include_adainclude_HEADERS += include/adainclude/rtems-semaphore.ads
-include_adainclude_HEADERS += include/adainclude/rtems-signal.adb
-include_adainclude_HEADERS += include/adainclude/rtems-signal.ads
-include_adainclude_HEADERS += include/adainclude/rtems-stack_checker.ads
-include_adainclude_HEADERS += include/adainclude/rtems-tasks.adb
-include_adainclude_HEADERS += include/adainclude/rtems-tasks.ads
-include_adainclude_HEADERS += include/adainclude/rtems-timer.adb
-include_adainclude_HEADERS += include/adainclude/rtems-timer.ads
 endif
 
 ## HACK: doxygen filter.
 EXTRA_DIST = doxy-filter
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/acinclude.m4 b/cpukit/acinclude.m4
index da6084de90..f1889b6677 100644
--- a/cpukit/acinclude.m4
+++ b/cpukit/acinclude.m4
@@ -36,26 +36,27 @@ _ACEOF
 ])
 
 AC_DEFUN([_RTEMS_CPUOPT_FINI],[
+AC_REQUIRE([RTEMS_BUILD_TOP])
 cat >>cpuopts.tmp <<\_ACEOF
 
 #endif /* _RTEMS_SCORE_CPUOPTS_H */
 _ACEOF
 
-AS_MKDIR_P(score/include/rtems/score)
-AS_IF([test -f score/include/rtems/score/cpuopts.h],
+AS_MKDIR_P(${RTEMS_BUILD_ROOT}/include/rtems/score)
+AS_IF([test -f ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h],
 [
-  AS_IF([cmp -s score/include/rtems/score/cpuopts.h cpuopts.tmp 2>/dev/null],
+  AS_IF([cmp -s ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h cpuopts.tmp 2>/dev/null],
   [ 
-    AC_MSG_NOTICE([score/include/rtems/score/cpuopts.h is unchanged])
+    AC_MSG_NOTICE([${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h is unchanged])
     rm -f cpuopts.tmp
   ],[
-    AC_MSG_NOTICE([creating score/include/rtems/score/cpuopts.h])
-    rm -f score/include/rtems/score/cpuopts.h
-    mv cpuopts.tmp score/include/rtems/score/cpuopts.h
+    AC_MSG_NOTICE([creating ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h])
+    rm -f ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h
+    mv cpuopts.tmp ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h
   ])
 ],[
-    AC_MSG_NOTICE([creating score/include/rtems/score/cpuopts.h])
-    rm -f score/include/rtems/score/cpuopts.h
-    mv cpuopts.tmp score/include/rtems/score/cpuopts.h
+    AC_MSG_NOTICE([creating ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h])
+    rm -f ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h
+    mv cpuopts.tmp ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h
 ])
 ])
diff --git a/cpukit/aclocal/check-networking.m4 b/cpukit/aclocal/check-networking.m4
index e15cf05aca..72730d2084 100644
--- a/cpukit/aclocal/check-networking.m4
+++ b/cpukit/aclocal/check-networking.m4
@@ -3,6 +3,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 CPU supports networking],
   rtems_cv_HAS_NETWORKING,
@@ -23,7 +24,8 @@ AC_CACHE_CHECK([whether CPU supports networking],
           && test x"$ac_cv_type_uint32_t" = xyes \
           && test x"$ac_cv_type_int64_t" = xyes \
           && test x"$ac_cv_type_uint64_t" = xyes],
-        [rtems_cv_HAS_NETWORKING=yes],
+        [rtems_cv_HAS_NETWORKING=yes
+        RTEMS_CPPFLAGS="${RTEMS_CPPFLAGS} -I${RTEMS_SOURCE_ROOT}/cpukit/libnetworking"],
         [rtems_cv_HAS_NETWORKING=no])
       ],[
         rtems_cv_HAS_NETWORKING=disabled
diff --git a/cpukit/aclocal/prog-cc.m4 b/cpukit/aclocal/prog-cc.m4
index 659a682558..9006e0e53a 100644
--- a/cpukit/aclocal/prog-cc.m4
+++ b/cpukit/aclocal/prog-cc.m4
@@ -29,11 +29,10 @@ test "$rtems_cv_gcc_pipe" = "yes" && CC="$CC --pipe"
 AS_IF([test "$GCC" = yes && test "$rtems_cv_CFLAGS_set" != set],
 [CFLAGS="$CFLAGS -Wall -Wimplicit-function-declaration -Wstrict-prototypes -Wnested-externs"])
 
-RTEMS_CPPFLAGS="-I\$(top_builddir) -I\$(PROJECT_INCLUDE)"
-AC_SUBST(RTEMS_CPPFLAGS)
-
 AS_IF([test "$GCC" = yes],[
   RTEMS_RELLDFLAGS="-qnolinkcmds -nostdlib -r"
 ])
 AC_SUBST(RTEMS_RELLDFLAGS)
+
+RTEMS_INCLUDES
 ])
diff --git a/cpukit/aclocal/rtems-bsp-includes.m4 b/cpukit/aclocal/rtems-bsp-includes.m4
new file mode 100644
index 0000000000..2248211192
--- /dev/null
+++ b/cpukit/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/cpukit/aclocal/rtems-build-top.m4 b/cpukit/aclocal/rtems-build-top.m4
new file mode 100644
index 0000000000..5708119c14
--- /dev/null
+++ b/cpukit/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/cpukit/aclocal/rtems-includes.m4 b/cpukit/aclocal/rtems-includes.m4
new file mode 100644
index 0000000000..ca4ebed581
--- /dev/null
+++ b/cpukit/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/cpukit/aclocal/rtems-source-top.m4 b/cpukit/aclocal/rtems-source-top.m4
new file mode 100644
index 0000000000..d1460ae82d
--- /dev/null
+++ b/cpukit/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/cpukit/automake/compile.am b/cpukit/automake/compile.am
index ace3d9045b..4fc133e7aa 100644
--- a/cpukit/automake/compile.am
+++ b/cpukit/automake/compile.am
@@ -1,3 +1,5 @@
 AM_CPPFLAGS = @RTEMS_CPPFLAGS@
 AM_CFLAGS =
 AM_CCASFLAGS = @RTEMS_CCASFLAGS@
+
+ARFLAGS = crD
diff --git a/cpukit/automake/local.am b/cpukit/automake/local.am
index c2bfbfdb98..3815a7d086 100644
--- a/cpukit/automake/local.am
+++ b/cpukit/automake/local.am
@@ -1,3 +1,2 @@
-preinstall-am: $(PREINSTALL_FILES)
-preinstall: preinstall-am
-.PHONY: preinstall preinstall-am
+
+all-local: $(TMPINSTALL_FILES)
diff --git a/cpukit/automake/subdirs.am b/cpukit/automake/subdirs.am
index 867704460f..8c7be70e60 100644
--- a/cpukit/automake/subdirs.am
+++ b/cpukit/automake/subdirs.am
@@ -14,29 +14,7 @@ SUBDIRS_no_dot           = $(filter-out .,$(_SUBDIRS))
 SUBDIRS_no_dot_no_wrapup = $(filter-out wrapup,$(SUBDIRS_no_dot))
 SUBDIRS_wrapup           = $(filter     wrapup,$(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
@@ -71,4 +49,4 @@ $(foreach D,$(SUBDIRS_no_dot),$(eval $(call CPUKITDIR,$(D),$(D))))
 #
 $(if "$(SUBDIRS_wrapup)" "wrapup",wrapup: dot $(foreach D,$(SUBDIRS_no_dot_no_wrapup),$(D)),)
 
-all-local: preinstall $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot)
+all-local: $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot)
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 382fee64a7..8435e138ea 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -4,13 +4,14 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([score])
 RTEMS_TOP([..],[])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
 AM_INIT_AUTOMAKE([no-define nostdinc subdir-objects foreign 1.12.2])
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_MULTILIB
 RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_POSIX
 RTEMS_ENABLE_RTEMS_DEBUG
@@ -489,9 +490,4 @@ pppd/Makefile
 mghttpd/Makefile
 wrapup/Makefile])
 
-AC_CONFIG_COMMANDS([preinstall-stamp],
-[test -z "$with_multisubdir" && ${MAKE} preinstall-stamp],
-[MAKE=${MAKE}
-with_multisubdir="$with_multisubdir"])
-
 AC_OUTPUT
diff --git a/cpukit/dev/Makefile.am b/cpukit/dev/Makefile.am
index b60e035fdb..f499bbb948 100644
--- a/cpukit/dev/Makefile.am
+++ b/cpukit/dev/Makefile.am
@@ -1,39 +1,6 @@
 include $(top_srcdir)/automake/compile.am
 include $(top_srcdir)/automake/multilib.am
 
-include_devdir = $(includedir)/dev
-include_dev_HEADERS =
-
-include_dev_i2cdir = $(includedir)/dev/i2c
-include_dev_i2c_HEADERS =
-include_dev_i2c_HEADERS += include/dev/i2c/eeprom.h
-include_dev_i2c_HEADERS += include/dev/i2c/fpga-i2c-slave.h
-include_dev_i2c_HEADERS += include/dev/i2c/gpio-nxp-pca9535.h
-include_dev_i2c_HEADERS += include/dev/i2c/i2c.h
-include_dev_i2c_HEADERS += include/dev/i2c/sensor-lm75a.h
-include_dev_i2c_HEADERS += include/dev/i2c/switch-nxp-pca9548a.h
-include_dev_i2c_HEADERS += include/dev/i2c/xilinx-axi-i2c.h
-include_dev_i2c_HEADERS += include/dev/i2c/ti-ads-16bit-adc.h
-include_dev_i2c_HEADERS += include/dev/i2c/ti-lm25066a.h
-include_dev_i2c_HEADERS += include/dev/i2c/ti-tmp112.h
-
-include_dev_spidir = $(includedir)/dev/spi
-include_dev_spi_HEADERS =
-include_dev_spi_HEADERS += include/dev/spi/spi.h
-
-include_dev_serialdir = $(includedir)/dev/serial
-include_dev_serial_HEADERS =
-include_dev_serial_HEADERS += include/dev/serial/sc16is752.h
-
-include_linuxdir = $(includedir)/linux
-include_linux_HEADERS =
-include_linux_HEADERS += include/linux/i2c.h
-include_linux_HEADERS += include/linux/i2c-dev.h
-
-include_linux_spidir = $(includedir)/linux/spi
-include_linux_spi_HEADERS =
-include_linux_spi_HEADERS += include/linux/spi/spidev.h
-
 noinst_LIBRARIES = libdev.a
 
 libdev_a_SOURCES =
@@ -53,5 +20,4 @@ libdev_a_SOURCES += serial/sc16is752.c
 libdev_a_SOURCES += serial/sc16is752-spi.c
 libdev_a_SOURCES += serial/sc16is752-regs.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/dev/preinstall.am b/cpukit/dev/preinstall.am
deleted file mode 100644
index 4cb1dce127..0000000000
--- a/cpukit/dev/preinstall.am
+++ /dev/null
@@ -1,105 +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)/dev/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/dev
-	@: > $(PROJECT_INCLUDE)/dev/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/dev/$(dirstamp)
-
-$(PROJECT_INCLUDE)/dev/i2c/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/dev/i2c
-	@: > $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
-
-$(PROJECT_INCLUDE)/dev/i2c/eeprom.h: include/dev/i2c/eeprom.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/eeprom.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/eeprom.h
-
-$(PROJECT_INCLUDE)/dev/i2c/fpga-i2c-slave.h: include/dev/i2c/fpga-i2c-slave.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/fpga-i2c-slave.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/fpga-i2c-slave.h
-
-$(PROJECT_INCLUDE)/dev/i2c/gpio-nxp-pca9535.h: include/dev/i2c/gpio-nxp-pca9535.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/gpio-nxp-pca9535.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/gpio-nxp-pca9535.h
-
-$(PROJECT_INCLUDE)/dev/i2c/i2c.h: include/dev/i2c/i2c.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/i2c.h
-
-$(PROJECT_INCLUDE)/dev/i2c/sensor-lm75a.h: include/dev/i2c/sensor-lm75a.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/sensor-lm75a.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/sensor-lm75a.h
-
-$(PROJECT_INCLUDE)/dev/i2c/switch-nxp-pca9548a.h: include/dev/i2c/switch-nxp-pca9548a.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/switch-nxp-pca9548a.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/switch-nxp-pca9548a.h
-
-$(PROJECT_INCLUDE)/dev/i2c/xilinx-axi-i2c.h: include/dev/i2c/xilinx-axi-i2c.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/xilinx-axi-i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/xilinx-axi-i2c.h
-
-$(PROJECT_INCLUDE)/dev/i2c/ti-ads-16bit-adc.h: include/dev/i2c/ti-ads-16bit-adc.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/ti-ads-16bit-adc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/ti-ads-16bit-adc.h
-
-$(PROJECT_INCLUDE)/dev/i2c/ti-lm25066a.h: include/dev/i2c/ti-lm25066a.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/ti-lm25066a.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/ti-lm25066a.h
-
-$(PROJECT_INCLUDE)/dev/i2c/ti-tmp112.h: include/dev/i2c/ti-tmp112.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/ti-tmp112.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/ti-tmp112.h
-
-$(PROJECT_INCLUDE)/dev/spi/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/dev/spi
-	@: > $(PROJECT_INCLUDE)/dev/spi/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/dev/spi/$(dirstamp)
-
-$(PROJECT_INCLUDE)/dev/spi/spi.h: include/dev/spi/spi.h $(PROJECT_INCLUDE)/dev/spi/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/spi/spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/spi/spi.h
-
-$(PROJECT_INCLUDE)/dev/serial/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/dev/serial
-	@: > $(PROJECT_INCLUDE)/dev/serial/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/dev/serial/$(dirstamp)
-
-$(PROJECT_INCLUDE)/dev/serial/sc16is752.h: include/dev/serial/sc16is752.h $(PROJECT_INCLUDE)/dev/serial/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/serial/sc16is752.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/serial/sc16is752.h
-
-$(PROJECT_INCLUDE)/linux/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/linux
-	@: > $(PROJECT_INCLUDE)/linux/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/linux/$(dirstamp)
-
-$(PROJECT_INCLUDE)/linux/i2c.h: include/linux/i2c.h $(PROJECT_INCLUDE)/linux/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/linux/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/linux/i2c.h
-
-$(PROJECT_INCLUDE)/linux/i2c-dev.h: include/linux/i2c-dev.h $(PROJECT_INCLUDE)/linux/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/linux/i2c-dev.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/linux/i2c-dev.h
-
-$(PROJECT_INCLUDE)/linux/spi/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/linux/spi
-	@: > $(PROJECT_INCLUDE)/linux/spi/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/linux/spi/$(dirstamp)
-
-$(PROJECT_INCLUDE)/linux/spi/spidev.h: include/linux/spi/spidev.h $(PROJECT_INCLUDE)/linux/spi/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/linux/spi/spidev.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/linux/spi/spidev.h
-
diff --git a/cpukit/dtc/libfdt/Makefile.am b/cpukit/dtc/libfdt/Makefile.am
index 687d226f0f..0782303891 100644
--- a/cpukit/dtc/libfdt/Makefile.am
+++ b/cpukit/dtc/libfdt/Makefile.am
@@ -1,7 +1,5 @@
 include $(top_srcdir)/automake/compile.am
 
-include_HEADERS = fdt.h libfdt.h libfdt_env.h
-
 noinst_LIBRARIES = libfdt.a
 
 libfdt_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)
@@ -15,5 +13,4 @@ libfdt_a_SOURCES += fdt_strerror.c
 libfdt_a_SOURCES += fdt_sw.c
 libfdt_a_SOURCES += fdt_wip.c
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/dtc/libfdt/preinstall.am b/cpukit/dtc/libfdt/preinstall.am
deleted file mode 100644
index 36b61f247d..0000000000
--- a/cpukit/dtc/libfdt/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)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/fdt.h: fdt.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/fdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/fdt.h
-
-$(PROJECT_INCLUDE)/libfdt.h: libfdt.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libfdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libfdt.h
-
-$(PROJECT_INCLUDE)/libfdt_env.h: libfdt_env.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libfdt_env.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libfdt_env.h
-
diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am
index 24a2815a97..fbb78650d6 100644
--- a/cpukit/ftpd/Makefile.am
+++ b/cpukit/ftpd/Makefile.am
@@ -2,8 +2,12 @@ include $(top_srcdir)/automake/compile.am
 
 if LIBNETWORKING
 project_lib_LIBRARIES = libftpd.a
+
+$(PROJECT_LIB)/libftpd.a: libftpd.a
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/libftpd.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/libftpd.a
+
 libftpd_a_SOURCES = ftpd.c ftpd.h
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/ftpd/preinstall.am b/cpukit/ftpd/preinstall.am
deleted file mode 100644
index 85ae87d6db..0000000000
--- a/cpukit/ftpd/preinstall.am
+++ /dev/null
@@ -1,25 +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)
-
-if LIBNETWORKING
-$(PROJECT_LIB)/libftpd.a: libftpd.a $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/libftpd.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libftpd.a
-endif
diff --git a/cpukit/headers.am b/cpukit/headers.am
new file mode 100644
index 0000000000..c486c3f51f
--- /dev/null
+++ b/cpukit/headers.am
@@ -0,0 +1,474 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += include/aio.h
+include_HEADERS += include/crypt.h
+include_HEADERS += include/dlfcn.h
+include_HEADERS += include/endian.h
+include_HEADERS += include/fdt.h
+include_HEADERS += include/libfdt.h
+include_HEADERS += include/libfdt_env.h
+include_HEADERS += include/librtemsNfs.h
+include_HEADERS += include/link.h
+include_HEADERS += include/link_elf.h
+include_HEADERS += include/md4.h
+include_HEADERS += include/md5.h
+include_HEADERS += include/memory.h
+include_HEADERS += include/mqueue.h
+include_HEADERS += include/pci.h
+include_HEADERS += include/rtems.h
+include_HEADERS += include/sha256.h
+include_HEADERS += include/sha512.h
+include_HEADERS += include/xz.h
+include_HEADERS += include/zconf.h
+include_HEADERS += include/zlib.h
+
+include_dev_i2cdir = $(includedir)/dev/i2c
+include_dev_i2c_HEADERS =
+include_dev_i2c_HEADERS += include/dev/i2c/eeprom.h
+include_dev_i2c_HEADERS += include/dev/i2c/fpga-i2c-slave.h
+include_dev_i2c_HEADERS += include/dev/i2c/gpio-nxp-pca9535.h
+include_dev_i2c_HEADERS += include/dev/i2c/i2c.h
+include_dev_i2c_HEADERS += include/dev/i2c/sensor-lm75a.h
+include_dev_i2c_HEADERS += include/dev/i2c/switch-nxp-pca9548a.h
+include_dev_i2c_HEADERS += include/dev/i2c/ti-ads-16bit-adc.h
+include_dev_i2c_HEADERS += include/dev/i2c/ti-lm25066a.h
+include_dev_i2c_HEADERS += include/dev/i2c/ti-tmp112.h
+include_dev_i2c_HEADERS += include/dev/i2c/xilinx-axi-i2c.h
+
+include_dev_serialdir = $(includedir)/dev/serial
+include_dev_serial_HEADERS =
+include_dev_serial_HEADERS += include/dev/serial/sc16is752.h
+
+include_dev_spidir = $(includedir)/dev/spi
+include_dev_spi_HEADERS =
+include_dev_spi_HEADERS += include/dev/spi/spi.h
+
+include_drvmgrdir = $(includedir)/drvmgr
+include_drvmgr_HEADERS =
+include_drvmgr_HEADERS += include/drvmgr/drvmgr.h
+include_drvmgr_HEADERS += include/drvmgr/drvmgr_confdefs.h
+include_drvmgr_HEADERS += include/drvmgr/drvmgr_list.h
+include_drvmgr_HEADERS += include/drvmgr/pci_bus.h
+
+include_linuxdir = $(includedir)/linux
+include_linux_HEADERS =
+include_linux_HEADERS += include/linux/i2c-dev.h
+include_linux_HEADERS += include/linux/i2c.h
+
+include_linux_spidir = $(includedir)/linux/spi
+include_linux_spi_HEADERS =
+include_linux_spi_HEADERS += include/linux/spi/spidev.h
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/_kernel_cpuset.h
+include_machine_HEADERS += include/machine/_kernel_param.h
+include_machine_HEADERS += include/machine/_kernel_time.h
+include_machine_HEADERS += include/machine/_kernel_types.h
+include_machine_HEADERS += include/machine/_timecounter.h
+
+include_mghttpddir = $(includedir)/mghttpd
+include_mghttpd_HEADERS =
+include_mghttpd_HEADERS += include/mghttpd/mongoose.h
+
+include_pcidir = $(includedir)/pci
+include_pci_HEADERS =
+include_pci_HEADERS += include/pci/access.h
+include_pci_HEADERS += include/pci/cfg.h
+include_pci_HEADERS += include/pci/cfg_auto.h
+include_pci_HEADERS += include/pci/cfg_peripheral.h
+include_pci_HEADERS += include/pci/cfg_read.h
+include_pci_HEADERS += include/pci/cfg_static.h
+include_pci_HEADERS += include/pci/ids.h
+include_pci_HEADERS += include/pci/ids_extra.h
+include_pci_HEADERS += include/pci/irq.h
+include_pci_HEADERS += include/pci/pcireg.h
+
+include_rpcdir = $(includedir)/rpc
+include_rpc_HEADERS =
+include_rpc_HEADERS += include/rpc/auth.h
+include_rpc_HEADERS += include/rpc/auth_unix.h
+include_rpc_HEADERS += include/rpc/clnt.h
+include_rpc_HEADERS += include/rpc/clnt_soc.h
+include_rpc_HEADERS += include/rpc/clnt_stat.h
+include_rpc_HEADERS += include/rpc/pmap_clnt.h
+include_rpc_HEADERS += include/rpc/pmap_prot.h
+include_rpc_HEADERS += include/rpc/pmap_rmt.h
+include_rpc_HEADERS += include/rpc/rpc.h
+include_rpc_HEADERS += include/rpc/rpc_com.h
+include_rpc_HEADERS += include/rpc/rpc_msg.h
+include_rpc_HEADERS += include/rpc/rpcent.h
+include_rpc_HEADERS += include/rpc/svc.h
+include_rpc_HEADERS += include/rpc/svc_auth.h
+include_rpc_HEADERS += include/rpc/svc_soc.h
+include_rpc_HEADERS += include/rpc/types.h
+include_rpc_HEADERS += include/rpc/xdr.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/assoc.h
+include_rtems_HEADERS += include/rtems/bdbuf.h
+include_rtems_HEADERS += include/rtems/bdpart.h
+include_rtems_HEADERS += include/rtems/blkdev.h
+include_rtems_HEADERS += include/rtems/bsd.h
+include_rtems_HEADERS += include/rtems/bspIo.h
+include_rtems_HEADERS += include/rtems/bspcmdline.h
+include_rtems_HEADERS += include/rtems/btimer.h
+include_rtems_HEADERS += include/rtems/capture-cli.h
+include_rtems_HEADERS += include/rtems/capture.h
+include_rtems_HEADERS += include/rtems/captureimpl.h
+include_rtems_HEADERS += include/rtems/cbs.h
+include_rtems_HEADERS += include/rtems/chain.h
+include_rtems_HEADERS += include/rtems/clockdrv.h
+include_rtems_HEADERS += include/rtems/concat.h
+include_rtems_HEADERS += include/rtems/confdefs.h
+include_rtems_HEADERS += include/rtems/config.h
+include_rtems_HEADERS += include/rtems/console.h
+include_rtems_HEADERS += include/rtems/counter.h
+include_rtems_HEADERS += include/rtems/cpuuse.h
+include_rtems_HEADERS += include/rtems/devfs.h
+include_rtems_HEADERS += include/rtems/deviceio.h
+include_rtems_HEADERS += include/rtems/devnull.h
+include_rtems_HEADERS += include/rtems/devzero.h
+include_rtems_HEADERS += include/rtems/diskdevs.h
+include_rtems_HEADERS += include/rtems/dosfs.h
+include_rtems_HEADERS += include/rtems/dumpbuf.h
+include_rtems_HEADERS += include/rtems/endian.h
+include_rtems_HEADERS += include/rtems/error.h
+include_rtems_HEADERS += include/rtems/extension.h
+include_rtems_HEADERS += include/rtems/extensionimpl.h
+include_rtems_HEADERS += include/rtems/fatal.h
+include_rtems_HEADERS += include/rtems/fb.h
+include_rtems_HEADERS += include/rtems/flashdisk.h
+include_rtems_HEADERS += include/rtems/framebuffer.h
+include_rtems_HEADERS += include/rtems/fs.h
+include_rtems_HEADERS += include/rtems/fsmount.h
+include_rtems_HEADERS += include/rtems/ftpd.h
+include_rtems_HEADERS += include/rtems/gxx_wrappers.h
+include_rtems_HEADERS += include/rtems/ide_part_table.h
+include_rtems_HEADERS += include/rtems/imfs.h
+include_rtems_HEADERS += include/rtems/init.h
+include_rtems_HEADERS += include/rtems/inttypes.h
+include_rtems_HEADERS += include/rtems/io.h
+include_rtems_HEADERS += include/rtems/ioimpl.h
+include_rtems_HEADERS += include/rtems/iosupp.h
+include_rtems_HEADERS += include/rtems/irq-extension.h
+include_rtems_HEADERS += include/rtems/irq.h
+include_rtems_HEADERS += include/rtems/jffs2.h
+include_rtems_HEADERS += include/rtems/libcsupport.h
+include_rtems_HEADERS += include/rtems/libi2c.h
+include_rtems_HEADERS += include/rtems/libio.h
+include_rtems_HEADERS += include/rtems/libio_.h
+include_rtems_HEADERS += include/rtems/linkersets.h
+include_rtems_HEADERS += include/rtems/malloc.h
+include_rtems_HEADERS += include/rtems/media.h
+include_rtems_HEADERS += include/rtems/monitor.h
+include_rtems_HEADERS += include/rtems/mouse_parser.h
+include_rtems_HEADERS += include/rtems/mptables.h
+include_rtems_HEADERS += include/rtems/mw_uid.h
+include_rtems_HEADERS += include/rtems/nvdisk-sram.h
+include_rtems_HEADERS += include/rtems/nvdisk.h
+include_rtems_HEADERS += include/rtems/passwd.h
+include_rtems_HEADERS += include/rtems/pci.h
+include_rtems_HEADERS += include/rtems/pipe.h
+include_rtems_HEADERS += include/rtems/print.h
+include_rtems_HEADERS += include/rtems/printer.h
+include_rtems_HEADERS += include/rtems/profiling.h
+include_rtems_HEADERS += include/rtems/pty.h
+include_rtems_HEADERS += include/rtems/qreslib.h
+include_rtems_HEADERS += include/rtems/ramdisk.h
+include_rtems_HEADERS += include/rtems/rbheap.h
+include_rtems_HEADERS += include/rtems/rbtree.h
+include_rtems_HEADERS += include/rtems/ringbuf.h
+include_rtems_HEADERS += include/rtems/rtc.h
+include_rtems_HEADERS += include/rtems/rtems-debugger.h
+include_rtems_HEADERS += include/rtems/rtems-fdt-shell.h
+include_rtems_HEADERS += include/rtems/rtems-fdt.h
+include_rtems_HEADERS += include/rtems/rtems-rfs-format.h
+include_rtems_HEADERS += include/rtems/rtems-rfs-shell.h
+include_rtems_HEADERS += include/rtems/rtems-rfs.h
+include_rtems_HEADERS += include/rtems/rtemsdialer.h
+include_rtems_HEADERS += include/rtems/rtemspppd.h
+include_rtems_HEADERS += include/rtems/scheduler.h
+include_rtems_HEADERS += include/rtems/serdbg.h
+include_rtems_HEADERS += include/rtems/serdbgcnf.h
+include_rtems_HEADERS += include/rtems/serial_mouse.h
+include_rtems_HEADERS += include/rtems/seterr.h
+include_rtems_HEADERS += include/rtems/shell.h
+include_rtems_HEADERS += include/rtems/shellconfig.h
+include_rtems_HEADERS += include/rtems/sparse-disk.h
+include_rtems_HEADERS += include/rtems/spurious.h
+include_rtems_HEADERS += include/rtems/stackchk.h
+include_rtems_HEADERS += include/rtems/status-checks.h
+include_rtems_HEADERS += include/rtems/stdio-redirect.h
+include_rtems_HEADERS += include/rtems/stringto.h
+include_rtems_HEADERS += include/rtems/sysinit.h
+include_rtems_HEADERS += include/rtems/system.h
+include_rtems_HEADERS += include/rtems/telnetd.h
+include_rtems_HEADERS += include/rtems/termios_printk.h
+include_rtems_HEADERS += include/rtems/termios_printk_cnf.h
+include_rtems_HEADERS += include/rtems/termiostypes.h
+include_rtems_HEADERS += include/rtems/test.h
+include_rtems_HEADERS += include/rtems/timecounter.h
+include_rtems_HEADERS += include/rtems/timespec.h
+include_rtems_HEADERS += include/rtems/tm27-default.h
+include_rtems_HEADERS += include/rtems/tod.h
+include_rtems_HEADERS += include/rtems/untar.h
+include_rtems_HEADERS += include/rtems/userenv.h
+include_rtems_HEADERS += include/rtems/version.h
+include_rtems_HEADERS += include/rtems/vmeintr.h
+include_rtems_HEADERS += include/rtems/watchdogdrv.h
+
+include_rtems_debuggerdir = $(includedir)/rtems/debugger
+include_rtems_debugger_HEADERS =
+include_rtems_debugger_HEADERS += include/rtems/debugger/rtems-debugger-remote.h
+include_rtems_debugger_HEADERS += include/rtems/debugger/rtems-debugger-server.h
+
+include_rtems_posixdir = $(includedir)/rtems/posix
+include_rtems_posix_HEADERS =
+include_rtems_posix_HEADERS += include/rtems/posix/aio_misc.h
+include_rtems_posix_HEADERS += include/rtems/posix/barrierimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/condimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/config.h
+include_rtems_posix_HEADERS += include/rtems/posix/key.h
+include_rtems_posix_HEADERS += include/rtems/posix/keyimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/mmanimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/mqueue.h
+include_rtems_posix_HEADERS += include/rtems/posix/mqueueimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/muteximpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/posixapi.h
+include_rtems_posix_HEADERS += include/rtems/posix/priorityimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/psignal.h
+include_rtems_posix_HEADERS += include/rtems/posix/psignalimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/pthread.h
+include_rtems_posix_HEADERS += include/rtems/posix/pthreadattrimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/pthreadimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/ptimer.h
+include_rtems_posix_HEADERS += include/rtems/posix/rwlockimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/semaphore.h
+include_rtems_posix_HEADERS += include/rtems/posix/semaphoreimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/shm.h
+include_rtems_posix_HEADERS += include/rtems/posix/shmimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/sigset.h
+include_rtems_posix_HEADERS += include/rtems/posix/spinlockimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/threadsup.h
+include_rtems_posix_HEADERS += include/rtems/posix/timer.h
+include_rtems_posix_HEADERS += include/rtems/posix/timerimpl.h
+
+include_rtems_rfsdir = $(includedir)/rtems/rfs
+include_rtems_rfs_HEADERS =
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-bitmaps.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-block-pos.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-block.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-buffer.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-data.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-dir-hash.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-dir.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-file-system-fwd.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-file-system.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-file.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-group.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-inode.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-link.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-mutex.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-trace.h
+
+include_rtems_rtemsdir = $(includedir)/rtems/rtems
+include_rtems_rtems_HEADERS =
+include_rtems_rtems_HEADERS += include/rtems/rtems/asr.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/asrimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/attr.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/attrimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/barrier.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/barrierimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/cache.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/clock.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/config.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/dpmem.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/dpmemimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/event.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/eventimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/eventmp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/intr.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/mainpage.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/message.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/messageimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/modes.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/modesimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/mp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/msgmp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/object.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/options.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/optionsimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/part.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/partimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/partmp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/ratemon.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/ratemonimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/region.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/regionimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/sem.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/semimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/semmp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/signal.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/signalimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/signalmp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/smp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/status.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/statusimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/support.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/taskmp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/tasks.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/tasksimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/timer.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/timerimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/types.h
+
+include_rtems_rtldir = $(includedir)/rtems/rtl
+include_rtems_rtl_HEADERS =
+include_rtems_rtl_HEADERS += include/rtems/rtl/dlfcn-shell.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rap-shell.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rap.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-allocator.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-fwd.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-indirect-ptr.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-obj-cache.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-obj-comp.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-obj-fwd.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-obj.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-sym.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-trace.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-unresolved.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/address.h
+include_rtems_score_HEADERS += include/rtems/score/apimutex.h
+include_rtems_score_HEADERS += include/rtems/score/assert.h
+include_rtems_score_HEADERS += include/rtems/score/atomic.h
+include_rtems_score_HEADERS += include/rtems/score/basedefs.h
+include_rtems_score_HEADERS += include/rtems/score/chain.h
+include_rtems_score_HEADERS += include/rtems/score/chainimpl.h
+include_rtems_score_HEADERS += include/rtems/score/context.h
+include_rtems_score_HEADERS += include/rtems/score/copyrt.h
+include_rtems_score_HEADERS += include/rtems/score/corebarrier.h
+include_rtems_score_HEADERS += include/rtems/score/corebarrierimpl.h
+include_rtems_score_HEADERS += include/rtems/score/coremsg.h
+include_rtems_score_HEADERS += include/rtems/score/coremsgimpl.h
+include_rtems_score_HEADERS += include/rtems/score/coremutex.h
+include_rtems_score_HEADERS += include/rtems/score/coremuteximpl.h
+include_rtems_score_HEADERS += include/rtems/score/corerwlockimpl.h
+include_rtems_score_HEADERS += include/rtems/score/coresem.h
+include_rtems_score_HEADERS += include/rtems/score/coresemimpl.h
+include_rtems_score_HEADERS += include/rtems/score/cpustdatomic.h
+include_rtems_score_HEADERS += include/rtems/score/freechain.h
+include_rtems_score_HEADERS += include/rtems/score/heap.h
+include_rtems_score_HEADERS += include/rtems/score/heapimpl.h
+include_rtems_score_HEADERS += include/rtems/score/interr.h
+include_rtems_score_HEADERS += include/rtems/score/io.h
+include_rtems_score_HEADERS += include/rtems/score/isr.h
+include_rtems_score_HEADERS += include/rtems/score/isrlevel.h
+include_rtems_score_HEADERS += include/rtems/score/isrlock.h
+include_rtems_score_HEADERS += include/rtems/score/mpci.h
+include_rtems_score_HEADERS += include/rtems/score/mpciimpl.h
+include_rtems_score_HEADERS += include/rtems/score/mppkt.h
+include_rtems_score_HEADERS += include/rtems/score/mrsp.h
+include_rtems_score_HEADERS += include/rtems/score/mrspimpl.h
+include_rtems_score_HEADERS += include/rtems/score/muteximpl.h
+include_rtems_score_HEADERS += include/rtems/score/object.h
+include_rtems_score_HEADERS += include/rtems/score/objectimpl.h
+include_rtems_score_HEADERS += include/rtems/score/objectmp.h
+include_rtems_score_HEADERS += include/rtems/score/onceimpl.h
+include_rtems_score_HEADERS += include/rtems/score/percpu.h
+include_rtems_score_HEADERS += include/rtems/score/priority.h
+include_rtems_score_HEADERS += include/rtems/score/prioritybitmap.h
+include_rtems_score_HEADERS += include/rtems/score/prioritybitmapimpl.h
+include_rtems_score_HEADERS += include/rtems/score/priorityimpl.h
+include_rtems_score_HEADERS += include/rtems/score/processormask.h
+include_rtems_score_HEADERS += include/rtems/score/profiling.h
+include_rtems_score_HEADERS += include/rtems/score/protectedheap.h
+include_rtems_score_HEADERS += include/rtems/score/rbtree.h
+include_rtems_score_HEADERS += include/rtems/score/rbtreeimpl.h
+include_rtems_score_HEADERS += include/rtems/score/scheduler.h
+include_rtems_score_HEADERS += include/rtems/score/schedulercbs.h
+include_rtems_score_HEADERS += include/rtems/score/schedulercbsimpl.h
+include_rtems_score_HEADERS += include/rtems/score/scheduleredf.h
+include_rtems_score_HEADERS += include/rtems/score/scheduleredfimpl.h
+include_rtems_score_HEADERS += include/rtems/score/scheduleredfsmp.h
+include_rtems_score_HEADERS += include/rtems/score/schedulerimpl.h
+include_rtems_score_HEADERS += include/rtems/score/schedulernode.h
+include_rtems_score_HEADERS += include/rtems/score/schedulernodeimpl.h
+include_rtems_score_HEADERS += include/rtems/score/schedulerpriority.h
+include_rtems_score_HEADERS += include/rtems/score/schedulerpriorityaffinitysmp.h
+include_rtems_score_HEADERS += include/rtems/score/schedulerpriorityimpl.h
+include_rtems_score_HEADERS += include/rtems/score/schedulerprioritysmp.h
+include_rtems_score_HEADERS += include/rtems/score/schedulerprioritysmpimpl.h
+include_rtems_score_HEADERS += include/rtems/score/schedulersimple.h
+include_rtems_score_HEADERS += include/rtems/score/schedulersimpleimpl.h
+include_rtems_score_HEADERS += include/rtems/score/schedulersimplesmp.h
+include_rtems_score_HEADERS += include/rtems/score/schedulersmp.h
+include_rtems_score_HEADERS += include/rtems/score/schedulersmpimpl.h
+include_rtems_score_HEADERS += include/rtems/score/schedulerstrongapa.h
+include_rtems_score_HEADERS += include/rtems/score/semaphoreimpl.h
+include_rtems_score_HEADERS += include/rtems/score/smp.h
+include_rtems_score_HEADERS += include/rtems/score/smpbarrier.h
+include_rtems_score_HEADERS += include/rtems/score/smpimpl.h
+include_rtems_score_HEADERS += include/rtems/score/smplock.h
+include_rtems_score_HEADERS += include/rtems/score/smplockmcs.h
+include_rtems_score_HEADERS += include/rtems/score/smplockseq.h
+include_rtems_score_HEADERS += include/rtems/score/smplockstats.h
+include_rtems_score_HEADERS += include/rtems/score/smplockticket.h
+include_rtems_score_HEADERS += include/rtems/score/stack.h
+include_rtems_score_HEADERS += include/rtems/score/stackimpl.h
+include_rtems_score_HEADERS += include/rtems/score/states.h
+include_rtems_score_HEADERS += include/rtems/score/statesimpl.h
+include_rtems_score_HEADERS += include/rtems/score/status.h
+include_rtems_score_HEADERS += include/rtems/score/sysstate.h
+include_rtems_score_HEADERS += include/rtems/score/thread.h
+include_rtems_score_HEADERS += include/rtems/score/threaddispatch.h
+include_rtems_score_HEADERS += include/rtems/score/threadimpl.h
+include_rtems_score_HEADERS += include/rtems/score/threadmp.h
+include_rtems_score_HEADERS += include/rtems/score/threadq.h
+include_rtems_score_HEADERS += include/rtems/score/threadqimpl.h
+include_rtems_score_HEADERS += include/rtems/score/timecounter.h
+include_rtems_score_HEADERS += include/rtems/score/timecounterimpl.h
+include_rtems_score_HEADERS += include/rtems/score/timespec.h
+include_rtems_score_HEADERS += include/rtems/score/timestamp.h
+include_rtems_score_HEADERS += include/rtems/score/tls.h
+include_rtems_score_HEADERS += include/rtems/score/tod.h
+include_rtems_score_HEADERS += include/rtems/score/todimpl.h
+include_rtems_score_HEADERS += include/rtems/score/userext.h
+include_rtems_score_HEADERS += include/rtems/score/userextimpl.h
+include_rtems_score_HEADERS += include/rtems/score/watchdog.h
+include_rtems_score_HEADERS += include/rtems/score/watchdogimpl.h
+include_rtems_score_HEADERS += include/rtems/score/wkspace.h
+
+include_rtems_tracedir = $(includedir)/rtems/trace
+include_rtems_trace_HEADERS =
+include_rtems_trace_HEADERS += include/rtems/trace/rtems-trace-buffer-vars.h
+
+include_sysdir = $(includedir)/sys
+include_sys_HEADERS =
+include_sys_HEADERS += include/sys/_ffcounter.h
+include_sys_HEADERS += include/sys/cdefs_elf.h
+include_sys_HEADERS += include/sys/endian.h
+include_sys_HEADERS += include/sys/event.h
+include_sys_HEADERS += include/sys/exec_elf.h
+include_sys_HEADERS += include/sys/poll.h
+include_sys_HEADERS += include/sys/priority.h
+include_sys_HEADERS += include/sys/statvfs.h
+include_sys_HEADERS += include/sys/timeffc.h
+include_sys_HEADERS += include/sys/timepps.h
+include_sys_HEADERS += include/sys/timetc.h
+include_sys_HEADERS += include/sys/timex.h
+include_sys_HEADERS += include/sys/utsname.h
+
+include_utf8procdir = $(includedir)/utf8proc
+include_utf8proc_HEADERS =
+include_utf8proc_HEADERS += include/utf8proc/utf8proc.h
+
+include_uuiddir = $(includedir)/uuid
+include_uuid_HEADERS =
+include_uuid_HEADERS += include/uuid/uuid.h
diff --git a/cpukit/include/adainclude/preinstall.am b/cpukit/include/adainclude/preinstall.am
deleted file mode 100644
index e41443a862..0000000000
--- a/cpukit/include/adainclude/preinstall.am
+++ /dev/null
@@ -1,177 +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 RTEMS_ADA
-$(PROJECT_INCLUDE)/adainclude/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/adainclude
-	@: > $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-
-$(PROJECT_INCLUDE)/adainclude/rtems.adb: rtems.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems.ads: rtems.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-barrier.adb: rtems-barrier.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-barrier.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-barrier.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-barrier.ads: rtems-barrier.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-barrier.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-barrier.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-clock.adb: rtems-clock.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-clock.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-clock.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-clock.ads: rtems-clock.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-clock.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-clock.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-cpu_usage.ads: rtems-cpu_usage.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-cpu_usage.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-cpu_usage.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-event.adb: rtems-event.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-event.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-event.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-event.ads: rtems-event.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-event.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-event.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-extension.adb: rtems-extension.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-extension.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-extension.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-extension.ads: rtems-extension.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-extension.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-extension.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-fatal.adb: rtems-fatal.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-fatal.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-fatal.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-fatal.ads: rtems-fatal.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-fatal.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-fatal.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-interrupt.ads: rtems-interrupt.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-interrupt.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-interrupt.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-io.adb: rtems-io.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-io.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-io.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-io.ads: rtems-io.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-io.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-io.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-message_queue.adb: rtems-message_queue.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-message_queue.ads: rtems-message_queue.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.adb: rtems-multiprocessing.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads: rtems-multiprocessing.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-object.adb: rtems-object.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-object.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-object.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-object.ads: rtems-object.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-object.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-object.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-partition.adb: rtems-partition.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-partition.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-partition.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-partition.ads: rtems-partition.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-partition.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-partition.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-port.adb: rtems-port.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-port.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-port.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-port.ads: rtems-port.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-port.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-port.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.adb: rtems-rate_monotonic.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.ads: rtems-rate_monotonic.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-region.adb: rtems-region.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-region.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-region.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-region.ads: rtems-region.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-region.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-region.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-semaphore.adb: rtems-semaphore.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-semaphore.ads: rtems-semaphore.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-signal.adb: rtems-signal.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-signal.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-signal.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-signal.ads: rtems-signal.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-signal.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-signal.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-stack_checker.ads: rtems-stack_checker.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-stack_checker.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-stack_checker.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-tasks.adb: rtems-tasks.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-tasks.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-tasks.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-tasks.ads: rtems-tasks.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-tasks.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-tasks.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-timer.adb: rtems-timer.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-timer.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-timer.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-timer.ads: rtems-timer.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-timer.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-timer.ads
-endif
diff --git a/cpukit/posix/include/aio.h b/cpukit/include/aio.h
index 95ed0fdb6c..95ed0fdb6c 100644
--- a/cpukit/posix/include/aio.h
+++ b/cpukit/include/aio.h
diff --git a/cpukit/dev/include/dev/i2c/eeprom.h b/cpukit/include/dev/i2c/eeprom.h
index 73df5ad9f4..73df5ad9f4 100644
--- a/cpukit/dev/include/dev/i2c/eeprom.h
+++ b/cpukit/include/dev/i2c/eeprom.h
diff --git a/cpukit/dev/include/dev/i2c/fpga-i2c-slave.h b/cpukit/include/dev/i2c/fpga-i2c-slave.h
index c10b26ac5b..c10b26ac5b 100644
--- a/cpukit/dev/include/dev/i2c/fpga-i2c-slave.h
+++ b/cpukit/include/dev/i2c/fpga-i2c-slave.h
diff --git a/cpukit/dev/include/dev/i2c/gpio-nxp-pca9535.h b/cpukit/include/dev/i2c/gpio-nxp-pca9535.h
index 1ebc1a3d4d..1ebc1a3d4d 100644
--- a/cpukit/dev/include/dev/i2c/gpio-nxp-pca9535.h
+++ b/cpukit/include/dev/i2c/gpio-nxp-pca9535.h
diff --git a/cpukit/dev/include/dev/i2c/i2c.h b/cpukit/include/dev/i2c/i2c.h
index 2ace4fcf64..2ace4fcf64 100644
--- a/cpukit/dev/include/dev/i2c/i2c.h
+++ b/cpukit/include/dev/i2c/i2c.h
diff --git a/cpukit/dev/include/dev/i2c/sensor-lm75a.h b/cpukit/include/dev/i2c/sensor-lm75a.h
index e1957dad19..e1957dad19 100644
--- a/cpukit/dev/include/dev/i2c/sensor-lm75a.h
+++ b/cpukit/include/dev/i2c/sensor-lm75a.h
diff --git a/cpukit/dev/include/dev/i2c/switch-nxp-pca9548a.h b/cpukit/include/dev/i2c/switch-nxp-pca9548a.h
index ce8ef2c809..ce8ef2c809 100644
--- a/cpukit/dev/include/dev/i2c/switch-nxp-pca9548a.h
+++ b/cpukit/include/dev/i2c/switch-nxp-pca9548a.h
diff --git a/cpukit/dev/include/dev/i2c/ti-ads-16bit-adc.h b/cpukit/include/dev/i2c/ti-ads-16bit-adc.h
index 40d680da88..40d680da88 100644
--- a/cpukit/dev/include/dev/i2c/ti-ads-16bit-adc.h
+++ b/cpukit/include/dev/i2c/ti-ads-16bit-adc.h
diff --git a/cpukit/dev/include/dev/i2c/ti-lm25066a.h b/cpukit/include/dev/i2c/ti-lm25066a.h
index 4429f0fc70..4429f0fc70 100644
--- a/cpukit/dev/include/dev/i2c/ti-lm25066a.h
+++ b/cpukit/include/dev/i2c/ti-lm25066a.h
diff --git a/cpukit/dev/include/dev/i2c/ti-tmp112.h b/cpukit/include/dev/i2c/ti-tmp112.h
index 1b80fa6994..1b80fa6994 100644
--- a/cpukit/dev/include/dev/i2c/ti-tmp112.h
+++ b/cpukit/include/dev/i2c/ti-tmp112.h
diff --git a/cpukit/dev/include/dev/i2c/xilinx-axi-i2c.h b/cpukit/include/dev/i2c/xilinx-axi-i2c.h
index fafac346ec..fafac346ec 100644
--- a/cpukit/dev/include/dev/i2c/xilinx-axi-i2c.h
+++ b/cpukit/include/dev/i2c/xilinx-axi-i2c.h
diff --git a/cpukit/dev/include/dev/serial/sc16is752.h b/cpukit/include/dev/serial/sc16is752.h
index 7e5b47aaa2..7e5b47aaa2 100644
--- a/cpukit/dev/include/dev/serial/sc16is752.h
+++ b/cpukit/include/dev/serial/sc16is752.h
diff --git a/cpukit/dev/include/dev/spi/spi.h b/cpukit/include/dev/spi/spi.h
index 66bbac2427..66bbac2427 100644
--- a/cpukit/dev/include/dev/spi/spi.h
+++ b/cpukit/include/dev/spi/spi.h
diff --git a/cpukit/libdl/dlfcn.h b/cpukit/include/dlfcn.h
index 1ac3ba1330..1ac3ba1330 100644
--- a/cpukit/libdl/dlfcn.h
+++ b/cpukit/include/dlfcn.h
diff --git a/cpukit/libdrvmgr/drvmgr.h b/cpukit/include/drvmgr/drvmgr.h
index cb8f4a5f5a..cb8f4a5f5a 100644
--- a/cpukit/libdrvmgr/drvmgr.h
+++ b/cpukit/include/drvmgr/drvmgr.h
diff --git a/cpukit/libdrvmgr/drvmgr_confdefs.h b/cpukit/include/drvmgr/drvmgr_confdefs.h
index 82829bd8aa..82829bd8aa 100644
--- a/cpukit/libdrvmgr/drvmgr_confdefs.h
+++ b/cpukit/include/drvmgr/drvmgr_confdefs.h
diff --git a/cpukit/libdrvmgr/drvmgr_list.h b/cpukit/include/drvmgr/drvmgr_list.h
index 76028fb5bd..76028fb5bd 100644
--- a/cpukit/libdrvmgr/drvmgr_list.h
+++ b/cpukit/include/drvmgr/drvmgr_list.h
diff --git a/cpukit/libpci/pci_bus.h b/cpukit/include/drvmgr/pci_bus.h
index b426010da5..b426010da5 100644
--- a/cpukit/libpci/pci_bus.h
+++ b/cpukit/include/drvmgr/pci_bus.h
diff --git a/cpukit/dtc/libfdt/fdt.h b/cpukit/include/fdt.h
index 526aedb515..526aedb515 100644
--- a/cpukit/dtc/libfdt/fdt.h
+++ b/cpukit/include/fdt.h
diff --git a/cpukit/dtc/libfdt/libfdt.h b/cpukit/include/libfdt.h
index 78adb1232e..78adb1232e 100644
--- a/cpukit/dtc/libfdt/libfdt.h
+++ b/cpukit/include/libfdt.h
diff --git a/cpukit/dtc/libfdt/libfdt_env.h b/cpukit/include/libfdt_env.h
index 9dea97dfff..9dea97dfff 100644
--- a/cpukit/dtc/libfdt/libfdt_env.h
+++ b/cpukit/include/libfdt_env.h
diff --git a/cpukit/libfs/src/nfsclient/src/librtemsNfs.h b/cpukit/include/librtemsNfs.h
index 530eee2144..530eee2144 100644
--- a/cpukit/libfs/src/nfsclient/src/librtemsNfs.h
+++ b/cpukit/include/librtemsNfs.h
diff --git a/cpukit/libdl/include/link.h b/cpukit/include/link.h
index c93efd9e78..c93efd9e78 100644
--- a/cpukit/libdl/include/link.h
+++ b/cpukit/include/link.h
diff --git a/cpukit/libdl/include/link_elf.h b/cpukit/include/link_elf.h
index d2691b68b0..d2691b68b0 100644
--- a/cpukit/libdl/include/link_elf.h
+++ b/cpukit/include/link_elf.h
diff --git a/cpukit/dev/include/linux/i2c-dev.h b/cpukit/include/linux/i2c-dev.h
index c0db3fe06c..c0db3fe06c 100644
--- a/cpukit/dev/include/linux/i2c-dev.h
+++ b/cpukit/include/linux/i2c-dev.h
diff --git a/cpukit/dev/include/linux/i2c.h b/cpukit/include/linux/i2c.h
index b113545cce..b113545cce 100644
--- a/cpukit/dev/include/linux/i2c.h
+++ b/cpukit/include/linux/i2c.h
diff --git a/cpukit/dev/include/linux/spi/spidev.h b/cpukit/include/linux/spi/spidev.h
index e2fdb4b7e1..e2fdb4b7e1 100644
--- a/cpukit/dev/include/linux/spi/spidev.h
+++ b/cpukit/include/linux/spi/spidev.h
diff --git a/cpukit/libcsupport/include/machine/_kernel_cpuset.h b/cpukit/include/machine/_kernel_cpuset.h
index e69de29bb2..e69de29bb2 100644
--- a/cpukit/libcsupport/include/machine/_kernel_cpuset.h
+++ b/cpukit/include/machine/_kernel_cpuset.h
diff --git a/cpukit/libcsupport/include/machine/_kernel_param.h b/cpukit/include/machine/_kernel_param.h
index 183bb895a2..183bb895a2 100644
--- a/cpukit/libcsupport/include/machine/_kernel_param.h
+++ b/cpukit/include/machine/_kernel_param.h
diff --git a/cpukit/libcsupport/include/machine/_kernel_time.h b/cpukit/include/machine/_kernel_time.h
index 8200b6a73e..8200b6a73e 100644
--- a/cpukit/libcsupport/include/machine/_kernel_time.h
+++ b/cpukit/include/machine/_kernel_time.h
diff --git a/cpukit/libcsupport/include/machine/_kernel_types.h b/cpukit/include/machine/_kernel_types.h
index 892ec413d5..892ec413d5 100644
--- a/cpukit/libcsupport/include/machine/_kernel_types.h
+++ b/cpukit/include/machine/_kernel_types.h
diff --git a/cpukit/libcsupport/include/machine/_timecounter.h b/cpukit/include/machine/_timecounter.h
index fb974f13c1..fb974f13c1 100644
--- a/cpukit/libcsupport/include/machine/_timecounter.h
+++ b/cpukit/include/machine/_timecounter.h
diff --git a/cpukit/libmd/md4.h b/cpukit/include/md4.h
index c5ae2f13ef..c5ae2f13ef 100644
--- a/cpukit/libmd/md4.h
+++ b/cpukit/include/md4.h
diff --git a/cpukit/libmd/md5.h b/cpukit/include/md5.h
index ca48d61d7b..ca48d61d7b 100644
--- a/cpukit/libmd/md5.h
+++ b/cpukit/include/md5.h
diff --git a/cpukit/mghttpd/mongoose.h b/cpukit/include/mghttpd/mongoose.h
index 330ed6701b..330ed6701b 100644
--- a/cpukit/mghttpd/mongoose.h
+++ b/cpukit/include/mghttpd/mongoose.h
diff --git a/cpukit/posix/include/mqueue.h b/cpukit/include/mqueue.h
index 36733a4730..36733a4730 100644
--- a/cpukit/posix/include/mqueue.h
+++ b/cpukit/include/mqueue.h
diff --git a/cpukit/libpci/pci.h b/cpukit/include/pci.h
index a0e008a2d0..a0e008a2d0 100644
--- a/cpukit/libpci/pci.h
+++ b/cpukit/include/pci.h
diff --git a/cpukit/libpci/pci/access.h b/cpukit/include/pci/access.h
index 4337db30c3..4337db30c3 100644
--- a/cpukit/libpci/pci/access.h
+++ b/cpukit/include/pci/access.h
diff --git a/cpukit/libpci/pci/cfg.h b/cpukit/include/pci/cfg.h
index 1f55c85971..1f55c85971 100644
--- a/cpukit/libpci/pci/cfg.h
+++ b/cpukit/include/pci/cfg.h
diff --git a/cpukit/libpci/pci/cfg_auto.h b/cpukit/include/pci/cfg_auto.h
index e374e2e2d4..e374e2e2d4 100644
--- a/cpukit/libpci/pci/cfg_auto.h
+++ b/cpukit/include/pci/cfg_auto.h
diff --git a/cpukit/libpci/pci/cfg_peripheral.h b/cpukit/include/pci/cfg_peripheral.h
index f05c8257c6..f05c8257c6 100644
--- a/cpukit/libpci/pci/cfg_peripheral.h
+++ b/cpukit/include/pci/cfg_peripheral.h
diff --git a/cpukit/libpci/pci/cfg_read.h b/cpukit/include/pci/cfg_read.h
index 3dd7678279..3dd7678279 100644
--- a/cpukit/libpci/pci/cfg_read.h
+++ b/cpukit/include/pci/cfg_read.h
diff --git a/cpukit/libpci/pci/cfg_static.h b/cpukit/include/pci/cfg_static.h
index 62ee0dad7d..62ee0dad7d 100644
--- a/cpukit/libpci/pci/cfg_static.h
+++ b/cpukit/include/pci/cfg_static.h
diff --git a/cpukit/libpci/pci/ids.h b/cpukit/include/pci/ids.h
index 88e1ad5e3e..88e1ad5e3e 100644
--- a/cpukit/libpci/pci/ids.h
+++ b/cpukit/include/pci/ids.h
diff --git a/cpukit/libpci/pci/ids_extra.h b/cpukit/include/pci/ids_extra.h
index 0b85fe2764..0b85fe2764 100644
--- a/cpukit/libpci/pci/ids_extra.h
+++ b/cpukit/include/pci/ids_extra.h
diff --git a/cpukit/libpci/pci/irq.h b/cpukit/include/pci/irq.h
index 7622201fd6..7622201fd6 100644
--- a/cpukit/libpci/pci/irq.h
+++ b/cpukit/include/pci/irq.h
diff --git a/cpukit/libpci/pci/pcireg.h b/cpukit/include/pci/pcireg.h
index f2b2b74cf0..f2b2b74cf0 100644
--- a/cpukit/libpci/pci/pcireg.h
+++ b/cpukit/include/pci/pcireg.h
diff --git a/cpukit/librpc/include/rpc/auth.h b/cpukit/include/rpc/auth.h
index 13432bd5d0..13432bd5d0 100644
--- a/cpukit/librpc/include/rpc/auth.h
+++ b/cpukit/include/rpc/auth.h
diff --git a/cpukit/librpc/include/rpc/auth_unix.h b/cpukit/include/rpc/auth_unix.h
index f822f3dd60..f822f3dd60 100644
--- a/cpukit/librpc/include/rpc/auth_unix.h
+++ b/cpukit/include/rpc/auth_unix.h
diff --git a/cpukit/librpc/include/rpc/clnt.h b/cpukit/include/rpc/clnt.h
index 3042abe1b6..3042abe1b6 100644
--- a/cpukit/librpc/include/rpc/clnt.h
+++ b/cpukit/include/rpc/clnt.h
diff --git a/cpukit/librpc/include/rpc/clnt_soc.h b/cpukit/include/rpc/clnt_soc.h
index 9aa99b88ba..9aa99b88ba 100644
--- a/cpukit/librpc/include/rpc/clnt_soc.h
+++ b/cpukit/include/rpc/clnt_soc.h
diff --git a/cpukit/librpc/include/rpc/clnt_stat.h b/cpukit/include/rpc/clnt_stat.h
index 2c68745407..2c68745407 100644
--- a/cpukit/librpc/include/rpc/clnt_stat.h
+++ b/cpukit/include/rpc/clnt_stat.h
diff --git a/cpukit/librpc/include/rpc/pmap_clnt.h b/cpukit/include/rpc/pmap_clnt.h
index 86fff6be4f..86fff6be4f 100644
--- a/cpukit/librpc/include/rpc/pmap_clnt.h
+++ b/cpukit/include/rpc/pmap_clnt.h
diff --git a/cpukit/librpc/include/rpc/pmap_prot.h b/cpukit/include/rpc/pmap_prot.h
index 14720e8cbd..14720e8cbd 100644
--- a/cpukit/librpc/include/rpc/pmap_prot.h
+++ b/cpukit/include/rpc/pmap_prot.h
diff --git a/cpukit/librpc/include/rpc/pmap_rmt.h b/cpukit/include/rpc/pmap_rmt.h
index a5ea404f45..a5ea404f45 100644
--- a/cpukit/librpc/include/rpc/pmap_rmt.h
+++ b/cpukit/include/rpc/pmap_rmt.h
diff --git a/cpukit/librpc/include/rpc/rpc.h b/cpukit/include/rpc/rpc.h
index 20065efd4d..20065efd4d 100644
--- a/cpukit/librpc/include/rpc/rpc.h
+++ b/cpukit/include/rpc/rpc.h
diff --git a/cpukit/librpc/include/rpc/rpc_com.h b/cpukit/include/rpc/rpc_com.h
index 9a1ce453ab..9a1ce453ab 100644
--- a/cpukit/librpc/include/rpc/rpc_com.h
+++ b/cpukit/include/rpc/rpc_com.h
diff --git a/cpukit/librpc/include/rpc/rpc_msg.h b/cpukit/include/rpc/rpc_msg.h
index 63a1f360a0..63a1f360a0 100644
--- a/cpukit/librpc/include/rpc/rpc_msg.h
+++ b/cpukit/include/rpc/rpc_msg.h
diff --git a/cpukit/librpc/include/rpc/rpcent.h b/cpukit/include/rpc/rpcent.h
index 1cf4161b81..1cf4161b81 100644
--- a/cpukit/librpc/include/rpc/rpcent.h
+++ b/cpukit/include/rpc/rpcent.h
diff --git a/cpukit/librpc/include/rpc/svc.h b/cpukit/include/rpc/svc.h
index 0808dddc5c..0808dddc5c 100644
--- a/cpukit/librpc/include/rpc/svc.h
+++ b/cpukit/include/rpc/svc.h
diff --git a/cpukit/librpc/include/rpc/svc_auth.h b/cpukit/include/rpc/svc_auth.h
index 846752c294..846752c294 100644
--- a/cpukit/librpc/include/rpc/svc_auth.h
+++ b/cpukit/include/rpc/svc_auth.h
diff --git a/cpukit/librpc/include/rpc/svc_soc.h b/cpukit/include/rpc/svc_soc.h
index 5b36fb46ef..5b36fb46ef 100644
--- a/cpukit/librpc/include/rpc/svc_soc.h
+++ b/cpukit/include/rpc/svc_soc.h
diff --git a/cpukit/librpc/include/rpc/types.h b/cpukit/include/rpc/types.h
index 05375d32e9..05375d32e9 100644
--- a/cpukit/librpc/include/rpc/types.h
+++ b/cpukit/include/rpc/types.h
diff --git a/cpukit/librpc/include/rpc/xdr.h b/cpukit/include/rpc/xdr.h
index 30f2bccc0c..30f2bccc0c 100644
--- a/cpukit/librpc/include/rpc/xdr.h
+++ b/cpukit/include/rpc/xdr.h
diff --git a/cpukit/rtems/include/rtems.h b/cpukit/include/rtems.h
index 8e536b449a..8e536b449a 100644
--- a/cpukit/rtems/include/rtems.h
+++ b/cpukit/include/rtems.h
diff --git a/cpukit/libcsupport/include/rtems/assoc.h b/cpukit/include/rtems/assoc.h
index 345761758a..345761758a 100644
--- a/cpukit/libcsupport/include/rtems/assoc.h
+++ b/cpukit/include/rtems/assoc.h
diff --git a/cpukit/libblock/include/rtems/bdbuf.h b/cpukit/include/rtems/bdbuf.h
index edec05e099..edec05e099 100644
--- a/cpukit/libblock/include/rtems/bdbuf.h
+++ b/cpukit/include/rtems/bdbuf.h
diff --git a/cpukit/libblock/include/rtems/bdpart.h b/cpukit/include/rtems/bdpart.h
index 8886c3614d..8886c3614d 100644
--- a/cpukit/libblock/include/rtems/bdpart.h
+++ b/cpukit/include/rtems/bdpart.h
diff --git a/cpukit/libblock/include/rtems/blkdev.h b/cpukit/include/rtems/blkdev.h
index 3f829e6068..3f829e6068 100644
--- a/cpukit/libblock/include/rtems/blkdev.h
+++ b/cpukit/include/rtems/blkdev.h
diff --git a/cpukit/sapi/include/rtems/bsd.h b/cpukit/include/rtems/bsd.h
index 0c44e3787d..0c44e3787d 100644
--- a/cpukit/sapi/include/rtems/bsd.h
+++ b/cpukit/include/rtems/bsd.h
diff --git a/cpukit/libmisc/bspcmdline/bspcmdline.h b/cpukit/include/rtems/bspcmdline.h
index 51916ff26a..51916ff26a 100644
--- a/cpukit/libmisc/bspcmdline/bspcmdline.h
+++ b/cpukit/include/rtems/bspcmdline.h
diff --git a/cpukit/libmisc/capture/capture-cli.h b/cpukit/include/rtems/capture-cli.h
index 55749b7cb1..55749b7cb1 100644
--- a/cpukit/libmisc/capture/capture-cli.h
+++ b/cpukit/include/rtems/capture-cli.h
diff --git a/cpukit/libmisc/capture/capture.h b/cpukit/include/rtems/capture.h
index f847ee0424..f847ee0424 100644
--- a/cpukit/libmisc/capture/capture.h
+++ b/cpukit/include/rtems/capture.h
diff --git a/cpukit/libmisc/capture/captureimpl.h b/cpukit/include/rtems/captureimpl.h
index 4c4cbe66c3..4c4cbe66c3 100644
--- a/cpukit/libmisc/capture/captureimpl.h
+++ b/cpukit/include/rtems/captureimpl.h
diff --git a/cpukit/sapi/include/rtems/cbs.h b/cpukit/include/rtems/cbs.h
index a42061ddc0..a42061ddc0 100644
--- a/cpukit/sapi/include/rtems/cbs.h
+++ b/cpukit/include/rtems/cbs.h
diff --git a/cpukit/sapi/include/rtems/chain.h b/cpukit/include/rtems/chain.h
index f0e7ee4f40..f0e7ee4f40 100644
--- a/cpukit/sapi/include/rtems/chain.h
+++ b/cpukit/include/rtems/chain.h
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/include/rtems/confdefs.h
index 1c993dd099..1c993dd099 100755
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
diff --git a/cpukit/sapi/include/rtems/config.h b/cpukit/include/rtems/config.h
index 6b97376511..6b97376511 100644
--- a/cpukit/sapi/include/rtems/config.h
+++ b/cpukit/include/rtems/config.h
diff --git a/cpukit/sapi/include/rtems/counter.h b/cpukit/include/rtems/counter.h
index 3b428402a8..3b428402a8 100644
--- a/cpukit/sapi/include/rtems/counter.h
+++ b/cpukit/include/rtems/counter.h
diff --git a/cpukit/libmisc/cpuuse/cpuuse.h b/cpukit/include/rtems/cpuuse.h
index 23f58faf1b..23f58faf1b 100644
--- a/cpukit/libmisc/cpuuse/cpuuse.h
+++ b/cpukit/include/rtems/cpuuse.h
diff --git a/cpukit/libdebugger/rtems-debugger-remote.h b/cpukit/include/rtems/debugger/rtems-debugger-remote.h
index 34ad9ee6d2..34ad9ee6d2 100644
--- a/cpukit/libdebugger/rtems-debugger-remote.h
+++ b/cpukit/include/rtems/debugger/rtems-debugger-remote.h
diff --git a/cpukit/libdebugger/rtems-debugger-server.h b/cpukit/include/rtems/debugger/rtems-debugger-server.h
index a345d7649e..a345d7649e 100644
--- a/cpukit/libdebugger/rtems-debugger-server.h
+++ b/cpukit/include/rtems/debugger/rtems-debugger-server.h
diff --git a/cpukit/libfs/src/devfs/devfs.h b/cpukit/include/rtems/devfs.h
index b0a9197eca..b0a9197eca 100644
--- a/cpukit/libfs/src/devfs/devfs.h
+++ b/cpukit/include/rtems/devfs.h
diff --git a/cpukit/libcsupport/include/rtems/deviceio.h b/cpukit/include/rtems/deviceio.h
index a448fc7bb4..a448fc7bb4 100644
--- a/cpukit/libcsupport/include/rtems/deviceio.h
+++ b/cpukit/include/rtems/deviceio.h
diff --git a/cpukit/libmisc/devnull/devnull.h b/cpukit/include/rtems/devnull.h
index 39081f478b..39081f478b 100644
--- a/cpukit/libmisc/devnull/devnull.h
+++ b/cpukit/include/rtems/devnull.h
diff --git a/cpukit/libmisc/devnull/devzero.h b/cpukit/include/rtems/devzero.h
index bc47d3ea09..bc47d3ea09 100644
--- a/cpukit/libmisc/devnull/devzero.h
+++ b/cpukit/include/rtems/devzero.h
diff --git a/cpukit/libblock/include/rtems/diskdevs.h b/cpukit/include/rtems/diskdevs.h
index 0be766afa3..0be766afa3 100644
--- a/cpukit/libblock/include/rtems/diskdevs.h
+++ b/cpukit/include/rtems/diskdevs.h
diff --git a/cpukit/libfs/src/dosfs/dosfs.h b/cpukit/include/rtems/dosfs.h
index 7691ed7e43..7691ed7e43 100644
--- a/cpukit/libfs/src/dosfs/dosfs.h
+++ b/cpukit/include/rtems/dosfs.h
diff --git a/cpukit/libmisc/dumpbuf/dumpbuf.h b/cpukit/include/rtems/dumpbuf.h
index d714879ab4..d714879ab4 100644
--- a/cpukit/libmisc/dumpbuf/dumpbuf.h
+++ b/cpukit/include/rtems/dumpbuf.h
diff --git a/cpukit/libcsupport/include/rtems/error.h b/cpukit/include/rtems/error.h
index 617f59642b..617f59642b 100644
--- a/cpukit/libcsupport/include/rtems/error.h
+++ b/cpukit/include/rtems/error.h
diff --git a/cpukit/sapi/include/rtems/extension.h b/cpukit/include/rtems/extension.h
index f22abf7f18..f22abf7f18 100644
--- a/cpukit/sapi/include/rtems/extension.h
+++ b/cpukit/include/rtems/extension.h
diff --git a/cpukit/sapi/include/rtems/extensionimpl.h b/cpukit/include/rtems/extensionimpl.h
index fb4eeaff7c..fb4eeaff7c 100644
--- a/cpukit/sapi/include/rtems/extensionimpl.h
+++ b/cpukit/include/rtems/extensionimpl.h
diff --git a/cpukit/sapi/include/rtems/fatal.h b/cpukit/include/rtems/fatal.h
index 291af42c6e..291af42c6e 100644
--- a/cpukit/sapi/include/rtems/fatal.h
+++ b/cpukit/include/rtems/fatal.h
diff --git a/cpukit/libmisc/fb/fb.h b/cpukit/include/rtems/fb.h
index bb5cb23805..bb5cb23805 100644
--- a/cpukit/libmisc/fb/fb.h
+++ b/cpukit/include/rtems/fb.h
diff --git a/cpukit/libblock/include/rtems/flashdisk.h b/cpukit/include/rtems/flashdisk.h
index ec353096ad..ec353096ad 100644
--- a/cpukit/libblock/include/rtems/flashdisk.h
+++ b/cpukit/include/rtems/flashdisk.h
diff --git a/cpukit/libmisc/fsmount/fsmount.h b/cpukit/include/rtems/fsmount.h
index 441b0d68ef..441b0d68ef 100644
--- a/cpukit/libmisc/fsmount/fsmount.h
+++ b/cpukit/include/rtems/fsmount.h
diff --git a/cpukit/ftpd/ftpd.h b/cpukit/include/rtems/ftpd.h
index f33ca59d3a..f33ca59d3a 100644
--- a/cpukit/ftpd/ftpd.h
+++ b/cpukit/include/rtems/ftpd.h
diff --git a/cpukit/libcsupport/include/rtems/gxx_wrappers.h b/cpukit/include/rtems/gxx_wrappers.h
index 94502b937f..94502b937f 100644
--- a/cpukit/libcsupport/include/rtems/gxx_wrappers.h
+++ b/cpukit/include/rtems/gxx_wrappers.h
diff --git a/cpukit/libblock/include/rtems/ide_part_table.h b/cpukit/include/rtems/ide_part_table.h
index 8b683b3ff5..8b683b3ff5 100644
--- a/cpukit/libblock/include/rtems/ide_part_table.h
+++ b/cpukit/include/rtems/ide_part_table.h
diff --git a/cpukit/libfs/src/imfs/imfs.h b/cpukit/include/rtems/imfs.h
index fe3c5b12a9..fe3c5b12a9 100644
--- a/cpukit/libfs/src/imfs/imfs.h
+++ b/cpukit/include/rtems/imfs.h
diff --git a/cpukit/sapi/include/rtems/init.h b/cpukit/include/rtems/init.h
index fa3108ea50..fa3108ea50 100644
--- a/cpukit/sapi/include/rtems/init.h
+++ b/cpukit/include/rtems/init.h
diff --git a/cpukit/sapi/include/rtems/io.h b/cpukit/include/rtems/io.h
index 760d412bb8..760d412bb8 100644
--- a/cpukit/sapi/include/rtems/io.h
+++ b/cpukit/include/rtems/io.h
diff --git a/cpukit/sapi/include/rtems/ioimpl.h b/cpukit/include/rtems/ioimpl.h
index 5c4a82eea6..5c4a82eea6 100644
--- a/cpukit/sapi/include/rtems/ioimpl.h
+++ b/cpukit/include/rtems/ioimpl.h
diff --git a/cpukit/libcsupport/include/iosupp.h b/cpukit/include/rtems/iosupp.h
index 9fe8a6ab1d..9fe8a6ab1d 100644
--- a/cpukit/libcsupport/include/iosupp.h
+++ b/cpukit/include/rtems/iosupp.h
diff --git a/cpukit/libfs/src/jffs2/include/rtems/jffs2.h b/cpukit/include/rtems/jffs2.h
index a856c46c41..a856c46c41 100644
--- a/cpukit/libfs/src/jffs2/include/rtems/jffs2.h
+++ b/cpukit/include/rtems/jffs2.h
diff --git a/cpukit/libcsupport/include/rtems/libcsupport.h b/cpukit/include/rtems/libcsupport.h
index 51607f9ea1..51607f9ea1 100644
--- a/cpukit/libcsupport/include/rtems/libcsupport.h
+++ b/cpukit/include/rtems/libcsupport.h
diff --git a/cpukit/libi2c/libi2c.h b/cpukit/include/rtems/libi2c.h
index 341e390760..341e390760 100644
--- a/cpukit/libi2c/libi2c.h
+++ b/cpukit/include/rtems/libi2c.h
diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/include/rtems/libio.h
index 9d30dafddf..9d30dafddf 100644
--- a/cpukit/libcsupport/include/rtems/libio.h
+++ b/cpukit/include/rtems/libio.h
diff --git a/cpukit/libcsupport/include/rtems/libio_.h b/cpukit/include/rtems/libio_.h
index 414e8a20fc..414e8a20fc 100644
--- a/cpukit/libcsupport/include/rtems/libio_.h
+++ b/cpukit/include/rtems/libio_.h
diff --git a/cpukit/score/include/rtems/linkersets.h b/cpukit/include/rtems/linkersets.h
index bad046999c..bad046999c 100644
--- a/cpukit/score/include/rtems/linkersets.h
+++ b/cpukit/include/rtems/linkersets.h
diff --git a/cpukit/libcsupport/include/rtems/malloc.h b/cpukit/include/rtems/malloc.h
index 7c00f21e77..7c00f21e77 100644
--- a/cpukit/libcsupport/include/rtems/malloc.h
+++ b/cpukit/include/rtems/malloc.h
diff --git a/cpukit/libblock/include/rtems/media.h b/cpukit/include/rtems/media.h
index 77a1aa8348..77a1aa8348 100644
--- a/cpukit/libblock/include/rtems/media.h
+++ b/cpukit/include/rtems/media.h
diff --git a/cpukit/libmisc/monitor/monitor.h b/cpukit/include/rtems/monitor.h
index 6ecd903c63..6ecd903c63 100644
--- a/cpukit/libmisc/monitor/monitor.h
+++ b/cpukit/include/rtems/monitor.h
diff --git a/cpukit/libmisc/mouse/mouse_parser.h b/cpukit/include/rtems/mouse_parser.h
index 27bea1bbbc..27bea1bbbc 100644
--- a/cpukit/libmisc/mouse/mouse_parser.h
+++ b/cpukit/include/rtems/mouse_parser.h
diff --git a/cpukit/sapi/include/rtems/mptables.h b/cpukit/include/rtems/mptables.h
index 01e5b653b4..01e5b653b4 100644
--- a/cpukit/sapi/include/rtems/mptables.h
+++ b/cpukit/include/rtems/mptables.h
diff --git a/cpukit/libmisc/fb/mw_uid.h b/cpukit/include/rtems/mw_uid.h
index aa88392d26..aa88392d26 100644
--- a/cpukit/libmisc/fb/mw_uid.h
+++ b/cpukit/include/rtems/mw_uid.h
diff --git a/cpukit/libblock/include/rtems/nvdisk-sram.h b/cpukit/include/rtems/nvdisk-sram.h
index 3acaf600b6..3acaf600b6 100644
--- a/cpukit/libblock/include/rtems/nvdisk-sram.h
+++ b/cpukit/include/rtems/nvdisk-sram.h
diff --git a/cpukit/libblock/include/rtems/nvdisk.h b/cpukit/include/rtems/nvdisk.h
index 5570fb8c6b..5570fb8c6b 100644
--- a/cpukit/libblock/include/rtems/nvdisk.h
+++ b/cpukit/include/rtems/nvdisk.h
diff --git a/cpukit/telnetd/passwd.h b/cpukit/include/rtems/passwd.h
index 8d5c299a5e..8d5c299a5e 100644
--- a/cpukit/telnetd/passwd.h
+++ b/cpukit/include/rtems/passwd.h
diff --git a/cpukit/libfs/src/pipe/pipe.h b/cpukit/include/rtems/pipe.h
index 7c6566ad50..7c6566ad50 100644
--- a/cpukit/libfs/src/pipe/pipe.h
+++ b/cpukit/include/rtems/pipe.h
diff --git a/cpukit/posix/include/rtems/posix/aio_misc.h b/cpukit/include/rtems/posix/aio_misc.h
index aeccbad98f..aeccbad98f 100644
--- a/cpukit/posix/include/rtems/posix/aio_misc.h
+++ b/cpukit/include/rtems/posix/aio_misc.h
diff --git a/cpukit/posix/include/rtems/posix/barrierimpl.h b/cpukit/include/rtems/posix/barrierimpl.h
index a1794b82fd..a1794b82fd 100644
--- a/cpukit/posix/include/rtems/posix/barrierimpl.h
+++ b/cpukit/include/rtems/posix/barrierimpl.h
diff --git a/cpukit/posix/include/rtems/posix/condimpl.h b/cpukit/include/rtems/posix/condimpl.h
index 66e09bf6d8..66e09bf6d8 100644
--- a/cpukit/posix/include/rtems/posix/condimpl.h
+++ b/cpukit/include/rtems/posix/condimpl.h
diff --git a/cpukit/posix/include/rtems/posix/config.h b/cpukit/include/rtems/posix/config.h
index e90dc27011..e90dc27011 100644
--- a/cpukit/posix/include/rtems/posix/config.h
+++ b/cpukit/include/rtems/posix/config.h
diff --git a/cpukit/posix/include/rtems/posix/key.h b/cpukit/include/rtems/posix/key.h
index 1f09916f06..1f09916f06 100644
--- a/cpukit/posix/include/rtems/posix/key.h
+++ b/cpukit/include/rtems/posix/key.h
diff --git a/cpukit/posix/include/rtems/posix/keyimpl.h b/cpukit/include/rtems/posix/keyimpl.h
index 1148123638..1148123638 100644
--- a/cpukit/posix/include/rtems/posix/keyimpl.h
+++ b/cpukit/include/rtems/posix/keyimpl.h
diff --git a/cpukit/posix/include/rtems/posix/mmanimpl.h b/cpukit/include/rtems/posix/mmanimpl.h
index e1cc672331..e1cc672331 100644
--- a/cpukit/posix/include/rtems/posix/mmanimpl.h
+++ b/cpukit/include/rtems/posix/mmanimpl.h
diff --git a/cpukit/posix/include/rtems/posix/mqueue.h b/cpukit/include/rtems/posix/mqueue.h
index cdf94514af..cdf94514af 100644
--- a/cpukit/posix/include/rtems/posix/mqueue.h
+++ b/cpukit/include/rtems/posix/mqueue.h
diff --git a/cpukit/posix/include/rtems/posix/mqueueimpl.h b/cpukit/include/rtems/posix/mqueueimpl.h
index 6813a3ef88..6813a3ef88 100644
--- a/cpukit/posix/include/rtems/posix/mqueueimpl.h
+++ b/cpukit/include/rtems/posix/mqueueimpl.h
diff --git a/cpukit/posix/include/rtems/posix/muteximpl.h b/cpukit/include/rtems/posix/muteximpl.h
index 435b43634d..435b43634d 100644
--- a/cpukit/posix/include/rtems/posix/muteximpl.h
+++ b/cpukit/include/rtems/posix/muteximpl.h
diff --git a/cpukit/posix/include/rtems/posix/posixapi.h b/cpukit/include/rtems/posix/posixapi.h
index 29394ab94e..29394ab94e 100644
--- a/cpukit/posix/include/rtems/posix/posixapi.h
+++ b/cpukit/include/rtems/posix/posixapi.h
diff --git a/cpukit/posix/include/rtems/posix/priorityimpl.h b/cpukit/include/rtems/posix/priorityimpl.h
index eb2e3e059f..eb2e3e059f 100644
--- a/cpukit/posix/include/rtems/posix/priorityimpl.h
+++ b/cpukit/include/rtems/posix/priorityimpl.h
diff --git a/cpukit/posix/include/rtems/posix/psignal.h b/cpukit/include/rtems/posix/psignal.h
index ed98442e32..ed98442e32 100644
--- a/cpukit/posix/include/rtems/posix/psignal.h
+++ b/cpukit/include/rtems/posix/psignal.h
diff --git a/cpukit/posix/include/rtems/posix/psignalimpl.h b/cpukit/include/rtems/posix/psignalimpl.h
index cccc3dafc9..cccc3dafc9 100644
--- a/cpukit/posix/include/rtems/posix/psignalimpl.h
+++ b/cpukit/include/rtems/posix/psignalimpl.h
diff --git a/cpukit/posix/include/rtems/posix/pthread.h b/cpukit/include/rtems/posix/pthread.h
index 05783ff4ad..05783ff4ad 100644
--- a/cpukit/posix/include/rtems/posix/pthread.h
+++ b/cpukit/include/rtems/posix/pthread.h
diff --git a/cpukit/posix/include/rtems/posix/pthreadattrimpl.h b/cpukit/include/rtems/posix/pthreadattrimpl.h
index 12b8559181..12b8559181 100644
--- a/cpukit/posix/include/rtems/posix/pthreadattrimpl.h
+++ b/cpukit/include/rtems/posix/pthreadattrimpl.h
diff --git a/cpukit/posix/include/rtems/posix/pthreadimpl.h b/cpukit/include/rtems/posix/pthreadimpl.h
index 3e2351e57e..3e2351e57e 100644
--- a/cpukit/posix/include/rtems/posix/pthreadimpl.h
+++ b/cpukit/include/rtems/posix/pthreadimpl.h
diff --git a/cpukit/posix/include/rtems/posix/ptimer.h b/cpukit/include/rtems/posix/ptimer.h
index f6de4ccb57..f6de4ccb57 100644
--- a/cpukit/posix/include/rtems/posix/ptimer.h
+++ b/cpukit/include/rtems/posix/ptimer.h
diff --git a/cpukit/posix/include/rtems/posix/rwlockimpl.h b/cpukit/include/rtems/posix/rwlockimpl.h
index b92ca9d04c..b92ca9d04c 100644
--- a/cpukit/posix/include/rtems/posix/rwlockimpl.h
+++ b/cpukit/include/rtems/posix/rwlockimpl.h
diff --git a/cpukit/posix/include/rtems/posix/semaphore.h b/cpukit/include/rtems/posix/semaphore.h
index 9133db22be..9133db22be 100644
--- a/cpukit/posix/include/rtems/posix/semaphore.h
+++ b/cpukit/include/rtems/posix/semaphore.h
diff --git a/cpukit/posix/include/rtems/posix/semaphoreimpl.h b/cpukit/include/rtems/posix/semaphoreimpl.h
index fd17743699..fd17743699 100644
--- a/cpukit/posix/include/rtems/posix/semaphoreimpl.h
+++ b/cpukit/include/rtems/posix/semaphoreimpl.h
diff --git a/cpukit/posix/include/rtems/posix/shm.h b/cpukit/include/rtems/posix/shm.h
index d2b6036493..d2b6036493 100644
--- a/cpukit/posix/include/rtems/posix/shm.h
+++ b/cpukit/include/rtems/posix/shm.h
diff --git a/cpukit/posix/include/rtems/posix/shmimpl.h b/cpukit/include/rtems/posix/shmimpl.h
index f16af8123d..f16af8123d 100644
--- a/cpukit/posix/include/rtems/posix/shmimpl.h
+++ b/cpukit/include/rtems/posix/shmimpl.h
diff --git a/cpukit/posix/include/rtems/posix/sigset.h b/cpukit/include/rtems/posix/sigset.h
index 96bcc086ba..96bcc086ba 100644
--- a/cpukit/posix/include/rtems/posix/sigset.h
+++ b/cpukit/include/rtems/posix/sigset.h
diff --git a/cpukit/posix/include/rtems/posix/spinlockimpl.h b/cpukit/include/rtems/posix/spinlockimpl.h
index d28e0391fc..d28e0391fc 100644
--- a/cpukit/posix/include/rtems/posix/spinlockimpl.h
+++ b/cpukit/include/rtems/posix/spinlockimpl.h
diff --git a/cpukit/posix/include/rtems/posix/threadsup.h b/cpukit/include/rtems/posix/threadsup.h
index d3ee5b28bb..d3ee5b28bb 100644
--- a/cpukit/posix/include/rtems/posix/threadsup.h
+++ b/cpukit/include/rtems/posix/threadsup.h
diff --git a/cpukit/posix/include/rtems/posix/timer.h b/cpukit/include/rtems/posix/timer.h
index 79fe093219..79fe093219 100644
--- a/cpukit/posix/include/rtems/posix/timer.h
+++ b/cpukit/include/rtems/posix/timer.h
diff --git a/cpukit/posix/include/rtems/posix/timerimpl.h b/cpukit/include/rtems/posix/timerimpl.h
index 42a814c992..42a814c992 100644
--- a/cpukit/posix/include/rtems/posix/timerimpl.h
+++ b/cpukit/include/rtems/posix/timerimpl.h
diff --git a/cpukit/sapi/include/rtems/profiling.h b/cpukit/include/rtems/profiling.h
index 9e434b2a3c..9e434b2a3c 100644
--- a/cpukit/sapi/include/rtems/profiling.h
+++ b/cpukit/include/rtems/profiling.h
diff --git a/cpukit/telnetd/pty.h b/cpukit/include/rtems/pty.h
index 392bfd0969..392bfd0969 100644
--- a/cpukit/telnetd/pty.h
+++ b/cpukit/include/rtems/pty.h
diff --git a/cpukit/libqos/qreslib.h b/cpukit/include/rtems/qreslib.h
index 3de8668fdb..3de8668fdb 100644
--- a/cpukit/libqos/qreslib.h
+++ b/cpukit/include/rtems/qreslib.h
diff --git a/cpukit/libblock/include/rtems/ramdisk.h b/cpukit/include/rtems/ramdisk.h
index 727efddbe8..727efddbe8 100644
--- a/cpukit/libblock/include/rtems/ramdisk.h
+++ b/cpukit/include/rtems/ramdisk.h
diff --git a/cpukit/sapi/include/rtems/rbheap.h b/cpukit/include/rtems/rbheap.h
index 735aa6c8fd..735aa6c8fd 100644
--- a/cpukit/sapi/include/rtems/rbheap.h
+++ b/cpukit/include/rtems/rbheap.h
diff --git a/cpukit/sapi/include/rtems/rbtree.h b/cpukit/include/rtems/rbtree.h
index 57821cf31d..57821cf31d 100644
--- a/cpukit/sapi/include/rtems/rbtree.h
+++ b/cpukit/include/rtems/rbtree.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h b/cpukit/include/rtems/rfs/rtems-rfs-bitmaps.h
index 5574339421..5574339421 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-bitmaps.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-block-pos.h b/cpukit/include/rtems/rfs/rtems-rfs-block-pos.h
index 7d0f0693be..7d0f0693be 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-block-pos.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-block-pos.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-block.h b/cpukit/include/rtems/rfs/rtems-rfs-block.h
index 394853b7ad..394853b7ad 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-block.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-block.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-buffer.h b/cpukit/include/rtems/rfs/rtems-rfs-buffer.h
index 1c603e1827..1c603e1827 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-buffer.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-buffer.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-data.h b/cpukit/include/rtems/rfs/rtems-rfs-data.h
index 6217e74587..6217e74587 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-data.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-data.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-dir-hash.h b/cpukit/include/rtems/rfs/rtems-rfs-dir-hash.h
index d9a8a2004f..d9a8a2004f 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-dir-hash.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-dir-hash.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-dir.h b/cpukit/include/rtems/rfs/rtems-rfs-dir.h
index ae3647d03c..ae3647d03c 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-dir.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-dir.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file-system-fwd.h b/cpukit/include/rtems/rfs/rtems-rfs-file-system-fwd.h
index e239c25d6f..e239c25d6f 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-file-system-fwd.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-file-system-fwd.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file-system.h b/cpukit/include/rtems/rfs/rtems-rfs-file-system.h
index e00b142532..e00b142532 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-file-system.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-file-system.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file.h b/cpukit/include/rtems/rfs/rtems-rfs-file.h
index 772e846143..772e846143 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-file.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-file.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-group.h b/cpukit/include/rtems/rfs/rtems-rfs-group.h
index 23e6434b2c..23e6434b2c 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-group.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-group.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-inode.h b/cpukit/include/rtems/rfs/rtems-rfs-inode.h
index 95861ea8a7..95861ea8a7 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-inode.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-inode.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-link.h b/cpukit/include/rtems/rfs/rtems-rfs-link.h
index d30814aaff..d30814aaff 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-link.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-link.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-mutex.h b/cpukit/include/rtems/rfs/rtems-rfs-mutex.h
index 606fd53233..606fd53233 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-mutex.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-mutex.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-trace.h b/cpukit/include/rtems/rfs/rtems-rfs-trace.h
index 4d6d0c9ddb..4d6d0c9ddb 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-trace.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-trace.h
diff --git a/cpukit/libcsupport/include/ringbuf.h b/cpukit/include/rtems/ringbuf.h
index c16a79d1ae..c16a79d1ae 100644
--- a/cpukit/libcsupport/include/ringbuf.h
+++ b/cpukit/include/rtems/ringbuf.h
diff --git a/cpukit/libdebugger/rtems-debugger.h b/cpukit/include/rtems/rtems-debugger.h
index 1fc8b3d522..1fc8b3d522 100644
--- a/cpukit/libdebugger/rtems-debugger.h
+++ b/cpukit/include/rtems/rtems-debugger.h
diff --git a/cpukit/libmisc/rtems-fdt/rtems-fdt-shell.h b/cpukit/include/rtems/rtems-fdt-shell.h
index 74e9a44aaf..74e9a44aaf 100644
--- a/cpukit/libmisc/rtems-fdt/rtems-fdt-shell.h
+++ b/cpukit/include/rtems/rtems-fdt-shell.h
diff --git a/cpukit/libmisc/rtems-fdt/rtems-fdt.h b/cpukit/include/rtems/rtems-fdt.h
index ebc222e4c9..ebc222e4c9 100644
--- a/cpukit/libmisc/rtems-fdt/rtems-fdt.h
+++ b/cpukit/include/rtems/rtems-fdt.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-format.h b/cpukit/include/rtems/rtems-rfs-format.h
index f65cce1789..f65cce1789 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-format.h
+++ b/cpukit/include/rtems/rtems-rfs-format.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-shell.h b/cpukit/include/rtems/rtems-rfs-shell.h
index c2e1108a47..c2e1108a47 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-shell.h
+++ b/cpukit/include/rtems/rtems-rfs-shell.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs.h b/cpukit/include/rtems/rtems-rfs.h
index 958f9a636b..958f9a636b 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs.h
+++ b/cpukit/include/rtems/rtems-rfs.h
diff --git a/cpukit/rtems/include/rtems/rtems/asr.h b/cpukit/include/rtems/rtems/asr.h
index edd5e2fe62..edd5e2fe62 100644
--- a/cpukit/rtems/include/rtems/rtems/asr.h
+++ b/cpukit/include/rtems/rtems/asr.h
diff --git a/cpukit/rtems/include/rtems/rtems/asrimpl.h b/cpukit/include/rtems/rtems/asrimpl.h
index 141c34d4bb..141c34d4bb 100644
--- a/cpukit/rtems/include/rtems/rtems/asrimpl.h
+++ b/cpukit/include/rtems/rtems/asrimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/attr.h b/cpukit/include/rtems/rtems/attr.h
index 7e8fa4818a..7e8fa4818a 100644
--- a/cpukit/rtems/include/rtems/rtems/attr.h
+++ b/cpukit/include/rtems/rtems/attr.h
diff --git a/cpukit/rtems/include/rtems/rtems/attrimpl.h b/cpukit/include/rtems/rtems/attrimpl.h
index bb8e5f8f58..bb8e5f8f58 100644
--- a/cpukit/rtems/include/rtems/rtems/attrimpl.h
+++ b/cpukit/include/rtems/rtems/attrimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/barrier.h b/cpukit/include/rtems/rtems/barrier.h
index 2eea90fa41..2eea90fa41 100644
--- a/cpukit/rtems/include/rtems/rtems/barrier.h
+++ b/cpukit/include/rtems/rtems/barrier.h
diff --git a/cpukit/rtems/include/rtems/rtems/barrierimpl.h b/cpukit/include/rtems/rtems/barrierimpl.h
index f0b53e0cab..f0b53e0cab 100644
--- a/cpukit/rtems/include/rtems/rtems/barrierimpl.h
+++ b/cpukit/include/rtems/rtems/barrierimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/cache.h b/cpukit/include/rtems/rtems/cache.h
index f1dc9bf03d..f1dc9bf03d 100644
--- a/cpukit/rtems/include/rtems/rtems/cache.h
+++ b/cpukit/include/rtems/rtems/cache.h
diff --git a/cpukit/rtems/include/rtems/rtems/clock.h b/cpukit/include/rtems/rtems/clock.h
index a837b88700..a837b88700 100644
--- a/cpukit/rtems/include/rtems/rtems/clock.h
+++ b/cpukit/include/rtems/rtems/clock.h
diff --git a/cpukit/rtems/include/rtems/rtems/config.h b/cpukit/include/rtems/rtems/config.h
index 77ee798d74..77ee798d74 100644
--- a/cpukit/rtems/include/rtems/rtems/config.h
+++ b/cpukit/include/rtems/rtems/config.h
diff --git a/cpukit/rtems/include/rtems/rtems/dpmem.h b/cpukit/include/rtems/rtems/dpmem.h
index e582d2d359..e582d2d359 100644
--- a/cpukit/rtems/include/rtems/rtems/dpmem.h
+++ b/cpukit/include/rtems/rtems/dpmem.h
diff --git a/cpukit/rtems/include/rtems/rtems/dpmemimpl.h b/cpukit/include/rtems/rtems/dpmemimpl.h
index 52ac48c8dc..52ac48c8dc 100644
--- a/cpukit/rtems/include/rtems/rtems/dpmemimpl.h
+++ b/cpukit/include/rtems/rtems/dpmemimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/event.h b/cpukit/include/rtems/rtems/event.h
index 1cd64c0cfa..1cd64c0cfa 100644
--- a/cpukit/rtems/include/rtems/rtems/event.h
+++ b/cpukit/include/rtems/rtems/event.h
diff --git a/cpukit/rtems/include/rtems/rtems/eventimpl.h b/cpukit/include/rtems/rtems/eventimpl.h
index 933ea0fe2b..933ea0fe2b 100644
--- a/cpukit/rtems/include/rtems/rtems/eventimpl.h
+++ b/cpukit/include/rtems/rtems/eventimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/eventmp.h b/cpukit/include/rtems/rtems/eventmp.h
index a80e60c4e0..a80e60c4e0 100644
--- a/cpukit/rtems/include/rtems/rtems/eventmp.h
+++ b/cpukit/include/rtems/rtems/eventmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/intr.h b/cpukit/include/rtems/rtems/intr.h
index 7f99d93883..7f99d93883 100644
--- a/cpukit/rtems/include/rtems/rtems/intr.h
+++ b/cpukit/include/rtems/rtems/intr.h
diff --git a/cpukit/rtems/mainpage.h b/cpukit/include/rtems/rtems/mainpage.h
index e2d51328cf..e2d51328cf 100644
--- a/cpukit/rtems/mainpage.h
+++ b/cpukit/include/rtems/rtems/mainpage.h
diff --git a/cpukit/rtems/include/rtems/rtems/message.h b/cpukit/include/rtems/rtems/message.h
index 8ae9e156a1..8ae9e156a1 100644
--- a/cpukit/rtems/include/rtems/rtems/message.h
+++ b/cpukit/include/rtems/rtems/message.h
diff --git a/cpukit/rtems/include/rtems/rtems/messageimpl.h b/cpukit/include/rtems/rtems/messageimpl.h
index df7cea6829..df7cea6829 100644
--- a/cpukit/rtems/include/rtems/rtems/messageimpl.h
+++ b/cpukit/include/rtems/rtems/messageimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/modes.h b/cpukit/include/rtems/rtems/modes.h
index 547ae13e05..547ae13e05 100644
--- a/cpukit/rtems/include/rtems/rtems/modes.h
+++ b/cpukit/include/rtems/rtems/modes.h
diff --git a/cpukit/rtems/include/rtems/rtems/modesimpl.h b/cpukit/include/rtems/rtems/modesimpl.h
index 8c1acc7cb9..8c1acc7cb9 100644
--- a/cpukit/rtems/include/rtems/rtems/modesimpl.h
+++ b/cpukit/include/rtems/rtems/modesimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/mp.h b/cpukit/include/rtems/rtems/mp.h
index f1b93b6751..f1b93b6751 100644
--- a/cpukit/rtems/include/rtems/rtems/mp.h
+++ b/cpukit/include/rtems/rtems/mp.h
diff --git a/cpukit/rtems/include/rtems/rtems/msgmp.h b/cpukit/include/rtems/rtems/msgmp.h
index 3dabd8d46b..3dabd8d46b 100644
--- a/cpukit/rtems/include/rtems/rtems/msgmp.h
+++ b/cpukit/include/rtems/rtems/msgmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/object.h b/cpukit/include/rtems/rtems/object.h
index 2652915462..2652915462 100644
--- a/cpukit/rtems/include/rtems/rtems/object.h
+++ b/cpukit/include/rtems/rtems/object.h
diff --git a/cpukit/rtems/include/rtems/rtems/options.h b/cpukit/include/rtems/rtems/options.h
index 752aefda2e..752aefda2e 100644
--- a/cpukit/rtems/include/rtems/rtems/options.h
+++ b/cpukit/include/rtems/rtems/options.h
diff --git a/cpukit/rtems/include/rtems/rtems/optionsimpl.h b/cpukit/include/rtems/rtems/optionsimpl.h
index 0263fcf78d..0263fcf78d 100644
--- a/cpukit/rtems/include/rtems/rtems/optionsimpl.h
+++ b/cpukit/include/rtems/rtems/optionsimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/part.h b/cpukit/include/rtems/rtems/part.h
index 5b840cc96c..5b840cc96c 100644
--- a/cpukit/rtems/include/rtems/rtems/part.h
+++ b/cpukit/include/rtems/rtems/part.h
diff --git a/cpukit/rtems/include/rtems/rtems/partimpl.h b/cpukit/include/rtems/rtems/partimpl.h
index 13ee86b4c2..13ee86b4c2 100644
--- a/cpukit/rtems/include/rtems/rtems/partimpl.h
+++ b/cpukit/include/rtems/rtems/partimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/partmp.h b/cpukit/include/rtems/rtems/partmp.h
index b9eaa08b8c..b9eaa08b8c 100644
--- a/cpukit/rtems/include/rtems/rtems/partmp.h
+++ b/cpukit/include/rtems/rtems/partmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/ratemon.h b/cpukit/include/rtems/rtems/ratemon.h
index ca48a92983..ca48a92983 100644
--- a/cpukit/rtems/include/rtems/rtems/ratemon.h
+++ b/cpukit/include/rtems/rtems/ratemon.h
diff --git a/cpukit/rtems/include/rtems/rtems/ratemonimpl.h b/cpukit/include/rtems/rtems/ratemonimpl.h
index ba38a3e61a..ba38a3e61a 100644
--- a/cpukit/rtems/include/rtems/rtems/ratemonimpl.h
+++ b/cpukit/include/rtems/rtems/ratemonimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/region.h b/cpukit/include/rtems/rtems/region.h
index 4772e2835b..4772e2835b 100644
--- a/cpukit/rtems/include/rtems/rtems/region.h
+++ b/cpukit/include/rtems/rtems/region.h
diff --git a/cpukit/rtems/include/rtems/rtems/regionimpl.h b/cpukit/include/rtems/rtems/regionimpl.h
index 178b7ea32b..178b7ea32b 100644
--- a/cpukit/rtems/include/rtems/rtems/regionimpl.h
+++ b/cpukit/include/rtems/rtems/regionimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/sem.h b/cpukit/include/rtems/rtems/sem.h
index 41b0061979..41b0061979 100644
--- a/cpukit/rtems/include/rtems/rtems/sem.h
+++ b/cpukit/include/rtems/rtems/sem.h
diff --git a/cpukit/rtems/include/rtems/rtems/semimpl.h b/cpukit/include/rtems/rtems/semimpl.h
index 6d0f156e5c..6d0f156e5c 100644
--- a/cpukit/rtems/include/rtems/rtems/semimpl.h
+++ b/cpukit/include/rtems/rtems/semimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/semmp.h b/cpukit/include/rtems/rtems/semmp.h
index 9d7669f43e..9d7669f43e 100644
--- a/cpukit/rtems/include/rtems/rtems/semmp.h
+++ b/cpukit/include/rtems/rtems/semmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/signal.h b/cpukit/include/rtems/rtems/signal.h
index f7b7000d9a..f7b7000d9a 100644
--- a/cpukit/rtems/include/rtems/rtems/signal.h
+++ b/cpukit/include/rtems/rtems/signal.h
diff --git a/cpukit/rtems/include/rtems/rtems/signalimpl.h b/cpukit/include/rtems/rtems/signalimpl.h
index 61848ae95c..61848ae95c 100644
--- a/cpukit/rtems/include/rtems/rtems/signalimpl.h
+++ b/cpukit/include/rtems/rtems/signalimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/signalmp.h b/cpukit/include/rtems/rtems/signalmp.h
index 57b8682c58..57b8682c58 100644
--- a/cpukit/rtems/include/rtems/rtems/signalmp.h
+++ b/cpukit/include/rtems/rtems/signalmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/smp.h b/cpukit/include/rtems/rtems/smp.h
index aeb0df6f46..aeb0df6f46 100644
--- a/cpukit/rtems/include/rtems/rtems/smp.h
+++ b/cpukit/include/rtems/rtems/smp.h
diff --git a/cpukit/rtems/include/rtems/rtems/status.h b/cpukit/include/rtems/rtems/status.h
index c54404ba14..c54404ba14 100644
--- a/cpukit/rtems/include/rtems/rtems/status.h
+++ b/cpukit/include/rtems/rtems/status.h
diff --git a/cpukit/rtems/include/rtems/rtems/statusimpl.h b/cpukit/include/rtems/rtems/statusimpl.h
index 8a51bb8b19..8a51bb8b19 100644
--- a/cpukit/rtems/include/rtems/rtems/statusimpl.h
+++ b/cpukit/include/rtems/rtems/statusimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/support.h b/cpukit/include/rtems/rtems/support.h
index 4ebb50cbdf..4ebb50cbdf 100644
--- a/cpukit/rtems/include/rtems/rtems/support.h
+++ b/cpukit/include/rtems/rtems/support.h
diff --git a/cpukit/rtems/include/rtems/rtems/taskmp.h b/cpukit/include/rtems/rtems/taskmp.h
index e2d70a924e..e2d70a924e 100644
--- a/cpukit/rtems/include/rtems/rtems/taskmp.h
+++ b/cpukit/include/rtems/rtems/taskmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/tasks.h b/cpukit/include/rtems/rtems/tasks.h
index 585f4c449c..585f4c449c 100644
--- a/cpukit/rtems/include/rtems/rtems/tasks.h
+++ b/cpukit/include/rtems/rtems/tasks.h
diff --git a/cpukit/rtems/include/rtems/rtems/tasksimpl.h b/cpukit/include/rtems/rtems/tasksimpl.h
index b0432351f3..b0432351f3 100644
--- a/cpukit/rtems/include/rtems/rtems/tasksimpl.h
+++ b/cpukit/include/rtems/rtems/tasksimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/timer.h b/cpukit/include/rtems/rtems/timer.h
index 032c49525a..032c49525a 100644
--- a/cpukit/rtems/include/rtems/rtems/timer.h
+++ b/cpukit/include/rtems/rtems/timer.h
diff --git a/cpukit/rtems/include/rtems/rtems/timerimpl.h b/cpukit/include/rtems/rtems/timerimpl.h
index d8581bfcd8..d8581bfcd8 100644
--- a/cpukit/rtems/include/rtems/rtems/timerimpl.h
+++ b/cpukit/include/rtems/rtems/timerimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/types.h b/cpukit/include/rtems/rtems/types.h
index 82c0edd3c3..82c0edd3c3 100644
--- a/cpukit/rtems/include/rtems/rtems/types.h
+++ b/cpukit/include/rtems/rtems/types.h
diff --git a/cpukit/pppd/rtemsdialer.h b/cpukit/include/rtems/rtemsdialer.h
index 611986b802..611986b802 100644
--- a/cpukit/pppd/rtemsdialer.h
+++ b/cpukit/include/rtems/rtemsdialer.h
diff --git a/cpukit/pppd/rtemspppd.h b/cpukit/include/rtems/rtemspppd.h
index a6c8d0b398..a6c8d0b398 100644
--- a/cpukit/pppd/rtemspppd.h
+++ b/cpukit/include/rtems/rtemspppd.h
diff --git a/cpukit/libdl/dlfcn-shell.h b/cpukit/include/rtems/rtl/dlfcn-shell.h
index 9383577d25..9383577d25 100644
--- a/cpukit/libdl/dlfcn-shell.h
+++ b/cpukit/include/rtems/rtl/dlfcn-shell.h
diff --git a/cpukit/libdl/rap-shell.h b/cpukit/include/rtems/rtl/rap-shell.h
index c2d9112c0f..c2d9112c0f 100644
--- a/cpukit/libdl/rap-shell.h
+++ b/cpukit/include/rtems/rtl/rap-shell.h
diff --git a/cpukit/libdl/rap.h b/cpukit/include/rtems/rtl/rap.h
index 0b86553e2b..0b86553e2b 100644
--- a/cpukit/libdl/rap.h
+++ b/cpukit/include/rtems/rtl/rap.h
diff --git a/cpukit/libdl/rtl-allocator.h b/cpukit/include/rtems/rtl/rtl-allocator.h
index e8044ee1e8..e8044ee1e8 100644
--- a/cpukit/libdl/rtl-allocator.h
+++ b/cpukit/include/rtems/rtl/rtl-allocator.h
diff --git a/cpukit/libdl/rtl-fwd.h b/cpukit/include/rtems/rtl/rtl-fwd.h
index 4641ad5d5e..4641ad5d5e 100644
--- a/cpukit/libdl/rtl-fwd.h
+++ b/cpukit/include/rtems/rtl/rtl-fwd.h
diff --git a/cpukit/libdl/rtl-indirect-ptr.h b/cpukit/include/rtems/rtl/rtl-indirect-ptr.h
index 81503a3b45..81503a3b45 100644
--- a/cpukit/libdl/rtl-indirect-ptr.h
+++ b/cpukit/include/rtems/rtl/rtl-indirect-ptr.h
diff --git a/cpukit/libdl/rtl-obj-cache.h b/cpukit/include/rtems/rtl/rtl-obj-cache.h
index 8eacdd316b..8eacdd316b 100644
--- a/cpukit/libdl/rtl-obj-cache.h
+++ b/cpukit/include/rtems/rtl/rtl-obj-cache.h
diff --git a/cpukit/libdl/rtl-obj-comp.h b/cpukit/include/rtems/rtl/rtl-obj-comp.h
index 34bfa6ffa1..34bfa6ffa1 100644
--- a/cpukit/libdl/rtl-obj-comp.h
+++ b/cpukit/include/rtems/rtl/rtl-obj-comp.h
diff --git a/cpukit/libdl/rtl-obj-fwd.h b/cpukit/include/rtems/rtl/rtl-obj-fwd.h
index 2c53244316..2c53244316 100644
--- a/cpukit/libdl/rtl-obj-fwd.h
+++ b/cpukit/include/rtems/rtl/rtl-obj-fwd.h
diff --git a/cpukit/libdl/rtl-obj.h b/cpukit/include/rtems/rtl/rtl-obj.h
index 6a35a72822..6a35a72822 100644
--- a/cpukit/libdl/rtl-obj.h
+++ b/cpukit/include/rtems/rtl/rtl-obj.h
diff --git a/cpukit/libdl/rtl-sym.h b/cpukit/include/rtems/rtl/rtl-sym.h
index fe00da89d7..fe00da89d7 100644
--- a/cpukit/libdl/rtl-sym.h
+++ b/cpukit/include/rtems/rtl/rtl-sym.h
diff --git a/cpukit/libdl/rtl-trace.h b/cpukit/include/rtems/rtl/rtl-trace.h
index 4b93c8c91c..4b93c8c91c 100644
--- a/cpukit/libdl/rtl-trace.h
+++ b/cpukit/include/rtems/rtl/rtl-trace.h
diff --git a/cpukit/libdl/rtl-unresolved.h b/cpukit/include/rtems/rtl/rtl-unresolved.h
index bd4ce2a215..bd4ce2a215 100644
--- a/cpukit/libdl/rtl-unresolved.h
+++ b/cpukit/include/rtems/rtl/rtl-unresolved.h
diff --git a/cpukit/libdl/rtl.h b/cpukit/include/rtems/rtl/rtl.h
index fe9a7df081..fe9a7df081 100644
--- a/cpukit/libdl/rtl.h
+++ b/cpukit/include/rtems/rtl/rtl.h
diff --git a/cpukit/sapi/include/rtems/scheduler.h b/cpukit/include/rtems/scheduler.h
index 8684b798f7..8684b798f7 100644
--- a/cpukit/sapi/include/rtems/scheduler.h
+++ b/cpukit/include/rtems/scheduler.h
diff --git a/cpukit/score/include/rtems/score/address.h b/cpukit/include/rtems/score/address.h
index 8f38f7c2dc..8f38f7c2dc 100644
--- a/cpukit/score/include/rtems/score/address.h
+++ b/cpukit/include/rtems/score/address.h
diff --git a/cpukit/score/include/rtems/score/apimutex.h b/cpukit/include/rtems/score/apimutex.h
index f43edf23f4..f43edf23f4 100644
--- a/cpukit/score/include/rtems/score/apimutex.h
+++ b/cpukit/include/rtems/score/apimutex.h
diff --git a/cpukit/score/include/rtems/score/assert.h b/cpukit/include/rtems/score/assert.h
index d4432838ce..d4432838ce 100644
--- a/cpukit/score/include/rtems/score/assert.h
+++ b/cpukit/include/rtems/score/assert.h
diff --git a/cpukit/score/include/rtems/score/atomic.h b/cpukit/include/rtems/score/atomic.h
index 526926926f..526926926f 100644
--- a/cpukit/score/include/rtems/score/atomic.h
+++ b/cpukit/include/rtems/score/atomic.h
diff --git a/cpukit/score/include/rtems/score/basedefs.h b/cpukit/include/rtems/score/basedefs.h
index 4e48d226e8..4e48d226e8 100644
--- a/cpukit/score/include/rtems/score/basedefs.h
+++ b/cpukit/include/rtems/score/basedefs.h
diff --git a/cpukit/score/include/rtems/score/chain.h b/cpukit/include/rtems/score/chain.h
index e358262e6e..e358262e6e 100644
--- a/cpukit/score/include/rtems/score/chain.h
+++ b/cpukit/include/rtems/score/chain.h
diff --git a/cpukit/score/include/rtems/score/chainimpl.h b/cpukit/include/rtems/score/chainimpl.h
index c94c051198..c94c051198 100644
--- a/cpukit/score/include/rtems/score/chainimpl.h
+++ b/cpukit/include/rtems/score/chainimpl.h
diff --git a/cpukit/score/include/rtems/score/context.h b/cpukit/include/rtems/score/context.h
index 990a602396..990a602396 100644
--- a/cpukit/score/include/rtems/score/context.h
+++ b/cpukit/include/rtems/score/context.h
diff --git a/cpukit/score/include/rtems/score/copyrt.h b/cpukit/include/rtems/score/copyrt.h
index 17c925a008..17c925a008 100644
--- a/cpukit/score/include/rtems/score/copyrt.h
+++ b/cpukit/include/rtems/score/copyrt.h
diff --git a/cpukit/score/include/rtems/score/corebarrier.h b/cpukit/include/rtems/score/corebarrier.h
index ba706be3e3..ba706be3e3 100644
--- a/cpukit/score/include/rtems/score/corebarrier.h
+++ b/cpukit/include/rtems/score/corebarrier.h
diff --git a/cpukit/score/include/rtems/score/corebarrierimpl.h b/cpukit/include/rtems/score/corebarrierimpl.h
index d5d63659d0..d5d63659d0 100644
--- a/cpukit/score/include/rtems/score/corebarrierimpl.h
+++ b/cpukit/include/rtems/score/corebarrierimpl.h
diff --git a/cpukit/score/include/rtems/score/coremsg.h b/cpukit/include/rtems/score/coremsg.h
index 8d25529fdc..8d25529fdc 100644
--- a/cpukit/score/include/rtems/score/coremsg.h
+++ b/cpukit/include/rtems/score/coremsg.h
diff --git a/cpukit/score/include/rtems/score/coremsgimpl.h b/cpukit/include/rtems/score/coremsgimpl.h
index e33e3308b2..e33e3308b2 100644
--- a/cpukit/score/include/rtems/score/coremsgimpl.h
+++ b/cpukit/include/rtems/score/coremsgimpl.h
diff --git a/cpukit/score/include/rtems/score/coremutex.h b/cpukit/include/rtems/score/coremutex.h
index fd1f27c697..fd1f27c697 100644
--- a/cpukit/score/include/rtems/score/coremutex.h
+++ b/cpukit/include/rtems/score/coremutex.h
diff --git a/cpukit/score/include/rtems/score/coremuteximpl.h b/cpukit/include/rtems/score/coremuteximpl.h
index 78fafca6e1..78fafca6e1 100644
--- a/cpukit/score/include/rtems/score/coremuteximpl.h
+++ b/cpukit/include/rtems/score/coremuteximpl.h
diff --git a/cpukit/score/include/rtems/score/corerwlockimpl.h b/cpukit/include/rtems/score/corerwlockimpl.h
index 942e8c8d75..942e8c8d75 100644
--- a/cpukit/score/include/rtems/score/corerwlockimpl.h
+++ b/cpukit/include/rtems/score/corerwlockimpl.h
diff --git a/cpukit/score/include/rtems/score/coresem.h b/cpukit/include/rtems/score/coresem.h
index f9d3ac8fd5..f9d3ac8fd5 100644
--- a/cpukit/score/include/rtems/score/coresem.h
+++ b/cpukit/include/rtems/score/coresem.h
diff --git a/cpukit/score/include/rtems/score/coresemimpl.h b/cpukit/include/rtems/score/coresemimpl.h
index 00f77e61dd..00f77e61dd 100644
--- a/cpukit/score/include/rtems/score/coresemimpl.h
+++ b/cpukit/include/rtems/score/coresemimpl.h
diff --git a/cpukit/score/include/rtems/score/cpustdatomic.h b/cpukit/include/rtems/score/cpustdatomic.h
index 6c6db8d279..6c6db8d279 100644
--- a/cpukit/score/include/rtems/score/cpustdatomic.h
+++ b/cpukit/include/rtems/score/cpustdatomic.h
diff --git a/cpukit/score/include/rtems/score/freechain.h b/cpukit/include/rtems/score/freechain.h
index 1540c0e2a1..1540c0e2a1 100644
--- a/cpukit/score/include/rtems/score/freechain.h
+++ b/cpukit/include/rtems/score/freechain.h
diff --git a/cpukit/score/include/rtems/score/heap.h b/cpukit/include/rtems/score/heap.h
index 60cb3be99d..60cb3be99d 100644
--- a/cpukit/score/include/rtems/score/heap.h
+++ b/cpukit/include/rtems/score/heap.h
diff --git a/cpukit/score/include/rtems/score/heapimpl.h b/cpukit/include/rtems/score/heapimpl.h
index a8948edd6f..a8948edd6f 100644
--- a/cpukit/score/include/rtems/score/heapimpl.h
+++ b/cpukit/include/rtems/score/heapimpl.h
diff --git a/cpukit/score/include/rtems/score/interr.h b/cpukit/include/rtems/score/interr.h
index 3144952716..3144952716 100644
--- a/cpukit/score/include/rtems/score/interr.h
+++ b/cpukit/include/rtems/score/interr.h
diff --git a/cpukit/score/include/rtems/score/io.h b/cpukit/include/rtems/score/io.h
index ae3c57f031..ae3c57f031 100644
--- a/cpukit/score/include/rtems/score/io.h
+++ b/cpukit/include/rtems/score/io.h
diff --git a/cpukit/score/include/rtems/score/isr.h b/cpukit/include/rtems/score/isr.h
index d9c03b807f..d9c03b807f 100644
--- a/cpukit/score/include/rtems/score/isr.h
+++ b/cpukit/include/rtems/score/isr.h
diff --git a/cpukit/score/include/rtems/score/isrlevel.h b/cpukit/include/rtems/score/isrlevel.h
index abfb1b67fc..abfb1b67fc 100644
--- a/cpukit/score/include/rtems/score/isrlevel.h
+++ b/cpukit/include/rtems/score/isrlevel.h
diff --git a/cpukit/score/include/rtems/score/isrlock.h b/cpukit/include/rtems/score/isrlock.h
index 7dd2f29000..7dd2f29000 100644
--- a/cpukit/score/include/rtems/score/isrlock.h
+++ b/cpukit/include/rtems/score/isrlock.h
diff --git a/cpukit/score/include/rtems/score/mpci.h b/cpukit/include/rtems/score/mpci.h
index c20b45c3e1..c20b45c3e1 100644
--- a/cpukit/score/include/rtems/score/mpci.h
+++ b/cpukit/include/rtems/score/mpci.h
diff --git a/cpukit/score/include/rtems/score/mpciimpl.h b/cpukit/include/rtems/score/mpciimpl.h
index eb03a1d7b3..eb03a1d7b3 100644
--- a/cpukit/score/include/rtems/score/mpciimpl.h
+++ b/cpukit/include/rtems/score/mpciimpl.h
diff --git a/cpukit/score/include/rtems/score/mppkt.h b/cpukit/include/rtems/score/mppkt.h
index 573abf574b..573abf574b 100644
--- a/cpukit/score/include/rtems/score/mppkt.h
+++ b/cpukit/include/rtems/score/mppkt.h
diff --git a/cpukit/score/include/rtems/score/mrsp.h b/cpukit/include/rtems/score/mrsp.h
index 85cbff784f..85cbff784f 100644
--- a/cpukit/score/include/rtems/score/mrsp.h
+++ b/cpukit/include/rtems/score/mrsp.h
diff --git a/cpukit/score/include/rtems/score/mrspimpl.h b/cpukit/include/rtems/score/mrspimpl.h
index b9c7441401..b9c7441401 100644
--- a/cpukit/score/include/rtems/score/mrspimpl.h
+++ b/cpukit/include/rtems/score/mrspimpl.h
diff --git a/cpukit/score/include/rtems/score/muteximpl.h b/cpukit/include/rtems/score/muteximpl.h
index 5fd4f5e8be..5fd4f5e8be 100644
--- a/cpukit/score/include/rtems/score/muteximpl.h
+++ b/cpukit/include/rtems/score/muteximpl.h
diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/include/rtems/score/object.h
index 6789c61fea..6789c61fea 100644
--- a/cpukit/score/include/rtems/score/object.h
+++ b/cpukit/include/rtems/score/object.h
diff --git a/cpukit/score/include/rtems/score/objectimpl.h b/cpukit/include/rtems/score/objectimpl.h
index cc5820785c..cc5820785c 100644
--- a/cpukit/score/include/rtems/score/objectimpl.h
+++ b/cpukit/include/rtems/score/objectimpl.h
diff --git a/cpukit/score/include/rtems/score/objectmp.h b/cpukit/include/rtems/score/objectmp.h
index 5c9f4f74e3..5c9f4f74e3 100644
--- a/cpukit/score/include/rtems/score/objectmp.h
+++ b/cpukit/include/rtems/score/objectmp.h
diff --git a/cpukit/score/include/rtems/score/onceimpl.h b/cpukit/include/rtems/score/onceimpl.h
index 60f1378506..60f1378506 100644
--- a/cpukit/score/include/rtems/score/onceimpl.h
+++ b/cpukit/include/rtems/score/onceimpl.h
diff --git a/cpukit/score/include/rtems/score/percpu.h b/cpukit/include/rtems/score/percpu.h
index 00528b5ce3..00528b5ce3 100644
--- a/cpukit/score/include/rtems/score/percpu.h
+++ b/cpukit/include/rtems/score/percpu.h
diff --git a/cpukit/score/include/rtems/score/priority.h b/cpukit/include/rtems/score/priority.h
index 7a8ddba763..7a8ddba763 100644
--- a/cpukit/score/include/rtems/score/priority.h
+++ b/cpukit/include/rtems/score/priority.h
diff --git a/cpukit/score/include/rtems/score/prioritybitmap.h b/cpukit/include/rtems/score/prioritybitmap.h
index 40638dd628..40638dd628 100644
--- a/cpukit/score/include/rtems/score/prioritybitmap.h
+++ b/cpukit/include/rtems/score/prioritybitmap.h
diff --git a/cpukit/score/include/rtems/score/prioritybitmapimpl.h b/cpukit/include/rtems/score/prioritybitmapimpl.h
index 82c92eb5d6..82c92eb5d6 100644
--- a/cpukit/score/include/rtems/score/prioritybitmapimpl.h
+++ b/cpukit/include/rtems/score/prioritybitmapimpl.h
diff --git a/cpukit/score/include/rtems/score/priorityimpl.h b/cpukit/include/rtems/score/priorityimpl.h
index 3380983cb7..3380983cb7 100644
--- a/cpukit/score/include/rtems/score/priorityimpl.h
+++ b/cpukit/include/rtems/score/priorityimpl.h
diff --git a/cpukit/score/include/rtems/score/processormask.h b/cpukit/include/rtems/score/processormask.h
index a06aa2a56b..a06aa2a56b 100644
--- a/cpukit/score/include/rtems/score/processormask.h
+++ b/cpukit/include/rtems/score/processormask.h
diff --git a/cpukit/score/include/rtems/score/profiling.h b/cpukit/include/rtems/score/profiling.h
index 6ba5d2987f..6ba5d2987f 100644
--- a/cpukit/score/include/rtems/score/profiling.h
+++ b/cpukit/include/rtems/score/profiling.h
diff --git a/cpukit/score/include/rtems/score/protectedheap.h b/cpukit/include/rtems/score/protectedheap.h
index a08fa36cf3..a08fa36cf3 100644
--- a/cpukit/score/include/rtems/score/protectedheap.h
+++ b/cpukit/include/rtems/score/protectedheap.h
diff --git a/cpukit/score/include/rtems/score/rbtree.h b/cpukit/include/rtems/score/rbtree.h
index 15a3bc8913..15a3bc8913 100644
--- a/cpukit/score/include/rtems/score/rbtree.h
+++ b/cpukit/include/rtems/score/rbtree.h
diff --git a/cpukit/score/include/rtems/score/rbtreeimpl.h b/cpukit/include/rtems/score/rbtreeimpl.h
index bf92e29228..bf92e29228 100644
--- a/cpukit/score/include/rtems/score/rbtreeimpl.h
+++ b/cpukit/include/rtems/score/rbtreeimpl.h
diff --git a/cpukit/score/include/rtems/score/scheduler.h b/cpukit/include/rtems/score/scheduler.h
index a6066c8e4a..a6066c8e4a 100644
--- a/cpukit/score/include/rtems/score/scheduler.h
+++ b/cpukit/include/rtems/score/scheduler.h
diff --git a/cpukit/score/include/rtems/score/schedulercbs.h b/cpukit/include/rtems/score/schedulercbs.h
index 635abce125..635abce125 100644
--- a/cpukit/score/include/rtems/score/schedulercbs.h
+++ b/cpukit/include/rtems/score/schedulercbs.h
diff --git a/cpukit/score/include/rtems/score/schedulercbsimpl.h b/cpukit/include/rtems/score/schedulercbsimpl.h
index ed75979f75..ed75979f75 100644
--- a/cpukit/score/include/rtems/score/schedulercbsimpl.h
+++ b/cpukit/include/rtems/score/schedulercbsimpl.h
diff --git a/cpukit/score/include/rtems/score/scheduleredf.h b/cpukit/include/rtems/score/scheduleredf.h
index 91c303ca56..91c303ca56 100644
--- a/cpukit/score/include/rtems/score/scheduleredf.h
+++ b/cpukit/include/rtems/score/scheduleredf.h
diff --git a/cpukit/score/include/rtems/score/scheduleredfimpl.h b/cpukit/include/rtems/score/scheduleredfimpl.h
index f6bd7d8384..f6bd7d8384 100644
--- a/cpukit/score/include/rtems/score/scheduleredfimpl.h
+++ b/cpukit/include/rtems/score/scheduleredfimpl.h
diff --git a/cpukit/score/include/rtems/score/scheduleredfsmp.h b/cpukit/include/rtems/score/scheduleredfsmp.h
index 018568190e..018568190e 100644
--- a/cpukit/score/include/rtems/score/scheduleredfsmp.h
+++ b/cpukit/include/rtems/score/scheduleredfsmp.h
diff --git a/cpukit/score/include/rtems/score/schedulerimpl.h b/cpukit/include/rtems/score/schedulerimpl.h
index 10c12242a9..10c12242a9 100644
--- a/cpukit/score/include/rtems/score/schedulerimpl.h
+++ b/cpukit/include/rtems/score/schedulerimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulernode.h b/cpukit/include/rtems/score/schedulernode.h
index d62e983853..d62e983853 100644
--- a/cpukit/score/include/rtems/score/schedulernode.h
+++ b/cpukit/include/rtems/score/schedulernode.h
diff --git a/cpukit/score/include/rtems/score/schedulernodeimpl.h b/cpukit/include/rtems/score/schedulernodeimpl.h
index 8997b3f218..8997b3f218 100644
--- a/cpukit/score/include/rtems/score/schedulernodeimpl.h
+++ b/cpukit/include/rtems/score/schedulernodeimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulerpriority.h b/cpukit/include/rtems/score/schedulerpriority.h
index f5ae66102d..f5ae66102d 100644
--- a/cpukit/score/include/rtems/score/schedulerpriority.h
+++ b/cpukit/include/rtems/score/schedulerpriority.h
diff --git a/cpukit/score/include/rtems/score/schedulerpriorityaffinitysmp.h b/cpukit/include/rtems/score/schedulerpriorityaffinitysmp.h
index d988d5752a..d988d5752a 100644
--- a/cpukit/score/include/rtems/score/schedulerpriorityaffinitysmp.h
+++ b/cpukit/include/rtems/score/schedulerpriorityaffinitysmp.h
diff --git a/cpukit/score/include/rtems/score/schedulerpriorityimpl.h b/cpukit/include/rtems/score/schedulerpriorityimpl.h
index 354065fac4..354065fac4 100644
--- a/cpukit/score/include/rtems/score/schedulerpriorityimpl.h
+++ b/cpukit/include/rtems/score/schedulerpriorityimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulerprioritysmp.h b/cpukit/include/rtems/score/schedulerprioritysmp.h
index 6671da5b7a..6671da5b7a 100644
--- a/cpukit/score/include/rtems/score/schedulerprioritysmp.h
+++ b/cpukit/include/rtems/score/schedulerprioritysmp.h
diff --git a/cpukit/score/include/rtems/score/schedulerprioritysmpimpl.h b/cpukit/include/rtems/score/schedulerprioritysmpimpl.h
index 17d6e552f3..17d6e552f3 100644
--- a/cpukit/score/include/rtems/score/schedulerprioritysmpimpl.h
+++ b/cpukit/include/rtems/score/schedulerprioritysmpimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulersimple.h b/cpukit/include/rtems/score/schedulersimple.h
index 0d410d5676..0d410d5676 100644
--- a/cpukit/score/include/rtems/score/schedulersimple.h
+++ b/cpukit/include/rtems/score/schedulersimple.h
diff --git a/cpukit/score/include/rtems/score/schedulersimpleimpl.h b/cpukit/include/rtems/score/schedulersimpleimpl.h
index 3891839281..3891839281 100644
--- a/cpukit/score/include/rtems/score/schedulersimpleimpl.h
+++ b/cpukit/include/rtems/score/schedulersimpleimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulersimplesmp.h b/cpukit/include/rtems/score/schedulersimplesmp.h
index bc75b205d5..bc75b205d5 100644
--- a/cpukit/score/include/rtems/score/schedulersimplesmp.h
+++ b/cpukit/include/rtems/score/schedulersimplesmp.h
diff --git a/cpukit/score/include/rtems/score/schedulersmp.h b/cpukit/include/rtems/score/schedulersmp.h
index 0bd899a6a6..0bd899a6a6 100644
--- a/cpukit/score/include/rtems/score/schedulersmp.h
+++ b/cpukit/include/rtems/score/schedulersmp.h
diff --git a/cpukit/score/include/rtems/score/schedulersmpimpl.h b/cpukit/include/rtems/score/schedulersmpimpl.h
index e152eb0878..e152eb0878 100644
--- a/cpukit/score/include/rtems/score/schedulersmpimpl.h
+++ b/cpukit/include/rtems/score/schedulersmpimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulerstrongapa.h b/cpukit/include/rtems/score/schedulerstrongapa.h
index d961f20c68..d961f20c68 100644
--- a/cpukit/score/include/rtems/score/schedulerstrongapa.h
+++ b/cpukit/include/rtems/score/schedulerstrongapa.h
diff --git a/cpukit/score/include/rtems/score/semaphoreimpl.h b/cpukit/include/rtems/score/semaphoreimpl.h
index a7857db93e..a7857db93e 100644
--- a/cpukit/score/include/rtems/score/semaphoreimpl.h
+++ b/cpukit/include/rtems/score/semaphoreimpl.h
diff --git a/cpukit/score/include/rtems/score/smp.h b/cpukit/include/rtems/score/smp.h
index 469025e5dc..469025e5dc 100644
--- a/cpukit/score/include/rtems/score/smp.h
+++ b/cpukit/include/rtems/score/smp.h
diff --git a/cpukit/score/include/rtems/score/smpbarrier.h b/cpukit/include/rtems/score/smpbarrier.h
index fddf7bb1cd..fddf7bb1cd 100644
--- a/cpukit/score/include/rtems/score/smpbarrier.h
+++ b/cpukit/include/rtems/score/smpbarrier.h
diff --git a/cpukit/score/include/rtems/score/smpimpl.h b/cpukit/include/rtems/score/smpimpl.h
index 48e6a12498..48e6a12498 100644
--- a/cpukit/score/include/rtems/score/smpimpl.h
+++ b/cpukit/include/rtems/score/smpimpl.h
diff --git a/cpukit/score/include/rtems/score/smplock.h b/cpukit/include/rtems/score/smplock.h
index a156edfd92..a156edfd92 100644
--- a/cpukit/score/include/rtems/score/smplock.h
+++ b/cpukit/include/rtems/score/smplock.h
diff --git a/cpukit/score/include/rtems/score/smplockmcs.h b/cpukit/include/rtems/score/smplockmcs.h
index 5a1ad23dc9..5a1ad23dc9 100644
--- a/cpukit/score/include/rtems/score/smplockmcs.h
+++ b/cpukit/include/rtems/score/smplockmcs.h
diff --git a/cpukit/score/include/rtems/score/smplockseq.h b/cpukit/include/rtems/score/smplockseq.h
index 5daaee9c6e..5daaee9c6e 100644
--- a/cpukit/score/include/rtems/score/smplockseq.h
+++ b/cpukit/include/rtems/score/smplockseq.h
diff --git a/cpukit/score/include/rtems/score/smplockstats.h b/cpukit/include/rtems/score/smplockstats.h
index dd8e06c81d..dd8e06c81d 100644
--- a/cpukit/score/include/rtems/score/smplockstats.h
+++ b/cpukit/include/rtems/score/smplockstats.h
diff --git a/cpukit/score/include/rtems/score/smplockticket.h b/cpukit/include/rtems/score/smplockticket.h
index e04c4056a5..e04c4056a5 100644
--- a/cpukit/score/include/rtems/score/smplockticket.h
+++ b/cpukit/include/rtems/score/smplockticket.h
diff --git a/cpukit/score/include/rtems/score/stack.h b/cpukit/include/rtems/score/stack.h
index 9622495092..9622495092 100644
--- a/cpukit/score/include/rtems/score/stack.h
+++ b/cpukit/include/rtems/score/stack.h
diff --git a/cpukit/score/include/rtems/score/stackimpl.h b/cpukit/include/rtems/score/stackimpl.h
index 4c622345ff..4c622345ff 100644
--- a/cpukit/score/include/rtems/score/stackimpl.h
+++ b/cpukit/include/rtems/score/stackimpl.h
diff --git a/cpukit/score/include/rtems/score/states.h b/cpukit/include/rtems/score/states.h
index ba59af6907..ba59af6907 100644
--- a/cpukit/score/include/rtems/score/states.h
+++ b/cpukit/include/rtems/score/states.h
diff --git a/cpukit/score/include/rtems/score/statesimpl.h b/cpukit/include/rtems/score/statesimpl.h
index db462fbb9a..db462fbb9a 100644
--- a/cpukit/score/include/rtems/score/statesimpl.h
+++ b/cpukit/include/rtems/score/statesimpl.h
diff --git a/cpukit/score/include/rtems/score/status.h b/cpukit/include/rtems/score/status.h
index 5b154bb207..5b154bb207 100644
--- a/cpukit/score/include/rtems/score/status.h
+++ b/cpukit/include/rtems/score/status.h
diff --git a/cpukit/score/include/rtems/score/sysstate.h b/cpukit/include/rtems/score/sysstate.h
index 0e01927d9a..0e01927d9a 100644
--- a/cpukit/score/include/rtems/score/sysstate.h
+++ b/cpukit/include/rtems/score/sysstate.h
diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/include/rtems/score/thread.h
index 7e0e2722dd..7e0e2722dd 100644
--- a/cpukit/score/include/rtems/score/thread.h
+++ b/cpukit/include/rtems/score/thread.h
diff --git a/cpukit/score/include/rtems/score/threaddispatch.h b/cpukit/include/rtems/score/threaddispatch.h
index 63eb4c6fb4..63eb4c6fb4 100644
--- a/cpukit/score/include/rtems/score/threaddispatch.h
+++ b/cpukit/include/rtems/score/threaddispatch.h
diff --git a/cpukit/score/include/rtems/score/threadimpl.h b/cpukit/include/rtems/score/threadimpl.h
index b6722fae19..b6722fae19 100644
--- a/cpukit/score/include/rtems/score/threadimpl.h
+++ b/cpukit/include/rtems/score/threadimpl.h
diff --git a/cpukit/score/include/rtems/score/threadmp.h b/cpukit/include/rtems/score/threadmp.h
index 9cde35b649..9cde35b649 100644
--- a/cpukit/score/include/rtems/score/threadmp.h
+++ b/cpukit/include/rtems/score/threadmp.h
diff --git a/cpukit/score/include/rtems/score/threadq.h b/cpukit/include/rtems/score/threadq.h
index 3e618bf5af..3e618bf5af 100644
--- a/cpukit/score/include/rtems/score/threadq.h
+++ b/cpukit/include/rtems/score/threadq.h
diff --git a/cpukit/score/include/rtems/score/threadqimpl.h b/cpukit/include/rtems/score/threadqimpl.h
index ecbd8fd42f..ecbd8fd42f 100644
--- a/cpukit/score/include/rtems/score/threadqimpl.h
+++ b/cpukit/include/rtems/score/threadqimpl.h
diff --git a/cpukit/score/include/rtems/score/timecounter.h b/cpukit/include/rtems/score/timecounter.h
index 79444de482..79444de482 100644
--- a/cpukit/score/include/rtems/score/timecounter.h
+++ b/cpukit/include/rtems/score/timecounter.h
diff --git a/cpukit/score/include/rtems/score/timecounterimpl.h b/cpukit/include/rtems/score/timecounterimpl.h
index a48ac70683..a48ac70683 100644
--- a/cpukit/score/include/rtems/score/timecounterimpl.h
+++ b/cpukit/include/rtems/score/timecounterimpl.h
diff --git a/cpukit/score/include/rtems/score/timespec.h b/cpukit/include/rtems/score/timespec.h
index 72a000177f..72a000177f 100644
--- a/cpukit/score/include/rtems/score/timespec.h
+++ b/cpukit/include/rtems/score/timespec.h
diff --git a/cpukit/score/include/rtems/score/timestamp.h b/cpukit/include/rtems/score/timestamp.h
index 6fc17ced9c..6fc17ced9c 100644
--- a/cpukit/score/include/rtems/score/timestamp.h
+++ b/cpukit/include/rtems/score/timestamp.h
diff --git a/cpukit/score/include/rtems/score/tls.h b/cpukit/include/rtems/score/tls.h
index 644e54e6f7..644e54e6f7 100644
--- a/cpukit/score/include/rtems/score/tls.h
+++ b/cpukit/include/rtems/score/tls.h
diff --git a/cpukit/score/include/rtems/score/tod.h b/cpukit/include/rtems/score/tod.h
index c0ab5e795d..c0ab5e795d 100644
--- a/cpukit/score/include/rtems/score/tod.h
+++ b/cpukit/include/rtems/score/tod.h
diff --git a/cpukit/score/include/rtems/score/todimpl.h b/cpukit/include/rtems/score/todimpl.h
index b00ab6cca2..b00ab6cca2 100644
--- a/cpukit/score/include/rtems/score/todimpl.h
+++ b/cpukit/include/rtems/score/todimpl.h
diff --git a/cpukit/score/include/rtems/score/userext.h b/cpukit/include/rtems/score/userext.h
index 5af5824808..5af5824808 100644
--- a/cpukit/score/include/rtems/score/userext.h
+++ b/cpukit/include/rtems/score/userext.h
diff --git a/cpukit/score/include/rtems/score/userextimpl.h b/cpukit/include/rtems/score/userextimpl.h
index 5ad2c63765..5ad2c63765 100644
--- a/cpukit/score/include/rtems/score/userextimpl.h
+++ b/cpukit/include/rtems/score/userextimpl.h
diff --git a/cpukit/score/include/rtems/score/watchdog.h b/cpukit/include/rtems/score/watchdog.h
index dbb092bbef..dbb092bbef 100644
--- a/cpukit/score/include/rtems/score/watchdog.h
+++ b/cpukit/include/rtems/score/watchdog.h
diff --git a/cpukit/score/include/rtems/score/watchdogimpl.h b/cpukit/include/rtems/score/watchdogimpl.h
index f219a70768..f219a70768 100644
--- a/cpukit/score/include/rtems/score/watchdogimpl.h
+++ b/cpukit/include/rtems/score/watchdogimpl.h
diff --git a/cpukit/score/include/rtems/score/wkspace.h b/cpukit/include/rtems/score/wkspace.h
index 3676ff28c4..3676ff28c4 100644
--- a/cpukit/score/include/rtems/score/wkspace.h
+++ b/cpukit/include/rtems/score/wkspace.h
diff --git a/cpukit/libmisc/serdbg/serdbg.h b/cpukit/include/rtems/serdbg.h
index fe106bce44..fe106bce44 100644
--- a/cpukit/libmisc/serdbg/serdbg.h
+++ b/cpukit/include/rtems/serdbg.h
diff --git a/cpukit/libmisc/serdbg/serdbgcnf.h b/cpukit/include/rtems/serdbgcnf.h
index 9d4087ae69..9d4087ae69 100644
--- a/cpukit/libmisc/serdbg/serdbgcnf.h
+++ b/cpukit/include/rtems/serdbgcnf.h
diff --git a/cpukit/libmisc/mouse/serial_mouse.h b/cpukit/include/rtems/serial_mouse.h
index 174fcfb909..174fcfb909 100644
--- a/cpukit/libmisc/mouse/serial_mouse.h
+++ b/cpukit/include/rtems/serial_mouse.h
diff --git a/cpukit/score/include/rtems/seterr.h b/cpukit/include/rtems/seterr.h
index 22fddc824e..22fddc824e 100644
--- a/cpukit/score/include/rtems/seterr.h
+++ b/cpukit/include/rtems/seterr.h
diff --git a/cpukit/libmisc/shell/shell.h b/cpukit/include/rtems/shell.h
index 98ddf0a958..98ddf0a958 100644
--- a/cpukit/libmisc/shell/shell.h
+++ b/cpukit/include/rtems/shell.h
diff --git a/cpukit/libmisc/shell/shellconfig.h b/cpukit/include/rtems/shellconfig.h
index 9f68b313fb..9f68b313fb 100644
--- a/cpukit/libmisc/shell/shellconfig.h
+++ b/cpukit/include/rtems/shellconfig.h
diff --git a/cpukit/libblock/include/rtems/sparse-disk.h b/cpukit/include/rtems/sparse-disk.h
index e558e08925..e558e08925 100644
--- a/cpukit/libblock/include/rtems/sparse-disk.h
+++ b/cpukit/include/rtems/sparse-disk.h
diff --git a/cpukit/libcsupport/include/spurious.h b/cpukit/include/rtems/spurious.h
index 049f3bf3a0..049f3bf3a0 100644
--- a/cpukit/libcsupport/include/spurious.h
+++ b/cpukit/include/rtems/spurious.h
diff --git a/cpukit/libmisc/stackchk/stackchk.h b/cpukit/include/rtems/stackchk.h
index 16fc4f9b9d..16fc4f9b9d 100644
--- a/cpukit/libmisc/stackchk/stackchk.h
+++ b/cpukit/include/rtems/stackchk.h
diff --git a/cpukit/libmisc/redirector/stdio-redirect.h b/cpukit/include/rtems/stdio-redirect.h
index 6f1d4cdd98..6f1d4cdd98 100644
--- a/cpukit/libmisc/redirector/stdio-redirect.h
+++ b/cpukit/include/rtems/stdio-redirect.h
diff --git a/cpukit/libmisc/stringto/stringto.h b/cpukit/include/rtems/stringto.h
index 878814da54..878814da54 100644
--- a/cpukit/libmisc/stringto/stringto.h
+++ b/cpukit/include/rtems/stringto.h
diff --git a/cpukit/score/include/rtems/sysinit.h b/cpukit/include/rtems/sysinit.h
index 535fb98e2c..535fb98e2c 100644
--- a/cpukit/score/include/rtems/sysinit.h
+++ b/cpukit/include/rtems/sysinit.h
diff --git a/cpukit/score/include/rtems/system.h b/cpukit/include/rtems/system.h
index 26156c64f7..26156c64f7 100644
--- a/cpukit/score/include/rtems/system.h
+++ b/cpukit/include/rtems/system.h
diff --git a/cpukit/telnetd/telnetd.h b/cpukit/include/rtems/telnetd.h
index a5c8a187e3..a5c8a187e3 100644
--- a/cpukit/telnetd/telnetd.h
+++ b/cpukit/include/rtems/telnetd.h
diff --git a/cpukit/libmisc/serdbg/termios_printk.h b/cpukit/include/rtems/termios_printk.h
index dcb183533a..dcb183533a 100644
--- a/cpukit/libmisc/serdbg/termios_printk.h
+++ b/cpukit/include/rtems/termios_printk.h
diff --git a/cpukit/libmisc/serdbg/termios_printk_cnf.h b/cpukit/include/rtems/termios_printk_cnf.h
index 03c3090c38..03c3090c38 100644
--- a/cpukit/libmisc/serdbg/termios_printk_cnf.h
+++ b/cpukit/include/rtems/termios_printk_cnf.h
diff --git a/cpukit/libcsupport/include/rtems/termiostypes.h b/cpukit/include/rtems/termiostypes.h
index b3cac66e92..b3cac66e92 100644
--- a/cpukit/libcsupport/include/rtems/termiostypes.h
+++ b/cpukit/include/rtems/termiostypes.h
diff --git a/cpukit/libmisc/testsupport/test.h b/cpukit/include/rtems/test.h
index 3dbdb9e32e..3dbdb9e32e 100644
--- a/cpukit/libmisc/testsupport/test.h
+++ b/cpukit/include/rtems/test.h
diff --git a/cpukit/sapi/include/rtems/timecounter.h b/cpukit/include/rtems/timecounter.h
index 8d1bd78618..8d1bd78618 100644
--- a/cpukit/sapi/include/rtems/timecounter.h
+++ b/cpukit/include/rtems/timecounter.h
diff --git a/cpukit/sapi/include/rtems/timespec.h b/cpukit/include/rtems/timespec.h
index e82d271492..e82d271492 100644
--- a/cpukit/sapi/include/rtems/timespec.h
+++ b/cpukit/include/rtems/timespec.h
diff --git a/cpukit/libcsupport/include/rtems/tod.h b/cpukit/include/rtems/tod.h
index 971e8548e8..971e8548e8 100644
--- a/cpukit/libcsupport/include/rtems/tod.h
+++ b/cpukit/include/rtems/tod.h
diff --git a/cpukit/libmisc/capture/rtems-trace-buffer-vars.h b/cpukit/include/rtems/trace/rtems-trace-buffer-vars.h
index 8f0ff08587..8f0ff08587 100644
--- a/cpukit/libmisc/capture/rtems-trace-buffer-vars.h
+++ b/cpukit/include/rtems/trace/rtems-trace-buffer-vars.h
diff --git a/cpukit/libmisc/untar/untar.h b/cpukit/include/rtems/untar.h
index bc0a97c103..bc0a97c103 100644
--- a/cpukit/libmisc/untar/untar.h
+++ b/cpukit/include/rtems/untar.h
diff --git a/cpukit/sapi/include/rtems/version.h b/cpukit/include/rtems/version.h
index b806cb8c2f..b806cb8c2f 100644
--- a/cpukit/sapi/include/rtems/version.h
+++ b/cpukit/include/rtems/version.h
diff --git a/cpukit/libcsupport/include/vmeintr.h b/cpukit/include/rtems/vmeintr.h
index 74bda9bf08..74bda9bf08 100644
--- a/cpukit/libcsupport/include/vmeintr.h
+++ b/cpukit/include/rtems/vmeintr.h
diff --git a/cpukit/libmd/sha256.h b/cpukit/include/sha256.h
index 1b6a4f4c57..1b6a4f4c57 100644
--- a/cpukit/libmd/sha256.h
+++ b/cpukit/include/sha256.h
diff --git a/cpukit/libmd/sha512.h b/cpukit/include/sha512.h
index 8998f4c5bf..8998f4c5bf 100644
--- a/cpukit/libmd/sha512.h
+++ b/cpukit/include/sha512.h
diff --git a/cpukit/score/include/sys/_ffcounter.h b/cpukit/include/sys/_ffcounter.h
index d83c48cd44..d83c48cd44 100644
--- a/cpukit/score/include/sys/_ffcounter.h
+++ b/cpukit/include/sys/_ffcounter.h
diff --git a/cpukit/libdl/include/sys/cdefs_elf.h b/cpukit/include/sys/cdefs_elf.h
index 91903d6017..91903d6017 100644
--- a/cpukit/libdl/include/sys/cdefs_elf.h
+++ b/cpukit/include/sys/cdefs_elf.h
diff --git a/cpukit/libcsupport/include/sys/event.h b/cpukit/include/sys/event.h
index bc18aa90ea..bc18aa90ea 100644
--- a/cpukit/libcsupport/include/sys/event.h
+++ b/cpukit/include/sys/event.h
diff --git a/cpukit/libdl/include/sys/exec_elf.h b/cpukit/include/sys/exec_elf.h
index 4242415f54..4242415f54 100644
--- a/cpukit/libdl/include/sys/exec_elf.h
+++ b/cpukit/include/sys/exec_elf.h
diff --git a/cpukit/libcsupport/include/sys/poll.h b/cpukit/include/sys/poll.h
index c955f321c7..c955f321c7 100644
--- a/cpukit/libcsupport/include/sys/poll.h
+++ b/cpukit/include/sys/poll.h
diff --git a/cpukit/libcsupport/include/sys/statvfs.h b/cpukit/include/sys/statvfs.h
index cf80478aae..cf80478aae 100644
--- a/cpukit/libcsupport/include/sys/statvfs.h
+++ b/cpukit/include/sys/statvfs.h
diff --git a/cpukit/score/include/sys/timeffc.h b/cpukit/include/sys/timeffc.h
index c04de97f1d..c04de97f1d 100644
--- a/cpukit/score/include/sys/timeffc.h
+++ b/cpukit/include/sys/timeffc.h
diff --git a/cpukit/score/include/sys/timepps.h b/cpukit/include/sys/timepps.h
index 01212f0b43..01212f0b43 100644
--- a/cpukit/score/include/sys/timepps.h
+++ b/cpukit/include/sys/timepps.h
diff --git a/cpukit/score/include/sys/timetc.h b/cpukit/include/sys/timetc.h
index 347a140ed9..347a140ed9 100644
--- a/cpukit/score/include/sys/timetc.h
+++ b/cpukit/include/sys/timetc.h
diff --git a/cpukit/score/include/sys/timex.h b/cpukit/include/sys/timex.h
index d2d2012ff5..d2d2012ff5 100644
--- a/cpukit/score/include/sys/timex.h
+++ b/cpukit/include/sys/timex.h
diff --git a/cpukit/libcsupport/include/sys/utsname.h b/cpukit/include/sys/utsname.h
index ddeb0e90c2..ddeb0e90c2 100644
--- a/cpukit/libcsupport/include/sys/utsname.h
+++ b/cpukit/include/sys/utsname.h
diff --git a/cpukit/libmisc/utf8proc/utf8proc.h b/cpukit/include/utf8proc/utf8proc.h
index 24a891b6c6..24a891b6c6 100644
--- a/cpukit/libmisc/utf8proc/utf8proc.h
+++ b/cpukit/include/utf8proc/utf8proc.h
diff --git a/cpukit/libmisc/uuid/uuid.h b/cpukit/include/uuid/uuid.h
index ca846da0f0..ca846da0f0 100644
--- a/cpukit/libmisc/uuid/uuid.h
+++ b/cpukit/include/uuid/uuid.h
diff --git a/cpukit/libmisc/xz/xz.h b/cpukit/include/xz.h
index 0a4b38d33c..0a4b38d33c 100644
--- a/cpukit/libmisc/xz/xz.h
+++ b/cpukit/include/xz.h
diff --git a/cpukit/zlib/zlib.h b/cpukit/include/zlib.h
index bfbba83e8e..bfbba83e8e 100644
--- a/cpukit/zlib/zlib.h
+++ b/cpukit/include/zlib.h
diff --git a/cpukit/libcrypt/Makefile.am b/cpukit/libcrypt/Makefile.am
index fe174d4e9d..cb8dbe129a 100644
--- a/cpukit/libcrypt/Makefile.am
+++ b/cpukit/libcrypt/Makefile.am
@@ -1,7 +1,5 @@
 include $(top_srcdir)/automake/compile.am
 
-include_HEADERS =
-
 noinst_LIBRARIES = libcrypt.a
 
 libcrypt_a_CPPFLAGS = $(AM_CPPFLAGS)
@@ -13,5 +11,4 @@ libcrypt_a_SOURCES += crypt-sha256.c
 libcrypt_a_SOURCES += crypt-sha512.c
 libcrypt_a_SOURCES += misc.c
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libcrypt/preinstall.am b/cpukit/libcrypt/preinstall.am
deleted file mode 100644
index feb5d1d4e3..0000000000
--- a/cpukit/libcrypt/preinstall.am
+++ /dev/null
@@ -1,15 +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)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index 038ac93548..253c2c9924 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -5,32 +5,7 @@ noinst_LIBRARIES = libcsupport.a libcalloc.a
 libcsupport_a_CPPFLAGS = $(AM_CPPFLAGS)
 libcalloc_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS  = include/iosupp.h
-include_rtems_HEADERS += include/ringbuf.h
-include_rtems_HEADERS += include/rtems/tod.h
-include_rtems_HEADERS += include/spurious.h
-include_rtems_HEADERS += include/vmeintr.h
-
 ## rtems
-include_rtems_HEADERS += include/rtems/assoc.h
-include_rtems_HEADERS += include/rtems/deviceio.h
-include_rtems_HEADERS += include/rtems/error.h
-include_rtems_HEADERS += include/rtems/libcsupport.h
-include_rtems_HEADERS += include/rtems/libio.h
-include_rtems_HEADERS += include/rtems/libio_.h
-include_rtems_HEADERS += include/rtems/malloc.h
-include_rtems_HEADERS += include/rtems/termiostypes.h
-include_rtems_HEADERS += include/rtems/gxx_wrappers.h
-
-include_machinedir = $(includedir)/machine
-include_machine_HEADERS =
-include_machine_HEADERS += include/machine/_kernel_cpuset.h
-include_machine_HEADERS += include/machine/_kernel_param.h
-include_machine_HEADERS += include/machine/_kernel_time.h
-include_machine_HEADERS += include/machine/_kernel_types.h
-include_machine_HEADERS += include/machine/_timecounter.h
-
 ##  General stuff
 ERROR_C_FILES = src/error.c src/__assert.c
 
@@ -157,5 +132,4 @@ libcalloc_a_CFLAGS = -fno-builtin
 
 EXTRA_DIST = src/TODO src/CASES src/README
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libcsupport/preinstall.am b/cpukit/libcsupport/preinstall.am
deleted file mode 100644
index 01a128e2ff..0000000000
--- a/cpukit/libcsupport/preinstall.am
+++ /dev/null
@@ -1,101 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/iosupp.h: include/iosupp.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/iosupp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/iosupp.h
-
-$(PROJECT_INCLUDE)/rtems/ringbuf.h: include/ringbuf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ringbuf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ringbuf.h
-
-$(PROJECT_INCLUDE)/rtems/tod.h: include/rtems/tod.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/tod.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/tod.h
-
-$(PROJECT_INCLUDE)/rtems/spurious.h: include/spurious.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/spurious.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/spurious.h
-
-$(PROJECT_INCLUDE)/rtems/vmeintr.h: include/vmeintr.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/vmeintr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/vmeintr.h
-
-$(PROJECT_INCLUDE)/rtems/assoc.h: include/rtems/assoc.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/assoc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/assoc.h
-
-$(PROJECT_INCLUDE)/rtems/deviceio.h: include/rtems/deviceio.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/deviceio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/deviceio.h
-
-$(PROJECT_INCLUDE)/rtems/error.h: include/rtems/error.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/error.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/error.h
-
-$(PROJECT_INCLUDE)/rtems/libcsupport.h: include/rtems/libcsupport.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/libcsupport.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/libcsupport.h
-
-$(PROJECT_INCLUDE)/rtems/libio.h: include/rtems/libio.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/libio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/libio.h
-
-$(PROJECT_INCLUDE)/rtems/libio_.h: include/rtems/libio_.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/libio_.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/libio_.h
-
-$(PROJECT_INCLUDE)/rtems/malloc.h: include/rtems/malloc.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/malloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/malloc.h
-
-$(PROJECT_INCLUDE)/rtems/termiostypes.h: include/rtems/termiostypes.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/termiostypes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/termiostypes.h
-
-$(PROJECT_INCLUDE)/rtems/gxx_wrappers.h: include/rtems/gxx_wrappers.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/gxx_wrappers.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/gxx_wrappers.h
-
-$(PROJECT_INCLUDE)/machine/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/machine
-	@: > $(PROJECT_INCLUDE)/machine/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/machine/$(dirstamp)
-
-$(PROJECT_INCLUDE)/machine/_kernel_cpuset.h: include/machine/_kernel_cpuset.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_kernel_cpuset.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_kernel_cpuset.h
-
-$(PROJECT_INCLUDE)/machine/_kernel_param.h: include/machine/_kernel_param.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_kernel_param.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_kernel_param.h
-
-$(PROJECT_INCLUDE)/machine/_kernel_time.h: include/machine/_kernel_time.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_kernel_time.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_kernel_time.h
-
-$(PROJECT_INCLUDE)/machine/_kernel_types.h: include/machine/_kernel_types.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_kernel_types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_kernel_types.h
-
-$(PROJECT_INCLUDE)/machine/_timecounter.h: include/machine/_timecounter.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_timecounter.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_timecounter.h
-
diff --git a/cpukit/libdebugger/Makefile.am b/cpukit/libdebugger/Makefile.am
index 72a89447d7..b202003e41 100644
--- a/cpukit/libdebugger/Makefile.am
+++ b/cpukit/libdebugger/Makefile.am
@@ -1,7 +1,7 @@
-if LIBDEBUGGER
-
 include $(top_srcdir)/automake/compile.am
 
+if LIBDEBUGGER
+
 noinst_LIBRARIES = libdebugger.a
 libdebugger_a_SOURCES = \
   rtems-debugger-block.c \
@@ -19,5 +19,4 @@ endif
 
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libdebugger/preinstall.am b/cpukit/libdebugger/preinstall.am
deleted file mode 100644
index 695eb30912..0000000000
--- a/cpukit/libdebugger/preinstall.am
+++ /dev/null
@@ -1,9 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-if LIBDEBUGGER
-endif
diff --git a/cpukit/libdl/Makefile.am b/cpukit/libdl/Makefile.am
index b21c16750a..8b95a7d91c 100644
--- a/cpukit/libdl/Makefile.am
+++ b/cpukit/libdl/Makefile.am
@@ -1,7 +1,7 @@
-if LIBDL
-
 include $(top_srcdir)/automake/compile.am
 
+if LIBDL
+
 noinst_LIBRARIES = libdl.a
 libdl_a_SOURCES = \
   dlfcn-shell.c \
@@ -33,5 +33,4 @@ libdl_a_CPPFLAGS = $(AM_CPPFLAGS) -DRTEMS_RTL_RAP_LOADER=1 -DRTEMS_RTL_ELF_LOADE
 
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libdl/preinstall.am b/cpukit/libdl/preinstall.am
deleted file mode 100644
index dba6cc4d81..0000000000
--- a/cpukit/libdl/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/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am
index 0985b2ffb4..a76fa8ae2d 100644
--- a/cpukit/libfs/Makefile.am
+++ b/cpukit/libfs/Makefile.am
@@ -112,6 +112,11 @@ librfs_a_SOURCES = \
 
 # JFFS2
 project_lib_LIBRARIES = libjffs2.a
+
+$(PROJECT_LIB)/libjffs2.a: libjffs2.a
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/libjffs2.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/libjffs2.a
+
 libjffs2_a_SOURCES =
 libjffs2_a_SOURCES += src/jffs2/src/build.c
 libjffs2_a_SOURCES += src/jffs2/src/compat-crc32.c
@@ -139,6 +144,5 @@ libjffs2_a_CPPFLAGS += -D__ECOS
 libjffs2_a_CPPFLAGS += '-DKBUILD_MODNAME="JFFS2"'
 
 # ---
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libfs/preinstall.am b/cpukit/libfs/preinstall.am
deleted file mode 100644
index 2aca1ef32f..0000000000
--- a/cpukit/libfs/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)/libjffs2.a: libjffs2.a $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/libjffs2.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libjffs2.a
-
diff --git a/cpukit/libfs/src/nfsclient/Makefile.am b/cpukit/libfs/src/nfsclient/Makefile.am
index 85f4a71756..04d840f507 100644
--- a/cpukit/libfs/src/nfsclient/Makefile.am
+++ b/cpukit/libfs/src/nfsclient/Makefile.am
@@ -10,6 +10,11 @@ dirutils_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 if LIBNETWORKING
 project_lib_LIBRARIES = libnfs.a
 
+$(PROJECT_LIB)/libnfs.a: libnfs.a
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/libnfs.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/libnfs.a
+
+
 # if you have CEXP set this variable to 'YES'
 # and some "help" info will be compiled in.
 libnfs_a_SOURCES = src/rpcio.c src/rpcio.h
@@ -19,8 +24,6 @@ libnfs_a_SOURCES += proto/mount_prot.h proto/nfs_prot.h
 # With CEXP
 # libnfs_a_SOURCES += dirutils.c rpcio.modini.c nfs.modini.c cexphelp.c
 
-include_HEADERS = src/librtemsNfs.h
-
 # PGMS=${ARCH}/nfs.obj ${ARCH}/rpcio.obj ${ARCH}/dirutils.obj
 
 libnfs_a_CPPFLAGS = $(AM_CPPFLAGS)
@@ -66,5 +69,4 @@ $(srcdir)/proto/nfs_prot_xdr.c: proto/nfs_prot.x proto/nfs_prot.h
 	> nfs_prot_xdr.c)
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libfs/src/nfsclient/preinstall.am b/cpukit/libfs/src/nfsclient/preinstall.am
deleted file mode 100644
index 593fc0367d..0000000000
--- a/cpukit/libfs/src/nfsclient/preinstall.am
+++ /dev/null
@@ -1,51 +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)/dirutils.rel: dirutils.rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/dirutils.rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/dirutils.rel
-
-if LIBNETWORKING
-$(PROJECT_LIB)/libnfs.a: libnfs.a $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/libnfs.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libnfs.a
-
-$(PROJECT_INCLUDE)/librtemsNfs.h: src/librtemsNfs.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/librtemsNfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/librtemsNfs.h
-
-$(PROJECT_LIB)/nfs.rel: nfs.rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/nfs.rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/nfs.rel
-
-$(PROJECT_LIB)/rpcio.rel: rpcio.rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/rpcio.rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/rpcio.rel
-endif
diff --git a/cpukit/libmd/Makefile.am b/cpukit/libmd/Makefile.am
index 2d3f2e1ad2..b56aff7ca5 100644
--- a/cpukit/libmd/Makefile.am
+++ b/cpukit/libmd/Makefile.am
@@ -1,12 +1,6 @@
 include $(top_srcdir)/automake/compile.am
 
 if NEWLIB
-include_HEADERS =
-include_HEADERS += md4.h
-include_HEADERS += md5.h
-include_HEADERS += sha256.h
-include_HEADERS += sha512.h
-
 noinst_LIBRARIES = libmd.a
 libmd_a_SOURCES =
 libmd_a_SOURCES += md4.c
@@ -18,5 +12,4 @@ endif
 libmd_a_CPPFLAGS = $(AM_CPPFLAGS)
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libmd/preinstall.am b/cpukit/libmd/preinstall.am
deleted file mode 100644
index f4462f4193..0000000000
--- a/cpukit/libmd/preinstall.am
+++ /dev/null
@@ -1,38 +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)
-
-if NEWLIB
-$(PROJECT_INCLUDE)/md4.h: md4.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/md4.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/md4.h
-
-$(PROJECT_INCLUDE)/md5.h: md5.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/md5.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/md5.h
-
-$(PROJECT_INCLUDE)/sha256.h: sha256.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sha256.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sha256.h
-
-$(PROJECT_INCLUDE)/sha512.h: sha512.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sha512.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sha512.h
-
-endif
diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am
index e1343ddf11..ca4686a954 100644
--- a/cpukit/libmisc/Makefile.am
+++ b/cpukit/libmisc/Makefile.am
@@ -208,5 +208,4 @@ libxz_a_SOURCES = xz/xz/h xz/xz_crc32.c \
 EXTRA_DIST += xz/README xz/COPING
 
 ## ---
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libmisc/preinstall.am b/cpukit/libmisc/preinstall.am
deleted file mode 100644
index f6a7e763d2..0000000000
--- a/cpukit/libmisc/preinstall.am
+++ /dev/null
@@ -1,9 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-if LIBSHELL
-endif
diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am
index d6c8af89dd..7ff7057457 100644
--- a/cpukit/libnetworking/Makefile.am
+++ b/cpukit/libnetworking/Makefile.am
@@ -1,8 +1,6 @@
 include $(top_srcdir)/automake/multilib.am
 include $(top_srcdir)/automake/compile.am
 
-AM_CPPFLAGS += -I$(srcdir)
-
 EXTRA_DIST = README
 EXTRA_DIST += rtems/bootp.h
 
@@ -22,8 +20,6 @@ libnetworking_a_CPPFLAGS = $(AM_CPPFLAGS) $(libnetworking_CPPFLAGS)
 
 ## poll.h is not in the list because RTEMS does not have poll()
 ## and installing poll.h confuses autoconf.
-include_HEADERS = resolv.h
-
 libnetworking_a_SOURCES = opt_atalk.h opt_bdg.h opt_compat.h opt_inet6.h \
     opt_inet.h opt_ipfw.h opt_ipx.h opt_mac.h opt_mrouting.h opt_netgraph.h \
     opt_tcpdebug.h opt_ipsec.h loop.h
@@ -32,12 +28,6 @@ libnetworking_a_SOURCES += bpfilter.h
 
 # arpa
 
-include_arpadir = $(includedir)/arpa
-
-include_arpa_HEADERS = arpa/ftp.h
-include_arpa_HEADERS += arpa/nameser.h
-include_arpa_HEADERS += arpa/nameser_compat.h
-
 ## kern
 
 libnetworking_a_SOURCES += kern/kern_mib.c kern/kern_subr.c \
@@ -46,68 +36,16 @@ libnetworking_a_SOURCES += kern/kern_mib.c kern/kern_subr.c \
 
 ## machine
 
-include_machinedir = $(includedir)/machine
-
-include_machine_HEADERS = machine/_align.h
-include_machine_HEADERS += machine/cpu.h
-include_machine_HEADERS += machine/cpufunc.h
-include_machine_HEADERS += machine/in_cksum.h
-include_machine_HEADERS += machine/_kernel_lock.h
-include_machine_HEADERS += machine/vmparam.h
-
 libnetworking_a_SOURCES += machine/limits.h
 
 ## net
 
-include_netdir = $(includedir)/net
-
-include_net_HEADERS = net/bpf.h
-include_net_HEADERS += net/ethernet.h
-include_net_HEADERS += net/if_arp.h
-include_net_HEADERS += net/if_dl.h
-include_net_HEADERS += net/if_llc.h
-include_net_HEADERS += net/if_ppp.h
-include_net_HEADERS += net/if_types.h
-include_net_HEADERS += net/if_var.h
-include_net_HEADERS += net/netisr.h
-include_net_HEADERS += net/ppp_defs.h
-include_net_HEADERS += net/radix.h
-include_net_HEADERS += net/raw_cb.h
-include_net_HEADERS += net/route.h
-include_net_HEADERS += net/if_pppvar.h
-include_net_HEADERS += net/slcompress.h
-include_net_HEADERS += net/if_media.h
-include_net_HEADERS += net/ppp_comp.h
-
 libnetworking_a_SOURCES += net/if.c net/if_ethersubr.c net/if_loop.c \
     net/radix.c net/route.c net/rtsock.c net/raw_cb.c net/raw_usrreq.c \
     net/if_ppp.c net/ppp_tty.c net/slcompress.c
 
 ## netinet
 
-include_netinetdir = $(includedir)/netinet
-
-include_netinet_HEADERS = netinet/icmp_var.h
-include_netinet_HEADERS += netinet/if_ether.h
-include_netinet_HEADERS += netinet/igmp.h
-include_netinet_HEADERS += netinet/igmp_var.h
-include_netinet_HEADERS += netinet/in_pcb.h
-include_netinet_HEADERS += netinet/in_systm.h
-include_netinet_HEADERS += netinet/in_var.h
-include_netinet_HEADERS += netinet/ip.h
-include_netinet_HEADERS += netinet/ip_fw.h
-include_netinet_HEADERS += netinet/ip_icmp.h
-include_netinet_HEADERS += netinet/ip_mroute.h
-include_netinet_HEADERS += netinet/ip_var.h
-include_netinet_HEADERS += netinet/tcp_debug.h
-include_netinet_HEADERS += netinet/tcp_fsm.h
-include_netinet_HEADERS += netinet/tcp_seq.h
-include_netinet_HEADERS += netinet/tcp_timer.h
-include_netinet_HEADERS += netinet/tcp_var.h
-include_netinet_HEADERS += netinet/tcpip.h
-include_netinet_HEADERS += netinet/udp.h
-include_netinet_HEADERS += netinet/udp_var.h
-
 libnetworking_a_SOURCES += netinet/if_ether.c netinet/igmp.c netinet/in.c \
     netinet/in_cksum.c netinet/in_pcb.c netinet/in_proto.c netinet/in_rmx.c \
     netinet/ip_divert.c netinet/ip_fw.c netinet/ip_icmp.c netinet/ip_input.c \
@@ -119,40 +57,14 @@ libnetworking_a_SOURCES += netinet/if_ether.c netinet/igmp.c netinet/in.c \
 
 ## netinet6
 
-include_netinet6dir = $(includedir)/netinet6
-
 
 ## nfs
 
-include_nfsdir = $(includedir)/nfs
-
-include_nfs_HEADERS = nfs/nfsproto.h
-include_nfs_HEADERS += nfs/rpcv2.h
-include_nfs_HEADERS += nfs/xdr_subs.h
-
 libnetworking_a_SOURCES += nfs/bootp_subr.c
 
 ## nfsclient
-include_nfsclientdir = $(includedir)/nfsclient
-
-include_nfsclient_HEADERS = nfsclient/nfsargs.h
-include_nfsclient_HEADERS += nfsclient/nfsdiskless.h
-
 ## rtems
 
-include_rtemsdir = $(includedir)/rtems
-
-include_rtems_HEADERS = rtems/rtems_bsdnet.h
-include_rtems_HEADERS += rtems/rtems_bsdnet_internal.h
-include_rtems_HEADERS += rtems/dhcp.h
-include_rtems_HEADERS += rtems/rtems_dhcp_failsafe.h
-include_rtems_HEADERS += rtems/tftp.h
-include_rtems_HEADERS += rtems/ftpfs.h
-include_rtems_HEADERS += rtems/mkrootfs.h
-include_rtems_HEADERS += rtems/rtems_mii_ioctl.h
-include_rtems_HEADERS += rtems/rtems_netdb.h
-include_rtems_HEADERS += rtems/rtems_netinet_in.h
-
 libnetworking_a_SOURCES += rtems/sghostname.c \
     rtems/rtems_glue.c rtems/rtems_malloc_mbuf.c rtems/rtems_syscall.c \
     rtems/rtems_bootp.c rtems/rtems_dhcp.c rtems/rtems_dhcp_failsafe.c \
@@ -165,41 +77,9 @@ libnetworking_a_SOURCES += rtems/sghostname.c \
 
 ## sys
 
-include_sysdir = $(includedir)/sys
-
-include_sys_HEADERS = sys/callout.h
-include_sys_HEADERS += sys/conf.h
-include_sys_HEADERS += sys/domain.h
-include_sys_HEADERS += sys/kernel.h
-include_sys_HEADERS += sys/libkern.h
-include_sys_HEADERS += sys/linker_set.h
-include_sys_HEADERS += sys/malloc.h
-include_sys_HEADERS += sys/mbuf.h
-include_sys_HEADERS += sys/mount.h
-include_sys_HEADERS += sys/proc.h
-include_sys_HEADERS += sys/protosw.h
-include_sys_HEADERS += sys/reboot.h
-include_sys_HEADERS += sys/resourcevar.h
-include_sys_HEADERS += sys/selinfo.h
-include_sys_HEADERS += sys/signalvar.h
-include_sys_HEADERS += sys/socketvar.h
-include_sys_HEADERS += sys/sysctl.h
-include_sys_HEADERS += sys/systm.h
-include_sys_HEADERS += sys/ucred.h
-
 # vm
 
-include_vmdir = $(includedir)/vm
-
-include_vm_HEADERS = vm/vm.h
-include_vm_HEADERS += vm/vm_extern.h
-include_vm_HEADERS += vm/vm_kern.h
-include_vm_HEADERS += vm/vm_param.h
-
 # dev
-include_dev_miidir = $(includedir)/dev/mii
-include_dev_mii_HEADERS = dev/mii/mii.h
-
 ## libc
 
 libc_CPPFLAGS = -DNOPOLL -DNOSELECT -D__BSD_VISIBLE -D_THREAD_SAFE
@@ -207,8 +87,6 @@ libc_CPPFLAGS = -DNOPOLL -DNOSELECT -D__BSD_VISIBLE -D_THREAD_SAFE
 noinst_LIBRARIES += libc.a
 libc_a_CPPFLAGS = $(AM_CPPFLAGS) $(libc_CPPFLAGS)
 
-include_HEADERS += ifaddrs.h
-
 libc_a_SOURCES = libc/base64.c \
     libc/gethostbydns.c libc/gethostbyht.c libc/gethostbynis.c \
     libc/gethostnamadr.c libc/getnetbydns.c libc/getnetbyht.c \
@@ -259,5 +137,5 @@ endif
 
 EXTRA_DIST += $(UNUSED_FILES)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/libnetworking/headers.am b/cpukit/libnetworking/headers.am
new file mode 100644
index 0000000000..62e9e27a8b
--- /dev/null
+++ b/cpukit/libnetworking/headers.am
@@ -0,0 +1,131 @@
+## In contrast to the other headers.am files, this file must be maintained by
+## hand.
+
+include_HEADERS =
+include_HEADERS += ifaddrs.h
+include_HEADERS += loop.h
+include_HEADERS += poll.h
+include_HEADERS += resolv.h
+
+include_arpadir = $(includedir)/arpa
+include_arpa_HEADERS =
+include_arpa_HEADERS += arpa/ftp.h
+include_arpa_HEADERS += arpa/nameser.h
+include_arpa_HEADERS += arpa/nameser_compat.h
+
+include_dev_miidir = $(includedir)/dev/mii
+include_dev_mii_HEADERS =
+include_dev_mii_HEADERS += dev/mii/mii.h
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += machine/_align.h
+include_machine_HEADERS += machine/_kernel_lock.h
+include_machine_HEADERS += machine/cpu.h
+include_machine_HEADERS += machine/cpufunc.h
+include_machine_HEADERS += machine/in_cksum.h
+include_machine_HEADERS += machine/limits.h
+include_machine_HEADERS += machine/vmparam.h
+
+include_netdir = $(includedir)/net
+include_net_HEADERS =
+include_net_HEADERS += net/bpf.h
+include_net_HEADERS += net/ethernet.h
+include_net_HEADERS += net/if_arp.h
+include_net_HEADERS += net/if_dl.h
+include_net_HEADERS += net/if_llc.h
+include_net_HEADERS += net/if_media.h
+include_net_HEADERS += net/if_ppp.h
+include_net_HEADERS += net/if_pppvar.h
+include_net_HEADERS += net/if_types.h
+include_net_HEADERS += net/if_var.h
+include_net_HEADERS += net/netisr.h
+include_net_HEADERS += net/ppp_comp.h
+include_net_HEADERS += net/ppp_defs.h
+include_net_HEADERS += net/radix.h
+include_net_HEADERS += net/raw_cb.h
+include_net_HEADERS += net/route.h
+include_net_HEADERS += net/slcompress.h
+
+include_netinetdir = $(includedir)/netinet
+include_netinet_HEADERS =
+include_netinet_HEADERS += netinet/icmp_var.h
+include_netinet_HEADERS += netinet/if_ether.h
+include_netinet_HEADERS += netinet/igmp.h
+include_netinet_HEADERS += netinet/igmp_var.h
+include_netinet_HEADERS += netinet/in_pcb.h
+include_netinet_HEADERS += netinet/in_systm.h
+include_netinet_HEADERS += netinet/in_var.h
+include_netinet_HEADERS += netinet/ip.h
+include_netinet_HEADERS += netinet/ip_fw.h
+include_netinet_HEADERS += netinet/ip_icmp.h
+include_netinet_HEADERS += netinet/ip_mroute.h
+include_netinet_HEADERS += netinet/ip_var.h
+include_netinet_HEADERS += netinet/tcp_debug.h
+include_netinet_HEADERS += netinet/tcp_fsm.h
+include_netinet_HEADERS += netinet/tcp_seq.h
+include_netinet_HEADERS += netinet/tcp_timer.h
+include_netinet_HEADERS += netinet/tcp_var.h
+include_netinet_HEADERS += netinet/tcpip.h
+include_netinet_HEADERS += netinet/udp.h
+include_netinet_HEADERS += netinet/udp_var.h
+
+include_nfsdir = $(includedir)/nfs
+include_nfs_HEADERS =
+include_nfs_HEADERS += nfs/nfsproto.h
+include_nfs_HEADERS += nfs/rpcv2.h
+include_nfs_HEADERS += nfs/xdr_subs.h
+
+include_nfsclientdir = $(includedir)/nfsclient
+include_nfsclient_HEADERS =
+include_nfsclient_HEADERS += nfsclient/nfsargs.h
+include_nfsclient_HEADERS += nfsclient/nfsdiskless.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += rtems/bootp.h
+include_rtems_HEADERS += rtems/dhcp.h
+include_rtems_HEADERS += rtems/ftpfs.h
+include_rtems_HEADERS += rtems/mkrootfs.h
+include_rtems_HEADERS += rtems/rtems_bsdnet.h
+include_rtems_HEADERS += rtems/rtems_bsdnet_internal.h
+include_rtems_HEADERS += rtems/rtems_dhcp_failsafe.h
+include_rtems_HEADERS += rtems/rtems_mii_ioctl.h
+include_rtems_HEADERS += rtems/rtems_netdb.h
+include_rtems_HEADERS += rtems/rtems_netinet_in.h
+include_rtems_HEADERS += rtems/rtems_syscall.h
+include_rtems_HEADERS += rtems/tftp.h
+
+include_rtems_bsdnetdir = $(includedir)/rtems/bsdnet
+include_rtems_bsdnet_HEADERS =
+include_rtems_bsdnet_HEADERS += rtems/bsdnet/_types.h
+include_rtems_bsdnet_HEADERS += rtems/bsdnet/servers.h
+
+include_sysdir = $(includedir)/sys
+include_sys_HEADERS =
+include_sys_HEADERS += sys/callout.h
+include_sys_HEADERS += sys/conf.h
+include_sys_HEADERS += sys/domain.h
+include_sys_HEADERS += sys/kernel.h
+include_sys_HEADERS += sys/libkern.h
+include_sys_HEADERS += sys/linker_set.h
+include_sys_HEADERS += sys/malloc.h
+include_sys_HEADERS += sys/mbuf.h
+include_sys_HEADERS += sys/mount.h
+include_sys_HEADERS += sys/proc.h
+include_sys_HEADERS += sys/protosw.h
+include_sys_HEADERS += sys/reboot.h
+include_sys_HEADERS += sys/resourcevar.h
+include_sys_HEADERS += sys/selinfo.h
+include_sys_HEADERS += sys/signalvar.h
+include_sys_HEADERS += sys/socketvar.h
+include_sys_HEADERS += sys/sysctl.h
+include_sys_HEADERS += sys/systm.h
+include_sys_HEADERS += sys/ucred.h
+
+include_vmdir = $(includedir)/vm
+include_vm_HEADERS =
+include_vm_HEADERS += vm/vm.h
+include_vm_HEADERS += vm/vm_extern.h
+include_vm_HEADERS += vm/vm_kern.h
+include_vm_HEADERS += vm/vm_param.h
diff --git a/cpukit/libnetworking/preinstall.am b/cpukit/libnetworking/preinstall.am
deleted file mode 100644
index 66d018304c..0000000000
--- a/cpukit/libnetworking/preinstall.am
+++ /dev/null
@@ -1,424 +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)
-
-if LIBNETWORKING
-$(PROJECT_INCLUDE)/resolv.h: resolv.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/resolv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/resolv.h
-
-$(PROJECT_INCLUDE)/arpa/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/arpa
-	@: > $(PROJECT_INCLUDE)/arpa/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arpa/$(dirstamp)
-
-$(PROJECT_INCLUDE)/arpa/ftp.h: arpa/ftp.h $(PROJECT_INCLUDE)/arpa/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arpa/ftp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa/ftp.h
-
-$(PROJECT_INCLUDE)/arpa/nameser.h: arpa/nameser.h $(PROJECT_INCLUDE)/arpa/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arpa/nameser.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa/nameser.h
-
-$(PROJECT_INCLUDE)/arpa/nameser_compat.h: arpa/nameser_compat.h $(PROJECT_INCLUDE)/arpa/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arpa/nameser_compat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa/nameser_compat.h
-
-$(PROJECT_INCLUDE)/machine/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/machine
-	@: > $(PROJECT_INCLUDE)/machine/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/machine/$(dirstamp)
-
-$(PROJECT_INCLUDE)/machine/_align.h: machine/_align.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_align.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_align.h
-
-$(PROJECT_INCLUDE)/machine/cpu.h: machine/cpu.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/cpu.h
-
-$(PROJECT_INCLUDE)/machine/cpufunc.h: machine/cpufunc.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/cpufunc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/cpufunc.h
-
-$(PROJECT_INCLUDE)/machine/in_cksum.h: machine/in_cksum.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/in_cksum.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/in_cksum.h
-
-$(PROJECT_INCLUDE)/machine/_kernel_lock.h: machine/_kernel_lock.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_kernel_lock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_kernel_lock.h
-
-$(PROJECT_INCLUDE)/machine/vmparam.h: machine/vmparam.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/vmparam.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/vmparam.h
-
-$(PROJECT_INCLUDE)/net/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/net
-	@: > $(PROJECT_INCLUDE)/net/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/net/$(dirstamp)
-
-$(PROJECT_INCLUDE)/net/bpf.h: net/bpf.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/bpf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/bpf.h
-
-$(PROJECT_INCLUDE)/net/ethernet.h: net/ethernet.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/ethernet.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/ethernet.h
-
-$(PROJECT_INCLUDE)/net/if_arp.h: net/if_arp.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_arp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_arp.h
-
-$(PROJECT_INCLUDE)/net/if_dl.h: net/if_dl.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_dl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_dl.h
-
-$(PROJECT_INCLUDE)/net/if_llc.h: net/if_llc.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_llc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_llc.h
-
-$(PROJECT_INCLUDE)/net/if_ppp.h: net/if_ppp.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_ppp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_ppp.h
-
-$(PROJECT_INCLUDE)/net/if_types.h: net/if_types.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_types.h
-
-$(PROJECT_INCLUDE)/net/if_var.h: net/if_var.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_var.h
-
-$(PROJECT_INCLUDE)/net/netisr.h: net/netisr.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/netisr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/netisr.h
-
-$(PROJECT_INCLUDE)/net/ppp_defs.h: net/ppp_defs.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/ppp_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/ppp_defs.h
-
-$(PROJECT_INCLUDE)/net/radix.h: net/radix.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/radix.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/radix.h
-
-$(PROJECT_INCLUDE)/net/raw_cb.h: net/raw_cb.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/raw_cb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/raw_cb.h
-
-$(PROJECT_INCLUDE)/net/route.h: net/route.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/route.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/route.h
-
-$(PROJECT_INCLUDE)/net/if_pppvar.h: net/if_pppvar.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_pppvar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_pppvar.h
-
-$(PROJECT_INCLUDE)/net/slcompress.h: net/slcompress.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/slcompress.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/slcompress.h
-
-$(PROJECT_INCLUDE)/net/if_media.h: net/if_media.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_media.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_media.h
-
-$(PROJECT_INCLUDE)/net/ppp_comp.h: net/ppp_comp.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/ppp_comp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/ppp_comp.h
-
-$(PROJECT_INCLUDE)/netinet/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/netinet
-	@: > $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-
-$(PROJECT_INCLUDE)/netinet/icmp_var.h: netinet/icmp_var.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/icmp_var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/icmp_var.h
-
-$(PROJECT_INCLUDE)/netinet/if_ether.h: netinet/if_ether.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/if_ether.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/if_ether.h
-
-$(PROJECT_INCLUDE)/netinet/igmp.h: netinet/igmp.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/igmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/igmp.h
-
-$(PROJECT_INCLUDE)/netinet/igmp_var.h: netinet/igmp_var.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/igmp_var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/igmp_var.h
-
-$(PROJECT_INCLUDE)/netinet/in_pcb.h: netinet/in_pcb.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/in_pcb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/in_pcb.h
-
-$(PROJECT_INCLUDE)/netinet/in_systm.h: netinet/in_systm.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/in_systm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/in_systm.h
-
-$(PROJECT_INCLUDE)/netinet/in_var.h: netinet/in_var.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/in_var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/in_var.h
-
-$(PROJECT_INCLUDE)/netinet/ip.h: netinet/ip.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/ip.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/ip.h
-
-$(PROJECT_INCLUDE)/netinet/ip_fw.h: netinet/ip_fw.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/ip_fw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/ip_fw.h
-
-$(PROJECT_INCLUDE)/netinet/ip_icmp.h: netinet/ip_icmp.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/ip_icmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/ip_icmp.h
-
-$(PROJECT_INCLUDE)/netinet/ip_mroute.h: netinet/ip_mroute.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/ip_mroute.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/ip_mroute.h
-
-$(PROJECT_INCLUDE)/netinet/ip_var.h: netinet/ip_var.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/ip_var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/ip_var.h
-
-$(PROJECT_INCLUDE)/netinet/tcp_debug.h: netinet/tcp_debug.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcp_debug.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcp_debug.h
-
-$(PROJECT_INCLUDE)/netinet/tcp_fsm.h: netinet/tcp_fsm.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcp_fsm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcp_fsm.h
-
-$(PROJECT_INCLUDE)/netinet/tcp_seq.h: netinet/tcp_seq.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcp_seq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcp_seq.h
-
-$(PROJECT_INCLUDE)/netinet/tcp_timer.h: netinet/tcp_timer.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcp_timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcp_timer.h
-
-$(PROJECT_INCLUDE)/netinet/tcp_var.h: netinet/tcp_var.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcp_var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcp_var.h
-
-$(PROJECT_INCLUDE)/netinet/tcpip.h: netinet/tcpip.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcpip.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcpip.h
-
-$(PROJECT_INCLUDE)/netinet/udp.h: netinet/udp.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/udp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/udp.h
-
-$(PROJECT_INCLUDE)/netinet/udp_var.h: netinet/udp_var.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/udp_var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/udp_var.h
-
-$(PROJECT_INCLUDE)/netinet6/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/netinet6
-	@: > $(PROJECT_INCLUDE)/netinet6/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/netinet6/$(dirstamp)
-
-$(PROJECT_INCLUDE)/nfs/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/nfs
-	@: > $(PROJECT_INCLUDE)/nfs/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/nfs/$(dirstamp)
-
-$(PROJECT_INCLUDE)/nfs/nfsproto.h: nfs/nfsproto.h $(PROJECT_INCLUDE)/nfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nfs/nfsproto.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfs/nfsproto.h
-
-$(PROJECT_INCLUDE)/nfs/rpcv2.h: nfs/rpcv2.h $(PROJECT_INCLUDE)/nfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nfs/rpcv2.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfs/rpcv2.h
-
-$(PROJECT_INCLUDE)/nfs/xdr_subs.h: nfs/xdr_subs.h $(PROJECT_INCLUDE)/nfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nfs/xdr_subs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfs/xdr_subs.h
-
-$(PROJECT_INCLUDE)/nfsclient/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/nfsclient
-	@: > $(PROJECT_INCLUDE)/nfsclient/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/nfsclient/$(dirstamp)
-
-$(PROJECT_INCLUDE)/nfsclient/nfsargs.h: nfsclient/nfsargs.h $(PROJECT_INCLUDE)/nfsclient/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nfsclient/nfsargs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfsclient/nfsargs.h
-
-$(PROJECT_INCLUDE)/nfsclient/nfsdiskless.h: nfsclient/nfsdiskless.h $(PROJECT_INCLUDE)/nfsclient/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nfsclient/nfsdiskless.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfsclient/nfsdiskless.h
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/rtems_bsdnet.h: rtems/rtems_bsdnet.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems_bsdnet.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems_bsdnet.h
-
-$(PROJECT_INCLUDE)/rtems/rtems_bsdnet_internal.h: rtems/rtems_bsdnet_internal.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems_bsdnet_internal.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems_bsdnet_internal.h
-
-$(PROJECT_INCLUDE)/rtems/dhcp.h: rtems/dhcp.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/dhcp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/dhcp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems_dhcp_failsafe.h: rtems/rtems_dhcp_failsafe.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems_dhcp_failsafe.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems_dhcp_failsafe.h
-
-$(PROJECT_INCLUDE)/rtems/tftp.h: rtems/tftp.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/tftp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/tftp.h
-
-$(PROJECT_INCLUDE)/rtems/ftpfs.h: rtems/ftpfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ftpfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ftpfs.h
-
-$(PROJECT_INCLUDE)/rtems/mkrootfs.h: rtems/mkrootfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mkrootfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mkrootfs.h
-
-$(PROJECT_INCLUDE)/rtems/rtems_mii_ioctl.h: rtems/rtems_mii_ioctl.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems_mii_ioctl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems_mii_ioctl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems_netdb.h: rtems/rtems_netdb.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems_netdb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems_netdb.h
-
-$(PROJECT_INCLUDE)/rtems/rtems_netinet_in.h: rtems/rtems_netinet_in.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems_netinet_in.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems_netinet_in.h
-
-$(PROJECT_INCLUDE)/sys/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/sys
-	@: > $(PROJECT_INCLUDE)/sys/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sys/$(dirstamp)
-
-$(PROJECT_INCLUDE)/sys/callout.h: sys/callout.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/callout.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/callout.h
-
-$(PROJECT_INCLUDE)/sys/conf.h: sys/conf.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/conf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/conf.h
-
-$(PROJECT_INCLUDE)/sys/domain.h: sys/domain.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/domain.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/domain.h
-
-$(PROJECT_INCLUDE)/sys/kernel.h: sys/kernel.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/kernel.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/kernel.h
-
-$(PROJECT_INCLUDE)/sys/libkern.h: sys/libkern.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/libkern.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/libkern.h
-
-$(PROJECT_INCLUDE)/sys/linker_set.h: sys/linker_set.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/linker_set.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/linker_set.h
-
-$(PROJECT_INCLUDE)/sys/malloc.h: sys/malloc.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/malloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/malloc.h
-
-$(PROJECT_INCLUDE)/sys/mbuf.h: sys/mbuf.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/mbuf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/mbuf.h
-
-$(PROJECT_INCLUDE)/sys/mount.h: sys/mount.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/mount.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/mount.h
-
-$(PROJECT_INCLUDE)/sys/proc.h: sys/proc.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/proc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/proc.h
-
-$(PROJECT_INCLUDE)/sys/protosw.h: sys/protosw.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/protosw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/protosw.h
-
-$(PROJECT_INCLUDE)/sys/reboot.h: sys/reboot.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/reboot.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/reboot.h
-
-$(PROJECT_INCLUDE)/sys/resourcevar.h: sys/resourcevar.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/resourcevar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/resourcevar.h
-
-$(PROJECT_INCLUDE)/sys/selinfo.h: sys/selinfo.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/selinfo.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/selinfo.h
-
-$(PROJECT_INCLUDE)/sys/signalvar.h: sys/signalvar.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/signalvar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/signalvar.h
-
-$(PROJECT_INCLUDE)/sys/socketvar.h: sys/socketvar.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/socketvar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/socketvar.h
-
-$(PROJECT_INCLUDE)/sys/sysctl.h: sys/sysctl.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/sysctl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/sysctl.h
-
-$(PROJECT_INCLUDE)/sys/systm.h: sys/systm.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/systm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/systm.h
-
-$(PROJECT_INCLUDE)/sys/ucred.h: sys/ucred.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ucred.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ucred.h
-
-$(PROJECT_INCLUDE)/vm/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/vm
-	@: > $(PROJECT_INCLUDE)/vm/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/vm/$(dirstamp)
-
-$(PROJECT_INCLUDE)/vm/vm.h: vm/vm.h $(PROJECT_INCLUDE)/vm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/vm/vm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/vm/vm.h
-
-$(PROJECT_INCLUDE)/vm/vm_extern.h: vm/vm_extern.h $(PROJECT_INCLUDE)/vm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/vm/vm_extern.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/vm/vm_extern.h
-
-$(PROJECT_INCLUDE)/vm/vm_kern.h: vm/vm_kern.h $(PROJECT_INCLUDE)/vm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/vm/vm_kern.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/vm/vm_kern.h
-
-$(PROJECT_INCLUDE)/vm/vm_param.h: vm/vm_param.h $(PROJECT_INCLUDE)/vm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/vm/vm_param.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/vm/vm_param.h
-
-$(PROJECT_INCLUDE)/dev/mii/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/dev/mii
-	@: > $(PROJECT_INCLUDE)/dev/mii/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/dev/mii/$(dirstamp)
-
-$(PROJECT_INCLUDE)/dev/mii/mii.h: dev/mii/mii.h $(PROJECT_INCLUDE)/dev/mii/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/mii/mii.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/mii/mii.h
-
-$(PROJECT_INCLUDE)/ifaddrs.h: ifaddrs.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ifaddrs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ifaddrs.h
-endif
diff --git a/cpukit/libnetworking/sys/poll.h b/cpukit/libnetworking/sys/poll.h
deleted file mode 100644
index 9ea42b9ddf..0000000000
--- a/cpukit/libnetworking/sys/poll.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * Copyright (c) 1997 Peter Wemm <peter@freebsd.org>
- * All rights reserved.
- *
- * 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * 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.
- *
- * $FreeBSD: src/sys/sys/poll.h,v 1.13 2002/07/10 04:47:25 mike Exp $
- */
-
-#ifndef _SYS_POLL_H_
-#define	_SYS_POLL_H_
-
-#include <sys/cdefs.h>
-
-/*
- * This file is intended to be compatible with the traditional poll.h.
- */
-
-typedef	unsigned int	nfds_t;
-
-/*
- * This structure is passed as an array to poll(2).
- */
-struct pollfd {
-	int	fd;		/* which file descriptor to poll */
-	short	events;		/* events we are interested in */
-	short	revents;	/* events found on return */
-};
-
-/*
- * Requestable events.  If poll(2) finds any of these set, they are
- * copied to revents on return.
- * XXX Note that FreeBSD doesn't make much distinction between POLLPRI
- * and POLLRDBAND since none of the file types have distinct priority
- * bands - and only some have an urgent "mode".
- * XXX Note POLLIN isn't really supported in true SVSV terms.  Under SYSV
- * POLLIN includes all of normal, band and urgent data.  Most poll handlers
- * on FreeBSD only treat it as "normal" data.
- */
-#define	POLLIN		0x0001		/* any readable data available */
-#define	POLLPRI		0x0002		/* OOB/Urgent readable data */
-#define	POLLOUT		0x0004		/* file descriptor is writeable */
-#define	POLLRDNORM	0x0040		/* non-OOB/URG data available */
-#define	POLLWRNORM	POLLOUT		/* no write type differentiation */
-#define	POLLRDBAND	0x0080		/* OOB/Urgent readable data */
-#define	POLLWRBAND	0x0100		/* OOB/Urgent data can be written */
-
-#if __BSD_VISIBLE
-/* General FreeBSD extension (currently only supported for sockets): */
-#define	POLLINIGNEOF	0x2000		/* like POLLIN, except ignore EOF */
-#endif
-
-/*
- * These events are set if they occur regardless of whether they were
- * requested.
- */
-#define	POLLERR		0x0008		/* some poll error occurred */
-#define	POLLHUP		0x0010		/* file descriptor was "hung up" */
-#define	POLLNVAL	0x0020		/* requested events "invalid" */
-
-#if __BSD_VISIBLE
-
-#define	POLLSTANDARD	(POLLIN|POLLPRI|POLLOUT|POLLRDNORM|POLLRDBAND|\
-			 POLLWRBAND|POLLERR|POLLHUP|POLLNVAL)
-
-/*
- * Request that poll() wait forever.
- * XXX in SYSV, this is defined in stropts.h, which is not included
- * by poll.h.
- */
-#define	INFTIM		(-1)
-
-#endif
-
-#ifndef _KERNEL
-
-__BEGIN_DECLS
-int	poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_POLL_H_ */
diff --git a/cpukit/libpci/Makefile.am b/cpukit/libpci/Makefile.am
index cff25b35c0..f762d39f8e 100644
--- a/cpukit/libpci/Makefile.am
+++ b/cpukit/libpci/Makefile.am
@@ -6,14 +6,6 @@ if LIBPCI
 EXTRA_DIST=
 
 ## PCI Library
-include_HEADERS = pci.h
-include_pcidir = $(includedir)/pci
-include_pci_HEADERS =	pci/access.h pci/cfg.h \
-			pci/cfg_auto.h pci/cfg_static.h \
-			pci/cfg_peripheral.h pci/cfg_read.h \
-			pci/ids.h pci/ids_extra.h pci/irq.h \
-			pci/pcireg.h
-
 noinst_LIBRARIES = libpci.a
 
 libpci_a_SOURCES  = pci_access.c
@@ -39,10 +31,6 @@ libpci_a_SOURCES += pci_print.c
 
 # Driver manager PCI bus
 libpci_a_SOURCES += pci_bus.c
-include_drvmgrdir = $(includedir)/drvmgr
-include_drvmgr_HEADERS = pci_bus.h
-
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libpci/preinstall.am b/cpukit/libpci/preinstall.am
deleted file mode 100644
index b9a8dd0400..0000000000
--- a/cpukit/libpci/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)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-if LIBPCI
-$(PROJECT_INCLUDE)/pci.h: pci.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci.h
-
-$(PROJECT_INCLUDE)/pci/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/pci
-	@: > $(PROJECT_INCLUDE)/pci/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/pci/$(dirstamp)
-
-$(PROJECT_INCLUDE)/pci/access.h: pci/access.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/access.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/access.h
-
-$(PROJECT_INCLUDE)/pci/cfg.h: pci/cfg.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/cfg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/cfg.h
-
-$(PROJECT_INCLUDE)/pci/cfg_auto.h: pci/cfg_auto.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/cfg_auto.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/cfg_auto.h
-
-$(PROJECT_INCLUDE)/pci/cfg_static.h: pci/cfg_static.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/cfg_static.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/cfg_static.h
-
-$(PROJECT_INCLUDE)/pci/cfg_peripheral.h: pci/cfg_peripheral.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/cfg_peripheral.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/cfg_peripheral.h
-
-$(PROJECT_INCLUDE)/pci/cfg_read.h: pci/cfg_read.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/cfg_read.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/cfg_read.h
-
-$(PROJECT_INCLUDE)/pci/ids.h: pci/ids.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/ids.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/ids.h
-
-$(PROJECT_INCLUDE)/pci/ids_extra.h: pci/ids_extra.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/ids_extra.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/ids_extra.h
-
-$(PROJECT_INCLUDE)/pci/irq.h: pci/irq.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/irq.h
-
-$(PROJECT_INCLUDE)/pci/pcireg.h: pci/pcireg.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/pcireg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/pcireg.h
-
-$(PROJECT_INCLUDE)/drvmgr/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/drvmgr
-	@: > $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-
-$(PROJECT_INCLUDE)/drvmgr/pci_bus.h: pci_bus.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/pci_bus.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/pci_bus.h
-endif
diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am
index edc760fc7d..92a76ba7ff 100644
--- a/cpukit/librpc/Makefile.am
+++ b/cpukit/librpc/Makefile.am
@@ -4,26 +4,6 @@ include $(top_srcdir)/automake/compile.am
 EXTRA_DIST =
 
 if LIBRPC
-include_rpcdir = $(includedir)/rpc
-
-include_rpc_HEADERS = include/rpc/auth.h
-include_rpc_HEADERS += include/rpc/auth_unix.h
-include_rpc_HEADERS += include/rpc/clnt.h
-include_rpc_HEADERS += include/rpc/clnt_stat.h
-include_rpc_HEADERS += include/rpc/clnt_soc.h
-include_rpc_HEADERS += include/rpc/svc.h
-include_rpc_HEADERS += include/rpc/svc_auth.h
-include_rpc_HEADERS += include/rpc/svc_soc.h
-include_rpc_HEADERS += include/rpc/pmap_clnt.h
-include_rpc_HEADERS += include/rpc/pmap_prot.h
-include_rpc_HEADERS += include/rpc/pmap_rmt.h
-include_rpc_HEADERS += include/rpc/rpc.h
-include_rpc_HEADERS += include/rpc/types.h
-include_rpc_HEADERS += include/rpc/xdr.h
-include_rpc_HEADERS += include/rpc/rpc_com.h
-include_rpc_HEADERS += include/rpc/rpc_msg.h
-include_rpc_HEADERS += include/rpc/rpcent.h
-
 man_MANS =
 
 noinst_LIBRARIES = libxdr.a
@@ -90,5 +70,4 @@ EXTRA_DIST += include/rpcsvc/bootparam_prot.x include/rpcsvc/crypt.x \
     include/rpcsvc/ypupdate_prot.x include/rpcsvc/yp.x \
     include/rpcsvc/ypxfrd.x
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/librpc/preinstall.am b/cpukit/librpc/preinstall.am
deleted file mode 100644
index 9dd5969507..0000000000
--- a/cpukit/librpc/preinstall.am
+++ /dev/null
@@ -1,89 +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 LIBRPC
-$(PROJECT_INCLUDE)/rpc/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rpc
-	@: > $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rpc/auth.h: include/rpc/auth.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/auth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/auth.h
-
-$(PROJECT_INCLUDE)/rpc/auth_unix.h: include/rpc/auth_unix.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/auth_unix.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/auth_unix.h
-
-$(PROJECT_INCLUDE)/rpc/clnt.h: include/rpc/clnt.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/clnt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/clnt.h
-
-$(PROJECT_INCLUDE)/rpc/clnt_stat.h: include/rpc/clnt_stat.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/clnt_stat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/clnt_stat.h
-
-$(PROJECT_INCLUDE)/rpc/clnt_soc.h: include/rpc/clnt_soc.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/clnt_soc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/clnt_soc.h
-
-$(PROJECT_INCLUDE)/rpc/svc.h: include/rpc/svc.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/svc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/svc.h
-
-$(PROJECT_INCLUDE)/rpc/svc_auth.h: include/rpc/svc_auth.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/svc_auth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/svc_auth.h
-
-$(PROJECT_INCLUDE)/rpc/svc_soc.h: include/rpc/svc_soc.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/svc_soc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/svc_soc.h
-
-$(PROJECT_INCLUDE)/rpc/pmap_clnt.h: include/rpc/pmap_clnt.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/pmap_clnt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/pmap_clnt.h
-
-$(PROJECT_INCLUDE)/rpc/pmap_prot.h: include/rpc/pmap_prot.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/pmap_prot.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/pmap_prot.h
-
-$(PROJECT_INCLUDE)/rpc/pmap_rmt.h: include/rpc/pmap_rmt.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/pmap_rmt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/pmap_rmt.h
-
-$(PROJECT_INCLUDE)/rpc/rpc.h: include/rpc/rpc.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/rpc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/rpc.h
-
-$(PROJECT_INCLUDE)/rpc/types.h: include/rpc/types.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/types.h
-
-$(PROJECT_INCLUDE)/rpc/xdr.h: include/rpc/xdr.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/xdr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/xdr.h
-
-$(PROJECT_INCLUDE)/rpc/rpc_com.h: include/rpc/rpc_com.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/rpc_com.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/rpc_com.h
-
-$(PROJECT_INCLUDE)/rpc/rpc_msg.h: include/rpc/rpc_msg.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/rpc_msg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/rpc_msg.h
-
-$(PROJECT_INCLUDE)/rpc/rpcent.h: include/rpc/rpcent.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/rpcent.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/rpcent.h
-endif
diff --git a/cpukit/libstdthreads/Makefile.am b/cpukit/libstdthreads/Makefile.am
index b6b9138063..7d6192724d 100644
--- a/cpukit/libstdthreads/Makefile.am
+++ b/cpukit/libstdthreads/Makefile.am
@@ -1,7 +1,5 @@
 include $(top_srcdir)/automake/compile.am
 
-include_HEADERS =
-
 noinst_LIBRARIES = libstdthreads.a
 
 libstdthreads_a_CFLAGS = -std=c11
diff --git a/cpukit/mghttpd/Makefile.am b/cpukit/mghttpd/Makefile.am
index bb5f84ba16..c3e605c679 100644
--- a/cpukit/mghttpd/Makefile.am
+++ b/cpukit/mghttpd/Makefile.am
@@ -2,17 +2,18 @@ include $(top_srcdir)/automake/compile.am
 
 if LIBNETWORKING
 if HAS_PTHREADS
-include_mghttpddir = $(includedir)/mghttpd
-
 project_lib_LIBRARIES = libmghttpd.a
+
+$(PROJECT_LIB)/libmghttpd.a: libmghttpd.a
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/libmghttpd.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/libmghttpd.a
+
 libmghttpd_a_CPPFLAGS = $(AM_CPPFLAGS)
 # libmghttpd_a_CPPFLAGS += -DHAVE_MD5
 libmghttpd_a_CPPFLAGS += -DNO_SSL -DNO_POPEN -DNO_CGI -DUSE_WEBSOCKET
 
 libmghttpd_a_SOURCES = mongoose.c mongoose.h
-include_mghttpd_HEADERS = mongoose.h
 endif
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/mghttpd/preinstall.am b/cpukit/mghttpd/preinstall.am
deleted file mode 100644
index b63c98898c..0000000000
--- a/cpukit/mghttpd/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)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-if LIBNETWORKING
-if HAS_PTHREADS
-$(PROJECT_INCLUDE)/mghttpd/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mghttpd
-	@: > $(PROJECT_INCLUDE)/mghttpd/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mghttpd/$(dirstamp)
-
-$(PROJECT_LIB)/libmghttpd.a: libmghttpd.a $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/libmghttpd.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libmghttpd.a
-
-$(PROJECT_INCLUDE)/mghttpd/mongoose.h: mongoose.h $(PROJECT_INCLUDE)/mghttpd/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mghttpd/mongoose.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mghttpd/mongoose.h
-endif
-endif
diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index 351dc714f8..1c127e1ae2 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -11,46 +11,10 @@ libposix_a_SOURCES =
 libposix_a_SOURCES += src/nanosleep.c src/clockgettime.c src/clocksettime.c \
     src/clockgetres.c src/sysconf.c
 
-include_rtems_posixdir = $(includedir)/rtems/posix
-
-include_rtems_posix_HEADERS = include/rtems/posix/sigset.h
-
 ## Some POSIX threads features are needed all the time
-include_rtems_posix_HEADERS += include/rtems/posix/barrierimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/condimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/key.h
-include_rtems_posix_HEADERS += include/rtems/posix/keyimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/config.h
-include_rtems_posix_HEADERS += include/rtems/posix/muteximpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/posixapi.h
-include_rtems_posix_HEADERS += include/rtems/posix/priorityimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/pthreadattrimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/rwlockimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/semaphore.h
-include_rtems_posix_HEADERS += include/rtems/posix/semaphoreimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/spinlockimpl.h
-
 if HAS_PTHREADS
 # include
-include_HEADERS = include/aio.h
-include_HEADERS += include/mqueue.h
-
 # include/rtems/posix
-include_rtems_posix_HEADERS += include/rtems/posix/aio_misc.h
-include_rtems_posix_HEADERS += include/rtems/posix/mmanimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/mqueue.h
-include_rtems_posix_HEADERS += include/rtems/posix/mqueueimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/psignal.h
-include_rtems_posix_HEADERS += include/rtems/posix/psignalimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/pthread.h
-include_rtems_posix_HEADERS += include/rtems/posix/pthreadimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/ptimer.h
-include_rtems_posix_HEADERS += include/rtems/posix/shm.h
-include_rtems_posix_HEADERS += include/rtems/posix/shmimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/threadsup.h
-include_rtems_posix_HEADERS += include/rtems/posix/timer.h
-include_rtems_posix_HEADERS += include/rtems/posix/timerimpl.h
-
 ## src
 libposix_a_SOURCES += src/aio_cancel.c src/aio_error.c src/aio_fsync.c \
     src/aio_read.c src/aio_return.c src/aio_suspend.c src/aio_write.c \
@@ -236,5 +200,4 @@ endif
 libposix_a_SOURCES += src/sched_getprioritymin.c
 libposix_a_SOURCES += src/sched_getprioritymax.c
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/posix/preinstall.am b/cpukit/posix/preinstall.am
deleted file mode 100644
index d96cbf75a7..0000000000
--- a/cpukit/posix/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)/rtems/posix/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/posix
-	@: > $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/posix/sigset.h: include/rtems/posix/sigset.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/sigset.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/sigset.h
-
-$(PROJECT_INCLUDE)/rtems/posix/barrierimpl.h: include/rtems/posix/barrierimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/barrierimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/barrierimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/condimpl.h: include/rtems/posix/condimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/condimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/condimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/key.h: include/rtems/posix/key.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/key.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/key.h
-
-$(PROJECT_INCLUDE)/rtems/posix/keyimpl.h: include/rtems/posix/keyimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/keyimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/keyimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/config.h: include/rtems/posix/config.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/config.h
-
-$(PROJECT_INCLUDE)/rtems/posix/muteximpl.h: include/rtems/posix/muteximpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/muteximpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/muteximpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/posixapi.h: include/rtems/posix/posixapi.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/posixapi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/posixapi.h
-
-$(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h: include/rtems/posix/priorityimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/pthreadattrimpl.h: include/rtems/posix/pthreadattrimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/pthreadattrimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/pthreadattrimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/rwlockimpl.h: include/rtems/posix/rwlockimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/rwlockimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/rwlockimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/semaphore.h: include/rtems/posix/semaphore.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/semaphore.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/semaphore.h
-
-$(PROJECT_INCLUDE)/rtems/posix/semaphoreimpl.h: include/rtems/posix/semaphoreimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/semaphoreimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/semaphoreimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/spinlockimpl.h: include/rtems/posix/spinlockimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/spinlockimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/spinlockimpl.h
-
-if HAS_PTHREADS
-$(PROJECT_INCLUDE)/aio.h: include/aio.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/aio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/aio.h
-
-$(PROJECT_INCLUDE)/mqueue.h: include/mqueue.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mqueue.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mqueue.h
-
-$(PROJECT_INCLUDE)/rtems/posix/aio_misc.h: include/rtems/posix/aio_misc.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/aio_misc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/aio_misc.h
-
-$(PROJECT_INCLUDE)/rtems/posix/mmanimpl.h: include/rtems/posix/mmanimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mmanimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mmanimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/mqueue.h: include/rtems/posix/mqueue.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mqueue.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mqueue.h
-
-$(PROJECT_INCLUDE)/rtems/posix/mqueueimpl.h: include/rtems/posix/mqueueimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mqueueimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mqueueimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/psignal.h: include/rtems/posix/psignal.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/psignal.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/psignal.h
-
-$(PROJECT_INCLUDE)/rtems/posix/psignalimpl.h: include/rtems/posix/psignalimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/psignalimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/psignalimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/pthread.h: include/rtems/posix/pthread.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/pthread.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/pthread.h
-
-$(PROJECT_INCLUDE)/rtems/posix/pthreadimpl.h: include/rtems/posix/pthreadimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/pthreadimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/pthreadimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/ptimer.h: include/rtems/posix/ptimer.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/ptimer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/ptimer.h
-
-$(PROJECT_INCLUDE)/rtems/posix/shm.h: include/rtems/posix/shm.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/shm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/shm.h
-
-$(PROJECT_INCLUDE)/rtems/posix/shmimpl.h: include/rtems/posix/shmimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/shmimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/shmimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/threadsup.h: include/rtems/posix/threadsup.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/threadsup.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/threadsup.h
-
-$(PROJECT_INCLUDE)/rtems/posix/timer.h: include/rtems/posix/timer.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/timer.h
-
-$(PROJECT_INCLUDE)/rtems/posix/timerimpl.h: include/rtems/posix/timerimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/timerimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/timerimpl.h
-endif
diff --git a/cpukit/pppd/Makefile.am b/cpukit/pppd/Makefile.am
index 2cf38edc69..53a05761f4 100644
--- a/cpukit/pppd/Makefile.am
+++ b/cpukit/pppd/Makefile.am
@@ -1,10 +1,12 @@
 include $(top_srcdir)/automake/compile.am
 
 if LIBNETWORKING
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtemspppd.h rtemsdialer.h
-
 project_lib_LIBRARIES = libpppd.a
+
+$(PROJECT_LIB)/libpppd.a: libpppd.a
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/libpppd.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/libpppd.a
+
 libpppd_a_SOURCES = auth.c ccp.c ccp.h chap.c chap.h chap_ms.c chap_ms.h \
     chat.c demand.c fsm.c fsm.h ipcp.c ipcp.h lcp.c lcp.h magic.c magic.h \
     options.c upap.c upap.h utils.c sys-rtems.c \
@@ -13,5 +15,4 @@ libpppd_a_SOURCES = auth.c ccp.c ccp.h chap.c chap.h chap_ms.c chap_ms.h \
 libpppd_a_CPPFLAGS = $(AM_CPPFLAGS) -D__BSD_VISIBLE -I$(srcdir)/../libmd
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/pppd/preinstall.am b/cpukit/pppd/preinstall.am
deleted file mode 100644
index 19f4bc1dda..0000000000
--- a/cpukit/pppd/preinstall.am
+++ /dev/null
@@ -1,43 +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)
-
-if LIBNETWORKING
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/rtemspppd.h: rtemspppd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtemspppd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtemspppd.h
-
-$(PROJECT_INCLUDE)/rtems/rtemsdialer.h: rtemsdialer.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtemsdialer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtemsdialer.h
-
-$(PROJECT_LIB)/libpppd.a: libpppd.a $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/libpppd.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libpppd.a
-endif
diff --git a/cpukit/preinstall.am b/cpukit/preinstall.am
deleted file mode 100644
index fd26535031..0000000000
--- a/cpukit/preinstall.am
+++ /dev/null
@@ -1,751 +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)/endian.h: include/endian.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/endian.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/endian.h
-
-$(PROJECT_INCLUDE)/zconf.h: include/zconf.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zconf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/zconf.h
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/uuid/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/uuid
-	@: > $(PROJECT_INCLUDE)/uuid/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/uuid/$(dirstamp)
-
-$(PROJECT_INCLUDE)/uuid/uuid.h: libmisc/uuid/uuid.h $(PROJECT_INCLUDE)/uuid/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uuid/uuid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/uuid/uuid.h
-
-$(PROJECT_INCLUDE)/utf8proc/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/utf8proc
-	@: > $(PROJECT_INCLUDE)/utf8proc/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/utf8proc/$(dirstamp)
-
-$(PROJECT_INCLUDE)/utf8proc/utf8proc.h: libmisc/utf8proc/utf8proc.h $(PROJECT_INCLUDE)/utf8proc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/utf8proc/utf8proc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/utf8proc/utf8proc.h
-
-$(PROJECT_INCLUDE)/sys/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/sys
-	@: > $(PROJECT_INCLUDE)/sys/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sys/$(dirstamp)
-
-$(PROJECT_INCLUDE)/crypt.h: include/crypt.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/crypt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/crypt.h
-
-$(PROJECT_INCLUDE)/memory.h: include/memory.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/memory.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/memory.h
-
-$(PROJECT_INCLUDE)/xz.h: libmisc/xz/xz.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/xz.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/xz.h
-
-$(PROJECT_INCLUDE)/sys/event.h: libcsupport/include/sys/event.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/event.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/event.h
-
-$(PROJECT_INCLUDE)/sys/poll.h: libcsupport/include/sys/poll.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/poll.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/poll.h
-
-$(PROJECT_INCLUDE)/sys/statvfs.h: libcsupport/include/sys/statvfs.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/statvfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/statvfs.h
-
-$(PROJECT_INCLUDE)/sys/utsname.h: libcsupport/include/sys/utsname.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/utsname.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/utsname.h
-
-$(PROJECT_INCLUDE)/sys/endian.h: include/sys/endian.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/endian.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/endian.h
-
-$(PROJECT_INCLUDE)/sys/priority.h: include/sys/priority.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/priority.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/priority.h
-
-if LIBNETWORKING
-$(PROJECT_INCLUDE)/rtems/bsdnet/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/bsdnet
-	@: > $(PROJECT_INCLUDE)/rtems/bsdnet/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/bsdnet/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/bsdnet/servers.h: libnetworking/rtems/bsdnet/servers.h $(PROJECT_INCLUDE)/rtems/bsdnet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bsdnet/servers.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bsdnet/servers.h
-
-$(PROJECT_INCLUDE)/rtems/bsdnet/_types.h: libnetworking/rtems/bsdnet/_types.h $(PROJECT_INCLUDE)/rtems/bsdnet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bsdnet/_types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bsdnet/_types.h
-endif
-if LIBDL
-$(PROJECT_INCLUDE)/dlfcn.h: libdl/dlfcn.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dlfcn.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dlfcn.h
-
-$(PROJECT_INCLUDE)/link.h: libdl/include/link.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/link.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/link.h
-
-$(PROJECT_INCLUDE)/link_elf.h: libdl/include/link_elf.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/link_elf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/link_elf.h
-
-$(PROJECT_INCLUDE)/sys/cdefs_elf.h: libdl/include/sys/cdefs_elf.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/cdefs_elf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/cdefs_elf.h
-
-$(PROJECT_INCLUDE)/sys/exec_elf.h: libdl/include/sys/exec_elf.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/exec_elf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/exec_elf.h
-
-$(PROJECT_INCLUDE)/machine/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/machine
-	@: > $(PROJECT_INCLUDE)/machine/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/machine/$(dirstamp)
-
-$(PROJECT_INCLUDE)/machine/elf_machdep.h: libdl/include/arch/@RTEMS_CPU@/machine/elf_machdep.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/elf_machdep.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/elf_machdep.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/rtl
-	@: > $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/rtl/dlfcn-shell.h: libdl/dlfcn-shell.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/dlfcn-shell.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/dlfcn-shell.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl.h: libdl/rtl.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-allocator.h: libdl/rtl-allocator.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-allocator.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-allocator.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-fwd.h: libdl/rtl-obj-fwd.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-fwd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-fwd.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-fwd.h: libdl/rtl-fwd.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-fwd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-fwd.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-obj.h: libdl/rtl-obj.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-cache.h: libdl/rtl-obj-cache.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-cache.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-cache.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-comp.h: libdl/rtl-obj-comp.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-comp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-comp.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-unresolved.h: libdl/rtl-unresolved.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-unresolved.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-unresolved.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-indirect-ptr.h: libdl/rtl-indirect-ptr.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-indirect-ptr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-indirect-ptr.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-sym.h: libdl/rtl-sym.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-sym.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-sym.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-trace.h: libdl/rtl-trace.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-trace.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-trace.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rap.h: libdl/rap.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rap.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rap.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rap-shell.h: libdl/rap-shell.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rap-shell.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rap-shell.h
-endif
-if LIBDEBUGGER
-$(PROJECT_INCLUDE)/rtems/rtems-debugger.h: libdebugger/rtems-debugger.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems-debugger.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems-debugger.h
-
-$(PROJECT_INCLUDE)/rtems/debugger/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/debugger
-	@: > $(PROJECT_INCLUDE)/rtems/debugger/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/debugger/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/debugger/rtems-debugger-server.h: libdebugger/rtems-debugger-server.h $(PROJECT_INCLUDE)/rtems/debugger/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/debugger/rtems-debugger-server.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/debugger/rtems-debugger-server.h
-
-$(PROJECT_INCLUDE)/rtems/debugger/rtems-debugger-remote.h: libdebugger/rtems-debugger-remote.h $(PROJECT_INCLUDE)/rtems/debugger/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/debugger/rtems-debugger-remote.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/debugger/rtems-debugger-remote.h
-endif
-$(PROJECT_INCLUDE)/rtems/bspIo.h: include/rtems/bspIo.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bspIo.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bspIo.h
-
-$(PROJECT_INCLUDE)/rtems/inttypes.h: include/rtems/inttypes.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/inttypes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/inttypes.h
-
-$(PROJECT_INCLUDE)/rtems/print.h: include/rtems/print.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/print.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/print.h
-
-$(PROJECT_INCLUDE)/rtems/printer.h: include/rtems/printer.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/printer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/printer.h
-
-$(PROJECT_INCLUDE)/rtems/userenv.h: include/rtems/userenv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/userenv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/userenv.h
-
-$(PROJECT_INCLUDE)/rtems/fs.h: include/rtems/fs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fs.h
-
-if !LIBPCI
-$(PROJECT_INCLUDE)/rtems/pci.h: include/rtems/pci.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/pci.h
-endif
-$(PROJECT_INCLUDE)/rtems/concat.h: include/rtems/concat.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/concat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/concat.h
-
-$(PROJECT_INCLUDE)/rtems/status-checks.h: include/rtems/status-checks.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/status-checks.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/status-checks.h
-
-$(PROJECT_INCLUDE)/rtems/endian.h: include/rtems/endian.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/endian.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/endian.h
-
-$(PROJECT_INCLUDE)/rtems/btimer.h: include/rtems/btimer.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/btimer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/btimer.h
-
-$(PROJECT_INCLUDE)/rtems/console.h: include/rtems/console.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/console.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/console.h
-
-$(PROJECT_INCLUDE)/rtems/clockdrv.h: include/rtems/clockdrv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/clockdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/clockdrv.h
-
-$(PROJECT_INCLUDE)/rtems/framebuffer.h: include/rtems/framebuffer.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/framebuffer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/framebuffer.h
-
-$(PROJECT_INCLUDE)/rtems/rtc.h: include/rtems/rtc.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtc.h
-
-$(PROJECT_INCLUDE)/rtems/watchdogdrv.h: include/rtems/watchdogdrv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/watchdogdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/watchdogdrv.h
-
-$(PROJECT_INCLUDE)/rtems/irq.h: include/rtems/irq.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/irq.h
-
-$(PROJECT_INCLUDE)/rtems/irq-extension.h: include/rtems/irq-extension.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/irq-extension.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/irq-extension.h
-
-$(PROJECT_INCLUDE)/rtems/imfs.h: libfs/src/imfs/imfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/imfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/imfs.h
-
-$(PROJECT_INCLUDE)/rtems/pipe.h: libfs/src/pipe/pipe.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/pipe.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/pipe.h
-
-$(PROJECT_INCLUDE)/rtems/devfs.h: libfs/src/devfs/devfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/devfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/devfs.h
-
-if LIBDOSFS
-$(PROJECT_INCLUDE)/rtems/dosfs.h: libfs/src/dosfs/dosfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/dosfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/dosfs.h
-endif
-$(PROJECT_INCLUDE)/rtems/rtems-rfs.h: libfs/src/rfs/rtems-rfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems-rfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems-rfs.h
-
-$(PROJECT_INCLUDE)/rtems/rtems-rfs-format.h: libfs/src/rfs/rtems-rfs-format.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems-rfs-format.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems-rfs-format.h
-
-$(PROJECT_INCLUDE)/rtems/rtems-rfs-shell.h: libfs/src/rfs/rtems-rfs-shell.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems-rfs-shell.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems-rfs-shell.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/rfs
-	@: > $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-bitmaps.h: libfs/src/rfs/rtems-rfs-bitmaps.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-bitmaps.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-bitmaps.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-block-pos.h: libfs/src/rfs/rtems-rfs-block-pos.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-block-pos.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-block-pos.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-block.h: libfs/src/rfs/rtems-rfs-block.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-block.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-block.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-buffer.h: libfs/src/rfs/rtems-rfs-buffer.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-buffer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-buffer.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-data.h: libfs/src/rfs/rtems-rfs-data.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-data.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-data.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-dir.h: libfs/src/rfs/rtems-rfs-dir.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-dir.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-dir.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-dir-hash.h: libfs/src/rfs/rtems-rfs-dir-hash.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-dir-hash.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-dir-hash.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file.h: libfs/src/rfs/rtems-rfs-file.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file-system-fwd.h: libfs/src/rfs/rtems-rfs-file-system-fwd.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file-system-fwd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file-system-fwd.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file-system.h: libfs/src/rfs/rtems-rfs-file-system.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file-system.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file-system.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-group.h: libfs/src/rfs/rtems-rfs-group.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-group.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-group.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-inode.h: libfs/src/rfs/rtems-rfs-inode.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-inode.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-inode.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-link.h: libfs/src/rfs/rtems-rfs-link.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-link.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-link.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-mutex.h: libfs/src/rfs/rtems-rfs-mutex.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-mutex.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-mutex.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-trace.h: libfs/src/rfs/rtems-rfs-trace.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-trace.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-trace.h
-
-$(PROJECT_INCLUDE)/rtems/jffs2.h: libfs/src/jffs2/include/rtems/jffs2.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/jffs2.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/jffs2.h
-
-$(PROJECT_INCLUDE)/rtems/bdbuf.h: libblock/include/rtems/bdbuf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bdbuf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bdbuf.h
-
-$(PROJECT_INCLUDE)/rtems/blkdev.h: libblock/include/rtems/blkdev.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/blkdev.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/blkdev.h
-
-$(PROJECT_INCLUDE)/rtems/diskdevs.h: libblock/include/rtems/diskdevs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/diskdevs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/diskdevs.h
-
-$(PROJECT_INCLUDE)/rtems/flashdisk.h: libblock/include/rtems/flashdisk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/flashdisk.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/flashdisk.h
-
-$(PROJECT_INCLUDE)/rtems/ramdisk.h: libblock/include/rtems/ramdisk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ramdisk.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ramdisk.h
-
-$(PROJECT_INCLUDE)/rtems/nvdisk.h: libblock/include/rtems/nvdisk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/nvdisk.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/nvdisk.h
-
-$(PROJECT_INCLUDE)/rtems/nvdisk-sram.h: libblock/include/rtems/nvdisk-sram.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/nvdisk-sram.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/nvdisk-sram.h
-
-$(PROJECT_INCLUDE)/rtems/sparse-disk.h: libblock/include/rtems/sparse-disk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/sparse-disk.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/sparse-disk.h
-
-$(PROJECT_INCLUDE)/rtems/ide_part_table.h: libblock/include/rtems/ide_part_table.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ide_part_table.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ide_part_table.h
-
-$(PROJECT_INCLUDE)/rtems/bdpart.h: libblock/include/rtems/bdpart.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bdpart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bdpart.h
-
-$(PROJECT_INCLUDE)/rtems/media.h: libblock/include/rtems/media.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/media.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/media.h
-
-if LIBNETWORKING
-$(PROJECT_INCLUDE)/rtems/ftpd.h: ftpd/ftpd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ftpd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ftpd.h
-endif
-$(PROJECT_INCLUDE)/rtems/bspcmdline.h: libmisc/bspcmdline/bspcmdline.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bspcmdline.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bspcmdline.h
-
-$(PROJECT_INCLUDE)/rtems/capture.h: libmisc/capture/capture.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/capture.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/capture.h
-
-$(PROJECT_INCLUDE)/rtems/capture-cli.h: libmisc/capture/capture-cli.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/capture-cli.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/capture-cli.h
-
-$(PROJECT_INCLUDE)/rtems/captureimpl.h: libmisc/capture/captureimpl.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/captureimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/captureimpl.h
-
-$(PROJECT_INCLUDE)/rtems/trace/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/trace
-	@: > $(PROJECT_INCLUDE)/rtems/trace/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/trace/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/trace/rtems-trace-buffer-vars.h: libmisc/capture/rtems-trace-buffer-vars.h $(PROJECT_INCLUDE)/rtems/trace/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/trace/rtems-trace-buffer-vars.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/trace/rtems-trace-buffer-vars.h
-
-$(PROJECT_INCLUDE)/rtems/cpuuse.h: libmisc/cpuuse/cpuuse.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/cpuuse.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/cpuuse.h
-
-$(PROJECT_INCLUDE)/rtems/devnull.h: libmisc/devnull/devnull.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/devnull.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/devnull.h
-
-$(PROJECT_INCLUDE)/rtems/devzero.h: libmisc/devnull/devzero.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/devzero.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/devzero.h
-
-$(PROJECT_INCLUDE)/rtems/dumpbuf.h: libmisc/dumpbuf/dumpbuf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/dumpbuf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/dumpbuf.h
-
-$(PROJECT_INCLUDE)/rtems/rtems-fdt.h: libmisc/rtems-fdt/rtems-fdt.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems-fdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems-fdt.h
-
-$(PROJECT_INCLUDE)/rtems/rtems-fdt-shell.h: libmisc/rtems-fdt/rtems-fdt-shell.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems-fdt-shell.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems-fdt-shell.h
-
-$(PROJECT_INCLUDE)/rtems/monitor.h: libmisc/monitor/monitor.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/monitor.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/monitor.h
-
-$(PROJECT_INCLUDE)/rtems/fb.h: libmisc/fb/fb.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fb.h
-
-$(PROJECT_INCLUDE)/rtems/mw_uid.h: libmisc/fb/mw_uid.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mw_uid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mw_uid.h
-
-$(PROJECT_INCLUDE)/rtems/mouse_parser.h: libmisc/mouse/mouse_parser.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mouse_parser.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mouse_parser.h
-
-$(PROJECT_INCLUDE)/rtems/serial_mouse.h: libmisc/mouse/serial_mouse.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/serial_mouse.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/serial_mouse.h
-
-$(PROJECT_INCLUDE)/rtems/qreslib.h: libqos/qreslib.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/qreslib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/qreslib.h
-
-$(PROJECT_INCLUDE)/rtems/stdio-redirect.h: libmisc/redirector/stdio-redirect.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/stdio-redirect.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/stdio-redirect.h
-
-if LIBSHELL
-$(PROJECT_INCLUDE)/rtems/shell.h: libmisc/shell/shell.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/shell.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/shell.h
-
-$(PROJECT_INCLUDE)/rtems/shellconfig.h: libmisc/shell/shellconfig.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/shellconfig.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/shellconfig.h
-endif
-$(PROJECT_INCLUDE)/rtems/stringto.h: libmisc/stringto/stringto.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/stringto.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/stringto.h
-
-$(PROJECT_INCLUDE)/rtems/test.h: libmisc/testsupport/test.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/test.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/test.h
-
-$(PROJECT_INCLUDE)/rtems/libi2c.h: libi2c/libi2c.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/libi2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/libi2c.h
-
-if LIBSERDBG
-$(PROJECT_INCLUDE)/rtems/serdbgcnf.h: libmisc/serdbg/serdbgcnf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/serdbgcnf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/serdbgcnf.h
-
-$(PROJECT_INCLUDE)/rtems/serdbg.h: libmisc/serdbg/serdbg.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/serdbg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/serdbg.h
-
-$(PROJECT_INCLUDE)/rtems/termios_printk_cnf.h: libmisc/serdbg/termios_printk_cnf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/termios_printk_cnf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/termios_printk_cnf.h
-
-$(PROJECT_INCLUDE)/rtems/termios_printk.h: libmisc/serdbg/termios_printk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/termios_printk.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/termios_printk.h
-endif
-$(PROJECT_INCLUDE)/rtems/stackchk.h: libmisc/stackchk/stackchk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/stackchk.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/stackchk.h
-
-$(PROJECT_INCLUDE)/rtems/untar.h: libmisc/untar/untar.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/untar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/untar.h
-
-$(PROJECT_INCLUDE)/rtems/fsmount.h: libmisc/fsmount/fsmount.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fsmount.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fsmount.h
-
-$(PROJECT_INCLUDE)/rtems/tm27-default.h: include/rtems/tm27-default.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/tm27-default.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/tm27-default.h
-
-if LIBDRVMGR
-$(PROJECT_INCLUDE)/drvmgr/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/drvmgr
-	@: > $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-
-$(PROJECT_INCLUDE)/drvmgr/drvmgr.h: libdrvmgr/drvmgr.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/drvmgr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/drvmgr.h
-
-$(PROJECT_INCLUDE)/drvmgr/drvmgr_confdefs.h: libdrvmgr/drvmgr_confdefs.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/drvmgr_confdefs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/drvmgr_confdefs.h
-
-$(PROJECT_INCLUDE)/drvmgr/drvmgr_list.h: libdrvmgr/drvmgr_list.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/drvmgr_list.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/drvmgr_list.h
-endif
-if LIBGNAT
-$(PROJECT_INCLUDE)/adainclude/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/adainclude
-	@: > $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-
-$(PROJECT_INCLUDE)/adainclude/rtems.adb: include/adainclude/rtems.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems.ads: include/adainclude/rtems.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-barrier.adb: include/adainclude/rtems-barrier.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-barrier.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-barrier.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-barrier.ads: include/adainclude/rtems-barrier.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-barrier.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-barrier.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-clock.adb: include/adainclude/rtems-clock.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-clock.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-clock.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-clock.ads: include/adainclude/rtems-clock.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-clock.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-clock.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-cpu_usage.ads: include/adainclude/rtems-cpu_usage.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-cpu_usage.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-cpu_usage.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-event.adb: include/adainclude/rtems-event.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-event.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-event.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-event.ads: include/adainclude/rtems-event.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-event.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-event.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-extension.adb: include/adainclude/rtems-extension.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-extension.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-extension.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-extension.ads: include/adainclude/rtems-extension.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-extension.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-extension.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-fatal.adb: include/adainclude/rtems-fatal.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-fatal.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-fatal.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-fatal.ads: include/adainclude/rtems-fatal.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-fatal.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-fatal.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-interrupt.ads: include/adainclude/rtems-interrupt.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-interrupt.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-interrupt.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-io.adb: include/adainclude/rtems-io.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-io.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-io.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-io.ads: include/adainclude/rtems-io.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-io.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-io.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-message_queue.adb: include/adainclude/rtems-message_queue.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-message_queue.ads: include/adainclude/rtems-message_queue.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.adb: include/adainclude/rtems-multiprocessing.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads: include/adainclude/rtems-multiprocessing.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-object.adb: include/adainclude/rtems-object.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-object.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-object.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-object.ads: include/adainclude/rtems-object.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-object.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-object.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-partition.adb: include/adainclude/rtems-partition.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-partition.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-partition.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-partition.ads: include/adainclude/rtems-partition.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-partition.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-partition.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-port.adb: include/adainclude/rtems-port.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-port.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-port.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-port.ads: include/adainclude/rtems-port.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-port.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-port.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.adb: include/adainclude/rtems-rate_monotonic.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.ads: include/adainclude/rtems-rate_monotonic.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-region.adb: include/adainclude/rtems-region.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-region.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-region.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-region.ads: include/adainclude/rtems-region.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-region.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-region.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-semaphore.adb: include/adainclude/rtems-semaphore.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-semaphore.ads: include/adainclude/rtems-semaphore.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-signal.adb: include/adainclude/rtems-signal.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-signal.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-signal.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-signal.ads: include/adainclude/rtems-signal.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-signal.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-signal.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-stack_checker.ads: include/adainclude/rtems-stack_checker.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-stack_checker.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-stack_checker.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-tasks.adb: include/adainclude/rtems-tasks.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-tasks.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-tasks.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-tasks.ads: include/adainclude/rtems-tasks.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-tasks.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-tasks.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-timer.adb: include/adainclude/rtems-timer.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-timer.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-timer.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-timer.ads: include/adainclude/rtems-timer.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-timer.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-timer.ads
-endif
diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am
index da6e302e2e..b8694b8022 100644
--- a/cpukit/rtems/Makefile.am
+++ b/cpukit/rtems/Makefile.am
@@ -6,63 +6,9 @@ librtems_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 # include
 
-include_HEADERS = include/rtems.h
-
 # include/rtems/rtems
-include_rtems_rtemsdir = $(includedir)/rtems/rtems
-include_rtems_rtems_HEADERS =
-
-include_rtems_rtems_HEADERS += include/rtems/rtems/asr.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/asrimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/attr.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/attrimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/barrier.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/barrierimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/cache.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/clock.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/config.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/dpmem.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/dpmemimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/event.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/eventimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/intr.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/message.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/messageimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/modes.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/modesimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/object.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/options.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/optionsimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/part.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/partimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/ratemon.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/ratemonimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/region.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/regionimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/sem.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/semimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/signal.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/signalimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/smp.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/status.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/statusimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/support.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/tasks.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/tasksimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/timer.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/timerimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/types.h
-include_rtems_rtems_HEADERS += mainpage.h
-
 if HAS_MP
 ## We only build multiprocessing related files if HAS_MP was defined
-include_rtems_rtems_HEADERS += include/rtems/rtems/eventmp.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/mp.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/msgmp.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/partmp.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/semmp.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/signalmp.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/taskmp.h
 endif
 
 ## src
@@ -252,5 +198,4 @@ librtems_a_SOURCES += src/signalmp.c
 librtems_a_SOURCES += src/taskmp.c
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/rtems/preinstall.am b/cpukit/rtems/preinstall.am
deleted file mode 100644
index 35e78db889..0000000000
--- a/cpukit/rtems/preinstall.am
+++ /dev/null
@@ -1,222 +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.h: include/rtems.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/rtems/asr.h: include/rtems/rtems/asr.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/asr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/asr.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/asrimpl.h: include/rtems/rtems/asrimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/asrimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/asrimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/attr.h: include/rtems/rtems/attr.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/attr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/attr.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/attrimpl.h: include/rtems/rtems/attrimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/attrimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/attrimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/barrier.h: include/rtems/rtems/barrier.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/barrier.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/barrier.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/barrierimpl.h: include/rtems/rtems/barrierimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/barrierimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/barrierimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/cache.h: include/rtems/rtems/cache.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/cache.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/cache.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/clock.h: include/rtems/rtems/clock.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/clock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/clock.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/config.h: include/rtems/rtems/config.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/config.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/dpmem.h: include/rtems/rtems/dpmem.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/dpmem.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/dpmem.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/dpmemimpl.h: include/rtems/rtems/dpmemimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/dpmemimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/dpmemimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/event.h: include/rtems/rtems/event.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/event.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/event.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/eventimpl.h: include/rtems/rtems/eventimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/eventimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/eventimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/intr.h: include/rtems/rtems/intr.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/intr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/intr.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/message.h: include/rtems/rtems/message.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/message.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/message.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/messageimpl.h: include/rtems/rtems/messageimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/messageimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/messageimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/modes.h: include/rtems/rtems/modes.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/modes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/modes.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/modesimpl.h: include/rtems/rtems/modesimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/modesimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/modesimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/object.h: include/rtems/rtems/object.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/object.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/object.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/options.h: include/rtems/rtems/options.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/options.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/options.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/optionsimpl.h: include/rtems/rtems/optionsimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/optionsimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/optionsimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/part.h: include/rtems/rtems/part.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/part.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/part.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/partimpl.h: include/rtems/rtems/partimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/partimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/partimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/ratemon.h: include/rtems/rtems/ratemon.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/ratemon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/ratemon.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/ratemonimpl.h: include/rtems/rtems/ratemonimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/ratemonimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/ratemonimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/region.h: include/rtems/rtems/region.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/region.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/region.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/regionimpl.h: include/rtems/rtems/regionimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/regionimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/regionimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/sem.h: include/rtems/rtems/sem.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/sem.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/sem.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/semimpl.h: include/rtems/rtems/semimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/semimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/semimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/signal.h: include/rtems/rtems/signal.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/signal.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/signal.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/signalimpl.h: include/rtems/rtems/signalimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/signalimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/signalimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/smp.h: include/rtems/rtems/smp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/smp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/smp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/status.h: include/rtems/rtems/status.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/status.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/status.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/statusimpl.h: include/rtems/rtems/statusimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/statusimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/statusimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/support.h: include/rtems/rtems/support.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/support.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/support.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/tasks.h: include/rtems/rtems/tasks.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/tasks.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/tasks.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/tasksimpl.h: include/rtems/rtems/tasksimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/tasksimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/tasksimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/timer.h: include/rtems/rtems/timer.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/timer.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/timerimpl.h: include/rtems/rtems/timerimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/timerimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/timerimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/types.h: include/rtems/rtems/types.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/types.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/mainpage.h: mainpage.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/mainpage.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/mainpage.h
-
-if HAS_MP
-$(PROJECT_INCLUDE)/rtems/rtems/eventmp.h: include/rtems/rtems/eventmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/eventmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/eventmp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/mp.h: include/rtems/rtems/mp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/mp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/mp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/msgmp.h: include/rtems/rtems/msgmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/msgmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/msgmp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/partmp.h: include/rtems/rtems/partmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/partmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/partmp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/semmp.h: include/rtems/rtems/semmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/semmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/semmp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/signalmp.h: include/rtems/rtems/signalmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/signalmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/signalmp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/taskmp.h: include/rtems/rtems/taskmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/taskmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/taskmp.h
-endif
diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am
index 326d67f193..4fb7c708cd 100644
--- a/cpukit/sapi/Makefile.am
+++ b/cpukit/sapi/Makefile.am
@@ -1,29 +1,6 @@
 include $(top_srcdir)/automake/multilib.am
 include $(top_srcdir)/automake/compile.am
 
-include_rtemsdir = $(includedir)/rtems
-
-include_rtems_HEADERS = include/confdefs.h
-include_rtems_HEADERS += include/rtems/bsd.h
-include_rtems_HEADERS += include/rtems/chain.h
-include_rtems_HEADERS += include/rtems/config.h
-include_rtems_HEADERS += include/rtems/counter.h
-include_rtems_HEADERS += include/rtems/extension.h
-include_rtems_HEADERS += include/rtems/extensionimpl.h
-include_rtems_HEADERS += include/rtems/fatal.h
-include_rtems_HEADERS += include/rtems/init.h
-include_rtems_HEADERS += include/rtems/io.h
-include_rtems_HEADERS += include/rtems/ioimpl.h
-include_rtems_HEADERS += include/rtems/mptables.h
-include_rtems_HEADERS += include/rtems/cbs.h
-include_rtems_HEADERS += include/rtems/profiling.h
-include_rtems_HEADERS += include/rtems/rbheap.h
-include_rtems_HEADERS += include/rtems/rbtree.h
-include_rtems_HEADERS += include/rtems/scheduler.h
-include_rtems_HEADERS += include/rtems/timecounter.h
-include_rtems_HEADERS += include/rtems/timespec.h
-include_rtems_HEADERS += include/rtems/version.h
-
 EXTRA_DIST = include/rtems/README
 
 noinst_LIBRARIES = libsapi.a
@@ -84,5 +61,4 @@ $(srcdir)/src/version.c: version-vc-key.h
 
 all-local: generate-vc-key
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/sapi/preinstall.am b/cpukit/sapi/preinstall.am
deleted file mode 100644
index a6b0ba30df..0000000000
--- a/cpukit/sapi/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)
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/confdefs.h: include/confdefs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/confdefs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/confdefs.h
-
-$(PROJECT_INCLUDE)/rtems/bsd.h: include/rtems/bsd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bsd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bsd.h
-
-$(PROJECT_INCLUDE)/rtems/chain.h: include/rtems/chain.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/chain.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/chain.h
-
-$(PROJECT_INCLUDE)/rtems/config.h: include/rtems/config.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/config.h
-
-$(PROJECT_INCLUDE)/rtems/counter.h: include/rtems/counter.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/counter.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/counter.h
-
-$(PROJECT_INCLUDE)/rtems/extension.h: include/rtems/extension.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/extension.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extension.h
-
-$(PROJECT_INCLUDE)/rtems/extensionimpl.h: include/rtems/extensionimpl.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/extensionimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extensionimpl.h
-
-$(PROJECT_INCLUDE)/rtems/fatal.h: include/rtems/fatal.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fatal.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fatal.h
-
-$(PROJECT_INCLUDE)/rtems/init.h: include/rtems/init.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/init.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/init.h
-
-$(PROJECT_INCLUDE)/rtems/io.h: include/rtems/io.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/io.h
-
-$(PROJECT_INCLUDE)/rtems/ioimpl.h: include/rtems/ioimpl.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ioimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ioimpl.h
-
-$(PROJECT_INCLUDE)/rtems/mptables.h: include/rtems/mptables.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mptables.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mptables.h
-
-$(PROJECT_INCLUDE)/rtems/cbs.h: include/rtems/cbs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/cbs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/cbs.h
-
-$(PROJECT_INCLUDE)/rtems/profiling.h: include/rtems/profiling.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/profiling.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/profiling.h
-
-$(PROJECT_INCLUDE)/rtems/rbheap.h: include/rtems/rbheap.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rbheap.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rbheap.h
-
-$(PROJECT_INCLUDE)/rtems/rbtree.h: include/rtems/rbtree.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rbtree.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rbtree.h
-
-$(PROJECT_INCLUDE)/rtems/scheduler.h: include/rtems/scheduler.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/scheduler.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/scheduler.h
-
-$(PROJECT_INCLUDE)/rtems/timecounter.h: include/rtems/timecounter.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/timecounter.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/timecounter.h
-
-$(PROJECT_INCLUDE)/rtems/timespec.h: include/rtems/timespec.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/timespec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/timespec.h
-
-$(PROJECT_INCLUDE)/rtems/version.h: include/rtems/version.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/version.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/version.h
-
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index b7edf09dde..8054df1d8f 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -5,132 +5,11 @@ _SUBDIRS = cpu
 
 ## include
 
-include_sysdir = $(includedir)/sys
-
-include_sys_HEADERS =
-include_sys_HEADERS += include/sys/_ffcounter.h
-include_sys_HEADERS += include/sys/timeffc.h
-include_sys_HEADERS += include/sys/timepps.h
-include_sys_HEADERS += include/sys/timetc.h
-include_sys_HEADERS += include/sys/timex.h
-
-include_rtemsdir = $(includedir)/rtems
-
-include_rtems_HEADERS =
-include_rtems_HEADERS += include/rtems/linkersets.h
-include_rtems_HEADERS += include/rtems/sysinit.h
-include_rtems_HEADERS += include/rtems/system.h
-include_rtems_HEADERS += include/rtems/seterr.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-
-include_rtems_score_HEADERS = include/rtems/score/address.h
-include_rtems_score_HEADERS += include/rtems/score/apimutex.h
-include_rtems_score_HEADERS += include/rtems/score/assert.h
-include_rtems_score_HEADERS += include/rtems/score/atomic.h
-include_rtems_score_HEADERS += include/rtems/score/chain.h
-include_rtems_score_HEADERS += include/rtems/score/chainimpl.h
-include_rtems_score_HEADERS += include/rtems/score/context.h
-include_rtems_score_HEADERS += include/rtems/score/copyrt.h
-include_rtems_score_HEADERS += include/rtems/score/corebarrier.h
-include_rtems_score_HEADERS += include/rtems/score/corebarrierimpl.h
-include_rtems_score_HEADERS += include/rtems/score/coremsg.h
-include_rtems_score_HEADERS += include/rtems/score/coremsgimpl.h
-include_rtems_score_HEADERS += include/rtems/score/coremutex.h
-include_rtems_score_HEADERS += include/rtems/score/coremuteximpl.h
-include_rtems_score_HEADERS += include/rtems/score/corerwlockimpl.h
-include_rtems_score_HEADERS += include/rtems/score/coresem.h
-include_rtems_score_HEADERS += include/rtems/score/coresemimpl.h
-include_rtems_score_HEADERS += include/rtems/score/cpustdatomic.h
-include_rtems_score_HEADERS += include/rtems/score/heap.h
-include_rtems_score_HEADERS += include/rtems/score/heapimpl.h
-include_rtems_score_HEADERS += include/rtems/score/protectedheap.h
-include_rtems_score_HEADERS += include/rtems/score/interr.h
-include_rtems_score_HEADERS += include/rtems/score/io.h
-include_rtems_score_HEADERS += include/rtems/score/isr.h
-include_rtems_score_HEADERS += include/rtems/score/isrlevel.h
-include_rtems_score_HEADERS += include/rtems/score/isrlock.h
-include_rtems_score_HEADERS += include/rtems/score/freechain.h
-include_rtems_score_HEADERS += include/rtems/score/mrsp.h
-include_rtems_score_HEADERS += include/rtems/score/mrspimpl.h
-include_rtems_score_HEADERS += include/rtems/score/muteximpl.h
-include_rtems_score_HEADERS += include/rtems/score/object.h
-include_rtems_score_HEADERS += include/rtems/score/objectimpl.h
-include_rtems_score_HEADERS += include/rtems/score/onceimpl.h
-include_rtems_score_HEADERS += include/rtems/score/percpu.h
-include_rtems_score_HEADERS += include/rtems/score/priority.h
-include_rtems_score_HEADERS += include/rtems/score/priorityimpl.h
-include_rtems_score_HEADERS += include/rtems/score/prioritybitmap.h
-include_rtems_score_HEADERS += include/rtems/score/prioritybitmapimpl.h
-include_rtems_score_HEADERS += include/rtems/score/profiling.h
-include_rtems_score_HEADERS += include/rtems/score/processormask.h
-include_rtems_score_HEADERS += include/rtems/score/rbtree.h
-include_rtems_score_HEADERS += include/rtems/score/rbtreeimpl.h
-include_rtems_score_HEADERS += include/rtems/score/scheduler.h
-include_rtems_score_HEADERS += include/rtems/score/schedulerimpl.h
-include_rtems_score_HEADERS += include/rtems/score/schedulercbs.h
-include_rtems_score_HEADERS += include/rtems/score/schedulercbsimpl.h
-include_rtems_score_HEADERS += include/rtems/score/scheduleredf.h
-include_rtems_score_HEADERS += include/rtems/score/scheduleredfimpl.h
-include_rtems_score_HEADERS += include/rtems/score/schedulernode.h
-include_rtems_score_HEADERS += include/rtems/score/schedulernodeimpl.h
-include_rtems_score_HEADERS += include/rtems/score/schedulerpriority.h
-include_rtems_score_HEADERS += include/rtems/score/schedulerpriorityimpl.h
-include_rtems_score_HEADERS += include/rtems/score/schedulerprioritysmp.h
-include_rtems_score_HEADERS += include/rtems/score/schedulersimple.h
-include_rtems_score_HEADERS += include/rtems/score/schedulersimpleimpl.h
-include_rtems_score_HEADERS += include/rtems/score/schedulersmp.h
-include_rtems_score_HEADERS += include/rtems/score/schedulersmpimpl.h
-include_rtems_score_HEADERS += include/rtems/score/semaphoreimpl.h
-include_rtems_score_HEADERS += include/rtems/score/smp.h
-include_rtems_score_HEADERS += include/rtems/score/smpbarrier.h
-include_rtems_score_HEADERS += include/rtems/score/smplock.h
-include_rtems_score_HEADERS += include/rtems/score/smplockseq.h
-include_rtems_score_HEADERS += include/rtems/score/smpimpl.h
-include_rtems_score_HEADERS += include/rtems/score/stack.h
-include_rtems_score_HEADERS += include/rtems/score/stackimpl.h
-include_rtems_score_HEADERS += include/rtems/score/states.h
-include_rtems_score_HEADERS += include/rtems/score/statesimpl.h
-include_rtems_score_HEADERS += include/rtems/score/status.h
-include_rtems_score_HEADERS += include/rtems/score/sysstate.h
-include_rtems_score_HEADERS += include/rtems/score/thread.h
-include_rtems_score_HEADERS += include/rtems/score/threadimpl.h
-include_rtems_score_HEADERS += include/rtems/score/threaddispatch.h
-include_rtems_score_HEADERS += include/rtems/score/threadq.h
-include_rtems_score_HEADERS += include/rtems/score/threadqimpl.h
-include_rtems_score_HEADERS += include/rtems/score/timespec.h
-include_rtems_score_HEADERS += include/rtems/score/timestamp.h
-include_rtems_score_HEADERS += include/rtems/score/timecounter.h
-include_rtems_score_HEADERS += include/rtems/score/timecounterimpl.h
-include_rtems_score_HEADERS += include/rtems/score/tls.h
-include_rtems_score_HEADERS += include/rtems/score/tod.h
-include_rtems_score_HEADERS += include/rtems/score/todimpl.h
-include_rtems_score_HEADERS += include/rtems/score/userext.h
-include_rtems_score_HEADERS += include/rtems/score/userextimpl.h
-include_rtems_score_HEADERS += include/rtems/score/watchdog.h
-include_rtems_score_HEADERS += include/rtems/score/watchdogimpl.h
-include_rtems_score_HEADERS += include/rtems/score/wkspace.h
-include_rtems_score_HEADERS += include/rtems/score/cpuopts.h
-include_rtems_score_HEADERS += include/rtems/score/basedefs.h
-
 if HAS_MP
 # We only build multiprocessing related files if HAS_MP was defined
-include_rtems_score_HEADERS += include/rtems/score/mpci.h
-include_rtems_score_HEADERS += include/rtems/score/mpciimpl.h
-include_rtems_score_HEADERS += include/rtems/score/mppkt.h
-include_rtems_score_HEADERS += include/rtems/score/objectmp.h
-include_rtems_score_HEADERS += include/rtems/score/threadmp.h
 endif
 
 if HAS_SMP
-include_rtems_score_HEADERS += include/rtems/score/scheduleredfsmp.h
-include_rtems_score_HEADERS += include/rtems/score/schedulerprioritysmpimpl.h
-include_rtems_score_HEADERS += include/rtems/score/schedulerpriorityaffinitysmp.h
-include_rtems_score_HEADERS += include/rtems/score/schedulersimplesmp.h
-include_rtems_score_HEADERS += include/rtems/score/schedulerstrongapa.h
-include_rtems_score_HEADERS += include/rtems/score/smplockmcs.h
-include_rtems_score_HEADERS += include/rtems/score/smplockstats.h
-include_rtems_score_HEADERS += include/rtems/score/smplockticket.h
 endif
 
 ## src
@@ -352,8 +231,10 @@ libscore_a_SOURCES += src/processormaskcopy.c
 
 EXTRA_DIST = src/Unlimited.txt
 
-DISTCLEANFILES = include/rtems/score/cpuopts.h
+# This file is in the build tree
+DISTCLEANFILES = ../..include/rtems/score/cpuopts.h
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS = ../../include/rtems/score/cpuopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am
index a0881e80e9..865a750477 100644
--- a/cpukit/score/cpu/arm/Makefile.am
+++ b/cpukit/score/cpu/arm/Makefile.am
@@ -1,20 +1,4 @@
 include $(top_srcdir)/automake/compile.am
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/arm.h
-include_rtems_score_HEADERS += rtems/score/armv4.h
-include_rtems_score_HEADERS += rtems/score/armv7m.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
-include_libcpudir = $(includedir)/libcpu
-include_libcpu_HEADERS = include/libcpu/arm-cp15.h
-
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 libscorecpu_a_SOURCES =
@@ -48,5 +32,5 @@ libscorecpu_a_SOURCES += armv7m-isr-level-set.c
 libscorecpu_a_SOURCES += armv7m-isr-vector-install.c
 libscorecpu_a_SOURCES += armv7m-multitasking-start-stop.c
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/arm/headers.am b/cpukit/score/cpu/arm/headers.am
new file mode 100644
index 0000000000..61a055f79a
--- /dev/null
+++ b/cpukit/score/cpu/arm/headers.am
@@ -0,0 +1,24 @@
+## This file was generated by "./boostrap -H".
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += include/libcpu/arm-cp15.h
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/arm.h
+include_rtems_score_HEADERS += include/rtems/score/armv4.h
+include_rtems_score_HEADERS += include/rtems/score/armv7m.h
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/arm/machine/elf_machdep.h b/cpukit/score/cpu/arm/include/machine/elf_machdep.h
index 8f01d05212..8f01d05212 100644
--- a/cpukit/libdl/include/arch/arm/machine/elf_machdep.h
+++ b/cpukit/score/cpu/arm/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/arm/rtems/asm.h b/cpukit/score/cpu/arm/include/rtems/asm.h
index f72df32325..f72df32325 100644
--- a/cpukit/score/cpu/arm/rtems/asm.h
+++ b/cpukit/score/cpu/arm/include/rtems/asm.h
diff --git a/cpukit/score/cpu/arm/rtems/score/arm.h b/cpukit/score/cpu/arm/include/rtems/score/arm.h
index f08da1dc57..f08da1dc57 100755
--- a/cpukit/score/cpu/arm/rtems/score/arm.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/arm.h
diff --git a/cpukit/score/cpu/arm/rtems/score/armv4.h b/cpukit/score/cpu/arm/include/rtems/score/armv4.h
index caeaa3e553..caeaa3e553 100644
--- a/cpukit/score/cpu/arm/rtems/score/armv4.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/armv4.h
diff --git a/cpukit/score/cpu/arm/rtems/score/armv7m.h b/cpukit/score/cpu/arm/include/rtems/score/armv7m.h
index a6cc8a34ac..a6cc8a34ac 100644
--- a/cpukit/score/cpu/arm/rtems/score/armv7m.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/armv7m.h
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/include/rtems/score/cpu.h
index 05e236c75a..05e236c75a 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpu.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu_asm.h b/cpukit/score/cpu/arm/include/rtems/score/cpu_asm.h
index c430911373..c430911373 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpu_asm.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/arm/rtems/score/cpuatomic.h b/cpukit/score/cpu/arm/include/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/arm/rtems/score/cpuimpl.h b/cpukit/score/cpu/arm/include/rtems/score/cpuimpl.h
index 0885c2ef39..0885c2ef39 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/arm/rtems/score/types.h b/cpukit/score/cpu/arm/include/rtems/score/types.h
index 37a56df029..37a56df029 100644
--- a/cpukit/score/cpu/arm/rtems/score/types.h
+++ b/cpukit/score/cpu/arm/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/arm/preinstall.am b/cpukit/score/cpu/arm/preinstall.am
deleted file mode 100644
index 3bdbb63561..0000000000
--- a/cpukit/score/cpu/arm/preinstall.am
+++ /dev/null
@@ -1,70 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.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)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/arm.h: rtems/score/arm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/arm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/arm.h
-
-$(PROJECT_INCLUDE)/rtems/score/armv4.h: rtems/score/armv4.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/armv4.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/armv4.h
-
-$(PROJECT_INCLUDE)/rtems/score/armv7m.h: rtems/score/armv7m.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/armv7m.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/armv7m.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/arm-cp15.h: include/libcpu/arm-cp15.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
-
diff --git a/cpukit/score/cpu/bfin/Makefile.am b/cpukit/score/cpu/bfin/Makefile.am
index 8fa75df995..3d7483a220 100644
--- a/cpukit/score/cpu/bfin/Makefile.am
+++ b/cpukit/score/cpu/bfin/Makefile.am
@@ -1,26 +1,10 @@
 include $(top_srcdir)/automake/compile.am
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_bfindir = $(includedir)/rtems/bfin
-include_rtems_bfin_HEADERS = rtems/bfin/bfin.h
-include_rtems_bfin_HEADERS += rtems/bfin/bf533.h
-include_rtems_bfin_HEADERS += rtems/bfin/bf52x.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/bfin.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c cpu_asm.S
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_SOURCES += bfin-exception-frame-print.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/bfin/headers.am b/cpukit/score/cpu/bfin/headers.am
new file mode 100644
index 0000000000..b9eba7b181
--- /dev/null
+++ b/cpukit/score/cpu/bfin/headers.am
@@ -0,0 +1,24 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_bfindir = $(includedir)/rtems/bfin
+include_rtems_bfin_HEADERS =
+include_rtems_bfin_HEADERS += include/rtems/bfin/bf52x.h
+include_rtems_bfin_HEADERS += include/rtems/bfin/bf533.h
+include_rtems_bfin_HEADERS += include/rtems/bfin/bfin.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/bfin.h
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/bfin/machine/elf_machdep.h b/cpukit/score/cpu/bfin/include/machine/elf_machdep.h
index cf0dc19221..cf0dc19221 100644
--- a/cpukit/libdl/include/arch/bfin/machine/elf_machdep.h
+++ b/cpukit/score/cpu/bfin/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/bfin/rtems/asm.h b/cpukit/score/cpu/bfin/include/rtems/asm.h
index 5d133ddbdd..5d133ddbdd 100644
--- a/cpukit/score/cpu/bfin/rtems/asm.h
+++ b/cpukit/score/cpu/bfin/include/rtems/asm.h
diff --git a/cpukit/score/cpu/bfin/rtems/bfin/bf52x.h b/cpukit/score/cpu/bfin/include/rtems/bfin/bf52x.h
index 86142a6c62..86142a6c62 100644
--- a/cpukit/score/cpu/bfin/rtems/bfin/bf52x.h
+++ b/cpukit/score/cpu/bfin/include/rtems/bfin/bf52x.h
diff --git a/cpukit/score/cpu/bfin/rtems/bfin/bf533.h b/cpukit/score/cpu/bfin/include/rtems/bfin/bf533.h
index 682aad4bbb..682aad4bbb 100644
--- a/cpukit/score/cpu/bfin/rtems/bfin/bf533.h
+++ b/cpukit/score/cpu/bfin/include/rtems/bfin/bf533.h
diff --git a/cpukit/score/cpu/bfin/rtems/bfin/bfin.h b/cpukit/score/cpu/bfin/include/rtems/bfin/bfin.h
index 4ba0b2b295..4ba0b2b295 100644
--- a/cpukit/score/cpu/bfin/rtems/bfin/bfin.h
+++ b/cpukit/score/cpu/bfin/include/rtems/bfin/bfin.h
diff --git a/cpukit/score/cpu/bfin/rtems/score/bfin.h b/cpukit/score/cpu/bfin/include/rtems/score/bfin.h
index caa3a51830..caa3a51830 100644
--- a/cpukit/score/cpu/bfin/rtems/score/bfin.h
+++ b/cpukit/score/cpu/bfin/include/rtems/score/bfin.h
diff --git a/cpukit/score/cpu/bfin/rtems/score/cpu.h b/cpukit/score/cpu/bfin/include/rtems/score/cpu.h
index 7c90fc6575..7c90fc6575 100644
--- a/cpukit/score/cpu/bfin/rtems/score/cpu.h
+++ b/cpukit/score/cpu/bfin/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/bfin/rtems/score/cpu_asm.h b/cpukit/score/cpu/bfin/include/rtems/score/cpu_asm.h
index 4f78c9d358..4f78c9d358 100644
--- a/cpukit/score/cpu/bfin/rtems/score/cpu_asm.h
+++ b/cpukit/score/cpu/bfin/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/bfin/rtems/score/cpuatomic.h b/cpukit/score/cpu/bfin/include/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/bfin/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/bfin/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/bfin/rtems/score/cpuimpl.h b/cpukit/score/cpu/bfin/include/rtems/score/cpuimpl.h
index 789f2badd9..789f2badd9 100644
--- a/cpukit/score/cpu/bfin/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/bfin/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/bfin/rtems/score/types.h b/cpukit/score/cpu/bfin/include/rtems/score/types.h
index 9865357cdd..9865357cdd 100644
--- a/cpukit/score/cpu/bfin/rtems/score/types.h
+++ b/cpukit/score/cpu/bfin/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/bfin/preinstall.am b/cpukit/score/cpu/bfin/preinstall.am
deleted file mode 100644
index 0ede1d7450..0000000000
--- a/cpukit/score/cpu/bfin/preinstall.am
+++ /dev/null
@@ -1,70 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/bfin/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/bfin
-	@: > $(PROJECT_INCLUDE)/rtems/bfin/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/bfin/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/bfin/bfin.h: rtems/bfin/bfin.h $(PROJECT_INCLUDE)/rtems/bfin/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bfin/bfin.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bfin/bfin.h
-
-$(PROJECT_INCLUDE)/rtems/bfin/bf533.h: rtems/bfin/bf533.h $(PROJECT_INCLUDE)/rtems/bfin/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bfin/bf533.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bfin/bf533.h
-
-$(PROJECT_INCLUDE)/rtems/bfin/bf52x.h: rtems/bfin/bf52x.h $(PROJECT_INCLUDE)/rtems/bfin/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bfin/bf52x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bfin/bf52x.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)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/bfin.h: rtems/score/bfin.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/bfin.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/bfin.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/epiphany/Makefile.am b/cpukit/score/cpu/epiphany/Makefile.am
index ed99b436e6..96b0de0054 100644
--- a/cpukit/score/cpu/epiphany/Makefile.am
+++ b/cpukit/score/cpu/epiphany/Makefile.am
@@ -3,21 +3,6 @@ include $(top_srcdir)/automake/compile.am
 CLEANFILES =
 DISTCLEANFILES =
 
-include_rtemsdir = $(includedir)/rtems
-
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-
-include_rtems_score_HEADERS =
-include_rtems_score_HEADERS += rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/epiphany.h
-include_rtems_score_HEADERS += rtems/score/epiphany-utility.h
-
 noinst_LIBRARIES = libscorecpu.a
 
 libscorecpu_a_SOURCES  = cpu.c
@@ -29,5 +14,5 @@ libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 all-local: $(PREINSTALL_FILES)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/epiphany/headers.am b/cpukit/score/cpu/epiphany/headers.am
new file mode 100644
index 0000000000..125a88dcd9
--- /dev/null
+++ b/cpukit/score/cpu/epiphany/headers.am
@@ -0,0 +1,15 @@
+## This file was generated by "./boostrap -H".
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/epiphany-utility.h
+include_rtems_score_HEADERS += include/rtems/score/epiphany.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/epiphany/rtems/asm.h b/cpukit/score/cpu/epiphany/include/rtems/asm.h
index 87e0cca1cb..87e0cca1cb 100644
--- a/cpukit/score/cpu/epiphany/rtems/asm.h
+++ b/cpukit/score/cpu/epiphany/include/rtems/asm.h
diff --git a/cpukit/score/cpu/epiphany/rtems/score/cpu.h b/cpukit/score/cpu/epiphany/include/rtems/score/cpu.h
index 34ac8ae6c6..34ac8ae6c6 100644
--- a/cpukit/score/cpu/epiphany/rtems/score/cpu.h
+++ b/cpukit/score/cpu/epiphany/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/epiphany/rtems/score/cpu_asm.h b/cpukit/score/cpu/epiphany/include/rtems/score/cpu_asm.h
index cc091fa909..cc091fa909 100644
--- a/cpukit/score/cpu/epiphany/rtems/score/cpu_asm.h
+++ b/cpukit/score/cpu/epiphany/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/epiphany/rtems/score/cpuatomic.h b/cpukit/score/cpu/epiphany/include/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/epiphany/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/epiphany/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/epiphany/rtems/score/cpuimpl.h b/cpukit/score/cpu/epiphany/include/rtems/score/cpuimpl.h
index 789f2badd9..789f2badd9 100644
--- a/cpukit/score/cpu/epiphany/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/epiphany/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/epiphany/rtems/score/epiphany-utility.h b/cpukit/score/cpu/epiphany/include/rtems/score/epiphany-utility.h
index bf223f93bf..bf223f93bf 100644
--- a/cpukit/score/cpu/epiphany/rtems/score/epiphany-utility.h
+++ b/cpukit/score/cpu/epiphany/include/rtems/score/epiphany-utility.h
diff --git a/cpukit/score/cpu/epiphany/rtems/score/epiphany.h b/cpukit/score/cpu/epiphany/include/rtems/score/epiphany.h
index 60d975581f..60d975581f 100644
--- a/cpukit/score/cpu/epiphany/rtems/score/epiphany.h
+++ b/cpukit/score/cpu/epiphany/include/rtems/score/epiphany.h
diff --git a/cpukit/score/cpu/epiphany/rtems/score/types.h b/cpukit/score/cpu/epiphany/include/rtems/score/types.h
index 24c8955fd3..24c8955fd3 100644
--- a/cpukit/score/cpu/epiphany/rtems/score/types.h
+++ b/cpukit/score/cpu/epiphany/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/epiphany/preinstall.am b/cpukit/score/cpu/epiphany/preinstall.am
deleted file mode 100644
index e12a51695e..0000000000
--- a/cpukit/score/cpu/epiphany/preinstall.am
+++ /dev/null
@@ -1,57 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.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)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/epiphany.h: rtems/score/epiphany.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/epiphany.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/epiphany.h
-
-$(PROJECT_INCLUDE)/rtems/score/epiphany-utility.h: rtems/score/epiphany-utility.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/epiphany-utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/epiphany-utility.h
-
diff --git a/cpukit/score/cpu/h8300/headers.am b/cpukit/score/cpu/h8300/headers.am
new file mode 100644
index 0000000000..6f4357916f
--- /dev/null
+++ b/cpukit/score/cpu/h8300/headers.am
@@ -0,0 +1,5 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
diff --git a/cpukit/libdl/include/arch/h8300/machine/elf_machdep.h b/cpukit/score/cpu/h8300/include/machine/elf_machdep.h
index 3d049157eb..3d049157eb 100644
--- a/cpukit/libdl/include/arch/h8300/machine/elf_machdep.h
+++ b/cpukit/score/cpu/h8300/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/i386/Makefile.am b/cpukit/score/cpu/i386/Makefile.am
index 7fb2a081b6..fe7fa5582c 100644
--- a/cpukit/score/cpu/i386/Makefile.am
+++ b/cpukit/score/cpu/i386/Makefile.am
@@ -1,22 +1,9 @@
 include $(top_srcdir)/automake/compile.am
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS= rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/i386.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/interrupts.h
-include_rtems_score_HEADERS += rtems/score/registers.h
-include_rtems_score_HEADERS += rtems/score/idtr.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c cpu_asm.S
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/i386/headers.am b/cpukit/score/cpu/i386/headers.am
new file mode 100644
index 0000000000..ea07edcbd4
--- /dev/null
+++ b/cpukit/score/cpu/i386/headers.am
@@ -0,0 +1,20 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/i386.h
+include_rtems_score_HEADERS += include/rtems/score/idtr.h
+include_rtems_score_HEADERS += include/rtems/score/interrupts.h
+include_rtems_score_HEADERS += include/rtems/score/registers.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/i386/machine/elf_machdep.h b/cpukit/score/cpu/i386/include/machine/elf_machdep.h
index 442c561a9c..442c561a9c 100644
--- a/cpukit/libdl/include/arch/i386/machine/elf_machdep.h
+++ b/cpukit/score/cpu/i386/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/i386/rtems/asm.h b/cpukit/score/cpu/i386/include/rtems/asm.h
index 50b0fd71a0..50b0fd71a0 100644
--- a/cpukit/score/cpu/i386/rtems/asm.h
+++ b/cpukit/score/cpu/i386/include/rtems/asm.h
diff --git a/cpukit/score/cpu/i386/rtems/score/cpu.h b/cpukit/score/cpu/i386/include/rtems/score/cpu.h
index f78149c24b..f78149c24b 100644
--- a/cpukit/score/cpu/i386/rtems/score/cpu.h
+++ b/cpukit/score/cpu/i386/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/i386/rtems/score/cpuatomic.h b/cpukit/score/cpu/i386/include/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/i386/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/i386/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/i386/rtems/score/cpuimpl.h b/cpukit/score/cpu/i386/include/rtems/score/cpuimpl.h
index 789f2badd9..789f2badd9 100644
--- a/cpukit/score/cpu/i386/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/i386/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/i386/rtems/score/i386.h b/cpukit/score/cpu/i386/include/rtems/score/i386.h
index 2555d13b8b..2555d13b8b 100644
--- a/cpukit/score/cpu/i386/rtems/score/i386.h
+++ b/cpukit/score/cpu/i386/include/rtems/score/i386.h
diff --git a/cpukit/score/cpu/i386/rtems/score/idtr.h b/cpukit/score/cpu/i386/include/rtems/score/idtr.h
index a79af40792..a79af40792 100644
--- a/cpukit/score/cpu/i386/rtems/score/idtr.h
+++ b/cpukit/score/cpu/i386/include/rtems/score/idtr.h
diff --git a/cpukit/score/cpu/i386/rtems/score/interrupts.h b/cpukit/score/cpu/i386/include/rtems/score/interrupts.h
index 3a7971c1ff..3a7971c1ff 100644
--- a/cpukit/score/cpu/i386/rtems/score/interrupts.h
+++ b/cpukit/score/cpu/i386/include/rtems/score/interrupts.h
diff --git a/cpukit/score/cpu/i386/rtems/score/registers.h b/cpukit/score/cpu/i386/include/rtems/score/registers.h
index 254fef701b..254fef701b 100644
--- a/cpukit/score/cpu/i386/rtems/score/registers.h
+++ b/cpukit/score/cpu/i386/include/rtems/score/registers.h
diff --git a/cpukit/score/cpu/i386/rtems/score/types.h b/cpukit/score/cpu/i386/include/rtems/score/types.h
index 00555d41b5..00555d41b5 100644
--- a/cpukit/score/cpu/i386/rtems/score/types.h
+++ b/cpukit/score/cpu/i386/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/i386/preinstall.am b/cpukit/score/cpu/i386/preinstall.am
deleted file mode 100644
index 6eda753836..0000000000
--- a/cpukit/score/cpu/i386/preinstall.am
+++ /dev/null
@@ -1,61 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.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)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/i386.h: rtems/score/i386.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/i386.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/i386.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/interrupts.h: rtems/score/interrupts.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/interrupts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/interrupts.h
-
-$(PROJECT_INCLUDE)/rtems/score/registers.h: rtems/score/registers.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/registers.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/registers.h
-
-$(PROJECT_INCLUDE)/rtems/score/idtr.h: rtems/score/idtr.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/idtr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/idtr.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/lm32/Makefile.am b/cpukit/score/cpu/lm32/Makefile.am
index 72cb69abcc..75bcba5793 100644
--- a/cpukit/score/cpu/lm32/Makefile.am
+++ b/cpukit/score/cpu/lm32/Makefile.am
@@ -1,21 +1,10 @@
 include $(top_srcdir)/automake/compile.am
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/lm32.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c cpu_asm.S irq.c
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_SOURCES += lm32-exception-frame-print.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/lm32/headers.am b/cpukit/score/cpu/lm32/headers.am
new file mode 100644
index 0000000000..68128ca00b
--- /dev/null
+++ b/cpukit/score/cpu/lm32/headers.am
@@ -0,0 +1,18 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/lm32.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/lm32/machine/elf_machdep.h b/cpukit/score/cpu/lm32/include/machine/elf_machdep.h
index 29c75b89db..29c75b89db 100644
--- a/cpukit/libdl/include/arch/lm32/machine/elf_machdep.h
+++ b/cpukit/score/cpu/lm32/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/lm32/rtems/asm.h b/cpukit/score/cpu/lm32/include/rtems/asm.h
index 15046df81c..15046df81c 100644
--- a/cpukit/score/cpu/lm32/rtems/asm.h
+++ b/cpukit/score/cpu/lm32/include/rtems/asm.h
diff --git a/cpukit/score/cpu/lm32/rtems/score/cpu.h b/cpukit/score/cpu/lm32/include/rtems/score/cpu.h
index 9d229948aa..9d229948aa 100644
--- a/cpukit/score/cpu/lm32/rtems/score/cpu.h
+++ b/cpukit/score/cpu/lm32/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/lm32/rtems/score/cpu_asm.h b/cpukit/score/cpu/lm32/include/rtems/score/cpu_asm.h
index 3909c1d608..3909c1d608 100644
--- a/cpukit/score/cpu/lm32/rtems/score/cpu_asm.h
+++ b/cpukit/score/cpu/lm32/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/lm32/rtems/score/cpuatomic.h b/cpukit/score/cpu/lm32/include/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/lm32/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/lm32/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/lm32/rtems/score/cpuimpl.h b/cpukit/score/cpu/lm32/include/rtems/score/cpuimpl.h
index 789f2badd9..789f2badd9 100644
--- a/cpukit/score/cpu/lm32/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/lm32/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/lm32/rtems/score/lm32.h b/cpukit/score/cpu/lm32/include/rtems/score/lm32.h
index e8fecdf2f6..e8fecdf2f6 100644
--- a/cpukit/score/cpu/lm32/rtems/score/lm32.h
+++ b/cpukit/score/cpu/lm32/include/rtems/score/lm32.h
diff --git a/cpukit/score/cpu/lm32/rtems/score/types.h b/cpukit/score/cpu/lm32/include/rtems/score/types.h
index c3d8666de4..c3d8666de4 100644
--- a/cpukit/score/cpu/lm32/rtems/score/types.h
+++ b/cpukit/score/cpu/lm32/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/lm32/preinstall.am b/cpukit/score/cpu/lm32/preinstall.am
deleted file mode 100644
index 282353f3f7..0000000000
--- a/cpukit/score/cpu/lm32/preinstall.am
+++ /dev/null
@@ -1,53 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.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)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/lm32.h: rtems/score/lm32.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/lm32.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/lm32.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/m32c/Makefile.am b/cpukit/score/cpu/m32c/Makefile.am
index 993cf4b4d3..22bec7fce0 100644
--- a/cpukit/score/cpu/m32c/Makefile.am
+++ b/cpukit/score/cpu/m32c/Makefile.am
@@ -1,18 +1,5 @@
 include $(top_srcdir)/automake/compile.am
 
-include_HEADERS = varvects.h
-
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/m32c.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c cpu_asm.c context_switch.S context_init.c \
     varvects.S
@@ -20,5 +7,5 @@ libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_SOURCES += m32c-exception-frame-print.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/m32c/headers.am b/cpukit/score/cpu/m32c/headers.am
new file mode 100644
index 0000000000..f67d070b88
--- /dev/null
+++ b/cpukit/score/cpu/m32c/headers.am
@@ -0,0 +1,17 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += include/varvects.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/m32c.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/m32c/rtems/asm.h b/cpukit/score/cpu/m32c/include/rtems/asm.h
index f3f244d066..f3f244d066 100644
--- a/cpukit/score/cpu/m32c/rtems/asm.h
+++ b/cpukit/score/cpu/m32c/include/rtems/asm.h
diff --git a/cpukit/score/cpu/m32c/rtems/score/cpu.h b/cpukit/score/cpu/m32c/include/rtems/score/cpu.h
index af1c3412ea..af1c3412ea 100644
--- a/cpukit/score/cpu/m32c/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m32c/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/m32c/rtems/score/cpu_asm.h b/cpukit/score/cpu/m32c/include/rtems/score/cpu_asm.h
index 451c022d75..451c022d75 100644
--- a/cpukit/score/cpu/m32c/rtems/score/cpu_asm.h
+++ b/cpukit/score/cpu/m32c/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/m32c/rtems/score/cpuatomic.h b/cpukit/score/cpu/m32c/include/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/m32c/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/m32c/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/m32c/rtems/score/cpuimpl.h b/cpukit/score/cpu/m32c/include/rtems/score/cpuimpl.h
index 789f2badd9..789f2badd9 100644
--- a/cpukit/score/cpu/m32c/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/m32c/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/m32c/rtems/score/m32c.h b/cpukit/score/cpu/m32c/include/rtems/score/m32c.h
index e1936fdcfb..e1936fdcfb 100644
--- a/cpukit/score/cpu/m32c/rtems/score/m32c.h
+++ b/cpukit/score/cpu/m32c/include/rtems/score/m32c.h
diff --git a/cpukit/score/cpu/m32c/rtems/score/types.h b/cpukit/score/cpu/m32c/include/rtems/score/types.h
index 99d8297143..99d8297143 100644
--- a/cpukit/score/cpu/m32c/rtems/score/types.h
+++ b/cpukit/score/cpu/m32c/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/m32c/varvects.h b/cpukit/score/cpu/m32c/include/varvects.h
index 7168482b54..7168482b54 100644
--- a/cpukit/score/cpu/m32c/varvects.h
+++ b/cpukit/score/cpu/m32c/include/varvects.h
diff --git a/cpukit/score/cpu/m32c/preinstall.am b/cpukit/score/cpu/m32c/preinstall.am
deleted file mode 100644
index 3e12ca477d..0000000000
--- a/cpukit/score/cpu/m32c/preinstall.am
+++ /dev/null
@@ -1,62 +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)/varvects.h: varvects.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/varvects.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/varvects.h
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.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)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/m32c.h: rtems/score/m32c.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/m32c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/m32c.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am
index 04eebcba85..68fd3a253a 100644
--- a/cpukit/score/cpu/m68k/Makefile.am
+++ b/cpukit/score/cpu/m68k/Makefile.am
@@ -3,26 +3,10 @@ include $(top_srcdir)/automake/compile.am
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_m68kdir = $(includedir)/rtems/m68k
-include_rtems_m68k_HEADERS = rtems/m68k/m68302.h
-include_rtems_m68k_HEADERS += rtems/m68k/m68360.h
-include_rtems_m68k_HEADERS += rtems/m68k/qsm.h
-include_rtems_m68k_HEADERS += rtems/m68k/sim.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/m68k.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
 libscorecpu_a_SOURCES = cpu.c cpu_asm.S
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_SOURCES += m68k-exception-frame-print.c
 libscorecpu_a_SOURCES += __m68k_read_tp.c
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/m68k/headers.am b/cpukit/score/cpu/m68k/headers.am
new file mode 100644
index 0000000000..e02fad3906
--- /dev/null
+++ b/cpukit/score/cpu/m68k/headers.am
@@ -0,0 +1,24 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_m68kdir = $(includedir)/rtems/m68k
+include_rtems_m68k_HEADERS =
+include_rtems_m68k_HEADERS += include/rtems/m68k/m68302.h
+include_rtems_m68k_HEADERS += include/rtems/m68k/m68360.h
+include_rtems_m68k_HEADERS += include/rtems/m68k/qsm.h
+include_rtems_m68k_HEADERS += include/rtems/m68k/sim.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/m68k.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/m68k/machine/elf_machdep.h b/cpukit/score/cpu/m68k/include/machine/elf_machdep.h
index 9a987c69b5..9a987c69b5 100644
--- a/cpukit/libdl/include/arch/m68k/machine/elf_machdep.h
+++ b/cpukit/score/cpu/m68k/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/m68k/rtems/asm.h b/cpukit/score/cpu/m68k/include/rtems/asm.h
index cbd2a7f8b2..cbd2a7f8b2 100644
--- a/cpukit/score/cpu/m68k/rtems/asm.h
+++ b/cpukit/score/cpu/m68k/include/rtems/asm.h
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/m68302.h b/cpukit/score/cpu/m68k/include/rtems/m68k/m68302.h
index acf55f50c5..acf55f50c5 100644
--- a/cpukit/score/cpu/m68k/rtems/m68k/m68302.h
+++ b/cpukit/score/cpu/m68k/include/rtems/m68k/m68302.h
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/m68360.h b/cpukit/score/cpu/m68k/include/rtems/m68k/m68360.h
index dc181d0cdf..dc181d0cdf 100644
--- a/cpukit/score/cpu/m68k/rtems/m68k/m68360.h
+++ b/cpukit/score/cpu/m68k/include/rtems/m68k/m68360.h
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/qsm.h b/cpukit/score/cpu/m68k/include/rtems/m68k/qsm.h
index 32dbc1d5f9..32dbc1d5f9 100644
--- a/cpukit/score/cpu/m68k/rtems/m68k/qsm.h
+++ b/cpukit/score/cpu/m68k/include/rtems/m68k/qsm.h
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/sim.h b/cpukit/score/cpu/m68k/include/rtems/m68k/sim.h
index cec6b84cc1..cec6b84cc1 100644
--- a/cpukit/score/cpu/m68k/rtems/m68k/sim.h
+++ b/cpukit/score/cpu/m68k/include/rtems/m68k/sim.h
diff --git a/cpukit/score/cpu/m68k/rtems/score/cpu.h b/cpukit/score/cpu/m68k/include/rtems/score/cpu.h
index 2be10c9638..2be10c9638 100644
--- a/cpukit/score/cpu/m68k/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m68k/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/m68k/rtems/score/cpuatomic.h b/cpukit/score/cpu/m68k/include/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/m68k/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/m68k/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/m68k/rtems/score/cpuimpl.h b/cpukit/score/cpu/m68k/include/rtems/score/cpuimpl.h
index 789f2badd9..789f2badd9 100644
--- a/cpukit/score/cpu/m68k/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/m68k/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/m68k/rtems/score/m68k.h b/cpukit/score/cpu/m68k/include/rtems/score/m68k.h
index 818578c078..818578c078 100644
--- a/cpukit/score/cpu/m68k/rtems/score/m68k.h
+++ b/cpukit/score/cpu/m68k/include/rtems/score/m68k.h
diff --git a/cpukit/score/cpu/m68k/rtems/score/types.h b/cpukit/score/cpu/m68k/include/rtems/score/types.h
index 947c6ace69..947c6ace69 100644
--- a/cpukit/score/cpu/m68k/rtems/score/types.h
+++ b/cpukit/score/cpu/m68k/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/m68k/preinstall.am b/cpukit/score/cpu/m68k/preinstall.am
deleted file mode 100644
index a580b7a4b5..0000000000
--- a/cpukit/score/cpu/m68k/preinstall.am
+++ /dev/null
@@ -1,70 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/m68k
-	@: > $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/m68k/m68302.h: rtems/m68k/m68302.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/m68302.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/m68302.h
-
-$(PROJECT_INCLUDE)/rtems/m68k/m68360.h: rtems/m68k/m68360.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/m68360.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/m68360.h
-
-$(PROJECT_INCLUDE)/rtems/m68k/qsm.h: rtems/m68k/qsm.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/qsm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/qsm.h
-
-$(PROJECT_INCLUDE)/rtems/m68k/sim.h: rtems/m68k/sim.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/sim.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/sim.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)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/m68k.h: rtems/score/m68k.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/m68k.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/m68k.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am
index 123e5232b9..fe7fa5582c 100644
--- a/cpukit/score/cpu/mips/Makefile.am
+++ b/cpukit/score/cpu/mips/Makefile.am
@@ -1,23 +1,9 @@
 include $(top_srcdir)/automake/compile.am
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_mipsdir = $(includedir)/rtems/mips
-include_rtems_mips_HEADERS = rtems/mips/idtcpu.h
-include_rtems_mips_HEADERS += rtems/mips/iregdef.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/mips.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c cpu_asm.S
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/mips/headers.am b/cpukit/score/cpu/mips/headers.am
new file mode 100644
index 0000000000..cbcf1dd91f
--- /dev/null
+++ b/cpukit/score/cpu/mips/headers.am
@@ -0,0 +1,22 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_mipsdir = $(includedir)/rtems/mips
+include_rtems_mips_HEADERS =
+include_rtems_mips_HEADERS += include/rtems/mips/idtcpu.h
+include_rtems_mips_HEADERS += include/rtems/mips/iregdef.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/mips.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/mips/machine/elf_machdep.h b/cpukit/score/cpu/mips/include/machine/elf_machdep.h
index 26700ce4ce..26700ce4ce 100644
--- a/cpukit/libdl/include/arch/mips/machine/elf_machdep.h
+++ b/cpukit/score/cpu/mips/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/mips/rtems/asm.h b/cpukit/score/cpu/mips/include/rtems/asm.h
index 9c84f61990..9c84f61990 100644
--- a/cpukit/score/cpu/mips/rtems/asm.h
+++ b/cpukit/score/cpu/mips/include/rtems/asm.h
diff --git a/cpukit/score/cpu/mips/rtems/mips/idtcpu.h b/cpukit/score/cpu/mips/include/rtems/mips/idtcpu.h
index 927bbec133..927bbec133 100644
--- a/cpukit/score/cpu/mips/rtems/mips/idtcpu.h
+++ b/cpukit/score/cpu/mips/include/rtems/mips/idtcpu.h
diff --git a/cpukit/score/cpu/mips/rtems/mips/iregdef.h b/cpukit/score/cpu/mips/include/rtems/mips/iregdef.h
index 5d41074184..5d41074184 100644
--- a/cpukit/score/cpu/mips/rtems/mips/iregdef.h
+++ b/cpukit/score/cpu/mips/include/rtems/mips/iregdef.h
diff --git a/cpukit/score/cpu/mips/rtems/score/cpu.h b/cpukit/score/cpu/mips/include/rtems/score/cpu.h
index 74afc800b9..74afc800b9 100644
--- a/cpukit/score/cpu/mips/rtems/score/cpu.h
+++ b/cpukit/score/cpu/mips/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/mips/rtems/score/cpuatomic.h b/cpukit/score/cpu/mips/include/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/mips/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/mips/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/mips/rtems/score/cpuimpl.h b/cpukit/score/cpu/mips/include/rtems/score/cpuimpl.h
index 789f2badd9..789f2badd9 100644
--- a/cpukit/score/cpu/mips/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/mips/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/mips/rtems/score/mips.h b/cpukit/score/cpu/mips/include/rtems/score/mips.h
index 4c2c53fa6d..4c2c53fa6d 100644
--- a/cpukit/score/cpu/mips/rtems/score/mips.h
+++ b/cpukit/score/cpu/mips/include/rtems/score/mips.h
diff --git a/cpukit/score/cpu/mips/rtems/score/types.h b/cpukit/score/cpu/mips/include/rtems/score/types.h
index e3226a3bb4..e3226a3bb4 100644
--- a/cpukit/score/cpu/mips/rtems/score/types.h
+++ b/cpukit/score/cpu/mips/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/mips/preinstall.am b/cpukit/score/cpu/mips/preinstall.am
deleted file mode 100644
index 8fa3cc67a3..0000000000
--- a/cpukit/score/cpu/mips/preinstall.am
+++ /dev/null
@@ -1,62 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/mips/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/mips
-	@: > $(PROJECT_INCLUDE)/rtems/mips/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/mips/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/mips/idtcpu.h: rtems/mips/idtcpu.h $(PROJECT_INCLUDE)/rtems/mips/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mips/idtcpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mips/idtcpu.h
-
-$(PROJECT_INCLUDE)/rtems/mips/iregdef.h: rtems/mips/iregdef.h $(PROJECT_INCLUDE)/rtems/mips/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mips/iregdef.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mips/iregdef.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)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/mips.h: rtems/score/mips.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/mips.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/mips.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/moxie/Makefile.am b/cpukit/score/cpu/moxie/Makefile.am
index edd2bd4699..29c9a656c5 100644
--- a/cpukit/score/cpu/moxie/Makefile.am
+++ b/cpukit/score/cpu/moxie/Makefile.am
@@ -4,19 +4,10 @@
 
 include $(top_srcdir)/automake/compile.am
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/moxie.h \
-    rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c moxie-exception-frame-print.c cpu_asm.S
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/moxie/headers.am b/cpukit/score/cpu/moxie/headers.am
new file mode 100644
index 0000000000..4f253a662b
--- /dev/null
+++ b/cpukit/score/cpu/moxie/headers.am
@@ -0,0 +1,17 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/moxie.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/moxie/machine/elf_machdep.h b/cpukit/score/cpu/moxie/include/machine/elf_machdep.h
index 3f0df23cdc..3f0df23cdc 100644
--- a/cpukit/libdl/include/arch/moxie/machine/elf_machdep.h
+++ b/cpukit/score/cpu/moxie/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/moxie/rtems/asm.h b/cpukit/score/cpu/moxie/include/rtems/asm.h
index fdb182f32f..fdb182f32f 100644
--- a/cpukit/score/cpu/moxie/rtems/asm.h
+++ b/cpukit/score/cpu/moxie/include/rtems/asm.h
diff --git a/cpukit/score/cpu/moxie/rtems/score/cpu.h b/cpukit/score/cpu/moxie/include/rtems/score/cpu.h
index a3aac9ee41..a3aac9ee41 100644
--- a/cpukit/score/cpu/moxie/rtems/score/cpu.h
+++ b/cpukit/score/cpu/moxie/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/moxie/rtems/score/cpuatomic.h b/cpukit/score/cpu/moxie/include/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/moxie/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/moxie/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/moxie/rtems/score/cpuimpl.h b/cpukit/score/cpu/moxie/include/rtems/score/cpuimpl.h
index 789f2badd9..789f2badd9 100644
--- a/cpukit/score/cpu/moxie/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/moxie/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/moxie/rtems/score/moxie.h b/cpukit/score/cpu/moxie/include/rtems/score/moxie.h
index 66f771aadf..66f771aadf 100644
--- a/cpukit/score/cpu/moxie/rtems/score/moxie.h
+++ b/cpukit/score/cpu/moxie/include/rtems/score/moxie.h
diff --git a/cpukit/score/cpu/moxie/rtems/score/types.h b/cpukit/score/cpu/moxie/include/rtems/score/types.h
index 99402b0208..99402b0208 100644
--- a/cpukit/score/cpu/moxie/rtems/score/types.h
+++ b/cpukit/score/cpu/moxie/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/moxie/preinstall.am b/cpukit/score/cpu/moxie/preinstall.am
deleted file mode 100644
index 9753489081..0000000000
--- a/cpukit/score/cpu/moxie/preinstall.am
+++ /dev/null
@@ -1,49 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.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)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/moxie.h: rtems/score/moxie.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/moxie.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/moxie.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/nios2/Makefile.am b/cpukit/score/cpu/nios2/Makefile.am
index b3e9d28c01..243f937e51 100644
--- a/cpukit/score/cpu/nios2/Makefile.am
+++ b/cpukit/score/cpu/nios2/Makefile.am
@@ -3,22 +3,6 @@ include $(top_srcdir)/automake/compile.am
 CLEANFILES =
 DISTCLEANFILES =
 
-include_rtemsdir = $(includedir)/rtems
-
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-
-include_rtems_score_HEADERS =
-include_rtems_score_HEADERS += rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/nios2.h
-include_rtems_score_HEADERS += rtems/score/nios2-utility.h
-include_rtems_score_HEADERS += rtems/score/nios2-count-zeros.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
 noinst_LIBRARIES = libscorecpu.a
 
 libscorecpu_a_SOURCES =
@@ -50,6 +34,6 @@ libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 all-local: $(PREINSTALL_FILES)
 
-include $(srcdir)/preinstall.am
 
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/nios2/headers.am b/cpukit/score/cpu/nios2/headers.am
new file mode 100644
index 0000000000..8cf15f1242
--- /dev/null
+++ b/cpukit/score/cpu/nios2/headers.am
@@ -0,0 +1,20 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/nios2-count-zeros.h
+include_rtems_score_HEADERS += include/rtems/score/nios2-utility.h
+include_rtems_score_HEADERS += include/rtems/score/nios2.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/nios2/machine/elf_machdep.h b/cpukit/score/cpu/nios2/include/machine/elf_machdep.h
index 3f3c108bf5..3f3c108bf5 100644
--- a/cpukit/libdl/include/arch/nios2/machine/elf_machdep.h
+++ b/cpukit/score/cpu/nios2/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/nios2/rtems/asm.h b/cpukit/score/cpu/nios2/include/rtems/asm.h
index 45ccd8b050..45ccd8b050 100644
--- a/cpukit/score/cpu/nios2/rtems/asm.h
+++ b/cpukit/score/cpu/nios2/include/rtems/asm.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/cpu.h b/cpukit/score/cpu/nios2/include/rtems/score/cpu.h
index a3f2f03d36..a3f2f03d36 100644
--- a/cpukit/score/cpu/nios2/rtems/score/cpu.h
+++ b/cpukit/score/cpu/nios2/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/cpu_asm.h b/cpukit/score/cpu/nios2/include/rtems/score/cpu_asm.h
index 81a19c8d69..81a19c8d69 100644
--- a/cpukit/score/cpu/nios2/rtems/score/cpu_asm.h
+++ b/cpukit/score/cpu/nios2/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/cpuatomic.h b/cpukit/score/cpu/nios2/include/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/nios2/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/nios2/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/cpuimpl.h b/cpukit/score/cpu/nios2/include/rtems/score/cpuimpl.h
index 789f2badd9..789f2badd9 100644
--- a/cpukit/score/cpu/nios2/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/nios2/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/nios2-count-zeros.h b/cpukit/score/cpu/nios2/include/rtems/score/nios2-count-zeros.h
index bf2390a51f..bf2390a51f 100644
--- a/cpukit/score/cpu/nios2/rtems/score/nios2-count-zeros.h
+++ b/cpukit/score/cpu/nios2/include/rtems/score/nios2-count-zeros.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h b/cpukit/score/cpu/nios2/include/rtems/score/nios2-utility.h
index d5eb4b3597..d5eb4b3597 100644
--- a/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h
+++ b/cpukit/score/cpu/nios2/include/rtems/score/nios2-utility.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/nios2.h b/cpukit/score/cpu/nios2/include/rtems/score/nios2.h
index 26d76bcbfa..26d76bcbfa 100644
--- a/cpukit/score/cpu/nios2/rtems/score/nios2.h
+++ b/cpukit/score/cpu/nios2/include/rtems/score/nios2.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/types.h b/cpukit/score/cpu/nios2/include/rtems/score/types.h
index 23cf39419b..23cf39419b 100644
--- a/cpukit/score/cpu/nios2/rtems/score/types.h
+++ b/cpukit/score/cpu/nios2/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/nios2/preinstall.am b/cpukit/score/cpu/nios2/preinstall.am
deleted file mode 100644
index fa07df865d..0000000000
--- a/cpukit/score/cpu/nios2/preinstall.am
+++ /dev/null
@@ -1,61 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.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)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/nios2.h: rtems/score/nios2.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/nios2.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/nios2.h
-
-$(PROJECT_INCLUDE)/rtems/score/nios2-utility.h: rtems/score/nios2-utility.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/nios2-utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/nios2-utility.h
-
-$(PROJECT_INCLUDE)/rtems/score/nios2-count-zeros.h: rtems/score/nios2-count-zeros.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/nios2-count-zeros.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/nios2-count-zeros.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/no_cpu/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am
index 3134c01da8..556d3dea34 100644
--- a/cpukit/score/cpu/no_cpu/Makefile.am
+++ b/cpukit/score/cpu/no_cpu/Makefile.am
@@ -1,19 +1,9 @@
 include $(top_srcdir)/automake/compile.am
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/no_cpu.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c cpu_asm.c
 libscorecpu_a_SOURCES += cpucounterread.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/no_cpu/headers.am b/cpukit/score/cpu/no_cpu/headers.am
new file mode 100644
index 0000000000..faf934fb1e
--- /dev/null
+++ b/cpukit/score/cpu/no_cpu/headers.am
@@ -0,0 +1,13 @@
+## This file was generated by "./boostrap -H".
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/no_cpu.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/no_cpu/rtems/asm.h b/cpukit/score/cpu/no_cpu/include/rtems/asm.h
index 926e3964e5..926e3964e5 100644
--- a/cpukit/score/cpu/no_cpu/rtems/asm.h
+++ b/cpukit/score/cpu/no_cpu/include/rtems/asm.h
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h b/cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h
index c16adc7327..c16adc7327 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
+++ b/cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpu_asm.h b/cpukit/score/cpu/no_cpu/include/rtems/score/cpu_asm.h
index 747fd3a1c1..747fd3a1c1 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/cpu_asm.h
+++ b/cpukit/score/cpu/no_cpu/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpuimpl.h b/cpukit/score/cpu/no_cpu/include/rtems/score/cpuimpl.h
index 85214d7f6c..85214d7f6c 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/no_cpu/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/no_cpu.h b/cpukit/score/cpu/no_cpu/include/rtems/score/no_cpu.h
index d1bbceccc0..d1bbceccc0 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/no_cpu.h
+++ b/cpukit/score/cpu/no_cpu/include/rtems/score/no_cpu.h
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/types.h b/cpukit/score/cpu/no_cpu/include/rtems/score/types.h
index b330c33904..b330c33904 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/types.h
+++ b/cpukit/score/cpu/no_cpu/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/no_cpu/preinstall.am b/cpukit/score/cpu/no_cpu/preinstall.am
deleted file mode 100644
index fa63e6a812..0000000000
--- a/cpukit/score/cpu/no_cpu/preinstall.am
+++ /dev/null
@@ -1,49 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.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)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/no_cpu.h: rtems/score/no_cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/no_cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/no_cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
diff --git a/cpukit/score/cpu/or1k/Makefile.am b/cpukit/score/cpu/or1k/Makefile.am
index c9f28595f8..e4c5b7cdd2 100644
--- a/cpukit/score/cpu/or1k/Makefile.am
+++ b/cpukit/score/cpu/or1k/Makefile.am
@@ -3,21 +3,6 @@ include $(top_srcdir)/automake/compile.am
 CLEANFILES =
 DISTCLEANFILES =
 
-include_rtemsdir = $(includedir)/rtems
-
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-
-include_rtems_score_HEADERS =
-include_rtems_score_HEADERS += rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/or1k.h
-include_rtems_score_HEADERS += rtems/score/or1k-utility.h
-
 noinst_LIBRARIES = libscorecpu.a
 
 libscorecpu_a_SOURCES =
@@ -34,5 +19,5 @@ libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 all-local: $(PREINSTALL_FILES)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/or1k/headers.am b/cpukit/score/cpu/or1k/headers.am
new file mode 100644
index 0000000000..1ddc654793
--- /dev/null
+++ b/cpukit/score/cpu/or1k/headers.am
@@ -0,0 +1,15 @@
+## This file was generated by "./boostrap -H".
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/or1k-utility.h
+include_rtems_score_HEADERS += include/rtems/score/or1k.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/or1k/rtems/asm.h b/cpukit/score/cpu/or1k/include/rtems/asm.h
index 4d2c22698b..4d2c22698b 100644
--- a/cpukit/score/cpu/or1k/rtems/asm.h
+++ b/cpukit/score/cpu/or1k/include/rtems/asm.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/cpu.h b/cpukit/score/cpu/or1k/include/rtems/score/cpu.h
index 6daca10f9c..6daca10f9c 100644
--- a/cpukit/score/cpu/or1k/rtems/score/cpu.h
+++ b/cpukit/score/cpu/or1k/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/cpu_asm.h b/cpukit/score/cpu/or1k/include/rtems/score/cpu_asm.h
index a5659f35ce..a5659f35ce 100644
--- a/cpukit/score/cpu/or1k/rtems/score/cpu_asm.h
+++ b/cpukit/score/cpu/or1k/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/cpuatomic.h b/cpukit/score/cpu/or1k/include/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/or1k/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/or1k/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/cpuimpl.h b/cpukit/score/cpu/or1k/include/rtems/score/cpuimpl.h
index 789f2badd9..789f2badd9 100644
--- a/cpukit/score/cpu/or1k/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/or1k/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/or1k-utility.h b/cpukit/score/cpu/or1k/include/rtems/score/or1k-utility.h
index 98bbe41b00..98bbe41b00 100644
--- a/cpukit/score/cpu/or1k/rtems/score/or1k-utility.h
+++ b/cpukit/score/cpu/or1k/include/rtems/score/or1k-utility.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/or1k.h b/cpukit/score/cpu/or1k/include/rtems/score/or1k.h
index e1a3ddce42..e1a3ddce42 100644
--- a/cpukit/score/cpu/or1k/rtems/score/or1k.h
+++ b/cpukit/score/cpu/or1k/include/rtems/score/or1k.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/types.h b/cpukit/score/cpu/or1k/include/rtems/score/types.h
index 09790feb29..09790feb29 100644
--- a/cpukit/score/cpu/or1k/rtems/score/types.h
+++ b/cpukit/score/cpu/or1k/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/or1k/preinstall.am b/cpukit/score/cpu/or1k/preinstall.am
deleted file mode 100644
index eae1e46d14..0000000000
--- a/cpukit/score/cpu/or1k/preinstall.am
+++ /dev/null
@@ -1,57 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.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)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/or1k.h: rtems/score/or1k.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/or1k.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/or1k.h
-
-$(PROJECT_INCLUDE)/rtems/score/or1k-utility.h: rtems/score/or1k-utility.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/or1k-utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/or1k-utility.h
-
diff --git a/cpukit/score/cpu/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am
index 7ed1f7996f..05ab2f480d 100644
--- a/cpukit/score/cpu/powerpc/Makefile.am
+++ b/cpukit/score/cpu/powerpc/Makefile.am
@@ -1,18 +1,5 @@
 include $(top_srcdir)/automake/compile.am
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/powerpc.h
-include_rtems_score_HEADERS += rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
-include_rtems_powerpcdir = $(includedir)/rtems/powerpc
-include_rtems_powerpc_HEADERS = rtems/powerpc/registers.h
-
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c
 libscorecpu_a_SOURCES += ppc-context-volatile-clobber.S
@@ -21,5 +8,5 @@ libscorecpu_a_SOURCES += ppc-isr-disable-mask.S
 libscorecpu_a_SOURCES += ppc-isr-vector-install.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/powerpc/headers.am b/cpukit/score/cpu/powerpc/headers.am
new file mode 100644
index 0000000000..d8253e84f9
--- /dev/null
+++ b/cpukit/score/cpu/powerpc/headers.am
@@ -0,0 +1,21 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_powerpcdir = $(includedir)/rtems/powerpc
+include_rtems_powerpc_HEADERS =
+include_rtems_powerpc_HEADERS += include/rtems/powerpc/registers.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/powerpc.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/powerpc/machine/elf_machdep.h b/cpukit/score/cpu/powerpc/include/machine/elf_machdep.h
index f0fdb3f33b..f0fdb3f33b 100644
--- a/cpukit/libdl/include/arch/powerpc/machine/elf_machdep.h
+++ b/cpukit/score/cpu/powerpc/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/powerpc/rtems/asm.h b/cpukit/score/cpu/powerpc/include/rtems/asm.h
index 2fddf56e6d..2fddf56e6d 100644
--- a/cpukit/score/cpu/powerpc/rtems/asm.h
+++ b/cpukit/score/cpu/powerpc/include/rtems/asm.h
diff --git a/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h b/cpukit/score/cpu/powerpc/include/rtems/powerpc/registers.h
index 4d9350324e..4d9350324e 100644
--- a/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h
+++ b/cpukit/score/cpu/powerpc/include/rtems/powerpc/registers.h
diff --git a/cpukit/score/cpu/powerpc/rtems/score/cpu.h b/cpukit/score/cpu/powerpc/include/rtems/score/cpu.h
index 8c0f200641..8c0f200641 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/cpu.h
+++ b/cpukit/score/cpu/powerpc/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/powerpc/rtems/score/cpuatomic.h b/cpukit/score/cpu/powerpc/include/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/powerpc/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/powerpc/rtems/score/cpuimpl.h b/cpukit/score/cpu/powerpc/include/rtems/score/cpuimpl.h
index 792a8111ad..792a8111ad 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/powerpc/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/powerpc/rtems/score/powerpc.h b/cpukit/score/cpu/powerpc/include/rtems/score/powerpc.h
index 88ee0020e6..88ee0020e6 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/powerpc.h
+++ b/cpukit/score/cpu/powerpc/include/rtems/score/powerpc.h
diff --git a/cpukit/score/cpu/powerpc/rtems/score/types.h b/cpukit/score/cpu/powerpc/include/rtems/score/types.h
index cdab30234d..cdab30234d 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/types.h
+++ b/cpukit/score/cpu/powerpc/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/powerpc/preinstall.am b/cpukit/score/cpu/powerpc/preinstall.am
deleted file mode 100644
index b0f59c24f9..0000000000
--- a/cpukit/score/cpu/powerpc/preinstall.am
+++ /dev/null
@@ -1,58 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.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)/rtems/score/powerpc.h: rtems/score/powerpc.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/powerpc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/powerpc.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
-$(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/registers.h: rtems/powerpc/registers.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/registers.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/registers.h
-
diff --git a/cpukit/score/cpu/riscv/Makefile.am b/cpukit/score/cpu/riscv/Makefile.am
index 1de5b2da42..3630c038a7 100644
--- a/cpukit/score/cpu/riscv/Makefile.am
+++ b/cpukit/score/cpu/riscv/Makefile.am
@@ -1,16 +1,4 @@
 include $(top_srcdir)/automake/compile.am
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/riscv.h
-include_rtems_score_HEADERS += rtems/score/riscv-utility.h
-
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 libscorecpu_a_SOURCES  = cpu.c
@@ -22,5 +10,5 @@ libscorecpu_a_SOURCES += riscv-context-initialize.c
 libscorecpu_a_SOURCES += riscv-context-validate.S
 libscorecpu_a_SOURCES += riscv-context-volatile-clobber.S
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/riscv/headers.am b/cpukit/score/cpu/riscv/headers.am
new file mode 100644
index 0000000000..b5d3295c33
--- /dev/null
+++ b/cpukit/score/cpu/riscv/headers.am
@@ -0,0 +1,15 @@
+## This file was generated by "./boostrap -H".
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/riscv-utility.h
+include_rtems_score_HEADERS += include/rtems/score/riscv.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/riscv/rtems/asm.h b/cpukit/score/cpu/riscv/include/rtems/asm.h
index 34b6474515..34b6474515 100644
--- a/cpukit/score/cpu/riscv/rtems/asm.h
+++ b/cpukit/score/cpu/riscv/include/rtems/asm.h
diff --git a/cpukit/score/cpu/riscv/rtems/score/cpu.h b/cpukit/score/cpu/riscv/include/rtems/score/cpu.h
index 3f8af862bf..3f8af862bf 100644
--- a/cpukit/score/cpu/riscv/rtems/score/cpu.h
+++ b/cpukit/score/cpu/riscv/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/riscv/rtems/score/cpu_asm.h b/cpukit/score/cpu/riscv/include/rtems/score/cpu_asm.h
index b5a56f3e22..b5a56f3e22 100644
--- a/cpukit/score/cpu/riscv/rtems/score/cpu_asm.h
+++ b/cpukit/score/cpu/riscv/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/riscv/rtems/score/cpuatomic.h b/cpukit/score/cpu/riscv/include/rtems/score/cpuatomic.h
index 8ee9606b44..8ee9606b44 100644
--- a/cpukit/score/cpu/riscv/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/riscv/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/riscv/rtems/score/cpuimpl.h b/cpukit/score/cpu/riscv/include/rtems/score/cpuimpl.h
index 3904c84bf9..3904c84bf9 100644
--- a/cpukit/score/cpu/riscv/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/riscv/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/riscv/rtems/score/riscv-utility.h b/cpukit/score/cpu/riscv/include/rtems/score/riscv-utility.h
index dc4836bee2..dc4836bee2 100644
--- a/cpukit/score/cpu/riscv/rtems/score/riscv-utility.h
+++ b/cpukit/score/cpu/riscv/include/rtems/score/riscv-utility.h
diff --git a/cpukit/score/cpu/riscv/rtems/score/riscv.h b/cpukit/score/cpu/riscv/include/rtems/score/riscv.h
index 6e7f1370c6..6e7f1370c6 100644
--- a/cpukit/score/cpu/riscv/rtems/score/riscv.h
+++ b/cpukit/score/cpu/riscv/include/rtems/score/riscv.h
diff --git a/cpukit/score/cpu/riscv/rtems/score/types.h b/cpukit/score/cpu/riscv/include/rtems/score/types.h
index d1440fb319..d1440fb319 100644
--- a/cpukit/score/cpu/riscv/rtems/score/types.h
+++ b/cpukit/score/cpu/riscv/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/riscv/preinstall.am b/cpukit/score/cpu/riscv/preinstall.am
deleted file mode 100644
index 14256ba876..0000000000
--- a/cpukit/score/cpu/riscv/preinstall.am
+++ /dev/null
@@ -1,57 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.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)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/riscv.h: rtems/score/riscv.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/riscv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/riscv.h
-
-$(PROJECT_INCLUDE)/rtems/score/riscv-utility.h: rtems/score/riscv-utility.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/riscv-utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/riscv-utility.h
-
diff --git a/cpukit/score/cpu/sh/Makefile.am b/cpukit/score/cpu/sh/Makefile.am
index b480b1aa26..6a19ce4cb8 100644
--- a/cpukit/score/cpu/sh/Makefile.am
+++ b/cpukit/score/cpu/sh/Makefile.am
@@ -1,21 +1,10 @@
 include $(top_srcdir)/automake/compile.am
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/sh.h
-include_rtems_score_HEADERS += rtems/score/sh_io.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c context.c
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_SOURCES += sh-exception-frame-print.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/sh/headers.am b/cpukit/score/cpu/sh/headers.am
new file mode 100644
index 0000000000..40073e7186
--- /dev/null
+++ b/cpukit/score/cpu/sh/headers.am
@@ -0,0 +1,14 @@
+## This file was generated by "./boostrap -H".
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/sh.h
+include_rtems_score_HEADERS += include/rtems/score/sh_io.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/sh/rtems/asm.h b/cpukit/score/cpu/sh/include/rtems/asm.h
index ac730310cd..ac730310cd 100644
--- a/cpukit/score/cpu/sh/rtems/asm.h
+++ b/cpukit/score/cpu/sh/include/rtems/asm.h
diff --git a/cpukit/score/cpu/sh/rtems/score/cpu.h b/cpukit/score/cpu/sh/include/rtems/score/cpu.h
index c2b7081e9e..c2b7081e9e 100644
--- a/cpukit/score/cpu/sh/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sh/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/sh/rtems/score/cpuatomic.h b/cpukit/score/cpu/sh/include/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/sh/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/sh/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/sh/rtems/score/cpuimpl.h b/cpukit/score/cpu/sh/include/rtems/score/cpuimpl.h
index 789f2badd9..789f2badd9 100644
--- a/cpukit/score/cpu/sh/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/sh/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/sh/rtems/score/sh.h b/cpukit/score/cpu/sh/include/rtems/score/sh.h
index 4e26478b8b..4e26478b8b 100644
--- a/cpukit/score/cpu/sh/rtems/score/sh.h
+++ b/cpukit/score/cpu/sh/include/rtems/score/sh.h
diff --git a/cpukit/score/cpu/sh/rtems/score/sh_io.h b/cpukit/score/cpu/sh/include/rtems/score/sh_io.h
index 8d81965f78..8d81965f78 100644
--- a/cpukit/score/cpu/sh/rtems/score/sh_io.h
+++ b/cpukit/score/cpu/sh/include/rtems/score/sh_io.h
diff --git a/cpukit/score/cpu/sh/rtems/score/types.h b/cpukit/score/cpu/sh/include/rtems/score/types.h
index a449a6d6e3..a449a6d6e3 100644
--- a/cpukit/score/cpu/sh/rtems/score/types.h
+++ b/cpukit/score/cpu/sh/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/sh/preinstall.am b/cpukit/score/cpu/sh/preinstall.am
deleted file mode 100644
index 08d2352709..0000000000
--- a/cpukit/score/cpu/sh/preinstall.am
+++ /dev/null
@@ -1,53 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.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)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/sh.h: rtems/score/sh.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh.h
-
-$(PROJECT_INCLUDE)/rtems/score/sh_io.h: rtems/score/sh_io.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh_io.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am
index e03aabc0ff..1a76a2f009 100644
--- a/cpukit/score/cpu/sparc/Makefile.am
+++ b/cpukit/score/cpu/sparc/Makefile.am
@@ -1,19 +1,5 @@
 include $(top_srcdir)/automake/compile.am
 
-include_libcpudir = $(includedir)/libcpu
-include_libcpu_HEADERS = include/libcpu/byteorder.h
-
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/sparc.h
-include_rtems_score_HEADERS += rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/sparcimpl.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = cpu.c
 libscorecpu_a_SOURCES += sparc-context-volatile-clobber.S
@@ -22,5 +8,5 @@ libscorecpu_a_SOURCES += sparc-counter.c
 libscorecpu_a_SOURCES += sparc-counter-asm.S
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/sparc/headers.am b/cpukit/score/cpu/sparc/headers.am
new file mode 100644
index 0000000000..89f4f63cf2
--- /dev/null
+++ b/cpukit/score/cpu/sparc/headers.am
@@ -0,0 +1,22 @@
+## This file was generated by "./boostrap -H".
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += include/libcpu/byteorder.h
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/sparc.h
+include_rtems_score_HEADERS += include/rtems/score/sparcimpl.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/sparc/machine/elf_machdep.h b/cpukit/score/cpu/sparc/include/machine/elf_machdep.h
index e8f2b630c2..e8f2b630c2 100644
--- a/cpukit/libdl/include/arch/sparc/machine/elf_machdep.h
+++ b/cpukit/score/cpu/sparc/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/sparc/rtems/asm.h b/cpukit/score/cpu/sparc/include/rtems/asm.h
index a2b11f63fc..a2b11f63fc 100644
--- a/cpukit/score/cpu/sparc/rtems/asm.h
+++ b/cpukit/score/cpu/sparc/include/rtems/asm.h
diff --git a/cpukit/score/cpu/sparc/rtems/score/cpu.h b/cpukit/score/cpu/sparc/include/rtems/score/cpu.h
index 2b50592e08..2b50592e08 100644
--- a/cpukit/score/cpu/sparc/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/sparc/rtems/score/cpuatomic.h b/cpukit/score/cpu/sparc/include/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/sparc/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/sparc/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/sparc/rtems/score/cpuimpl.h b/cpukit/score/cpu/sparc/include/rtems/score/cpuimpl.h
index 4f2311e755..4f2311e755 100644
--- a/cpukit/score/cpu/sparc/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/sparc/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/sparc/rtems/score/sparc.h b/cpukit/score/cpu/sparc/include/rtems/score/sparc.h
index 747d013559..747d013559 100644
--- a/cpukit/score/cpu/sparc/rtems/score/sparc.h
+++ b/cpukit/score/cpu/sparc/include/rtems/score/sparc.h
diff --git a/cpukit/score/cpu/sparc/rtems/score/sparcimpl.h b/cpukit/score/cpu/sparc/include/rtems/score/sparcimpl.h
index 9f9999b063..9f9999b063 100644
--- a/cpukit/score/cpu/sparc/rtems/score/sparcimpl.h
+++ b/cpukit/score/cpu/sparc/include/rtems/score/sparcimpl.h
diff --git a/cpukit/score/cpu/sparc/rtems/score/types.h b/cpukit/score/cpu/sparc/include/rtems/score/types.h
index 6419c9f15f..6419c9f15f 100644
--- a/cpukit/score/cpu/sparc/rtems/score/types.h
+++ b/cpukit/score/cpu/sparc/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/sparc/preinstall.am b/cpukit/score/cpu/sparc/preinstall.am
deleted file mode 100644
index 13caf27e22..0000000000
--- a/cpukit/score/cpu/sparc/preinstall.am
+++ /dev/null
@@ -1,62 +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/byteorder.h: include/libcpu/byteorder.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.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)/rtems/score/sparc.h: rtems/score/sparc.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sparc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sparc.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/sparcimpl.h: rtems/score/sparcimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sparcimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sparcimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/sparc64/Makefile.am b/cpukit/score/cpu/sparc64/Makefile.am
index 491c197b81..2afd3edead 100644
--- a/cpukit/score/cpu/sparc64/Makefile.am
+++ b/cpukit/score/cpu/sparc64/Makefile.am
@@ -1,23 +1,13 @@
 include $(top_srcdir)/automake/compile.am
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
 #include_rtems_sparc64dir = $(includedir)/rtems/sparc64
 #include_rtems_sparc64_HEADERS = 
 
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/sparc64.h
-include_rtems_score_HEADERS += rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES = context.S cpu.c
 libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_SOURCES += sparc64-exception-frame-print.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/sparc64/headers.am b/cpukit/score/cpu/sparc64/headers.am
new file mode 100644
index 0000000000..9b54d09ece
--- /dev/null
+++ b/cpukit/score/cpu/sparc64/headers.am
@@ -0,0 +1,13 @@
+## This file was generated by "./boostrap -H".
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/sparc64.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/sparc64/rtems/asm.h b/cpukit/score/cpu/sparc64/include/rtems/asm.h
index f4448b03a5..f4448b03a5 100644
--- a/cpukit/score/cpu/sparc64/rtems/asm.h
+++ b/cpukit/score/cpu/sparc64/include/rtems/asm.h
diff --git a/cpukit/score/cpu/sparc64/rtems/score/cpu.h b/cpukit/score/cpu/sparc64/include/rtems/score/cpu.h
index 47041e7d5e..47041e7d5e 100644
--- a/cpukit/score/cpu/sparc64/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc64/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/sparc64/rtems/score/cpuatomic.h b/cpukit/score/cpu/sparc64/include/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/sparc64/rtems/score/cpuatomic.h
+++ b/cpukit/score/cpu/sparc64/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/sparc64/rtems/score/cpuimpl.h b/cpukit/score/cpu/sparc64/include/rtems/score/cpuimpl.h
index 789f2badd9..789f2badd9 100644
--- a/cpukit/score/cpu/sparc64/rtems/score/cpuimpl.h
+++ b/cpukit/score/cpu/sparc64/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/sparc64/rtems/score/sparc64.h b/cpukit/score/cpu/sparc64/include/rtems/score/sparc64.h
index d20c2ff509..d20c2ff509 100644
--- a/cpukit/score/cpu/sparc64/rtems/score/sparc64.h
+++ b/cpukit/score/cpu/sparc64/include/rtems/score/sparc64.h
diff --git a/cpukit/score/cpu/sparc64/rtems/score/types.h b/cpukit/score/cpu/sparc64/include/rtems/score/types.h
index faf50b7a55..faf50b7a55 100644
--- a/cpukit/score/cpu/sparc64/rtems/score/types.h
+++ b/cpukit/score/cpu/sparc64/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/sparc64/preinstall.am b/cpukit/score/cpu/sparc64/preinstall.am
deleted file mode 100644
index 8565c8a672..0000000000
--- a/cpukit/score/cpu/sparc64/preinstall.am
+++ /dev/null
@@ -1,49 +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)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.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)/rtems/score/sparc64.h: rtems/score/sparc64.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sparc64.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sparc64.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/v850/Makefile.am b/cpukit/score/cpu/v850/Makefile.am
index 7200f2a097..15867801a5 100644
--- a/cpukit/score/cpu/v850/Makefile.am
+++ b/cpukit/score/cpu/v850/Makefile.am
@@ -1,15 +1,5 @@
 include $(top_srcdir)/automake/compile.am
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS  = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/v850.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES  = cpu.c
 libscorecpu_a_SOURCES += cpu_asm.S
@@ -17,5 +7,5 @@ libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
 libscorecpu_a_SOURCES += v850-exception-frame-print.c
 libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/v850/headers.am b/cpukit/score/cpu/v850/headers.am
new file mode 100644
index 0000000000..ea94e64aa2
--- /dev/null
+++ b/cpukit/score/cpu/v850/headers.am
@@ -0,0 +1,18 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
+include_rtems_score_HEADERS += include/rtems/score/v850.h
diff --git a/cpukit/libdl/include/arch/v850/machine/elf_machdep.h b/cpukit/score/cpu/v850/include/machine/elf_machdep.h
index b76d1491d6..b76d1491d6 100644
--- a/cpukit/libdl/include/arch/v850/machine/elf_machdep.h
+++ b/cpukit/score/cpu/v850/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/v850/rtems/asm.h b/cpukit/score/cpu/v850/include/rtems/asm.h
index 265e4967ae..265e4967ae 100644
--- a/cpukit/score/cpu/v850/rtems/asm.h
+++ b/cpukit/score/cpu/v850/include/rtems/asm.h
diff --git a/cpukit/score/cpu/v850/rtems/score/cpu.h b/cpukit/score/cpu/v850/include/rtems/score/cpu.h
index d3cdf0514a..d3cdf0514a 100644
--- a/