Merge branch 'fix' into waf (this contains the 'include' branch as well)

3262 files changed, 13048 insertions, 130 deletions

diff --git a/cpukit/libmisc/uuid/uuidP.h b/cpukit/libmisc/uuid/uuidP.h
index d0e24c6942..e897bbb4e5 100644
--- a/cpukit/libmisc/uuid/uuidP.h
+++ b/cpukit/libmisc/uuid/uuidP.h
@@ -39,7 +39,7 @@
 #endif
 #include <sys/types.h>
 
-#include "uuid.h"
+#include <uuid/uuid.h>
 
 /*
  * Offset between 15-Oct-1582 and 1-Jan-70
diff --git a/cpukit/posix/include/rtems/posix/threadsup.h b/cpukit/posix/include/rtems/posix/threadsup.h
deleted file mode 100644
index 46903fed98..0000000000
--- a/cpukit/posix/include/rtems/posix/threadsup.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * @file
- * 
- * @brief POSIX Thread API Support
- *
- * This defines the POSIX thread API extension.
- */
-
-/*
- *  COPYRIGHT (c) 1989-2014.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifndef _RTEMS_POSIX_THREADSUP_H
-#define _RTEMS_POSIX_THREADSUP_H
-
-#include <rtems/score/coresem.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/threadq.h>
-#include <rtems/score/watchdog.h>
-
-#include <pthread.h>
-#include <signal.h>
-
-/**
- *  @defgroup POSIX_THREAD POSIX Thread API Extension
- *
- *  @ingroup POSIXAPI
- * 
- */
-/**@{**/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * This defines the POSIX API support structure associated with
- * each thread in a system with POSIX configured.
- */
-typedef struct {
-  /** This is the POSIX threads attribute set. */
-  pthread_attr_t          Attributes;
-  /** This indicates whether the thread is attached or detached. */
-  int                     detachstate;
-  /** This is the set of threads waiting for the thread to exit. */
-  Thread_queue_Control    Join_List;
-  /** This is the thread's current scheduling policy. */
-  int                     schedpolicy;
-  /** This is the thread's current set of scheduling parameters. */
-  struct sched_param      schedparam;
-  /**
-   * This is the high priority to execute at when using the sporadic
-   * scheduler.
-   */
-  int                     ss_high_priority;
-  /**
-   * This is the timer which controls when the thread executes at
-   * high and low priority when using the sporadic scheduler.
-   */
-  Watchdog_Control        Sporadic_timer;
-
-  /** This is the set of signals which are currently blocked. */
-  sigset_t                signals_blocked;
-  /** This is the set of signals which are currently pending. */
-  sigset_t                signals_pending;
-
-  /**
-   * @brief Signal post-switch action in case signals are pending.
-   */
-  Thread_Action           Signal_action;
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /***************         POSIX Cancelability         ***************/
-  /*******************************************************************/
-  /*******************************************************************/
-
-  /** This is the cancelability state. */
-  int                     cancelability_state;
-  /** This is the cancelability type. */
-  int                     cancelability_type;
-  /** This indicates if a cancelation has been requested. */
-  int                     cancelation_requested;
-#ifndef HAVE_STRUCT__PTHREAD_CLEANUP_CONTEXT
-  /** This is the set of cancelation handlers. */
-  Chain_Control           Cancellation_Handlers;
-#else /* HAVE_STRUCT__PTHREAD_CLEANUP_CONTEXT */
-  /**
-   * @brief LIFO list of cleanup contexts.
-   */
-  struct _pthread_cleanup_context *last_cleanup_context;
-#endif /* HAVE_STRUCT__PTHREAD_CLEANUP_CONTEXT */
-
-} POSIX_API_Control;
-
-/**
- * @brief POSIX thread exit shared helper.
- *
- * 16.1.5.1 Thread Termination, p1003.1c/Draft 10, p. 150
- *
- * This method is a helper routine which ensures that all
- * POSIX thread calls which result in a thread exiting will
- * do so in the same manner.
- *
- * @param[in] the_thread is a pointer to the thread exiting or being canceled
- * @param[in] value_ptr is a pointer the value to be returned by the thread
- *
- * NOTE: Key destructors are executed in the POSIX api delete extension.
- *
- */
-void _POSIX_Thread_Exit(
-  Thread_Control *the_thread,
-  void           *value_ptr
-);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/posix/src/cleanuppop.c b/cpukit/posix/src/cleanuppop.c
index e8ddc388bd..2d7019fedf 100644
--- a/cpukit/posix/src/cleanuppop.c
+++ b/cpukit/posix/src/cleanuppop.c
@@ -18,7 +18,7 @@
 #include "config.h"
 #endif
 
-#include <pthread.h>
+#include <rtems/posix/pthread.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/threaddispatch.h>
diff --git a/cpukit/posix/src/cleanuppush.c b/cpukit/posix/src/cleanuppush.c
index cf640e0477..0084aebede 100644
--- a/cpukit/posix/src/cleanuppush.c
+++ b/cpukit/posix/src/cleanuppush.c
@@ -18,7 +18,7 @@
 #include "config.h"
 #endif
 
-#include <pthread.h>
+#include <rtems/posix/pthread.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/threaddispatch.h>
diff --git a/cpukit/posix/include/aio.h b/include/aio.h
index 95ed0fdb6c..95ed0fdb6c 100644
--- a/cpukit/posix/include/aio.h
+++ b/include/aio.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/amba.h b/include/amba.h
index 2bbc33308c..2bbc33308c 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/amba.h
+++ b/include/amba.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/ambapp.h b/include/ambapp.h
index 338602e83d..338602e83d 100644
--- a/c/src/lib/libbsp/sparc/shared/include/ambapp.h
+++ b/include/ambapp.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/ambapp_ids.h b/include/ambapp_ids.h
index 65a1248dc1..65a1248dc1 100644
--- a/c/src/lib/libbsp/sparc/shared/include/ambapp_ids.h
+++ b/include/ambapp_ids.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart.h b/include/apbuart.h
index 2f34a11083..2f34a11083 100644
--- a/c/src/lib/libbsp/sparc/shared/include/apbuart.h
+++ b/include/apbuart.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart_pci.h b/include/apbuart_pci.h
index d2d8bf0149..d2d8bf0149 100644
--- a/c/src/lib/libbsp/sparc/shared/include/apbuart_pci.h
+++ b/include/apbuart_pci.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart_rasta.h b/include/apbuart_rasta.h
index d502970eb9..d502970eb9 100644
--- a/c/src/lib/libbsp/sparc/shared/include/apbuart_rasta.h
+++ b/include/apbuart_rasta.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart_termios.h b/include/apbuart_termios.h
index 40377c1023..40377c1023 100644
--- a/c/src/lib/libbsp/sparc/shared/include/apbuart_termios.h
+++ b/include/apbuart_termios.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/arch.h b/include/arch/arch.h
index 5fdd4a2cb2..5fdd4a2cb2 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/arch.h
+++ b/include/arch/arch.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/boot.h b/include/arch/boot.h
index b0a997a957..b0a997a957 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/boot.h
+++ b/include/arch/boot.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/cache_spec.h b/include/arch/mm/cache_spec.h
index 1d9199db33..1d9199db33 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/cache_spec.h
+++ b/include/arch/mm/cache_spec.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/frame.h b/include/arch/mm/frame.h
index fb66e54bf1..fb66e54bf1 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/frame.h
+++ b/include/arch/mm/frame.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/mmu.h b/include/arch/mm/mmu.h
index 1d445f2e24..1d445f2e24 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/mmu.h
+++ b/include/arch/mm/mmu.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h b/include/arch/mm/sun4u/frame.h
index e30f504d08..e30f504d08 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h
+++ b/include/arch/mm/sun4u/frame.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h b/include/arch/mm/sun4u/mmu.h
index f887ebe7f4..f887ebe7f4 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h
+++ b/include/arch/mm/sun4u/mmu.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/page.h b/include/arch/mm/sun4u/page.h
index f1451a2866..f1451a2866 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/page.h
+++ b/include/arch/mm/sun4u/page.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h b/include/arch/mm/sun4u/tlb.h
index 6f6e6542e6..6f6e6542e6 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h
+++ b/include/arch/mm/sun4u/tlb.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h b/include/arch/mm/sun4u/tte.h
index 46acaed47c..46acaed47c 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h
+++ b/include/arch/mm/sun4u/tte.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tlb.h b/include/arch/mm/tlb.h
index 4adf26ca64..4adf26ca64 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tlb.h
+++ b/include/arch/mm/tlb.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tte.h b/include/arch/mm/tte.h
index f0b746e8c6..f0b746e8c6 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tte.h
+++ b/include/arch/mm/tte.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/regdef.h b/include/arch/regdef.h
index aae46fa99f..aae46fa99f 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/regdef.h
+++ b/include/arch/regdef.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/stack.h b/include/arch/stack.h
index 6364916912..6364916912 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/stack.h
+++ b/include/arch/stack.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/sun4u/arch.h b/include/arch/sun4u/arch.h
index 9e883a37ff..9e883a37ff 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/sun4u/arch.h
+++ b/include/arch/sun4u/arch.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/include/bsp.h b/include/arm/altcycv_devkit/bsp.h
index 3ab9d551aa..3ab9d551aa 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/include/bsp.h
+++ b/include/arm/altcycv_devkit/bsp.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/include/irq.h b/include/arm/altcycv_devkit/bsp/irq.h
index c136500415..c136500415 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/include/irq.h
+++ b/include/arm/altcycv_devkit/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/shared/include/linker-symbols.h b/include/arm/altcycv_devkit/bsp/linker-symbols.h
index 8bfa5d172d..8bfa5d172d 100644
--- a/c/src/lib/libbsp/arm/shared/include/linker-symbols.h
+++ b/include/arm/altcycv_devkit/bsp/linker-symbols.h
diff --git a/c/src/lib/libbsp/arm/shared/include/start.h b/include/arm/altcycv_devkit/bsp/start.h
index 9df6df4f3f..9df6df4f3f 100644
--- a/c/src/lib/libbsp/arm/shared/include/start.h
+++ b/include/arm/altcycv_devkit/bsp/start.h
diff --git a/c/src/lib/libbsp/shared/include/coverhd.h b/include/arm/altcycv_devkit/coverhd.h
index 3a551e412a..3a551e412a 100644
--- a/c/src/lib/libbsp/shared/include/coverhd.h
+++ b/include/arm/altcycv_devkit/coverhd.h
diff --git a/cpukit/score/cpu/arm/rtems/asm.h b/include/arm/altcycv_devkit/rtems/asm.h
index d22514d60a..d22514d60a 100644
--- a/cpukit/score/cpu/arm/rtems/asm.h
+++ b/include/arm/altcycv_devkit/rtems/asm.h
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/include/arm/altcycv_devkit/rtems/score/cpu.h
index 900486bbe4..900486bbe4 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpu.h
+++ b/include/arm/altcycv_devkit/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu_asm.h b/include/arm/altcycv_devkit/rtems/score/cpu_asm.h
index c430911373..c430911373 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpu_asm.h
+++ b/include/arm/altcycv_devkit/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/v850/rtems/score/cpuatomic.h b/include/arm/altcycv_devkit/rtems/score/cpuatomic.h
index 598ee76b20..598ee76b20 100644
--- a/cpukit/score/cpu/v850/rtems/score/cpuatomic.h
+++ b/include/arm/altcycv_devkit/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/arm/rtems/score/types.h b/include/arm/altcycv_devkit/rtems/score/types.h
index 6910e1850a..6910e1850a 100644
--- a/cpukit/score/cpu/arm/rtems/score/types.h
+++ b/include/arm/altcycv_devkit/rtems/score/types.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/include/tm27.h b/include/arm/altcycv_devkit/tm27.h
index c17c0107b4..c17c0107b4 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/include/tm27.h
+++ b/include/arm/altcycv_devkit/tm27.h
diff --git a/include/arm/altcycv_devkit_smp/bsp.h b/include/arm/altcycv_devkit_smp/bsp.h
new file mode 100644
index 0000000000..97413b21a7
--- /dev/null
+++ b/include/arm/altcycv_devkit_smp/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp.h>
diff --git a/include/arm/altcycv_devkit_smp/bsp/irq.h b/include/arm/altcycv_devkit_smp/bsp/irq.h
new file mode 100644
index 0000000000..405821d78e
--- /dev/null
+++ b/include/arm/altcycv_devkit_smp/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/irq.h>
diff --git a/include/arm/altcycv_devkit_smp/bsp/linker-symbols.h b/include/arm/altcycv_devkit_smp/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/altcycv_devkit_smp/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/altcycv_devkit_smp/bsp/start.h b/include/arm/altcycv_devkit_smp/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/altcycv_devkit_smp/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/altcycv_devkit_smp/coverhd.h b/include/arm/altcycv_devkit_smp/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/altcycv_devkit_smp/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/altcycv_devkit_smp/rtems/asm.h b/include/arm/altcycv_devkit_smp/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/altcycv_devkit_smp/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/altcycv_devkit_smp/rtems/score/cpu.h b/include/arm/altcycv_devkit_smp/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/altcycv_devkit_smp/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/altcycv_devkit_smp/rtems/score/cpu_asm.h b/include/arm/altcycv_devkit_smp/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/altcycv_devkit_smp/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/altcycv_devkit_smp/rtems/score/cpuatomic.h b/include/arm/altcycv_devkit_smp/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/altcycv_devkit_smp/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/altcycv_devkit_smp/rtems/score/types.h b/include/arm/altcycv_devkit_smp/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/altcycv_devkit_smp/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/altcycv_devkit_smp/tm27.h b/include/arm/altcycv_devkit_smp/tm27.h
new file mode 100644
index 0000000000..9559aec633
--- /dev/null
+++ b/include/arm/altcycv_devkit_smp/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/tm27.h>
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/include/bsp.h b/include/arm/arm1136jfs/bsp.h
index 316041833d..316041833d 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/include/bsp.h
+++ b/include/arm/arm1136jfs/bsp.h
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/include/irq.h b/include/arm/arm1136jfs/bsp/irq.h
index 3c86d22797..3c86d22797 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/include/irq.h
+++ b/include/arm/arm1136jfs/bsp/irq.h
diff --git a/include/arm/arm1136jfs/bsp/linker-symbols.h b/include/arm/arm1136jfs/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/arm1136jfs/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/arm1136jfs/bsp/start.h b/include/arm/arm1136jfs/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/arm1136jfs/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/arm1136jfs/coverhd.h b/include/arm/arm1136jfs/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/arm1136jfs/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/arm1136jfs/rtems/asm.h b/include/arm/arm1136jfs/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/arm1136jfs/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/arm1136jfs/rtems/score/cpu.h b/include/arm/arm1136jfs/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/arm1136jfs/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/arm1136jfs/rtems/score/cpu_asm.h b/include/arm/arm1136jfs/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/arm1136jfs/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/arm1136jfs/rtems/score/cpuatomic.h b/include/arm/arm1136jfs/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/arm1136jfs/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/arm1136jfs/rtems/score/types.h b/include/arm/arm1136jfs/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/arm1136jfs/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/shared/include/tm27.h b/include/arm/arm1136jfs/tm27.h
index 7fdb09a5ba..7fdb09a5ba 100644
--- a/c/src/lib/libbsp/shared/include/tm27.h
+++ b/include/arm/arm1136jfs/tm27.h
diff --git a/include/arm/arm1136js/bsp.h b/include/arm/arm1136js/bsp.h
new file mode 100644
index 0000000000..5c3e03ce58
--- /dev/null
+++ b/include/arm/arm1136js/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/bsp.h>
diff --git a/include/arm/arm1136js/bsp/irq.h b/include/arm/arm1136js/bsp/irq.h
new file mode 100644
index 0000000000..60ec9d0f3e
--- /dev/null
+++ b/include/arm/arm1136js/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/bsp/irq.h>
diff --git a/include/arm/arm1136js/bsp/linker-symbols.h b/include/arm/arm1136js/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/arm1136js/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/arm1136js/bsp/start.h b/include/arm/arm1136js/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/arm1136js/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/arm1136js/coverhd.h b/include/arm/arm1136js/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/arm1136js/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/arm1136js/rtems/asm.h b/include/arm/arm1136js/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/arm1136js/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/arm1136js/rtems/score/cpu.h b/include/arm/arm1136js/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/arm1136js/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/arm1136js/rtems/score/cpu_asm.h b/include/arm/arm1136js/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/arm1136js/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/arm1136js/rtems/score/cpuatomic.h b/include/arm/arm1136js/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/arm1136js/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/arm1136js/rtems/score/types.h b/include/arm/arm1136js/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/arm1136js/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/arm1136js/tm27.h b/include/arm/arm1136js/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/arm1136js/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/arm7tdmi/bsp.h b/include/arm/arm7tdmi/bsp.h
new file mode 100644
index 0000000000..5c3e03ce58
--- /dev/null
+++ b/include/arm/arm7tdmi/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/bsp.h>
diff --git a/include/arm/arm7tdmi/bsp/irq.h b/include/arm/arm7tdmi/bsp/irq.h
new file mode 100644
index 0000000000..60ec9d0f3e
--- /dev/null
+++ b/include/arm/arm7tdmi/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/bsp/irq.h>
diff --git a/include/arm/arm7tdmi/bsp/linker-symbols.h b/include/arm/arm7tdmi/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/arm7tdmi/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/arm7tdmi/bsp/start.h b/include/arm/arm7tdmi/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/arm7tdmi/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/arm7tdmi/coverhd.h b/include/arm/arm7tdmi/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/arm7tdmi/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/arm7tdmi/rtems/asm.h b/include/arm/arm7tdmi/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/arm7tdmi/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/arm7tdmi/rtems/score/cpu.h b/include/arm/arm7tdmi/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/arm7tdmi/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/arm7tdmi/rtems/score/cpu_asm.h b/include/arm/arm7tdmi/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/arm7tdmi/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/arm7tdmi/rtems/score/cpuatomic.h b/include/arm/arm7tdmi/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/arm7tdmi/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/arm7tdmi/rtems/score/types.h b/include/arm/arm7tdmi/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/arm7tdmi/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/arm7tdmi/tm27.h b/include/arm/arm7tdmi/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/arm7tdmi/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/arm920/bsp.h b/include/arm/arm920/bsp.h
new file mode 100644
index 0000000000..5c3e03ce58
--- /dev/null
+++ b/include/arm/arm920/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/bsp.h>
diff --git a/include/arm/arm920/bsp/irq.h b/include/arm/arm920/bsp/irq.h
new file mode 100644
index 0000000000..60ec9d0f3e
--- /dev/null
+++ b/include/arm/arm920/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/bsp/irq.h>
diff --git a/include/arm/arm920/bsp/linker-symbols.h b/include/arm/arm920/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/arm920/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/arm920/bsp/start.h b/include/arm/arm920/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/arm920/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/arm920/coverhd.h b/include/arm/arm920/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/arm920/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/arm920/rtems/asm.h b/include/arm/arm920/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/arm920/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/arm920/rtems/score/cpu.h b/include/arm/arm920/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/arm920/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/arm920/rtems/score/cpu_asm.h b/include/arm/arm920/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/arm920/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/arm920/rtems/score/cpuatomic.h b/include/arm/arm920/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/arm920/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/arm920/rtems/score/types.h b/include/arm/arm920/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/arm920/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/arm920/tm27.h b/include/arm/arm920/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/arm920/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/armcortexa9/bsp.h b/include/arm/armcortexa9/bsp.h
new file mode 100644
index 0000000000..5c3e03ce58
--- /dev/null
+++ b/include/arm/armcortexa9/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/bsp.h>
diff --git a/include/arm/armcortexa9/bsp/irq.h b/include/arm/armcortexa9/bsp/irq.h
new file mode 100644
index 0000000000..60ec9d0f3e
--- /dev/null
+++ b/include/arm/armcortexa9/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/bsp/irq.h>
diff --git a/include/arm/armcortexa9/bsp/linker-symbols.h b/include/arm/armcortexa9/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/armcortexa9/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/armcortexa9/bsp/start.h b/include/arm/armcortexa9/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/armcortexa9/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/armcortexa9/coverhd.h b/include/arm/armcortexa9/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/armcortexa9/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/armcortexa9/rtems/asm.h b/include/arm/armcortexa9/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/armcortexa9/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/armcortexa9/rtems/score/cpu.h b/include/arm/armcortexa9/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/armcortexa9/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/armcortexa9/rtems/score/cpu_asm.h b/include/arm/armcortexa9/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/armcortexa9/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/armcortexa9/rtems/score/cpuatomic.h b/include/arm/armcortexa9/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/armcortexa9/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/armcortexa9/rtems/score/types.h b/include/arm/armcortexa9/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/armcortexa9/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/armcortexa9/tm27.h b/include/arm/armcortexa9/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/armcortexa9/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/beagle/include/bsp.h b/include/arm/beagleboardorig/bsp.h
index e235efa901..e235efa901 100644
--- a/c/src/lib/libbsp/arm/beagle/include/bsp.h
+++ b/include/arm/beagleboardorig/bsp.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/i2c.h b/include/arm/beagleboardorig/bsp/i2c.h
index dbd066a984..dbd066a984 100644
--- a/c/src/lib/libbsp/arm/beagle/include/i2c.h
+++ b/include/arm/beagleboardorig/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/irq.h b/include/arm/beagleboardorig/bsp/irq.h
index 4cbf3a271f..4cbf3a271f 100644
--- a/c/src/lib/libbsp/arm/beagle/include/irq.h
+++ b/include/arm/beagleboardorig/bsp/irq.h
diff --git a/include/arm/beagleboardorig/bsp/linker-symbols.h b/include/arm/beagleboardorig/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/beagleboardorig/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/beagleboardorig/bsp/start.h b/include/arm/beagleboardorig/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/beagleboardorig/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/beagleboardorig/coverhd.h b/include/arm/beagleboardorig/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/beagleboardorig/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/beagleboardorig/rtems/asm.h b/include/arm/beagleboardorig/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/beagleboardorig/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/beagleboardorig/rtems/score/cpu.h b/include/arm/beagleboardorig/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/beagleboardorig/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/beagleboardorig/rtems/score/cpu_asm.h b/include/arm/beagleboardorig/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/beagleboardorig/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/beagleboardorig/rtems/score/cpuatomic.h b/include/arm/beagleboardorig/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/beagleboardorig/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/beagleboardorig/rtems/score/types.h b/include/arm/beagleboardorig/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/beagleboardorig/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/beagleboardorig/tm27.h b/include/arm/beagleboardorig/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/beagleboardorig/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/beagleboardxm/bsp.h b/include/arm/beagleboardxm/bsp.h
new file mode 100644
index 0000000000..64c75a4541
--- /dev/null
+++ b/include/arm/beagleboardxm/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/beagleboardorig/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/beagleboardorig/bsp.h>
diff --git a/include/arm/beagleboardxm/bsp/i2c.h b/include/arm/beagleboardxm/bsp/i2c.h
new file mode 100644
index 0000000000..3487b69849
--- /dev/null
+++ b/include/arm/beagleboardxm/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/beagleboardorig/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/beagleboardorig/bsp/i2c.h>
diff --git a/include/arm/beagleboardxm/bsp/irq.h b/include/arm/beagleboardxm/bsp/irq.h
new file mode 100644
index 0000000000..1351963365
--- /dev/null
+++ b/include/arm/beagleboardxm/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/beagleboardorig/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/beagleboardorig/bsp/irq.h>
diff --git a/include/arm/beagleboardxm/bsp/linker-symbols.h b/include/arm/beagleboardxm/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/beagleboardxm/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/beagleboardxm/bsp/start.h b/include/arm/beagleboardxm/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/beagleboardxm/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/beagleboardxm/coverhd.h b/include/arm/beagleboardxm/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/beagleboardxm/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/beagleboardxm/rtems/asm.h b/include/arm/beagleboardxm/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/beagleboardxm/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/beagleboardxm/rtems/score/cpu.h b/include/arm/beagleboardxm/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/beagleboardxm/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/beagleboardxm/rtems/score/cpu_asm.h b/include/arm/beagleboardxm/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/beagleboardxm/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/beagleboardxm/rtems/score/cpuatomic.h b/include/arm/beagleboardxm/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/beagleboardxm/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/beagleboardxm/rtems/score/types.h b/include/arm/beagleboardxm/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/beagleboardxm/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/beagleboardxm/tm27.h b/include/arm/beagleboardxm/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/beagleboardxm/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/beagleboneblack/bsp.h b/include/arm/beagleboneblack/bsp.h
new file mode 100644
index 0000000000..64c75a4541
--- /dev/null
+++ b/include/arm/beagleboneblack/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/beagleboardorig/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/beagleboardorig/bsp.h>
diff --git a/include/arm/beagleboneblack/bsp/i2c.h b/include/arm/beagleboneblack/bsp/i2c.h
new file mode 100644
index 0000000000..3487b69849
--- /dev/null
+++ b/include/arm/beagleboneblack/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/beagleboardorig/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/beagleboardorig/bsp/i2c.h>
diff --git a/include/arm/beagleboneblack/bsp/irq.h b/include/arm/beagleboneblack/bsp/irq.h
new file mode 100644
index 0000000000..1351963365
--- /dev/null
+++ b/include/arm/beagleboneblack/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/beagleboardorig/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/beagleboardorig/bsp/irq.h>
diff --git a/include/arm/beagleboneblack/bsp/linker-symbols.h b/include/arm/beagleboneblack/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/beagleboneblack/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/beagleboneblack/bsp/start.h b/include/arm/beagleboneblack/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/beagleboneblack/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/beagleboneblack/coverhd.h b/include/arm/beagleboneblack/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/beagleboneblack/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/beagleboneblack/rtems/asm.h b/include/arm/beagleboneblack/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/beagleboneblack/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/beagleboneblack/rtems/score/cpu.h b/include/arm/beagleboneblack/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/beagleboneblack/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/beagleboneblack/rtems/score/cpu_asm.h b/include/arm/beagleboneblack/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/beagleboneblack/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/beagleboneblack/rtems/score/cpuatomic.h b/include/arm/beagleboneblack/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/beagleboneblack/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/beagleboneblack/rtems/score/types.h b/include/arm/beagleboneblack/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/beagleboneblack/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/beagleboneblack/tm27.h b/include/arm/beagleboneblack/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/beagleboneblack/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/beaglebonewhite/bsp.h b/include/arm/beaglebonewhite/bsp.h
new file mode 100644
index 0000000000..64c75a4541
--- /dev/null
+++ b/include/arm/beaglebonewhite/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/beagleboardorig/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/beagleboardorig/bsp.h>
diff --git a/include/arm/beaglebonewhite/bsp/i2c.h b/include/arm/beaglebonewhite/bsp/i2c.h
new file mode 100644
index 0000000000..3487b69849
--- /dev/null
+++ b/include/arm/beaglebonewhite/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/beagleboardorig/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/beagleboardorig/bsp/i2c.h>
diff --git a/include/arm/beaglebonewhite/bsp/irq.h b/include/arm/beaglebonewhite/bsp/irq.h
new file mode 100644
index 0000000000..1351963365
--- /dev/null
+++ b/include/arm/beaglebonewhite/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/beagleboardorig/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/beagleboardorig/bsp/irq.h>
diff --git a/include/arm/beaglebonewhite/bsp/linker-symbols.h b/include/arm/beaglebonewhite/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/beaglebonewhite/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/beaglebonewhite/bsp/start.h b/include/arm/beaglebonewhite/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/beaglebonewhite/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/beaglebonewhite/coverhd.h b/include/arm/beaglebonewhite/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/beaglebonewhite/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/beaglebonewhite/rtems/asm.h b/include/arm/beaglebonewhite/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/beaglebonewhite/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/beaglebonewhite/rtems/score/cpu.h b/include/arm/beaglebonewhite/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/beaglebonewhite/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/beaglebonewhite/rtems/score/cpu_asm.h b/include/arm/beaglebonewhite/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/beaglebonewhite/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/beaglebonewhite/rtems/score/cpuatomic.h b/include/arm/beaglebonewhite/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/beaglebonewhite/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/beaglebonewhite/rtems/score/types.h b/include/arm/beaglebonewhite/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/beaglebonewhite/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/beaglebonewhite/tm27.h b/include/arm/beaglebonewhite/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/beaglebonewhite/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/csb336/include/bsp.h b/include/arm/csb336/bsp.h
index c9ce435fa5..c9ce435fa5 100644
--- a/c/src/lib/libbsp/arm/csb336/include/bsp.h
+++ b/include/arm/csb336/bsp.h
diff --git a/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.h b/include/arm/csb336/bsp/irq.h
index eb56fdd887..eb56fdd887 100644
--- a/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.h
+++ b/include/arm/csb336/bsp/irq.h
diff --git a/include/arm/csb336/bsp/linker-symbols.h b/include/arm/csb336/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/csb336/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/csb336/coverhd.h b/include/arm/csb336/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/csb336/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/c/src/lib/libcpu/arm/shared/include/mmu.h b/include/arm/csb336/libcpu/mmu.h
index b82e838695..b82e838695 100644
--- a/c/src/lib/libcpu/arm/shared/include/mmu.h
+++ b/include/arm/csb336/libcpu/mmu.h
diff --git a/include/arm/csb336/rtems/asm.h b/include/arm/csb336/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/csb336/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/csb336/rtems/score/cpu.h b/include/arm/csb336/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/csb336/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/csb336/rtems/score/cpu_asm.h b/include/arm/csb336/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/csb336/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/csb336/rtems/score/cpuatomic.h b/include/arm/csb336/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/csb336/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/csb336/rtems/score/types.h b/include/arm/csb336/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/csb336/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/csb336/tm27.h b/include/arm/csb336/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/csb336/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/csb337/include/bsp.h b/include/arm/csb337/bsp.h
index 7374adfa86..7374adfa86 100644
--- a/c/src/lib/libbsp/arm/csb337/include/bsp.h
+++ b/include/arm/csb337/bsp.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/irq/irq.h b/include/arm/csb337/bsp/irq.h
index 771059a3e4..771059a3e4 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/irq/irq.h
+++ b/include/arm/csb337/bsp/irq.h
diff --git a/include/arm/csb337/bsp/linker-symbols.h b/include/arm/csb337/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/csb337/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/csb337/coverhd.h b/include/arm/csb337/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/csb337/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/csb337/libcpu/mmu.h b/include/arm/csb337/libcpu/mmu.h
new file mode 100644
index 0000000000..613920fcf5
--- /dev/null
+++ b/include/arm/csb337/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/csb336/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/csb336/libcpu/mmu.h>
diff --git a/include/arm/csb337/rtems/asm.h b/include/arm/csb337/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/csb337/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/csb337/rtems/score/cpu.h b/include/arm/csb337/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/csb337/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/csb337/rtems/score/cpu_asm.h b/include/arm/csb337/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/csb337/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/csb337/rtems/score/cpuatomic.h b/include/arm/csb337/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/csb337/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/csb337/rtems/score/types.h b/include/arm/csb337/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/csb337/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/csb337/tm27.h b/include/arm/csb337/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/csb337/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/csb637/bsp.h b/include/arm/csb637/bsp.h
new file mode 100644
index 0000000000..566848f23f
--- /dev/null
+++ b/include/arm/csb637/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/csb337/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/csb337/bsp.h>
diff --git a/include/arm/csb637/bsp/irq.h b/include/arm/csb637/bsp/irq.h
new file mode 100644
index 0000000000..3f0223fbf9
--- /dev/null
+++ b/include/arm/csb637/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/csb337/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/csb337/bsp/irq.h>
diff --git a/include/arm/csb637/bsp/linker-symbols.h b/include/arm/csb637/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/csb637/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/csb637/coverhd.h b/include/arm/csb637/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/csb637/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/csb637/libcpu/mmu.h b/include/arm/csb637/libcpu/mmu.h
new file mode 100644
index 0000000000..613920fcf5
--- /dev/null
+++ b/include/arm/csb637/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/csb336/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/csb336/libcpu/mmu.h>
diff --git a/include/arm/csb637/rtems/asm.h b/include/arm/csb637/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/csb637/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/csb637/rtems/score/cpu.h b/include/arm/csb637/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/csb637/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/csb637/rtems/score/cpu_asm.h b/include/arm/csb637/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/csb637/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/csb637/rtems/score/cpuatomic.h b/include/arm/csb637/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/csb637/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/csb637/rtems/score/types.h b/include/arm/csb637/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/csb637/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/csb637/tm27.h b/include/arm/csb637/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/csb637/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/edb7312/include/bsp.h b/include/arm/edb7312/bsp.h
index 33a60306cd..33a60306cd 100644
--- a/c/src/lib/libbsp/arm/edb7312/include/bsp.h
+++ b/include/arm/edb7312/bsp.h
diff --git a/c/src/lib/libbsp/arm/edb7312/irq/irq.h b/include/arm/edb7312/bsp/irq.h
index 04579a7c6f..04579a7c6f 100644
--- a/c/src/lib/libbsp/arm/edb7312/irq/irq.h
+++ b/include/arm/edb7312/bsp/irq.h
diff --git a/include/arm/edb7312/bsp/linker-symbols.h b/include/arm/edb7312/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/edb7312/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/edb7312/coverhd.h b/include/arm/edb7312/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/edb7312/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/edb7312/rtems/asm.h b/include/arm/edb7312/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/edb7312/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/edb7312/rtems/score/cpu.h b/include/arm/edb7312/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/edb7312/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/edb7312/rtems/score/cpu_asm.h b/include/arm/edb7312/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/edb7312/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/edb7312/rtems/score/cpuatomic.h b/include/arm/edb7312/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/edb7312/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/edb7312/rtems/score/types.h b/include/arm/edb7312/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/edb7312/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/edb7312/tm27.h b/include/arm/edb7312/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/edb7312/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/shared/comm/uart.h b/include/arm/edb7312/uart.h
index 2f69d57a74..2f69d57a74 100644
--- a/c/src/lib/libbsp/arm/shared/comm/uart.h
+++ b/include/arm/edb7312/uart.h
diff --git a/c/src/lib/libbsp/arm/gba/include/bsp.h b/include/arm/gba/bsp.h
index f9cbbc4163..f9cbbc4163 100644
--- a/c/src/lib/libbsp/arm/gba/include/bsp.h
+++ b/include/arm/gba/bsp.h
diff --git a/c/src/lib/libbsp/arm/gba/irq/irq.h b/include/arm/gba/bsp/irq.h
index 37ae527912..37ae527912 100644
--- a/c/src/lib/libbsp/arm/gba/irq/irq.h
+++ b/include/arm/gba/bsp/irq.h
diff --git a/include/arm/gba/bsp/linker-symbols.h b/include/arm/gba/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/gba/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/gba/coverhd.h b/include/arm/gba/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/gba/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/gba/rtems/asm.h b/include/arm/gba/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/gba/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/gba/rtems/score/cpu.h b/include/arm/gba/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/gba/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/gba/rtems/score/cpu_asm.h b/include/arm/gba/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/gba/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/gba/rtems/score/cpuatomic.h b/include/arm/gba/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/gba/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/gba/rtems/score/types.h b/include/arm/gba/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/gba/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/gba/tm27.h b/include/arm/gba/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/gba/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/gp32/include/bsp.h b/include/arm/gp32/bsp.h
index 4e1439aed8..4e1439aed8 100644
--- a/c/src/lib/libbsp/arm/gp32/include/bsp.h
+++ b/include/arm/gp32/bsp.h
diff --git a/c/src/lib/libcpu/arm/s3c24xx/irq/irq.h b/include/arm/gp32/bsp/irq.h
index 8882b4362b..8882b4362b 100644
--- a/c/src/lib/libcpu/arm/s3c24xx/irq/irq.h
+++ b/include/arm/gp32/bsp/irq.h
diff --git a/include/arm/gp32/bsp/linker-symbols.h b/include/arm/gp32/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/gp32/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/gp32/coverhd.h b/include/arm/gp32/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/gp32/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/gp32/libcpu/mmu.h b/include/arm/gp32/libcpu/mmu.h
new file mode 100644
index 0000000000..613920fcf5
--- /dev/null
+++ b/include/arm/gp32/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/csb336/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/csb336/libcpu/mmu.h>
diff --git a/include/arm/gp32/rtems/asm.h b/include/arm/gp32/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/gp32/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/gp32/rtems/score/cpu.h b/include/arm/gp32/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/gp32/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/gp32/rtems/score/cpu_asm.h b/include/arm/gp32/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/gp32/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/gp32/rtems/score/cpuatomic.h b/include/arm/gp32/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/gp32/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/gp32/rtems/score/types.h b/include/arm/gp32/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/gp32/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/gp32/tm27.h b/include/arm/gp32/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/gp32/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/gumstix/include/bsp.h b/include/arm/gumstix/bsp.h
index 80525a7ec4..80525a7ec4 100644
--- a/c/src/lib/libbsp/arm/gumstix/include/bsp.h
+++ b/include/arm/gumstix/bsp.h
diff --git a/c/src/lib/libcpu/arm/pxa255/irq/irq.h b/include/arm/gumstix/bsp/irq.h
index a8b5d24da1..a8b5d24da1 100644
--- a/c/src/lib/libcpu/arm/pxa255/irq/irq.h
+++ b/include/arm/gumstix/bsp/irq.h
diff --git a/include/arm/gumstix/bsp/linker-symbols.h b/include/arm/gumstix/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/gumstix/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/gumstix/coverhd.h b/include/arm/gumstix/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/gumstix/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/gumstix/libcpu/mmu.h b/include/arm/gumstix/libcpu/mmu.h
new file mode 100644
index 0000000000..613920fcf5
--- /dev/null
+++ b/include/arm/gumstix/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/csb336/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/csb336/libcpu/mmu.h>
diff --git a/include/arm/gumstix/rtems/asm.h b/include/arm/gumstix/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/gumstix/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/gumstix/rtems/score/cpu.h b/include/arm/gumstix/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/gumstix/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/gumstix/rtems/score/cpu_asm.h b/include/arm/gumstix/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/gumstix/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/gumstix/rtems/score/cpuatomic.h b/include/arm/gumstix/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/gumstix/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/gumstix/rtems/score/types.h b/include/arm/gumstix/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/gumstix/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/arm/gumstix/include/tm27.h b/include/arm/gumstix/tm27.h
index ed8d73e113..ed8d73e113 100644
--- a/c/src/lib/libbsp/arm/gumstix/include/tm27.h
+++ b/include/arm/gumstix/tm27.h
diff --git a/include/arm/kit637_v6/bsp.h b/include/arm/kit637_v6/bsp.h
new file mode 100644
index 0000000000..566848f23f
--- /dev/null
+++ b/include/arm/kit637_v6/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/csb337/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/csb337/bsp.h>
diff --git a/include/arm/kit637_v6/bsp/irq.h b/include/arm/kit637_v6/bsp/irq.h
new file mode 100644
index 0000000000..3f0223fbf9
--- /dev/null
+++ b/include/arm/kit637_v6/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/csb337/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/csb337/bsp/irq.h>
diff --git a/include/arm/kit637_v6/bsp/linker-symbols.h b/include/arm/kit637_v6/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/kit637_v6/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/kit637_v6/coverhd.h b/include/arm/kit637_v6/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/kit637_v6/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/kit637_v6/libcpu/mmu.h b/include/arm/kit637_v6/libcpu/mmu.h
new file mode 100644
index 0000000000..613920fcf5
--- /dev/null
+++ b/include/arm/kit637_v6/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/csb336/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/csb336/libcpu/mmu.h>
diff --git a/include/arm/kit637_v6/rtems/asm.h b/include/arm/kit637_v6/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/kit637_v6/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/kit637_v6/rtems/score/cpu.h b/include/arm/kit637_v6/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/kit637_v6/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/kit637_v6/rtems/score/cpu_asm.h b/include/arm/kit637_v6/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/kit637_v6/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/kit637_v6/rtems/score/cpuatomic.h b/include/arm/kit637_v6/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/kit637_v6/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/kit637_v6/rtems/score/types.h b/include/arm/kit637_v6/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/kit637_v6/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/kit637_v6/tm27.h b/include/arm/kit637_v6/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/kit637_v6/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/bsp.h b/include/arm/lm3s3749/bsp.h
index 8b94f9754d..8b94f9754d 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/include/bsp.h
+++ b/include/arm/lm3s3749/bsp.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/io.h b/include/arm/lm3s3749/bsp/io.h
index f9ddf4c8ee..f9ddf4c8ee 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/include/io.h
+++ b/include/arm/lm3s3749/bsp/io.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/irq.h b/include/arm/lm3s3749/bsp/irq.h
index 0b380c2ce2..0b380c2ce2 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/include/irq.h
+++ b/include/arm/lm3s3749/bsp/irq.h
diff --git a/include/arm/lm3s3749/bsp/linker-symbols.h b/include/arm/lm3s3749/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lm3s3749/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lm3s3749/bsp/start.h b/include/arm/lm3s3749/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lm3s3749/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lm3s3749/coverhd.h b/include/arm/lm3s3749/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lm3s3749/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lm3s3749/rtems/asm.h b/include/arm/lm3s3749/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lm3s3749/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lm3s3749/rtems/score/cpu.h b/include/arm/lm3s3749/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lm3s3749/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lm3s3749/rtems/score/cpu_asm.h b/include/arm/lm3s3749/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lm3s3749/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lm3s3749/rtems/score/cpuatomic.h b/include/arm/lm3s3749/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lm3s3749/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lm3s3749/rtems/score/types.h b/include/arm/lm3s3749/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lm3s3749/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lm3s3749/tm27.h b/include/arm/lm3s3749/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lm3s3749/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lm3s6965/bsp.h b/include/arm/lm3s6965/bsp.h
new file mode 100644
index 0000000000..d60f983f3f
--- /dev/null
+++ b/include/arm/lm3s6965/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lm3s3749/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lm3s3749/bsp.h>
diff --git a/include/arm/lm3s6965/bsp/io.h b/include/arm/lm3s6965/bsp/io.h
new file mode 100644
index 0000000000..38e1a89e7e
--- /dev/null
+++ b/include/arm/lm3s6965/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lm3s3749/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lm3s3749/bsp/io.h>
diff --git a/include/arm/lm3s6965/bsp/irq.h b/include/arm/lm3s6965/bsp/irq.h
new file mode 100644
index 0000000000..d189da479d
--- /dev/null
+++ b/include/arm/lm3s6965/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lm3s3749/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lm3s3749/bsp/irq.h>
diff --git a/include/arm/lm3s6965/bsp/linker-symbols.h b/include/arm/lm3s6965/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lm3s6965/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lm3s6965/bsp/start.h b/include/arm/lm3s6965/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lm3s6965/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lm3s6965/coverhd.h b/include/arm/lm3s6965/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lm3s6965/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lm3s6965/rtems/asm.h b/include/arm/lm3s6965/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lm3s6965/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lm3s6965/rtems/score/cpu.h b/include/arm/lm3s6965/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lm3s6965/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lm3s6965/rtems/score/cpu_asm.h b/include/arm/lm3s6965/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lm3s6965/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lm3s6965/rtems/score/cpuatomic.h b/include/arm/lm3s6965/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lm3s6965/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lm3s6965/rtems/score/types.h b/include/arm/lm3s6965/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lm3s6965/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lm3s6965/tm27.h b/include/arm/lm3s6965/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lm3s6965/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lm3s6965_qemu/bsp.h b/include/arm/lm3s6965_qemu/bsp.h
new file mode 100644
index 0000000000..d60f983f3f
--- /dev/null
+++ b/include/arm/lm3s6965_qemu/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lm3s3749/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lm3s3749/bsp.h>
diff --git a/include/arm/lm3s6965_qemu/bsp/io.h b/include/arm/lm3s6965_qemu/bsp/io.h
new file mode 100644
index 0000000000..38e1a89e7e
--- /dev/null
+++ b/include/arm/lm3s6965_qemu/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lm3s3749/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lm3s3749/bsp/io.h>
diff --git a/include/arm/lm3s6965_qemu/bsp/irq.h b/include/arm/lm3s6965_qemu/bsp/irq.h
new file mode 100644
index 0000000000..d189da479d
--- /dev/null
+++ b/include/arm/lm3s6965_qemu/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lm3s3749/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lm3s3749/bsp/irq.h>
diff --git a/include/arm/lm3s6965_qemu/bsp/linker-symbols.h b/include/arm/lm3s6965_qemu/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lm3s6965_qemu/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lm3s6965_qemu/bsp/start.h b/include/arm/lm3s6965_qemu/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lm3s6965_qemu/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lm3s6965_qemu/coverhd.h b/include/arm/lm3s6965_qemu/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lm3s6965_qemu/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lm3s6965_qemu/rtems/asm.h b/include/arm/lm3s6965_qemu/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lm3s6965_qemu/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lm3s6965_qemu/rtems/score/cpu.h b/include/arm/lm3s6965_qemu/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lm3s6965_qemu/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lm3s6965_qemu/rtems/score/cpu_asm.h b/include/arm/lm3s6965_qemu/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lm3s6965_qemu/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lm3s6965_qemu/rtems/score/cpuatomic.h b/include/arm/lm3s6965_qemu/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lm3s6965_qemu/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lm3s6965_qemu/rtems/score/types.h b/include/arm/lm3s6965_qemu/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lm3s6965_qemu/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lm3s6965_qemu/tm27.h b/include/arm/lm3s6965_qemu/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lm3s6965_qemu/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lm4f120/bsp.h b/include/arm/lm4f120/bsp.h
new file mode 100644
index 0000000000..d60f983f3f
--- /dev/null
+++ b/include/arm/lm4f120/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lm3s3749/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lm3s3749/bsp.h>
diff --git a/include/arm/lm4f120/bsp/io.h b/include/arm/lm4f120/bsp/io.h
new file mode 100644
index 0000000000..38e1a89e7e
--- /dev/null
+++ b/include/arm/lm4f120/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lm3s3749/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lm3s3749/bsp/io.h>
diff --git a/include/arm/lm4f120/bsp/irq.h b/include/arm/lm4f120/bsp/irq.h
new file mode 100644
index 0000000000..d189da479d
--- /dev/null
+++ b/include/arm/lm4f120/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lm3s3749/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lm3s3749/bsp/irq.h>
diff --git a/include/arm/lm4f120/bsp/linker-symbols.h b/include/arm/lm4f120/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lm4f120/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lm4f120/bsp/start.h b/include/arm/lm4f120/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lm4f120/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lm4f120/coverhd.h b/include/arm/lm4f120/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lm4f120/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lm4f120/rtems/asm.h b/include/arm/lm4f120/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lm4f120/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lm4f120/rtems/score/cpu.h b/include/arm/lm4f120/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lm4f120/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lm4f120/rtems/score/cpu_asm.h b/include/arm/lm4f120/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lm4f120/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lm4f120/rtems/score/cpuatomic.h b/include/arm/lm4f120/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lm4f120/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lm4f120/rtems/score/types.h b/include/arm/lm4f120/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lm4f120/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lm4f120/tm27.h b/include/arm/lm4f120/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lm4f120/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/bsp.h b/include/arm/lpc1768_mbed/bsp.h
index 89c5c40045..89c5c40045 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/bsp.h
+++ b/include/arm/lpc1768_mbed/bsp.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/io.h b/include/arm/lpc1768_mbed/bsp/io.h
index e7c0dd0d58..e7c0dd0d58 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/io.h
+++ b/include/arm/lpc1768_mbed/bsp/io.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/irq.h b/include/arm/lpc1768_mbed/bsp/irq.h
index 99032d0a55..99032d0a55 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/irq.h
+++ b/include/arm/lpc1768_mbed/bsp/irq.h
diff --git a/include/arm/lpc1768_mbed/bsp/linker-symbols.h b/include/arm/lpc1768_mbed/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc1768_mbed/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/lpc-clock-config.h b/include/arm/lpc1768_mbed/bsp/lpc-clock-config.h
index 22b5747134..22b5747134 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/lpc-clock-config.h
+++ b/include/arm/lpc1768_mbed/bsp/lpc-clock-config.h
diff --git a/include/arm/lpc1768_mbed/bsp/start.h b/include/arm/lpc1768_mbed/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc1768_mbed/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc1768_mbed/coverhd.h b/include/arm/lpc1768_mbed/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc1768_mbed/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc1768_mbed/rtems/asm.h b/include/arm/lpc1768_mbed/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc1768_mbed/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc1768_mbed/rtems/score/cpu.h b/include/arm/lpc1768_mbed/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc1768_mbed/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc1768_mbed/rtems/score/cpu_asm.h b/include/arm/lpc1768_mbed/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc1768_mbed/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc1768_mbed/rtems/score/cpuatomic.h b/include/arm/lpc1768_mbed/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc1768_mbed/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc1768_mbed/rtems/score/types.h b/include/arm/lpc1768_mbed/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc1768_mbed/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc1768_mbed/tm27.h b/include/arm/lpc1768_mbed/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc1768_mbed/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram/bsp.h b/include/arm/lpc1768_mbed_ahb_ram/bsp.h
new file mode 100644
index 0000000000..5a2c12c877
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc1768_mbed/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc1768_mbed/bsp.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram/bsp/io.h b/include/arm/lpc1768_mbed_ahb_ram/bsp/io.h
new file mode 100644
index 0000000000..05fbbad2aa
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc1768_mbed/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc1768_mbed/bsp/io.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram/bsp/irq.h b/include/arm/lpc1768_mbed_ahb_ram/bsp/irq.h
new file mode 100644
index 0000000000..e84d8987f7
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc1768_mbed/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc1768_mbed/bsp/irq.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram/bsp/linker-symbols.h b/include/arm/lpc1768_mbed_ahb_ram/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram/bsp/lpc-clock-config.h b/include/arm/lpc1768_mbed_ahb_ram/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..58d58f1f70
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc1768_mbed/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc1768_mbed/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram/bsp/start.h b/include/arm/lpc1768_mbed_ahb_ram/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram/coverhd.h b/include/arm/lpc1768_mbed_ahb_ram/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram/rtems/asm.h b/include/arm/lpc1768_mbed_ahb_ram/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram/rtems/score/cpu.h b/include/arm/lpc1768_mbed_ahb_ram/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram/rtems/score/cpu_asm.h b/include/arm/lpc1768_mbed_ahb_ram/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram/rtems/score/cpuatomic.h b/include/arm/lpc1768_mbed_ahb_ram/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram/rtems/score/types.h b/include/arm/lpc1768_mbed_ahb_ram/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram/tm27.h b/include/arm/lpc1768_mbed_ahb_ram/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram_eth/bsp.h b/include/arm/lpc1768_mbed_ahb_ram_eth/bsp.h
new file mode 100644
index 0000000000..5a2c12c877
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram_eth/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc1768_mbed/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc1768_mbed/bsp.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram_eth/bsp/io.h b/include/arm/lpc1768_mbed_ahb_ram_eth/bsp/io.h
new file mode 100644
index 0000000000..05fbbad2aa
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram_eth/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc1768_mbed/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc1768_mbed/bsp/io.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram_eth/bsp/irq.h b/include/arm/lpc1768_mbed_ahb_ram_eth/bsp/irq.h
new file mode 100644
index 0000000000..e84d8987f7
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram_eth/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc1768_mbed/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc1768_mbed/bsp/irq.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram_eth/bsp/linker-symbols.h b/include/arm/lpc1768_mbed_ahb_ram_eth/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram_eth/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram_eth/bsp/lpc-clock-config.h b/include/arm/lpc1768_mbed_ahb_ram_eth/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..58d58f1f70
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram_eth/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc1768_mbed/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc1768_mbed/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram_eth/bsp/start.h b/include/arm/lpc1768_mbed_ahb_ram_eth/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram_eth/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram_eth/coverhd.h b/include/arm/lpc1768_mbed_ahb_ram_eth/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram_eth/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram_eth/rtems/asm.h b/include/arm/lpc1768_mbed_ahb_ram_eth/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram_eth/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram_eth/rtems/score/cpu.h b/include/arm/lpc1768_mbed_ahb_ram_eth/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram_eth/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram_eth/rtems/score/cpu_asm.h b/include/arm/lpc1768_mbed_ahb_ram_eth/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram_eth/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram_eth/rtems/score/cpuatomic.h b/include/arm/lpc1768_mbed_ahb_ram_eth/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram_eth/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram_eth/rtems/score/types.h b/include/arm/lpc1768_mbed_ahb_ram_eth/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram_eth/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc1768_mbed_ahb_ram_eth/tm27.h b/include/arm/lpc1768_mbed_ahb_ram_eth/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc1768_mbed_ahb_ram_eth/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h b/include/arm/lpc17xx_ea_ram/bsp.h
index e8c5d9ac12..e8c5d9ac12 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h
+++ b/include/arm/lpc17xx_ea_ram/bsp.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/i2c.h b/include/arm/lpc17xx_ea_ram/bsp/i2c.h
index 42836ddfa8..42836ddfa8 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/i2c.h
+++ b/include/arm/lpc17xx_ea_ram/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/io.h b/include/arm/lpc17xx_ea_ram/bsp/io.h
index 9f58ee8efb..9f58ee8efb 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/io.h
+++ b/include/arm/lpc17xx_ea_ram/bsp/io.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/irq.h b/include/arm/lpc17xx_ea_ram/bsp/irq.h
index 0f0e473a0c..0f0e473a0c 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/irq.h
+++ b/include/arm/lpc17xx_ea_ram/bsp/irq.h
diff --git a/include/arm/lpc17xx_ea_ram/bsp/linker-symbols.h b/include/arm/lpc17xx_ea_ram/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc17xx_ea_ram/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lpc-clock-config.h b/include/arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h
index 1edab4eb02..1edab4eb02 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/lpc-clock-config.h
+++ b/include/arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lpc-ethernet-config.h b/include/arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h
index d24f132567..d24f132567 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/lpc-ethernet-config.h
+++ b/include/arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h
diff --git a/include/arm/lpc17xx_ea_ram/bsp/start.h b/include/arm/lpc17xx_ea_ram/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc17xx_ea_ram/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc17xx_ea_ram/coverhd.h b/include/arm/lpc17xx_ea_ram/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc17xx_ea_ram/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc17xx_ea_ram/rtems/asm.h b/include/arm/lpc17xx_ea_ram/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc17xx_ea_ram/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc17xx_ea_ram/rtems/score/cpu.h b/include/arm/lpc17xx_ea_ram/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc17xx_ea_ram/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc17xx_ea_ram/rtems/score/cpu_asm.h b/include/arm/lpc17xx_ea_ram/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc17xx_ea_ram/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc17xx_ea_ram/rtems/score/cpuatomic.h b/include/arm/lpc17xx_ea_ram/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc17xx_ea_ram/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc17xx_ea_ram/rtems/score/types.h b/include/arm/lpc17xx_ea_ram/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc17xx_ea_ram/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc17xx_ea_ram/tm27.h b/include/arm/lpc17xx_ea_ram/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc17xx_ea_ram/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lpc17xx_ea_rom_int/bsp.h b/include/arm/lpc17xx_ea_rom_int/bsp.h
new file mode 100644
index 0000000000..d782e1ffa6
--- /dev/null
+++ b/include/arm/lpc17xx_ea_rom_int/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp.h>
diff --git a/include/arm/lpc17xx_ea_rom_int/bsp/i2c.h b/include/arm/lpc17xx_ea_rom_int/bsp/i2c.h
new file mode 100644
index 0000000000..c9c3c77722
--- /dev/null
+++ b/include/arm/lpc17xx_ea_rom_int/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/i2c.h>
diff --git a/include/arm/lpc17xx_ea_rom_int/bsp/io.h b/include/arm/lpc17xx_ea_rom_int/bsp/io.h
new file mode 100644
index 0000000000..32a06c6969
--- /dev/null
+++ b/include/arm/lpc17xx_ea_rom_int/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/io.h>
diff --git a/include/arm/lpc17xx_ea_rom_int/bsp/irq.h b/include/arm/lpc17xx_ea_rom_int/bsp/irq.h
new file mode 100644
index 0000000000..31c7ccebfb
--- /dev/null
+++ b/include/arm/lpc17xx_ea_rom_int/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/irq.h>
diff --git a/include/arm/lpc17xx_ea_rom_int/bsp/linker-symbols.h b/include/arm/lpc17xx_ea_rom_int/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc17xx_ea_rom_int/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc17xx_ea_rom_int/bsp/lpc-clock-config.h b/include/arm/lpc17xx_ea_rom_int/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..20f2e40532
--- /dev/null
+++ b/include/arm/lpc17xx_ea_rom_int/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc17xx_ea_rom_int/bsp/lpc-ethernet-config.h b/include/arm/lpc17xx_ea_rom_int/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..742e6f1199
--- /dev/null
+++ b/include/arm/lpc17xx_ea_rom_int/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc17xx_ea_rom_int/bsp/start.h b/include/arm/lpc17xx_ea_rom_int/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc17xx_ea_rom_int/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc17xx_ea_rom_int/coverhd.h b/include/arm/lpc17xx_ea_rom_int/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc17xx_ea_rom_int/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc17xx_ea_rom_int/rtems/asm.h b/include/arm/lpc17xx_ea_rom_int/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc17xx_ea_rom_int/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc17xx_ea_rom_int/rtems/score/cpu.h b/include/arm/lpc17xx_ea_rom_int/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc17xx_ea_rom_int/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc17xx_ea_rom_int/rtems/score/cpu_asm.h b/include/arm/lpc17xx_ea_rom_int/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc17xx_ea_rom_int/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc17xx_ea_rom_int/rtems/score/cpuatomic.h b/include/arm/lpc17xx_ea_rom_int/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc17xx_ea_rom_int/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc17xx_ea_rom_int/rtems/score/types.h b/include/arm/lpc17xx_ea_rom_int/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc17xx_ea_rom_int/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc17xx_ea_rom_int/tm27.h b/include/arm/lpc17xx_ea_rom_int/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc17xx_ea_rom_int/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lpc17xx_plx800_ram/bsp.h b/include/arm/lpc17xx_plx800_ram/bsp.h
new file mode 100644
index 0000000000..d782e1ffa6
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_ram/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp.h>
diff --git a/include/arm/lpc17xx_plx800_ram/bsp/i2c.h b/include/arm/lpc17xx_plx800_ram/bsp/i2c.h
new file mode 100644
index 0000000000..c9c3c77722
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_ram/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/i2c.h>
diff --git a/include/arm/lpc17xx_plx800_ram/bsp/io.h b/include/arm/lpc17xx_plx800_ram/bsp/io.h
new file mode 100644
index 0000000000..32a06c6969
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_ram/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/io.h>
diff --git a/include/arm/lpc17xx_plx800_ram/bsp/irq.h b/include/arm/lpc17xx_plx800_ram/bsp/irq.h
new file mode 100644
index 0000000000..31c7ccebfb
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_ram/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/irq.h>
diff --git a/include/arm/lpc17xx_plx800_ram/bsp/linker-symbols.h b/include/arm/lpc17xx_plx800_ram/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_ram/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc17xx_plx800_ram/bsp/lpc-clock-config.h b/include/arm/lpc17xx_plx800_ram/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..20f2e40532
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_ram/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc17xx_plx800_ram/bsp/lpc-ethernet-config.h b/include/arm/lpc17xx_plx800_ram/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..742e6f1199
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_ram/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc17xx_plx800_ram/bsp/start.h b/include/arm/lpc17xx_plx800_ram/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_ram/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc17xx_plx800_ram/coverhd.h b/include/arm/lpc17xx_plx800_ram/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_ram/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc17xx_plx800_ram/rtems/asm.h b/include/arm/lpc17xx_plx800_ram/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_ram/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc17xx_plx800_ram/rtems/score/cpu.h b/include/arm/lpc17xx_plx800_ram/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_ram/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc17xx_plx800_ram/rtems/score/cpu_asm.h b/include/arm/lpc17xx_plx800_ram/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_ram/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc17xx_plx800_ram/rtems/score/cpuatomic.h b/include/arm/lpc17xx_plx800_ram/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_ram/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc17xx_plx800_ram/rtems/score/types.h b/include/arm/lpc17xx_plx800_ram/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_ram/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc17xx_plx800_ram/tm27.h b/include/arm/lpc17xx_plx800_ram/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_ram/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lpc17xx_plx800_rom_int/bsp.h b/include/arm/lpc17xx_plx800_rom_int/bsp.h
new file mode 100644
index 0000000000..d782e1ffa6
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_rom_int/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp.h>
diff --git a/include/arm/lpc17xx_plx800_rom_int/bsp/i2c.h b/include/arm/lpc17xx_plx800_rom_int/bsp/i2c.h
new file mode 100644
index 0000000000..c9c3c77722
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_rom_int/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/i2c.h>
diff --git a/include/arm/lpc17xx_plx800_rom_int/bsp/io.h b/include/arm/lpc17xx_plx800_rom_int/bsp/io.h
new file mode 100644
index 0000000000..32a06c6969
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_rom_int/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/io.h>
diff --git a/include/arm/lpc17xx_plx800_rom_int/bsp/irq.h b/include/arm/lpc17xx_plx800_rom_int/bsp/irq.h
new file mode 100644
index 0000000000..31c7ccebfb
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_rom_int/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/irq.h>
diff --git a/include/arm/lpc17xx_plx800_rom_int/bsp/linker-symbols.h b/include/arm/lpc17xx_plx800_rom_int/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_rom_int/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc17xx_plx800_rom_int/bsp/lpc-clock-config.h b/include/arm/lpc17xx_plx800_rom_int/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..20f2e40532
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_rom_int/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc17xx_plx800_rom_int/bsp/lpc-ethernet-config.h b/include/arm/lpc17xx_plx800_rom_int/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..742e6f1199
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_rom_int/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc17xx_plx800_rom_int/bsp/start.h b/include/arm/lpc17xx_plx800_rom_int/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_rom_int/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc17xx_plx800_rom_int/coverhd.h b/include/arm/lpc17xx_plx800_rom_int/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_rom_int/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc17xx_plx800_rom_int/rtems/asm.h b/include/arm/lpc17xx_plx800_rom_int/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_rom_int/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc17xx_plx800_rom_int/rtems/score/cpu.h b/include/arm/lpc17xx_plx800_rom_int/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_rom_int/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc17xx_plx800_rom_int/rtems/score/cpu_asm.h b/include/arm/lpc17xx_plx800_rom_int/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_rom_int/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc17xx_plx800_rom_int/rtems/score/cpuatomic.h b/include/arm/lpc17xx_plx800_rom_int/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_rom_int/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc17xx_plx800_rom_int/rtems/score/types.h b/include/arm/lpc17xx_plx800_rom_int/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_rom_int/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc17xx_plx800_rom_int/tm27.h b/include/arm/lpc17xx_plx800_rom_int/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc17xx_plx800_rom_int/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lpc2362/bsp.h b/include/arm/lpc2362/bsp.h
new file mode 100644
index 0000000000..d782e1ffa6
--- /dev/null
+++ b/include/arm/lpc2362/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp.h>
diff --git a/include/arm/lpc2362/bsp/i2c.h b/include/arm/lpc2362/bsp/i2c.h
new file mode 100644
index 0000000000..c9c3c77722
--- /dev/null
+++ b/include/arm/lpc2362/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/i2c.h>
diff --git a/include/arm/lpc2362/bsp/io.h b/include/arm/lpc2362/bsp/io.h
new file mode 100644
index 0000000000..32a06c6969
--- /dev/null
+++ b/include/arm/lpc2362/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/io.h>
diff --git a/include/arm/lpc2362/bsp/irq.h b/include/arm/lpc2362/bsp/irq.h
new file mode 100644
index 0000000000..31c7ccebfb
--- /dev/null
+++ b/include/arm/lpc2362/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/irq.h>
diff --git a/include/arm/lpc2362/bsp/linker-symbols.h b/include/arm/lpc2362/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc2362/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc2362/bsp/lpc-clock-config.h b/include/arm/lpc2362/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..20f2e40532
--- /dev/null
+++ b/include/arm/lpc2362/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc2362/bsp/lpc-ethernet-config.h b/include/arm/lpc2362/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..742e6f1199
--- /dev/null
+++ b/include/arm/lpc2362/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc2362/bsp/start.h b/include/arm/lpc2362/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc2362/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc2362/coverhd.h b/include/arm/lpc2362/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc2362/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc2362/rtems/asm.h b/include/arm/lpc2362/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc2362/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc2362/rtems/score/cpu.h b/include/arm/lpc2362/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc2362/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc2362/rtems/score/cpu_asm.h b/include/arm/lpc2362/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc2362/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc2362/rtems/score/cpuatomic.h b/include/arm/lpc2362/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc2362/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc2362/rtems/score/types.h b/include/arm/lpc2362/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc2362/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc2362/tm27.h b/include/arm/lpc2362/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc2362/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lpc23xx_tli800/bsp.h b/include/arm/lpc23xx_tli800/bsp.h
new file mode 100644
index 0000000000..d782e1ffa6
--- /dev/null
+++ b/include/arm/lpc23xx_tli800/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp.h>
diff --git a/include/arm/lpc23xx_tli800/bsp/i2c.h b/include/arm/lpc23xx_tli800/bsp/i2c.h
new file mode 100644
index 0000000000..c9c3c77722
--- /dev/null
+++ b/include/arm/lpc23xx_tli800/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/i2c.h>
diff --git a/include/arm/lpc23xx_tli800/bsp/io.h b/include/arm/lpc23xx_tli800/bsp/io.h
new file mode 100644
index 0000000000..32a06c6969
--- /dev/null
+++ b/include/arm/lpc23xx_tli800/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/io.h>
diff --git a/include/arm/lpc23xx_tli800/bsp/irq.h b/include/arm/lpc23xx_tli800/bsp/irq.h
new file mode 100644
index 0000000000..31c7ccebfb
--- /dev/null
+++ b/include/arm/lpc23xx_tli800/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/irq.h>
diff --git a/include/arm/lpc23xx_tli800/bsp/linker-symbols.h b/include/arm/lpc23xx_tli800/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc23xx_tli800/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc23xx_tli800/bsp/lpc-clock-config.h b/include/arm/lpc23xx_tli800/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..20f2e40532
--- /dev/null
+++ b/include/arm/lpc23xx_tli800/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc23xx_tli800/bsp/lpc-ethernet-config.h b/include/arm/lpc23xx_tli800/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..742e6f1199
--- /dev/null
+++ b/include/arm/lpc23xx_tli800/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc23xx_tli800/bsp/start.h b/include/arm/lpc23xx_tli800/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc23xx_tli800/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc23xx_tli800/coverhd.h b/include/arm/lpc23xx_tli800/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc23xx_tli800/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc23xx_tli800/rtems/asm.h b/include/arm/lpc23xx_tli800/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc23xx_tli800/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc23xx_tli800/rtems/score/cpu.h b/include/arm/lpc23xx_tli800/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc23xx_tli800/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc23xx_tli800/rtems/score/cpu_asm.h b/include/arm/lpc23xx_tli800/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc23xx_tli800/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc23xx_tli800/rtems/score/cpuatomic.h b/include/arm/lpc23xx_tli800/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc23xx_tli800/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc23xx_tli800/rtems/score/types.h b/include/arm/lpc23xx_tli800/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc23xx_tli800/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc23xx_tli800/tm27.h b/include/arm/lpc23xx_tli800/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc23xx_tli800/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lpc24xx_ea/bsp.h b/include/arm/lpc24xx_ea/bsp.h
new file mode 100644
index 0000000000..d782e1ffa6
--- /dev/null
+++ b/include/arm/lpc24xx_ea/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp.h>
diff --git a/include/arm/lpc24xx_ea/bsp/i2c.h b/include/arm/lpc24xx_ea/bsp/i2c.h
new file mode 100644
index 0000000000..c9c3c77722
--- /dev/null
+++ b/include/arm/lpc24xx_ea/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/i2c.h>
diff --git a/include/arm/lpc24xx_ea/bsp/io.h b/include/arm/lpc24xx_ea/bsp/io.h
new file mode 100644
index 0000000000..32a06c6969
--- /dev/null
+++ b/include/arm/lpc24xx_ea/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/io.h>
diff --git a/include/arm/lpc24xx_ea/bsp/irq.h b/include/arm/lpc24xx_ea/bsp/irq.h
new file mode 100644
index 0000000000..31c7ccebfb
--- /dev/null
+++ b/include/arm/lpc24xx_ea/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/irq.h>
diff --git a/include/arm/lpc24xx_ea/bsp/linker-symbols.h b/include/arm/lpc24xx_ea/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc24xx_ea/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc24xx_ea/bsp/lpc-clock-config.h b/include/arm/lpc24xx_ea/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..20f2e40532
--- /dev/null
+++ b/include/arm/lpc24xx_ea/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc24xx_ea/bsp/lpc-ethernet-config.h b/include/arm/lpc24xx_ea/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..742e6f1199
--- /dev/null
+++ b/include/arm/lpc24xx_ea/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc24xx_ea/bsp/start.h b/include/arm/lpc24xx_ea/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc24xx_ea/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc24xx_ea/coverhd.h b/include/arm/lpc24xx_ea/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc24xx_ea/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc24xx_ea/rtems/asm.h b/include/arm/lpc24xx_ea/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc24xx_ea/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc24xx_ea/rtems/score/cpu.h b/include/arm/lpc24xx_ea/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc24xx_ea/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc24xx_ea/rtems/score/cpu_asm.h b/include/arm/lpc24xx_ea/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc24xx_ea/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc24xx_ea/rtems/score/cpuatomic.h b/include/arm/lpc24xx_ea/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc24xx_ea/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc24xx_ea/rtems/score/types.h b/include/arm/lpc24xx_ea/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc24xx_ea/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc24xx_ea/tm27.h b/include/arm/lpc24xx_ea/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc24xx_ea/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lpc24xx_ncs_ram/bsp.h b/include/arm/lpc24xx_ncs_ram/bsp.h
new file mode 100644
index 0000000000..d782e1ffa6
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_ram/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp.h>
diff --git a/include/arm/lpc24xx_ncs_ram/bsp/i2c.h b/include/arm/lpc24xx_ncs_ram/bsp/i2c.h
new file mode 100644
index 0000000000..c9c3c77722
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_ram/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/i2c.h>
diff --git a/include/arm/lpc24xx_ncs_ram/bsp/io.h b/include/arm/lpc24xx_ncs_ram/bsp/io.h
new file mode 100644
index 0000000000..32a06c6969
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_ram/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/io.h>
diff --git a/include/arm/lpc24xx_ncs_ram/bsp/irq.h b/include/arm/lpc24xx_ncs_ram/bsp/irq.h
new file mode 100644
index 0000000000..31c7ccebfb
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_ram/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/irq.h>
diff --git a/include/arm/lpc24xx_ncs_ram/bsp/linker-symbols.h b/include/arm/lpc24xx_ncs_ram/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_ram/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc24xx_ncs_ram/bsp/lpc-clock-config.h b/include/arm/lpc24xx_ncs_ram/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..20f2e40532
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_ram/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc24xx_ncs_ram/bsp/lpc-ethernet-config.h b/include/arm/lpc24xx_ncs_ram/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..742e6f1199
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_ram/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc24xx_ncs_ram/bsp/start.h b/include/arm/lpc24xx_ncs_ram/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_ram/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc24xx_ncs_ram/coverhd.h b/include/arm/lpc24xx_ncs_ram/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_ram/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc24xx_ncs_ram/rtems/asm.h b/include/arm/lpc24xx_ncs_ram/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_ram/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc24xx_ncs_ram/rtems/score/cpu.h b/include/arm/lpc24xx_ncs_ram/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_ram/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc24xx_ncs_ram/rtems/score/cpu_asm.h b/include/arm/lpc24xx_ncs_ram/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_ram/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc24xx_ncs_ram/rtems/score/cpuatomic.h b/include/arm/lpc24xx_ncs_ram/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_ram/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc24xx_ncs_ram/rtems/score/types.h b/include/arm/lpc24xx_ncs_ram/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_ram/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc24xx_ncs_ram/tm27.h b/include/arm/lpc24xx_ncs_ram/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_ram/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lpc24xx_ncs_rom_ext/bsp.h b/include/arm/lpc24xx_ncs_rom_ext/bsp.h
new file mode 100644
index 0000000000..d782e1ffa6
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_ext/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp.h>
diff --git a/include/arm/lpc24xx_ncs_rom_ext/bsp/i2c.h b/include/arm/lpc24xx_ncs_rom_ext/bsp/i2c.h
new file mode 100644
index 0000000000..c9c3c77722
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_ext/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/i2c.h>
diff --git a/include/arm/lpc24xx_ncs_rom_ext/bsp/io.h b/include/arm/lpc24xx_ncs_rom_ext/bsp/io.h
new file mode 100644
index 0000000000..32a06c6969
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_ext/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/io.h>
diff --git a/include/arm/lpc24xx_ncs_rom_ext/bsp/irq.h b/include/arm/lpc24xx_ncs_rom_ext/bsp/irq.h
new file mode 100644
index 0000000000..31c7ccebfb
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_ext/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/irq.h>
diff --git a/include/arm/lpc24xx_ncs_rom_ext/bsp/linker-symbols.h b/include/arm/lpc24xx_ncs_rom_ext/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_ext/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc24xx_ncs_rom_ext/bsp/lpc-clock-config.h b/include/arm/lpc24xx_ncs_rom_ext/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..20f2e40532
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_ext/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc24xx_ncs_rom_ext/bsp/lpc-ethernet-config.h b/include/arm/lpc24xx_ncs_rom_ext/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..742e6f1199
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_ext/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc24xx_ncs_rom_ext/bsp/start.h b/include/arm/lpc24xx_ncs_rom_ext/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_ext/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc24xx_ncs_rom_ext/coverhd.h b/include/arm/lpc24xx_ncs_rom_ext/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_ext/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc24xx_ncs_rom_ext/rtems/asm.h b/include/arm/lpc24xx_ncs_rom_ext/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_ext/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc24xx_ncs_rom_ext/rtems/score/cpu.h b/include/arm/lpc24xx_ncs_rom_ext/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_ext/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc24xx_ncs_rom_ext/rtems/score/cpu_asm.h b/include/arm/lpc24xx_ncs_rom_ext/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_ext/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc24xx_ncs_rom_ext/rtems/score/cpuatomic.h b/include/arm/lpc24xx_ncs_rom_ext/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_ext/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc24xx_ncs_rom_ext/rtems/score/types.h b/include/arm/lpc24xx_ncs_rom_ext/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_ext/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc24xx_ncs_rom_ext/tm27.h b/include/arm/lpc24xx_ncs_rom_ext/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_ext/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lpc24xx_ncs_rom_int/bsp.h b/include/arm/lpc24xx_ncs_rom_int/bsp.h
new file mode 100644
index 0000000000..d782e1ffa6
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_int/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp.h>
diff --git a/include/arm/lpc24xx_ncs_rom_int/bsp/i2c.h b/include/arm/lpc24xx_ncs_rom_int/bsp/i2c.h
new file mode 100644
index 0000000000..c9c3c77722
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_int/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/i2c.h>
diff --git a/include/arm/lpc24xx_ncs_rom_int/bsp/io.h b/include/arm/lpc24xx_ncs_rom_int/bsp/io.h
new file mode 100644
index 0000000000..32a06c6969
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_int/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/io.h>
diff --git a/include/arm/lpc24xx_ncs_rom_int/bsp/irq.h b/include/arm/lpc24xx_ncs_rom_int/bsp/irq.h
new file mode 100644
index 0000000000..31c7ccebfb
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_int/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/irq.h>
diff --git a/include/arm/lpc24xx_ncs_rom_int/bsp/linker-symbols.h b/include/arm/lpc24xx_ncs_rom_int/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_int/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc24xx_ncs_rom_int/bsp/lpc-clock-config.h b/include/arm/lpc24xx_ncs_rom_int/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..20f2e40532
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_int/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc24xx_ncs_rom_int/bsp/lpc-ethernet-config.h b/include/arm/lpc24xx_ncs_rom_int/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..742e6f1199
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_int/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc24xx_ncs_rom_int/bsp/start.h b/include/arm/lpc24xx_ncs_rom_int/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_int/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc24xx_ncs_rom_int/coverhd.h b/include/arm/lpc24xx_ncs_rom_int/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_int/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc24xx_ncs_rom_int/rtems/asm.h b/include/arm/lpc24xx_ncs_rom_int/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_int/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc24xx_ncs_rom_int/rtems/score/cpu.h b/include/arm/lpc24xx_ncs_rom_int/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_int/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc24xx_ncs_rom_int/rtems/score/cpu_asm.h b/include/arm/lpc24xx_ncs_rom_int/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_int/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc24xx_ncs_rom_int/rtems/score/cpuatomic.h b/include/arm/lpc24xx_ncs_rom_int/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_int/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc24xx_ncs_rom_int/rtems/score/types.h b/include/arm/lpc24xx_ncs_rom_int/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_int/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc24xx_ncs_rom_int/tm27.h b/include/arm/lpc24xx_ncs_rom_int/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc24xx_ncs_rom_int/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lpc24xx_plx800_ram/bsp.h b/include/arm/lpc24xx_plx800_ram/bsp.h
new file mode 100644
index 0000000000..d782e1ffa6
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_ram/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp.h>
diff --git a/include/arm/lpc24xx_plx800_ram/bsp/i2c.h b/include/arm/lpc24xx_plx800_ram/bsp/i2c.h
new file mode 100644
index 0000000000..c9c3c77722
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_ram/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/i2c.h>
diff --git a/include/arm/lpc24xx_plx800_ram/bsp/io.h b/include/arm/lpc24xx_plx800_ram/bsp/io.h
new file mode 100644
index 0000000000..32a06c6969
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_ram/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/io.h>
diff --git a/include/arm/lpc24xx_plx800_ram/bsp/irq.h b/include/arm/lpc24xx_plx800_ram/bsp/irq.h
new file mode 100644
index 0000000000..31c7ccebfb
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_ram/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/irq.h>
diff --git a/include/arm/lpc24xx_plx800_ram/bsp/linker-symbols.h b/include/arm/lpc24xx_plx800_ram/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_ram/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc24xx_plx800_ram/bsp/lpc-clock-config.h b/include/arm/lpc24xx_plx800_ram/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..20f2e40532
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_ram/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc24xx_plx800_ram/bsp/lpc-ethernet-config.h b/include/arm/lpc24xx_plx800_ram/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..742e6f1199
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_ram/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc24xx_plx800_ram/bsp/start.h b/include/arm/lpc24xx_plx800_ram/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_ram/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc24xx_plx800_ram/coverhd.h b/include/arm/lpc24xx_plx800_ram/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_ram/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc24xx_plx800_ram/rtems/asm.h b/include/arm/lpc24xx_plx800_ram/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_ram/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc24xx_plx800_ram/rtems/score/cpu.h b/include/arm/lpc24xx_plx800_ram/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_ram/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc24xx_plx800_ram/rtems/score/cpu_asm.h b/include/arm/lpc24xx_plx800_ram/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_ram/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc24xx_plx800_ram/rtems/score/cpuatomic.h b/include/arm/lpc24xx_plx800_ram/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_ram/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc24xx_plx800_ram/rtems/score/types.h b/include/arm/lpc24xx_plx800_ram/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_ram/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc24xx_plx800_ram/tm27.h b/include/arm/lpc24xx_plx800_ram/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_ram/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lpc24xx_plx800_rom_int/bsp.h b/include/arm/lpc24xx_plx800_rom_int/bsp.h
new file mode 100644
index 0000000000..d782e1ffa6
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_rom_int/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp.h>
diff --git a/include/arm/lpc24xx_plx800_rom_int/bsp/i2c.h b/include/arm/lpc24xx_plx800_rom_int/bsp/i2c.h
new file mode 100644
index 0000000000..c9c3c77722
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_rom_int/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/i2c.h>
diff --git a/include/arm/lpc24xx_plx800_rom_int/bsp/io.h b/include/arm/lpc24xx_plx800_rom_int/bsp/io.h
new file mode 100644
index 0000000000..32a06c6969
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_rom_int/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/io.h>
diff --git a/include/arm/lpc24xx_plx800_rom_int/bsp/irq.h b/include/arm/lpc24xx_plx800_rom_int/bsp/irq.h
new file mode 100644
index 0000000000..31c7ccebfb
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_rom_int/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/irq.h>
diff --git a/include/arm/lpc24xx_plx800_rom_int/bsp/linker-symbols.h b/include/arm/lpc24xx_plx800_rom_int/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_rom_int/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc24xx_plx800_rom_int/bsp/lpc-clock-config.h b/include/arm/lpc24xx_plx800_rom_int/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..20f2e40532
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_rom_int/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc24xx_plx800_rom_int/bsp/lpc-ethernet-config.h b/include/arm/lpc24xx_plx800_rom_int/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..742e6f1199
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_rom_int/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc24xx_plx800_rom_int/bsp/start.h b/include/arm/lpc24xx_plx800_rom_int/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_rom_int/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc24xx_plx800_rom_int/coverhd.h b/include/arm/lpc24xx_plx800_rom_int/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_rom_int/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc24xx_plx800_rom_int/rtems/asm.h b/include/arm/lpc24xx_plx800_rom_int/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_rom_int/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc24xx_plx800_rom_int/rtems/score/cpu.h b/include/arm/lpc24xx_plx800_rom_int/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_rom_int/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc24xx_plx800_rom_int/rtems/score/cpu_asm.h b/include/arm/lpc24xx_plx800_rom_int/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_rom_int/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc24xx_plx800_rom_int/rtems/score/cpuatomic.h b/include/arm/lpc24xx_plx800_rom_int/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_rom_int/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc24xx_plx800_rom_int/rtems/score/types.h b/include/arm/lpc24xx_plx800_rom_int/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_rom_int/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc24xx_plx800_rom_int/tm27.h b/include/arm/lpc24xx_plx800_rom_int/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc24xx_plx800_rom_int/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/bsp.h b/include/arm/lpc32xx_mzx/bsp.h
index c36dafd43d..c36dafd43d 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/bsp.h
+++ b/include/arm/lpc32xx_mzx/bsp.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/i2c.h b/include/arm/lpc32xx_mzx/bsp/i2c.h
index e0bf8349ac..e0bf8349ac 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/i2c.h
+++ b/include/arm/lpc32xx_mzx/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/irq.h b/include/arm/lpc32xx_mzx/bsp/irq.h
index fbb13b5262..fbb13b5262 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/irq.h
+++ b/include/arm/lpc32xx_mzx/bsp/irq.h
diff --git a/include/arm/lpc32xx_mzx/bsp/linker-symbols.h b/include/arm/lpc32xx_mzx/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc32xx_mzx/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/lpc-clock-config.h b/include/arm/lpc32xx_mzx/bsp/lpc-clock-config.h
index accd0d256a..accd0d256a 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/lpc-clock-config.h
+++ b/include/arm/lpc32xx_mzx/bsp/lpc-clock-config.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/lpc-ethernet-config.h b/include/arm/lpc32xx_mzx/bsp/lpc-ethernet-config.h
index 53e9e8415d..53e9e8415d 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/lpc-ethernet-config.h
+++ b/include/arm/lpc32xx_mzx/bsp/lpc-ethernet-config.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/mmu.h b/include/arm/lpc32xx_mzx/bsp/mmu.h
index 32352b5ed9..32352b5ed9 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/mmu.h
+++ b/include/arm/lpc32xx_mzx/bsp/mmu.h
diff --git a/include/arm/lpc32xx_mzx/bsp/start.h b/include/arm/lpc32xx_mzx/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc32xx_mzx/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc32xx_mzx/coverhd.h b/include/arm/lpc32xx_mzx/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc32xx_mzx/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc32xx_mzx/rtems/asm.h b/include/arm/lpc32xx_mzx/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc32xx_mzx/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc32xx_mzx/rtems/score/cpu.h b/include/arm/lpc32xx_mzx/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc32xx_mzx/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc32xx_mzx/rtems/score/cpu_asm.h b/include/arm/lpc32xx_mzx/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc32xx_mzx/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc32xx_mzx/rtems/score/cpuatomic.h b/include/arm/lpc32xx_mzx/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc32xx_mzx/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc32xx_mzx/rtems/score/types.h b/include/arm/lpc32xx_mzx/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc32xx_mzx/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/tm27.h b/include/arm/lpc32xx_mzx/tm27.h
index 4cbc17a085..4cbc17a085 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/tm27.h
+++ b/include/arm/lpc32xx_mzx/tm27.h
diff --git a/include/arm/lpc32xx_mzx_stage_1/bsp.h b/include/arm/lpc32xx_mzx_stage_1/bsp.h
new file mode 100644
index 0000000000..583de32254
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_1/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp.h>
diff --git a/include/arm/lpc32xx_mzx_stage_1/bsp/i2c.h b/include/arm/lpc32xx_mzx_stage_1/bsp/i2c.h
new file mode 100644
index 0000000000..5955038ffe
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_1/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp/i2c.h>
diff --git a/include/arm/lpc32xx_mzx_stage_1/bsp/irq.h b/include/arm/lpc32xx_mzx_stage_1/bsp/irq.h
new file mode 100644
index 0000000000..afe812e2d8
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_1/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp/irq.h>
diff --git a/include/arm/lpc32xx_mzx_stage_1/bsp/linker-symbols.h b/include/arm/lpc32xx_mzx_stage_1/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_1/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc32xx_mzx_stage_1/bsp/lpc-clock-config.h b/include/arm/lpc32xx_mzx_stage_1/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..0424fd9eb5
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_1/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc32xx_mzx_stage_1/bsp/lpc-ethernet-config.h b/include/arm/lpc32xx_mzx_stage_1/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..9ad4858877
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_1/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc32xx_mzx_stage_1/bsp/mmu.h b/include/arm/lpc32xx_mzx_stage_1/bsp/mmu.h
new file mode 100644
index 0000000000..1ccd390cb5
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_1/bsp/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp/mmu.h>
diff --git a/include/arm/lpc32xx_mzx_stage_1/bsp/start.h b/include/arm/lpc32xx_mzx_stage_1/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_1/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc32xx_mzx_stage_1/coverhd.h b/include/arm/lpc32xx_mzx_stage_1/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_1/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc32xx_mzx_stage_1/rtems/asm.h b/include/arm/lpc32xx_mzx_stage_1/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_1/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc32xx_mzx_stage_1/rtems/score/cpu.h b/include/arm/lpc32xx_mzx_stage_1/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_1/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc32xx_mzx_stage_1/rtems/score/cpu_asm.h b/include/arm/lpc32xx_mzx_stage_1/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_1/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc32xx_mzx_stage_1/rtems/score/cpuatomic.h b/include/arm/lpc32xx_mzx_stage_1/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_1/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc32xx_mzx_stage_1/rtems/score/types.h b/include/arm/lpc32xx_mzx_stage_1/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_1/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc32xx_mzx_stage_1/tm27.h b/include/arm/lpc32xx_mzx_stage_1/tm27.h
new file mode 100644
index 0000000000..87249f02e7
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_1/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/tm27.h>
diff --git a/include/arm/lpc32xx_mzx_stage_2/bsp.h b/include/arm/lpc32xx_mzx_stage_2/bsp.h
new file mode 100644
index 0000000000..583de32254
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_2/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp.h>
diff --git a/include/arm/lpc32xx_mzx_stage_2/bsp/i2c.h b/include/arm/lpc32xx_mzx_stage_2/bsp/i2c.h
new file mode 100644
index 0000000000..5955038ffe
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_2/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp/i2c.h>
diff --git a/include/arm/lpc32xx_mzx_stage_2/bsp/irq.h b/include/arm/lpc32xx_mzx_stage_2/bsp/irq.h
new file mode 100644
index 0000000000..afe812e2d8
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_2/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp/irq.h>
diff --git a/include/arm/lpc32xx_mzx_stage_2/bsp/linker-symbols.h b/include/arm/lpc32xx_mzx_stage_2/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_2/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc32xx_mzx_stage_2/bsp/lpc-clock-config.h b/include/arm/lpc32xx_mzx_stage_2/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..0424fd9eb5
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_2/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc32xx_mzx_stage_2/bsp/lpc-ethernet-config.h b/include/arm/lpc32xx_mzx_stage_2/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..9ad4858877
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_2/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc32xx_mzx_stage_2/bsp/mmu.h b/include/arm/lpc32xx_mzx_stage_2/bsp/mmu.h
new file mode 100644
index 0000000000..1ccd390cb5
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_2/bsp/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp/mmu.h>
diff --git a/include/arm/lpc32xx_mzx_stage_2/bsp/start.h b/include/arm/lpc32xx_mzx_stage_2/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_2/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc32xx_mzx_stage_2/coverhd.h b/include/arm/lpc32xx_mzx_stage_2/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_2/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc32xx_mzx_stage_2/rtems/asm.h b/include/arm/lpc32xx_mzx_stage_2/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_2/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc32xx_mzx_stage_2/rtems/score/cpu.h b/include/arm/lpc32xx_mzx_stage_2/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_2/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc32xx_mzx_stage_2/rtems/score/cpu_asm.h b/include/arm/lpc32xx_mzx_stage_2/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_2/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc32xx_mzx_stage_2/rtems/score/cpuatomic.h b/include/arm/lpc32xx_mzx_stage_2/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_2/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc32xx_mzx_stage_2/rtems/score/types.h b/include/arm/lpc32xx_mzx_stage_2/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_2/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc32xx_mzx_stage_2/tm27.h b/include/arm/lpc32xx_mzx_stage_2/tm27.h
new file mode 100644
index 0000000000..87249f02e7
--- /dev/null
+++ b/include/arm/lpc32xx_mzx_stage_2/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/tm27.h>
diff --git a/include/arm/lpc32xx_phycore/bsp.h b/include/arm/lpc32xx_phycore/bsp.h
new file mode 100644
index 0000000000..583de32254
--- /dev/null
+++ b/include/arm/lpc32xx_phycore/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp.h>
diff --git a/include/arm/lpc32xx_phycore/bsp/i2c.h b/include/arm/lpc32xx_phycore/bsp/i2c.h
new file mode 100644
index 0000000000..5955038ffe
--- /dev/null
+++ b/include/arm/lpc32xx_phycore/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp/i2c.h>
diff --git a/include/arm/lpc32xx_phycore/bsp/irq.h b/include/arm/lpc32xx_phycore/bsp/irq.h
new file mode 100644
index 0000000000..afe812e2d8
--- /dev/null
+++ b/include/arm/lpc32xx_phycore/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp/irq.h>
diff --git a/include/arm/lpc32xx_phycore/bsp/linker-symbols.h b/include/arm/lpc32xx_phycore/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc32xx_phycore/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc32xx_phycore/bsp/lpc-clock-config.h b/include/arm/lpc32xx_phycore/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..0424fd9eb5
--- /dev/null
+++ b/include/arm/lpc32xx_phycore/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc32xx_phycore/bsp/lpc-ethernet-config.h b/include/arm/lpc32xx_phycore/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..9ad4858877
--- /dev/null
+++ b/include/arm/lpc32xx_phycore/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc32xx_phycore/bsp/mmu.h b/include/arm/lpc32xx_phycore/bsp/mmu.h
new file mode 100644
index 0000000000..1ccd390cb5
--- /dev/null
+++ b/include/arm/lpc32xx_phycore/bsp/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/bsp/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/bsp/mmu.h>
diff --git a/include/arm/lpc32xx_phycore/bsp/start.h b/include/arm/lpc32xx_phycore/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc32xx_phycore/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc32xx_phycore/coverhd.h b/include/arm/lpc32xx_phycore/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc32xx_phycore/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc32xx_phycore/rtems/asm.h b/include/arm/lpc32xx_phycore/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc32xx_phycore/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc32xx_phycore/rtems/score/cpu.h b/include/arm/lpc32xx_phycore/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc32xx_phycore/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc32xx_phycore/rtems/score/cpu_asm.h b/include/arm/lpc32xx_phycore/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc32xx_phycore/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc32xx_phycore/rtems/score/cpuatomic.h b/include/arm/lpc32xx_phycore/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc32xx_phycore/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc32xx_phycore/rtems/score/types.h b/include/arm/lpc32xx_phycore/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc32xx_phycore/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc32xx_phycore/tm27.h b/include/arm/lpc32xx_phycore/tm27.h
new file mode 100644
index 0000000000..87249f02e7
--- /dev/null
+++ b/include/arm/lpc32xx_phycore/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc32xx_mzx/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc32xx_mzx/tm27.h>
diff --git a/include/arm/lpc40xx_ea_ram/bsp.h b/include/arm/lpc40xx_ea_ram/bsp.h
new file mode 100644
index 0000000000..d782e1ffa6
--- /dev/null
+++ b/include/arm/lpc40xx_ea_ram/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp.h>
diff --git a/include/arm/lpc40xx_ea_ram/bsp/i2c.h b/include/arm/lpc40xx_ea_ram/bsp/i2c.h
new file mode 100644
index 0000000000..c9c3c77722
--- /dev/null
+++ b/include/arm/lpc40xx_ea_ram/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/i2c.h>
diff --git a/include/arm/lpc40xx_ea_ram/bsp/io.h b/include/arm/lpc40xx_ea_ram/bsp/io.h
new file mode 100644
index 0000000000..32a06c6969
--- /dev/null
+++ b/include/arm/lpc40xx_ea_ram/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/io.h>
diff --git a/include/arm/lpc40xx_ea_ram/bsp/irq.h b/include/arm/lpc40xx_ea_ram/bsp/irq.h
new file mode 100644
index 0000000000..31c7ccebfb
--- /dev/null
+++ b/include/arm/lpc40xx_ea_ram/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/irq.h>
diff --git a/include/arm/lpc40xx_ea_ram/bsp/linker-symbols.h b/include/arm/lpc40xx_ea_ram/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc40xx_ea_ram/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc40xx_ea_ram/bsp/lpc-clock-config.h b/include/arm/lpc40xx_ea_ram/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..20f2e40532
--- /dev/null
+++ b/include/arm/lpc40xx_ea_ram/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc40xx_ea_ram/bsp/lpc-ethernet-config.h b/include/arm/lpc40xx_ea_ram/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..742e6f1199
--- /dev/null
+++ b/include/arm/lpc40xx_ea_ram/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc40xx_ea_ram/bsp/start.h b/include/arm/lpc40xx_ea_ram/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc40xx_ea_ram/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc40xx_ea_ram/coverhd.h b/include/arm/lpc40xx_ea_ram/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc40xx_ea_ram/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc40xx_ea_ram/rtems/asm.h b/include/arm/lpc40xx_ea_ram/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc40xx_ea_ram/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc40xx_ea_ram/rtems/score/cpu.h b/include/arm/lpc40xx_ea_ram/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc40xx_ea_ram/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc40xx_ea_ram/rtems/score/cpu_asm.h b/include/arm/lpc40xx_ea_ram/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc40xx_ea_ram/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc40xx_ea_ram/rtems/score/cpuatomic.h b/include/arm/lpc40xx_ea_ram/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc40xx_ea_ram/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc40xx_ea_ram/rtems/score/types.h b/include/arm/lpc40xx_ea_ram/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc40xx_ea_ram/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc40xx_ea_ram/tm27.h b/include/arm/lpc40xx_ea_ram/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc40xx_ea_ram/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/lpc40xx_ea_rom_int/bsp.h b/include/arm/lpc40xx_ea_rom_int/bsp.h
new file mode 100644
index 0000000000..d782e1ffa6
--- /dev/null
+++ b/include/arm/lpc40xx_ea_rom_int/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp.h>
diff --git a/include/arm/lpc40xx_ea_rom_int/bsp/i2c.h b/include/arm/lpc40xx_ea_rom_int/bsp/i2c.h
new file mode 100644
index 0000000000..c9c3c77722
--- /dev/null
+++ b/include/arm/lpc40xx_ea_rom_int/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/i2c.h>
diff --git a/include/arm/lpc40xx_ea_rom_int/bsp/io.h b/include/arm/lpc40xx_ea_rom_int/bsp/io.h
new file mode 100644
index 0000000000..32a06c6969
--- /dev/null
+++ b/include/arm/lpc40xx_ea_rom_int/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/io.h>
diff --git a/include/arm/lpc40xx_ea_rom_int/bsp/irq.h b/include/arm/lpc40xx_ea_rom_int/bsp/irq.h
new file mode 100644
index 0000000000..31c7ccebfb
--- /dev/null
+++ b/include/arm/lpc40xx_ea_rom_int/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/irq.h>
diff --git a/include/arm/lpc40xx_ea_rom_int/bsp/linker-symbols.h b/include/arm/lpc40xx_ea_rom_int/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/lpc40xx_ea_rom_int/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/lpc40xx_ea_rom_int/bsp/lpc-clock-config.h b/include/arm/lpc40xx_ea_rom_int/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..20f2e40532
--- /dev/null
+++ b/include/arm/lpc40xx_ea_rom_int/bsp/lpc-clock-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h>
diff --git a/include/arm/lpc40xx_ea_rom_int/bsp/lpc-ethernet-config.h b/include/arm/lpc40xx_ea_rom_int/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..742e6f1199
--- /dev/null
+++ b/include/arm/lpc40xx_ea_rom_int/bsp/lpc-ethernet-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h>
diff --git a/include/arm/lpc40xx_ea_rom_int/bsp/start.h b/include/arm/lpc40xx_ea_rom_int/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/lpc40xx_ea_rom_int/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/lpc40xx_ea_rom_int/coverhd.h b/include/arm/lpc40xx_ea_rom_int/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/lpc40xx_ea_rom_int/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/lpc40xx_ea_rom_int/rtems/asm.h b/include/arm/lpc40xx_ea_rom_int/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/lpc40xx_ea_rom_int/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/lpc40xx_ea_rom_int/rtems/score/cpu.h b/include/arm/lpc40xx_ea_rom_int/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/lpc40xx_ea_rom_int/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/lpc40xx_ea_rom_int/rtems/score/cpu_asm.h b/include/arm/lpc40xx_ea_rom_int/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/lpc40xx_ea_rom_int/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/lpc40xx_ea_rom_int/rtems/score/cpuatomic.h b/include/arm/lpc40xx_ea_rom_int/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/lpc40xx_ea_rom_int/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/lpc40xx_ea_rom_int/rtems/score/types.h b/include/arm/lpc40xx_ea_rom_int/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/lpc40xx_ea_rom_int/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/lpc40xx_ea_rom_int/tm27.h b/include/arm/lpc40xx_ea_rom_int/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/lpc40xx_ea_rom_int/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/nds/include/bsp.h b/include/arm/nds/bsp.h
index 2f1d730bb7..2f1d730bb7 100644
--- a/c/src/lib/libbsp/arm/nds/include/bsp.h
+++ b/include/arm/nds/bsp.h
diff --git a/c/src/lib/libbsp/arm/nds/irq/irq.h b/include/arm/nds/bsp/irq.h
index aeaccef298..aeaccef298 100644
--- a/c/src/lib/libbsp/arm/nds/irq/irq.h
+++ b/include/arm/nds/bsp/irq.h
diff --git a/include/arm/nds/bsp/linker-symbols.h b/include/arm/nds/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/nds/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/nds/coverhd.h b/include/arm/nds/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/nds/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/nds/rtems/asm.h b/include/arm/nds/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/nds/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/nds/rtems/score/cpu.h b/include/arm/nds/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/nds/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/nds/rtems/score/cpu_asm.h b/include/arm/nds/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/nds/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/nds/rtems/score/cpuatomic.h b/include/arm/nds/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/nds/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/nds/rtems/score/types.h b/include/arm/nds/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/nds/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/nds/tm27.h b/include/arm/nds/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/nds/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/bsp.h b/include/arm/raspberrypi/bsp.h
index c05a4102a6..c05a4102a6 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/bsp.h
+++ b/include/arm/raspberrypi/bsp.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/irq.h b/include/arm/raspberrypi/bsp/irq.h
index 8436c2dfc6..8436c2dfc6 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/irq.h
+++ b/include/arm/raspberrypi/bsp/irq.h
diff --git a/include/arm/raspberrypi/bsp/linker-symbols.h b/include/arm/raspberrypi/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/raspberrypi/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/mmu.h b/include/arm/raspberrypi/bsp/mmu.h
index 45ecc5a2a4..45ecc5a2a4 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/mmu.h
+++ b/include/arm/raspberrypi/bsp/mmu.h
diff --git a/include/arm/raspberrypi/bsp/start.h b/include/arm/raspberrypi/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/raspberrypi/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/usart.h b/include/arm/raspberrypi/bsp/usart.h
index 491392b1f7..491392b1f7 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/usart.h
+++ b/include/arm/raspberrypi/bsp/usart.h
diff --git a/include/arm/raspberrypi/coverhd.h b/include/arm/raspberrypi/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/raspberrypi/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/raspberrypi/rtems/asm.h b/include/arm/raspberrypi/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/raspberrypi/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/raspberrypi/rtems/score/cpu.h b/include/arm/raspberrypi/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/raspberrypi/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/raspberrypi/rtems/score/cpu_asm.h b/include/arm/raspberrypi/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/raspberrypi/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/raspberrypi/rtems/score/cpuatomic.h b/include/arm/raspberrypi/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/raspberrypi/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/raspberrypi/rtems/score/types.h b/include/arm/raspberrypi/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/raspberrypi/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/raspberrypi/tm27.h b/include/arm/raspberrypi/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/raspberrypi/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/include/bsp.h b/include/arm/realview_pbx_a9_qemu/bsp.h
index b670b1174d..b670b1174d 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/include/bsp.h
+++ b/include/arm/realview_pbx_a9_qemu/bsp.h
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/include/irq.h b/include/arm/realview_pbx_a9_qemu/bsp/irq.h
index 3c9790e9ef..3c9790e9ef 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/include/irq.h
+++ b/include/arm/realview_pbx_a9_qemu/bsp/irq.h
diff --git a/include/arm/realview_pbx_a9_qemu/bsp/linker-symbols.h b/include/arm/realview_pbx_a9_qemu/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/realview_pbx_a9_qemu/bsp/start.h b/include/arm/realview_pbx_a9_qemu/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/realview_pbx_a9_qemu/coverhd.h b/include/arm/realview_pbx_a9_qemu/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/realview_pbx_a9_qemu/rtems/asm.h b/include/arm/realview_pbx_a9_qemu/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/realview_pbx_a9_qemu/rtems/score/cpu.h b/include/arm/realview_pbx_a9_qemu/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/realview_pbx_a9_qemu/rtems/score/cpu_asm.h b/include/arm/realview_pbx_a9_qemu/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/realview_pbx_a9_qemu/rtems/score/cpuatomic.h b/include/arm/realview_pbx_a9_qemu/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/realview_pbx_a9_qemu/rtems/score/types.h b/include/arm/realview_pbx_a9_qemu/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/include/tm27.h b/include/arm/realview_pbx_a9_qemu/tm27.h
index c336d8d310..c336d8d310 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/include/tm27.h
+++ b/include/arm/realview_pbx_a9_qemu/tm27.h
diff --git a/include/arm/realview_pbx_a9_qemu_smp/bsp.h b/include/arm/realview_pbx_a9_qemu_smp/bsp.h
new file mode 100644
index 0000000000..154017414b
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu_smp/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/realview_pbx_a9_qemu/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/realview_pbx_a9_qemu/bsp.h>
diff --git a/include/arm/realview_pbx_a9_qemu_smp/bsp/irq.h b/include/arm/realview_pbx_a9_qemu_smp/bsp/irq.h
new file mode 100644
index 0000000000..19ee4de8ef
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu_smp/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/realview_pbx_a9_qemu/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/realview_pbx_a9_qemu/bsp/irq.h>
diff --git a/include/arm/realview_pbx_a9_qemu_smp/bsp/linker-symbols.h b/include/arm/realview_pbx_a9_qemu_smp/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu_smp/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/realview_pbx_a9_qemu_smp/bsp/start.h b/include/arm/realview_pbx_a9_qemu_smp/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu_smp/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/realview_pbx_a9_qemu_smp/coverhd.h b/include/arm/realview_pbx_a9_qemu_smp/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu_smp/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/realview_pbx_a9_qemu_smp/rtems/asm.h b/include/arm/realview_pbx_a9_qemu_smp/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu_smp/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/realview_pbx_a9_qemu_smp/rtems/score/cpu.h b/include/arm/realview_pbx_a9_qemu_smp/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu_smp/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/realview_pbx_a9_qemu_smp/rtems/score/cpu_asm.h b/include/arm/realview_pbx_a9_qemu_smp/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu_smp/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/realview_pbx_a9_qemu_smp/rtems/score/cpuatomic.h b/include/arm/realview_pbx_a9_qemu_smp/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu_smp/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/realview_pbx_a9_qemu_smp/rtems/score/types.h b/include/arm/realview_pbx_a9_qemu_smp/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu_smp/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/realview_pbx_a9_qemu_smp/tm27.h b/include/arm/realview_pbx_a9_qemu_smp/tm27.h
new file mode 100644
index 0000000000..ab30c7b8fe
--- /dev/null
+++ b/include/arm/realview_pbx_a9_qemu_smp/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/realview_pbx_a9_qemu/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/realview_pbx_a9_qemu/tm27.h>
diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h b/include/arm/rtl22xx/bsp.h
index 5908ed6ac3..5908ed6ac3 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h
+++ b/include/arm/rtl22xx/bsp.h
diff --git a/c/src/lib/libcpu/arm/lpc22xx/irq/irq.h b/include/arm/rtl22xx/bsp/irq.h
index 31825ca56e..31825ca56e 100644
--- a/c/src/lib/libcpu/arm/lpc22xx/irq/irq.h
+++ b/include/arm/rtl22xx/bsp/irq.h
diff --git a/include/arm/rtl22xx/bsp/linker-symbols.h b/include/arm/rtl22xx/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/rtl22xx/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/rtl22xx/coverhd.h b/include/arm/rtl22xx/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/rtl22xx/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/rtl22xx/rtems/asm.h b/include/arm/rtl22xx/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/rtl22xx/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/rtl22xx/rtems/score/cpu.h b/include/arm/rtl22xx/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/rtl22xx/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/rtl22xx/rtems/score/cpu_asm.h b/include/arm/rtl22xx/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/rtl22xx/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/rtl22xx/rtems/score/cpuatomic.h b/include/arm/rtl22xx/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/rtl22xx/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/rtl22xx/rtems/score/types.h b/include/arm/rtl22xx/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/rtl22xx/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/rtl22xx/tm27.h b/include/arm/rtl22xx/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/rtl22xx/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/rtl22xx/uart.h b/include/arm/rtl22xx/uart.h
new file mode 100644
index 0000000000..8134169430
--- /dev/null
+++ b/include/arm/rtl22xx/uart.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/edb7312/uart.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/edb7312/uart.h>
diff --git a/include/arm/rtl22xx_t/bsp.h b/include/arm/rtl22xx_t/bsp.h
new file mode 100644
index 0000000000..7040734942
--- /dev/null
+++ b/include/arm/rtl22xx_t/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/rtl22xx/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/rtl22xx/bsp.h>
diff --git a/include/arm/rtl22xx_t/bsp/irq.h b/include/arm/rtl22xx_t/bsp/irq.h
new file mode 100644
index 0000000000..c8590c201d
--- /dev/null
+++ b/include/arm/rtl22xx_t/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/rtl22xx/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/rtl22xx/bsp/irq.h>
diff --git a/include/arm/rtl22xx_t/bsp/linker-symbols.h b/include/arm/rtl22xx_t/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/rtl22xx_t/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/rtl22xx_t/coverhd.h b/include/arm/rtl22xx_t/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/rtl22xx_t/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/rtl22xx_t/rtems/asm.h b/include/arm/rtl22xx_t/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/rtl22xx_t/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/rtl22xx_t/rtems/score/cpu.h b/include/arm/rtl22xx_t/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/rtl22xx_t/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/rtl22xx_t/rtems/score/cpu_asm.h b/include/arm/rtl22xx_t/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/rtl22xx_t/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/rtl22xx_t/rtems/score/cpuatomic.h b/include/arm/rtl22xx_t/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/rtl22xx_t/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/rtl22xx_t/rtems/score/types.h b/include/arm/rtl22xx_t/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/rtl22xx_t/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/rtl22xx_t/tm27.h b/include/arm/rtl22xx_t/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/rtl22xx_t/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/rtl22xx_t/uart.h b/include/arm/rtl22xx_t/uart.h
new file mode 100644
index 0000000000..8134169430
--- /dev/null
+++ b/include/arm/rtl22xx_t/uart.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/edb7312/uart.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/edb7312/uart.h>
diff --git a/include/arm/smdk2410/bsp.h b/include/arm/smdk2410/bsp.h
new file mode 100644
index 0000000000..32687d3654
--- /dev/null
+++ b/include/arm/smdk2410/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/gp32/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/gp32/bsp.h>
diff --git a/include/arm/smdk2410/bsp/irq.h b/include/arm/smdk2410/bsp/irq.h
new file mode 100644
index 0000000000..5a537ad34e
--- /dev/null
+++ b/include/arm/smdk2410/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/gp32/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/gp32/bsp/irq.h>
diff --git a/include/arm/smdk2410/bsp/linker-symbols.h b/include/arm/smdk2410/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/smdk2410/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/smdk2410/coverhd.h b/include/arm/smdk2410/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/smdk2410/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/smdk2410/libcpu/mmu.h b/include/arm/smdk2410/libcpu/mmu.h
new file mode 100644
index 0000000000..613920fcf5
--- /dev/null
+++ b/include/arm/smdk2410/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/csb336/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/csb336/libcpu/mmu.h>
diff --git a/include/arm/smdk2410/rtems/asm.h b/include/arm/smdk2410/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/smdk2410/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/smdk2410/rtems/score/cpu.h b/include/arm/smdk2410/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/smdk2410/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/smdk2410/rtems/score/cpu_asm.h b/include/arm/smdk2410/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/smdk2410/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/smdk2410/rtems/score/cpuatomic.h b/include/arm/smdk2410/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/smdk2410/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/smdk2410/rtems/score/types.h b/include/arm/smdk2410/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/smdk2410/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/smdk2410/tm27.h b/include/arm/smdk2410/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/smdk2410/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/bsp.h b/include/arm/stm32f105rc/bsp.h
index a5e7e60484..a5e7e60484 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/bsp.h
+++ b/include/arm/stm32f105rc/bsp.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/i2c.h b/include/arm/stm32f105rc/bsp/i2c.h
index fa18b1f92f..fa18b1f92f 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/i2c.h
+++ b/include/arm/stm32f105rc/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/io.h b/include/arm/stm32f105rc/bsp/io.h
index b7f8669cba..b7f8669cba 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/io.h
+++ b/include/arm/stm32f105rc/bsp/io.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/irq.h b/include/arm/stm32f105rc/bsp/irq.h
index 4771f521fe..4771f521fe 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/irq.h
+++ b/include/arm/stm32f105rc/bsp/irq.h
diff --git a/include/arm/stm32f105rc/bsp/linker-symbols.h b/include/arm/stm32f105rc/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/stm32f105rc/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/stm32f105rc/bsp/start.h b/include/arm/stm32f105rc/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/stm32f105rc/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/usart.h b/include/arm/stm32f105rc/bsp/usart.h
index bac0f6845a..bac0f6845a 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/usart.h
+++ b/include/arm/stm32f105rc/bsp/usart.h
diff --git a/include/arm/stm32f105rc/coverhd.h b/include/arm/stm32f105rc/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/stm32f105rc/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/stm32f105rc/rtems/asm.h b/include/arm/stm32f105rc/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/stm32f105rc/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/stm32f105rc/rtems/score/cpu.h b/include/arm/stm32f105rc/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/stm32f105rc/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/stm32f105rc/rtems/score/cpu_asm.h b/include/arm/stm32f105rc/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/stm32f105rc/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/stm32f105rc/rtems/score/cpuatomic.h b/include/arm/stm32f105rc/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/stm32f105rc/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/stm32f105rc/rtems/score/types.h b/include/arm/stm32f105rc/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/stm32f105rc/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/stm32f105rc/tm27.h b/include/arm/stm32f105rc/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/stm32f105rc/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/stm32f4/bsp.h b/include/arm/stm32f4/bsp.h
new file mode 100644
index 0000000000..ad7eabb998
--- /dev/null
+++ b/include/arm/stm32f4/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/stm32f105rc/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/stm32f105rc/bsp.h>
diff --git a/include/arm/stm32f4/bsp/i2c.h b/include/arm/stm32f4/bsp/i2c.h
new file mode 100644
index 0000000000..6c44792814
--- /dev/null
+++ b/include/arm/stm32f4/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/stm32f105rc/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/stm32f105rc/bsp/i2c.h>
diff --git a/include/arm/stm32f4/bsp/io.h b/include/arm/stm32f4/bsp/io.h
new file mode 100644
index 0000000000..5e5ef5e274
--- /dev/null
+++ b/include/arm/stm32f4/bsp/io.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/stm32f105rc/bsp/io.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/stm32f105rc/bsp/io.h>
diff --git a/include/arm/stm32f4/bsp/irq.h b/include/arm/stm32f4/bsp/irq.h
new file mode 100644
index 0000000000..f0e66e2690
--- /dev/null
+++ b/include/arm/stm32f4/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/stm32f105rc/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/stm32f105rc/bsp/irq.h>
diff --git a/include/arm/stm32f4/bsp/linker-symbols.h b/include/arm/stm32f4/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/stm32f4/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/stm32f4/bsp/start.h b/include/arm/stm32f4/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/stm32f4/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/stm32f4/bsp/usart.h b/include/arm/stm32f4/bsp/usart.h
new file mode 100644
index 0000000000..239102ccdb
--- /dev/null
+++ b/include/arm/stm32f4/bsp/usart.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/stm32f105rc/bsp/usart.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/stm32f105rc/bsp/usart.h>
diff --git a/include/arm/stm32f4/coverhd.h b/include/arm/stm32f4/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/stm32f4/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/stm32f4/rtems/asm.h b/include/arm/stm32f4/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/stm32f4/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/stm32f4/rtems/score/cpu.h b/include/arm/stm32f4/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/stm32f4/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/stm32f4/rtems/score/cpu_asm.h b/include/arm/stm32f4/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/stm32f4/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/stm32f4/rtems/score/cpuatomic.h b/include/arm/stm32f4/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/stm32f4/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/stm32f4/rtems/score/types.h b/include/arm/stm32f4/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/stm32f4/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/stm32f4/tm27.h b/include/arm/stm32f4/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/stm32f4/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/tms570/include/bsp.h b/include/arm/tms570ls3137_hdk/bsp.h
index 81bc4cd9cf..81bc4cd9cf 100644
--- a/c/src/lib/libbsp/arm/tms570/include/bsp.h
+++ b/include/arm/tms570ls3137_hdk/bsp.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/irq.h b/include/arm/tms570ls3137_hdk/bsp/irq.h
index f35e7fe5ca..f35e7fe5ca 100644
--- a/c/src/lib/libbsp/arm/tms570/include/irq.h
+++ b/include/arm/tms570ls3137_hdk/bsp/irq.h
diff --git a/include/arm/tms570ls3137_hdk/bsp/linker-symbols.h b/include/arm/tms570ls3137_hdk/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/tms570ls3137_hdk/bsp/start.h b/include/arm/tms570ls3137_hdk/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/tms570ls3137_hdk/coverhd.h b/include/arm/tms570ls3137_hdk/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/tms570ls3137_hdk/rtems/asm.h b/include/arm/tms570ls3137_hdk/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/tms570ls3137_hdk/rtems/score/cpu.h b/include/arm/tms570ls3137_hdk/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/tms570ls3137_hdk/rtems/score/cpu_asm.h b/include/arm/tms570ls3137_hdk/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/tms570ls3137_hdk/rtems/score/cpuatomic.h b/include/arm/tms570ls3137_hdk/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/tms570ls3137_hdk/rtems/score/types.h b/include/arm/tms570ls3137_hdk/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/tms570ls3137_hdk/tm27.h b/include/arm/tms570ls3137_hdk/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/tms570ls3137_hdk_intram/bsp.h b/include/arm/tms570ls3137_hdk_intram/bsp.h
new file mode 100644
index 0000000000..e0d039ba5c
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_intram/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/tms570ls3137_hdk/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/tms570ls3137_hdk/bsp.h>
diff --git a/include/arm/tms570ls3137_hdk_intram/bsp/irq.h b/include/arm/tms570ls3137_hdk_intram/bsp/irq.h
new file mode 100644
index 0000000000..5a0949c002
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_intram/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/tms570ls3137_hdk/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/tms570ls3137_hdk/bsp/irq.h>
diff --git a/include/arm/tms570ls3137_hdk_intram/bsp/linker-symbols.h b/include/arm/tms570ls3137_hdk_intram/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_intram/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/tms570ls3137_hdk_intram/bsp/start.h b/include/arm/tms570ls3137_hdk_intram/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_intram/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/tms570ls3137_hdk_intram/coverhd.h b/include/arm/tms570ls3137_hdk_intram/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_intram/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/tms570ls3137_hdk_intram/rtems/asm.h b/include/arm/tms570ls3137_hdk_intram/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_intram/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/tms570ls3137_hdk_intram/rtems/score/cpu.h b/include/arm/tms570ls3137_hdk_intram/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_intram/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/tms570ls3137_hdk_intram/rtems/score/cpu_asm.h b/include/arm/tms570ls3137_hdk_intram/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_intram/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/tms570ls3137_hdk_intram/rtems/score/cpuatomic.h b/include/arm/tms570ls3137_hdk_intram/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_intram/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/tms570ls3137_hdk_intram/rtems/score/types.h b/include/arm/tms570ls3137_hdk_intram/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_intram/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/tms570ls3137_hdk_intram/tm27.h b/include/arm/tms570ls3137_hdk_intram/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_intram/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/arm/tms570ls3137_hdk_sdram/bsp.h b/include/arm/tms570ls3137_hdk_sdram/bsp.h
new file mode 100644
index 0000000000..e0d039ba5c
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_sdram/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/tms570ls3137_hdk/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/tms570ls3137_hdk/bsp.h>
diff --git a/include/arm/tms570ls3137_hdk_sdram/bsp/irq.h b/include/arm/tms570ls3137_hdk_sdram/bsp/irq.h
new file mode 100644
index 0000000000..5a0949c002
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_sdram/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/tms570ls3137_hdk/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/tms570ls3137_hdk/bsp/irq.h>
diff --git a/include/arm/tms570ls3137_hdk_sdram/bsp/linker-symbols.h b/include/arm/tms570ls3137_hdk_sdram/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_sdram/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/tms570ls3137_hdk_sdram/bsp/start.h b/include/arm/tms570ls3137_hdk_sdram/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_sdram/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/tms570ls3137_hdk_sdram/coverhd.h b/include/arm/tms570ls3137_hdk_sdram/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_sdram/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/tms570ls3137_hdk_sdram/rtems/asm.h b/include/arm/tms570ls3137_hdk_sdram/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_sdram/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/tms570ls3137_hdk_sdram/rtems/score/cpu.h b/include/arm/tms570ls3137_hdk_sdram/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_sdram/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/tms570ls3137_hdk_sdram/rtems/score/cpu_asm.h b/include/arm/tms570ls3137_hdk_sdram/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_sdram/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/tms570ls3137_hdk_sdram/rtems/score/cpuatomic.h b/include/arm/tms570ls3137_hdk_sdram/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_sdram/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/tms570ls3137_hdk_sdram/rtems/score/types.h b/include/arm/tms570ls3137_hdk_sdram/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_sdram/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/tms570ls3137_hdk_sdram/tm27.h b/include/arm/tms570ls3137_hdk_sdram/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/arm/tms570ls3137_hdk_sdram/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/bsp.h b/include/arm/xilinx_zynq_a9_qemu/bsp.h
index bf3ad92b96..bf3ad92b96 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/bsp.h
+++ b/include/arm/xilinx_zynq_a9_qemu/bsp.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/i2c.h b/include/arm/xilinx_zynq_a9_qemu/bsp/i2c.h
index 709ea0178e..709ea0178e 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/i2c.h
+++ b/include/arm/xilinx_zynq_a9_qemu/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/irq.h b/include/arm/xilinx_zynq_a9_qemu/bsp/irq.h
index e8288938fe..e8288938fe 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/irq.h
+++ b/include/arm/xilinx_zynq_a9_qemu/bsp/irq.h
diff --git a/include/arm/xilinx_zynq_a9_qemu/bsp/linker-symbols.h b/include/arm/xilinx_zynq_a9_qemu/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/xilinx_zynq_a9_qemu/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/xilinx_zynq_a9_qemu/bsp/start.h b/include/arm/xilinx_zynq_a9_qemu/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/xilinx_zynq_a9_qemu/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/xilinx_zynq_a9_qemu/coverhd.h b/include/arm/xilinx_zynq_a9_qemu/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/xilinx_zynq_a9_qemu/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/xilinx_zynq_a9_qemu/rtems/asm.h b/include/arm/xilinx_zynq_a9_qemu/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/xilinx_zynq_a9_qemu/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/xilinx_zynq_a9_qemu/rtems/score/cpu.h b/include/arm/xilinx_zynq_a9_qemu/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/xilinx_zynq_a9_qemu/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/xilinx_zynq_a9_qemu/rtems/score/cpu_asm.h b/include/arm/xilinx_zynq_a9_qemu/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/xilinx_zynq_a9_qemu/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/xilinx_zynq_a9_qemu/rtems/score/cpuatomic.h b/include/arm/xilinx_zynq_a9_qemu/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/xilinx_zynq_a9_qemu/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/xilinx_zynq_a9_qemu/rtems/score/types.h b/include/arm/xilinx_zynq_a9_qemu/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/xilinx_zynq_a9_qemu/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/tm27.h b/include/arm/xilinx_zynq_a9_qemu/tm27.h
index 39b8ecafec..39b8ecafec 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/tm27.h
+++ b/include/arm/xilinx_zynq_a9_qemu/tm27.h
diff --git a/include/arm/xilinx_zynq_zc702/bsp.h b/include/arm/xilinx_zynq_zc702/bsp.h
new file mode 100644
index 0000000000..ae36d59803
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc702/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/xilinx_zynq_a9_qemu/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/xilinx_zynq_a9_qemu/bsp.h>
diff --git a/include/arm/xilinx_zynq_zc702/bsp/i2c.h b/include/arm/xilinx_zynq_zc702/bsp/i2c.h
new file mode 100644
index 0000000000..33cbf75cee
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc702/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/xilinx_zynq_a9_qemu/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/xilinx_zynq_a9_qemu/bsp/i2c.h>
diff --git a/include/arm/xilinx_zynq_zc702/bsp/irq.h b/include/arm/xilinx_zynq_zc702/bsp/irq.h
new file mode 100644
index 0000000000..9309bbb600
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc702/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/xilinx_zynq_a9_qemu/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/xilinx_zynq_a9_qemu/bsp/irq.h>
diff --git a/include/arm/xilinx_zynq_zc702/bsp/linker-symbols.h b/include/arm/xilinx_zynq_zc702/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc702/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/xilinx_zynq_zc702/bsp/start.h b/include/arm/xilinx_zynq_zc702/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc702/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/xilinx_zynq_zc702/coverhd.h b/include/arm/xilinx_zynq_zc702/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc702/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/xilinx_zynq_zc702/rtems/asm.h b/include/arm/xilinx_zynq_zc702/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc702/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/xilinx_zynq_zc702/rtems/score/cpu.h b/include/arm/xilinx_zynq_zc702/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc702/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/xilinx_zynq_zc702/rtems/score/cpu_asm.h b/include/arm/xilinx_zynq_zc702/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc702/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/xilinx_zynq_zc702/rtems/score/cpuatomic.h b/include/arm/xilinx_zynq_zc702/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc702/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/xilinx_zynq_zc702/rtems/score/types.h b/include/arm/xilinx_zynq_zc702/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc702/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/xilinx_zynq_zc702/tm27.h b/include/arm/xilinx_zynq_zc702/tm27.h
new file mode 100644
index 0000000000..ca2df340c3
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc702/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/xilinx_zynq_a9_qemu/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/xilinx_zynq_a9_qemu/tm27.h>
diff --git a/include/arm/xilinx_zynq_zc706/bsp.h b/include/arm/xilinx_zynq_zc706/bsp.h
new file mode 100644
index 0000000000..ae36d59803
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc706/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/xilinx_zynq_a9_qemu/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/xilinx_zynq_a9_qemu/bsp.h>
diff --git a/include/arm/xilinx_zynq_zc706/bsp/i2c.h b/include/arm/xilinx_zynq_zc706/bsp/i2c.h
new file mode 100644
index 0000000000..33cbf75cee
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc706/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/xilinx_zynq_a9_qemu/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/xilinx_zynq_a9_qemu/bsp/i2c.h>
diff --git a/include/arm/xilinx_zynq_zc706/bsp/irq.h b/include/arm/xilinx_zynq_zc706/bsp/irq.h
new file mode 100644
index 0000000000..9309bbb600
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc706/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/xilinx_zynq_a9_qemu/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/xilinx_zynq_a9_qemu/bsp/irq.h>
diff --git a/include/arm/xilinx_zynq_zc706/bsp/linker-symbols.h b/include/arm/xilinx_zynq_zc706/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc706/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/xilinx_zynq_zc706/bsp/start.h b/include/arm/xilinx_zynq_zc706/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc706/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/xilinx_zynq_zc706/coverhd.h b/include/arm/xilinx_zynq_zc706/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc706/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/xilinx_zynq_zc706/rtems/asm.h b/include/arm/xilinx_zynq_zc706/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc706/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/xilinx_zynq_zc706/rtems/score/cpu.h b/include/arm/xilinx_zynq_zc706/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc706/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/xilinx_zynq_zc706/rtems/score/cpu_asm.h b/include/arm/xilinx_zynq_zc706/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc706/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/xilinx_zynq_zc706/rtems/score/cpuatomic.h b/include/arm/xilinx_zynq_zc706/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc706/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/xilinx_zynq_zc706/rtems/score/types.h b/include/arm/xilinx_zynq_zc706/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc706/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/xilinx_zynq_zc706/tm27.h b/include/arm/xilinx_zynq_zc706/tm27.h
new file mode 100644
index 0000000000..ca2df340c3
--- /dev/null
+++ b/include/arm/xilinx_zynq_zc706/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/xilinx_zynq_a9_qemu/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/xilinx_zynq_a9_qemu/tm27.h>
diff --git a/include/arm/xilinx_zynq_zedboard/bsp.h b/include/arm/xilinx_zynq_zedboard/bsp.h
new file mode 100644
index 0000000000..ae36d59803
--- /dev/null
+++ b/include/arm/xilinx_zynq_zedboard/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/xilinx_zynq_a9_qemu/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/xilinx_zynq_a9_qemu/bsp.h>
diff --git a/include/arm/xilinx_zynq_zedboard/bsp/i2c.h b/include/arm/xilinx_zynq_zedboard/bsp/i2c.h
new file mode 100644
index 0000000000..33cbf75cee
--- /dev/null
+++ b/include/arm/xilinx_zynq_zedboard/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/xilinx_zynq_a9_qemu/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/xilinx_zynq_a9_qemu/bsp/i2c.h>
diff --git a/include/arm/xilinx_zynq_zedboard/bsp/irq.h b/include/arm/xilinx_zynq_zedboard/bsp/irq.h
new file mode 100644
index 0000000000..9309bbb600
--- /dev/null
+++ b/include/arm/xilinx_zynq_zedboard/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/xilinx_zynq_a9_qemu/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/xilinx_zynq_a9_qemu/bsp/irq.h>
diff --git a/include/arm/xilinx_zynq_zedboard/bsp/linker-symbols.h b/include/arm/xilinx_zynq_zedboard/bsp/linker-symbols.h
new file mode 100644
index 0000000000..1ae4dfff89
--- /dev/null
+++ b/include/arm/xilinx_zynq_zedboard/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/linker-symbols.h>
diff --git a/include/arm/xilinx_zynq_zedboard/bsp/start.h b/include/arm/xilinx_zynq_zedboard/bsp/start.h
new file mode 100644
index 0000000000..78ccc736d0
--- /dev/null
+++ b/include/arm/xilinx_zynq_zedboard/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/bsp/start.h>
diff --git a/include/arm/xilinx_zynq_zedboard/coverhd.h b/include/arm/xilinx_zynq_zedboard/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/arm/xilinx_zynq_zedboard/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/arm/xilinx_zynq_zedboard/rtems/asm.h b/include/arm/xilinx_zynq_zedboard/rtems/asm.h
new file mode 100644
index 0000000000..6ac0366a94
--- /dev/null
+++ b/include/arm/xilinx_zynq_zedboard/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/asm.h>
diff --git a/include/arm/xilinx_zynq_zedboard/rtems/score/cpu.h b/include/arm/xilinx_zynq_zedboard/rtems/score/cpu.h
new file mode 100644
index 0000000000..8289086ef2
--- /dev/null
+++ b/include/arm/xilinx_zynq_zedboard/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu.h>
diff --git a/include/arm/xilinx_zynq_zedboard/rtems/score/cpu_asm.h b/include/arm/xilinx_zynq_zedboard/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..efa5e43abd
--- /dev/null
+++ b/include/arm/xilinx_zynq_zedboard/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
diff --git a/include/arm/xilinx_zynq_zedboard/rtems/score/cpuatomic.h b/include/arm/xilinx_zynq_zedboard/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/arm/xilinx_zynq_zedboard/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/arm/xilinx_zynq_zedboard/rtems/score/types.h b/include/arm/xilinx_zynq_zedboard/rtems/score/types.h
new file mode 100644
index 0000000000..759b8380b0
--- /dev/null
+++ b/include/arm/xilinx_zynq_zedboard/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/types.h>
diff --git a/include/arm/xilinx_zynq_zedboard/tm27.h b/include/arm/xilinx_zynq_zedboard/tm27.h
new file mode 100644
index 0000000000..ca2df340c3
--- /dev/null
+++ b/include/arm/xilinx_zynq_zedboard/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/xilinx_zynq_a9_qemu/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/xilinx_zynq_a9_qemu/tm27.h>
diff --git a/c/src/lib/libbsp/arm/gba/include/arm_mode_bits.h b/include/arm_mode_bits.h
index bd9630fbe0..bd9630fbe0 100644
--- a/c/src/lib/libbsp/arm/gba/include/arm_mode_bits.h
+++ b/include/arm_mode_bits.h
diff --git a/cpukit/libnetworking/arpa/ftp.h b/include/arpa/ftp.h
index 9a36488540..9a36488540 100644
--- a/cpukit/libnetworking/arpa/ftp.h
+++ b/include/arpa/ftp.h
diff --git a/cpukit/libnetworking/arpa/inet.h b/include/arpa/inet.h
index 6ea7e7063f..6ea7e7063f 100644
--- a/cpukit/libnetworking/arpa/inet.h
+++ b/include/arpa/inet.h
diff --git a/cpukit/libnetworking/arpa/nameser.h b/include/arpa/nameser.h
index d499611875..d499611875 100644
--- a/cpukit/libnetworking/arpa/nameser.h
+++ b/include/arpa/nameser.h
diff --git a/cpukit/libnetworking/arpa/nameser_compat.h b/include/arpa/nameser_compat.h
index b38e42a1e7..b38e42a1e7 100644
--- a/cpukit/libnetworking/arpa/nameser_compat.h
+++ b/include/arpa/nameser_compat.h
diff --git a/c/src/lib/libbsp/sparc64/shared/include/asm.h b/include/asm.h
index bd3cc1298a..bd3cc1298a 100644
--- a/c/src/lib/libbsp/sparc64/shared/include/asm.h
+++ b/include/asm.h
diff --git a/c/src/lib/libbsp/arm/gba/include/asm_macros.h b/include/asm_macros.h
index 4cfadb8773..4cfadb8773 100644
--- a/c/src/lib/libbsp/arm/gba/include/asm_macros.h
+++ b/include/asm_macros.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200.h b/include/at91rm9200.h
index 3ed64c7073..3ed64c7073 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200.h
+++ b/include/at91rm9200.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_dbgu.h b/include/at91rm9200_dbgu.h
index 9a65483db0..9a65483db0 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_dbgu.h
+++ b/include/at91rm9200_dbgu.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_emac.h b/include/at91rm9200_emac.h
index 77c42d1526..77c42d1526 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_emac.h
+++ b/include/at91rm9200_emac.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_gpio.h b/include/at91rm9200_gpio.h
index 9fa18ad476..9fa18ad476 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_gpio.h
+++ b/include/at91rm9200_gpio.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_mem.h b/include/at91rm9200_mem.h
index fafb18f6e8..fafb18f6e8 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_mem.h
+++ b/include/at91rm9200_mem.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_pmc.h b/include/at91rm9200_pmc.h
index 70cf77fc5a..70cf77fc5a 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_pmc.h
+++ b/include/at91rm9200_pmc.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_usart.h b/include/at91rm9200_usart.h
index 387f353992..387f353992 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_usart.h
+++ b/include/at91rm9200_usart.h
diff --git a/c/src/lib/libbsp/avr/avrtest/include/bsp.h b/include/avr/avrtest/bsp.h
index b64d59ccc5..b64d59ccc5 100644
--- a/c/src/lib/libbsp/avr/avrtest/include/bsp.h
+++ b/include/avr/avrtest/bsp.h
diff --git a/include/avr/avrtest/coverhd.h b/include/avr/avrtest/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/avr/avrtest/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/cpukit/score/cpu/avr/rtems/asm.h b/include/avr/avrtest/rtems/asm.h
index e93841d06e..e93841d06e 100644
--- a/cpukit/score/cpu/avr/rtems/asm.h
+++ b/include/avr/avrtest/rtems/asm.h
diff --git a/cpukit/score/cpu/avr/rtems/score/cpu.h b/include/avr/avrtest/rtems/score/cpu.h
index 7a6e9d91dc..7a6e9d91dc 100644
--- a/cpukit/score/cpu/avr/rtems/score/cpu.h
+++ b/include/avr/avrtest/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/avr/rtems/score/cpu_asm.h b/include/avr/avrtest/rtems/score/cpu_asm.h
index af920d143e..af920d143e 100644
--- a/cpukit/score/cpu/avr/rtems/score/cpu_asm.h
+++ b/include/avr/avrtest/rtems/score/cpu_asm.h
diff --git a/include/avr/avrtest/rtems/score/cpuatomic.h b/include/avr/avrtest/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/avr/avrtest/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/avr/rtems/score/types.h b/include/avr/avrtest/rtems/score/types.h
index 0de6ba295d..0de6ba295d 100644
--- a/cpukit/score/cpu/avr/rtems/score/types.h
+++ b/include/avr/avrtest/rtems/score/types.h
diff --git a/include/avr/avrtest/tm27.h b/include/avr/avrtest/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/avr/avrtest/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/cpukit/score/cpu/avr/avr/boot.h b/include/avr/boot.h
index 863143b226..863143b226 100644
--- a/cpukit/score/cpu/avr/avr/boot.h
+++ b/include/avr/boot.h
diff --git a/cpukit/score/cpu/avr/avr/common.h b/include/avr/common.h
index 1acfe26889..1acfe26889 100644
--- a/cpukit/score/cpu/avr/avr/common.h
+++ b/include/avr/common.h
diff --git a/cpukit/score/cpu/avr/avr/crc16.h b/include/avr/crc16.h
index fe6dfd4346..fe6dfd4346 100644
--- a/cpukit/score/cpu/avr/avr/crc16.h
+++ b/include/avr/crc16.h
diff --git a/cpukit/score/cpu/avr/avr/delay.h b/include/avr/delay.h
index ad9db108eb..ad9db108eb 100644
--- a/cpukit/score/cpu/avr/avr/delay.h
+++ b/include/avr/delay.h
diff --git a/cpukit/score/cpu/avr/avr/eeprom.h b/include/avr/eeprom.h
index 448248dc37..448248dc37 100644
--- a/cpukit/score/cpu/avr/avr/eeprom.h
+++ b/include/avr/eeprom.h
diff --git a/cpukit/score/cpu/avr/avr/fuse.h b/include/avr/fuse.h
index ba968ba853..ba968ba853 100644
--- a/cpukit/score/cpu/avr/avr/fuse.h
+++ b/include/avr/fuse.h
diff --git a/cpukit/score/cpu/avr/avr/interrupt.h b/include/avr/interrupt.h
index 8dd5e26d09..8dd5e26d09 100644
--- a/cpukit/score/cpu/avr/avr/interrupt.h
+++ b/include/avr/interrupt.h
diff --git a/cpukit/score/cpu/avr/avr/io.h b/include/avr/io.h
index 22ac57d84f..22ac57d84f 100644
--- a/cpukit/score/cpu/avr/avr/io.h
+++ b/include/avr/io.h
diff --git a/cpukit/score/cpu/avr/avr/io1200.h b/include/avr/io1200.h
index ae2aa17542..ae2aa17542 100644
--- a/cpukit/score/cpu/avr/avr/io1200.h
+++ b/include/avr/io1200.h
diff --git a/cpukit/score/cpu/avr/avr/io2313.h b/include/avr/io2313.h
index 1ca95a6749..1ca95a6749 100644
--- a/cpukit/score/cpu/avr/avr/io2313.h
+++ b/include/avr/io2313.h
diff --git a/cpukit/score/cpu/avr/avr/io2323.h b/include/avr/io2323.h
index 2bfe7174d2..2bfe7174d2 100644
--- a/cpukit/score/cpu/avr/avr/io2323.h
+++ b/include/avr/io2323.h
diff --git a/cpukit/score/cpu/avr/avr/io2333.h b/include/avr/io2333.h
index 63c7fab337..63c7fab337 100644
--- a/cpukit/score/cpu/avr/avr/io2333.h
+++ b/include/avr/io2333.h
diff --git a/cpukit/score/cpu/avr/avr/io2343.h b/include/avr/io2343.h
index bee4ad4fa7..bee4ad4fa7 100644
--- a/cpukit/score/cpu/avr/avr/io2343.h
+++ b/include/avr/io2343.h
diff --git a/cpukit/score/cpu/avr/avr/io43u32x.h b/include/avr/io43u32x.h
index ed36ff1010..ed36ff1010 100644
--- a/cpukit/score/cpu/avr/avr/io43u32x.h
+++ b/include/avr/io43u32x.h
diff --git a/cpukit/score/cpu/avr/avr/io43u35x.h b/include/avr/io43u35x.h
index 66a06d867a..66a06d867a 100644
--- a/cpukit/score/cpu/avr/avr/io43u35x.h
+++ b/include/avr/io43u35x.h
diff --git a/cpukit/score/cpu/avr/avr/io4414.h b/include/avr/io4414.h
index 96c400030d..96c400030d 100644
--- a/cpukit/score/cpu/avr/avr/io4414.h
+++ b/include/avr/io4414.h
diff --git a/cpukit/score/cpu/avr/avr/io4433.h b/include/avr/io4433.h
index 62cbb00cd3..62cbb00cd3 100644
--- a/cpukit/score/cpu/avr/avr/io4433.h
+++ b/include/avr/io4433.h
diff --git a/cpukit/score/cpu/avr/avr/io4434.h b/include/avr/io4434.h
index 72bc72680d..72bc72680d 100644
--- a/cpukit/score/cpu/avr/avr/io4434.h
+++ b/include/avr/io4434.h
diff --git a/cpukit/score/cpu/avr/avr/io76c711.h b/include/avr/io76c711.h
index e0c68e2267..e0c68e2267 100644
--- a/cpukit/score/cpu/avr/avr/io76c711.h
+++ b/include/avr/io76c711.h
diff --git a/cpukit/score/cpu/avr/avr/io8515.h b/include/avr/io8515.h
index 305224d201..305224d201 100644
--- a/cpukit/score/cpu/avr/avr/io8515.h
+++ b/include/avr/io8515.h
diff --git a/cpukit/score/cpu/avr/avr/io8534.h b/include/avr/io8534.h
index c873a71430..c873a71430 100644
--- a/cpukit/score/cpu/avr/avr/io8534.h
+++ b/include/avr/io8534.h
diff --git a/cpukit/score/cpu/avr/avr/io8535.h b/include/avr/io8535.h
index cf31f00c32..cf31f00c32 100644
--- a/cpukit/score/cpu/avr/avr/io8535.h
+++ b/include/avr/io8535.h
diff --git a/cpukit/score/cpu/avr/avr/io86r401.h b/include/avr/io86r401.h
index 56f2d568f3..56f2d568f3 100644
--- a/cpukit/score/cpu/avr/avr/io86r401.h
+++ b/include/avr/io86r401.h
diff --git a/cpukit/score/cpu/avr/avr/io90pwm1.h b/include/avr/io90pwm1.h
index 6c3aad03a5..6c3aad03a5 100644
--- a/cpukit/score/cpu/avr/avr/io90pwm1.h
+++ b/include/avr/io90pwm1.h
diff --git a/cpukit/score/cpu/avr/avr/io90pwm216.h b/include/avr/io90pwm216.h
index c6befa4081..c6befa4081 100644
--- a/cpukit/score/cpu/avr/avr/io90pwm216.h
+++ b/include/avr/io90pwm216.h
diff --git a/cpukit/score/cpu/avr/avr/io90pwm2b.h b/include/avr/io90pwm2b.h
index 22d0c1c379..22d0c1c379 100644
--- a/cpukit/score/cpu/avr/avr/io90pwm2b.h
+++ b/include/avr/io90pwm2b.h
diff --git a/cpukit/score/cpu/avr/avr/io90pwm316.h b/include/avr/io90pwm316.h
index fbc1256922..fbc1256922 100644
--- a/cpukit/score/cpu/avr/avr/io90pwm316.h
+++ b/include/avr/io90pwm316.h
diff --git a/cpukit/score/cpu/avr/avr/io90pwm3b.h b/include/avr/io90pwm3b.h
index 5b1a7537cb..5b1a7537cb 100644
--- a/cpukit/score/cpu/avr/avr/io90pwm3b.h
+++ b/include/avr/io90pwm3b.h
diff --git a/cpukit/score/cpu/avr/avr/io90pwm81.h b/include/avr/io90pwm81.h
index b2faea85f6..b2faea85f6 100644
--- a/cpukit/score/cpu/avr/avr/io90pwm81.h
+++ b/include/avr/io90pwm81.h
diff --git a/cpukit/score/cpu/avr/avr/io90pwmx.h b/include/avr/io90pwmx.h
index b66b65c541..b66b65c541 100644
--- a/cpukit/score/cpu/avr/avr/io90pwmx.h
+++ b/include/avr/io90pwmx.h
diff --git a/cpukit/score/cpu/avr/avr/io90scr100.h b/include/avr/io90scr100.h
index cb9f59247a..cb9f59247a 100644
--- a/cpukit/score/cpu/avr/avr/io90scr100.h
+++ b/include/avr/io90scr100.h
diff --git a/cpukit/score/cpu/avr/avr/ioa6289.h b/include/avr/ioa6289.h
index d51e3a965a..d51e3a965a 100644
--- a/cpukit/score/cpu/avr/avr/ioa6289.h
+++ b/include/avr/ioa6289.h
diff --git a/cpukit/score/cpu/avr/avr/ioat94k.h b/include/avr/ioat94k.h
index dc0cab6890..dc0cab6890 100644
--- a/cpukit/score/cpu/avr/avr/ioat94k.h
+++ b/include/avr/ioat94k.h
diff --git a/cpukit/score/cpu/avr/avr/iocan128.h b/include/avr/iocan128.h
index d7996f0c8b..d7996f0c8b 100644
--- a/cpukit/score/cpu/avr/avr/iocan128.h
+++ b/include/avr/iocan128.h
diff --git a/cpukit/score/cpu/avr/avr/iocan32.h b/include/avr/iocan32.h
index 512b45d7b5..512b45d7b5 100644
--- a/cpukit/score/cpu/avr/avr/iocan32.h
+++ b/include/avr/iocan32.h
diff --git a/cpukit/score/cpu/avr/avr/iocan64.h b/include/avr/iocan64.h
index d7525c0939..d7525c0939 100644
--- a/cpukit/score/cpu/avr/avr/iocan64.h
+++ b/include/avr/iocan64.h
diff --git a/cpukit/score/cpu/avr/avr/iocanxx.h b/include/avr/iocanxx.h
index a593539cb1..a593539cb1 100644
--- a/cpukit/score/cpu/avr/avr/iocanxx.h
+++ b/include/avr/iocanxx.h
diff --git a/cpukit/score/cpu/avr/avr/iom103.h b/include/avr/iom103.h
index 6ca791b100..6ca791b100 100644
--- a/cpukit/score/cpu/avr/avr/iom103.h
+++ b/include/avr/iom103.h
diff --git a/cpukit/score/cpu/avr/avr/iom128.h b/include/avr/iom128.h
index 7eeb3f57e6..7eeb3f57e6 100644
--- a/cpukit/score/cpu/avr/avr/iom128.h
+++ b/include/avr/iom128.h
diff --git a/cpukit/score/cpu/avr/avr/iom1280.h b/include/avr/iom1280.h
index a6aff362b8..a6aff362b8 100644
--- a/cpukit/score/cpu/avr/avr/iom1280.h
+++ b/include/avr/iom1280.h
diff --git a/cpukit/score/cpu/avr/avr/iom1281.h b/include/avr/iom1281.h
index 8b764c675e..8b764c675e 100644
--- a/cpukit/score/cpu/avr/avr/iom1281.h
+++ b/include/avr/iom1281.h
diff --git a/cpukit/score/cpu/avr/avr/iom1284p.h b/include/avr/iom1284p.h
index 3076de21c6..3076de21c6 100644
--- a/cpukit/score/cpu/avr/avr/iom1284p.h
+++ b/include/avr/iom1284p.h
diff --git a/cpukit/score/cpu/avr/avr/iom128rfa1.h b/include/avr/iom128rfa1.h
index 480ae200f8..480ae200f8 100644
--- a/cpukit/score/cpu/avr/avr/iom128rfa1.h
+++ b/include/avr/iom128rfa1.h
diff --git a/cpukit/score/cpu/avr/avr/iom16.h b/include/avr/iom16.h
index 6d6e9e3e2c..6d6e9e3e2c 100644
--- a/cpukit/score/cpu/avr/avr/iom16.h
+++ b/include/avr/iom16.h
diff --git a/cpukit/score/cpu/avr/avr/iom161.h b/include/avr/iom161.h
index af7bebeec1..af7bebeec1 100644
--- a/cpukit/score/cpu/avr/avr/iom161.h
+++ b/include/avr/iom161.h
diff --git a/cpukit/score/cpu/avr/avr/iom162.h b/include/avr/iom162.h
index d10a59aff7..d10a59aff7 100644
--- a/cpukit/score/cpu/avr/avr/iom162.h
+++ b/include/avr/iom162.h
diff --git a/cpukit/score/cpu/avr/avr/iom163.h b/include/avr/iom163.h
index 2dabcd8d40..2dabcd8d40 100644
--- a/cpukit/score/cpu/avr/avr/iom163.h
+++ b/include/avr/iom163.h
diff --git a/cpukit/score/cpu/avr/avr/iom164.h b/include/avr/iom164.h
index 160663da88..160663da88 100644
--- a/cpukit/score/cpu/avr/avr/iom164.h
+++ b/include/avr/iom164.h
diff --git a/cpukit/score/cpu/avr/avr/iom165.h b/include/avr/iom165.h
index 72cbc39fec..72cbc39fec 100644
--- a/cpukit/score/cpu/avr/avr/iom165.h
+++ b/include/avr/iom165.h
diff --git a/cpukit/score/cpu/avr/avr/iom165p.h b/include/avr/iom165p.h
index 90daff565f..90daff565f 100644
--- a/cpukit/score/cpu/avr/avr/iom165p.h
+++ b/include/avr/iom165p.h
diff --git a/cpukit/score/cpu/avr/avr/iom168.h b/include/avr/iom168.h
index 7f1dee2345..7f1dee2345 100644
--- a/cpukit/score/cpu/avr/avr/iom168.h
+++ b/include/avr/iom168.h
diff --git a/cpukit/score/cpu/avr/avr/iom168p.h b/include/avr/iom168p.h
index 987d489434..987d489434 100644
--- a/cpukit/score/cpu/avr/avr/iom168p.h
+++ b/include/avr/iom168p.h
diff --git a/cpukit/score/cpu/avr/avr/iom169.h b/include/avr/iom169.h
index 64910dd115..64910dd115 100644
--- a/cpukit/score/cpu/avr/avr/iom169.h
+++ b/include/avr/iom169.h
diff --git a/cpukit/score/cpu/avr/avr/iom169p.h b/include/avr/iom169p.h
index 3d7995a3f5..3d7995a3f5 100644
--- a/cpukit/score/cpu/avr/avr/iom169p.h
+++ b/include/avr/iom169p.h
diff --git a/cpukit/score/cpu/avr/avr/iom16hva.h b/include/avr/iom16hva.h
index 7dcad90e37..7dcad90e37 100644
--- a/cpukit/score/cpu/avr/avr/iom16hva.h
+++ b/include/avr/iom16hva.h
diff --git a/cpukit/score/cpu/avr/avr/iom16m1.h b/include/avr/iom16m1.h
index 4ca8f1e40c..4ca8f1e40c 100644
--- a/cpukit/score/cpu/avr/avr/iom16m1.h
+++ b/include/avr/iom16m1.h
diff --git a/cpukit/score/cpu/avr/avr/iom16u4.h b/include/avr/iom16u4.h
index 79e577919b..79e577919b 100644
--- a/cpukit/score/cpu/avr/avr/iom16u4.h
+++ b/include/avr/iom16u4.h
diff --git a/cpukit/score/cpu/avr/avr/iom2560.h b/include/avr/iom2560.h
index 461f93611f..461f93611f 100644
--- a/cpukit/score/cpu/avr/avr/iom2560.h
+++ b/include/avr/iom2560.h
diff --git a/cpukit/score/cpu/avr/avr/iom2561.h b/include/avr/iom2561.h
index 3514efcd62..3514efcd62 100644
--- a/cpukit/score/cpu/avr/avr/iom2561.h
+++ b/include/avr/iom2561.h
diff --git a/cpukit/score/cpu/avr/avr/iom32.h b/include/avr/iom32.h
index 88465252d6..88465252d6 100644
--- a/cpukit/score/cpu/avr/avr/iom32.h
+++ b/include/avr/iom32.h
diff --git a/cpukit/score/cpu/avr/avr/iom323.h b/include/avr/iom323.h
index d631ab5e06..d631ab5e06 100644
--- a/cpukit/score/cpu/avr/avr/iom323.h
+++ b/include/avr/iom323.h
diff --git a/cpukit/score/cpu/avr/avr/iom324.h b/include/avr/iom324.h
index 09fbd51f66..09fbd51f66 100644
--- a/cpukit/score/cpu/avr/avr/iom324.h
+++ b/include/avr/iom324.h
diff --git a/cpukit/score/cpu/avr/avr/iom325.h b/include/avr/iom325.h
index 7d4f582aaf..7d4f582aaf 100644
--- a/cpukit/score/cpu/avr/avr/iom325.h
+++ b/include/avr/iom325.h
diff --git a/cpukit/score/cpu/avr/avr/iom3250.h b/include/avr/iom3250.h
index 6c3cb35a0f..6c3cb35a0f 100644
--- a/cpukit/score/cpu/avr/avr/iom3250.h
+++ b/include/avr/iom3250.h
diff --git a/cpukit/score/cpu/avr/avr/iom328p.h b/include/avr/iom328p.h
index b2bb6b58bf..b2bb6b58bf 100644
--- a/cpukit/score/cpu/avr/avr/iom328p.h
+++ b/include/avr/iom328p.h
diff --git a/cpukit/score/cpu/avr/avr/iom329.h b/include/avr/iom329.h
index a7b5efdfd1..a7b5efdfd1 100644
--- a/cpukit/score/cpu/avr/avr/iom329.h
+++ b/include/avr/iom329.h
diff --git a/cpukit/score/cpu/avr/avr/iom3290.h b/include/avr/iom3290.h
index f349821f77..f349821f77 100644
--- a/cpukit/score/cpu/avr/avr/iom3290.h
+++ b/include/avr/iom3290.h
diff --git a/cpukit/score/cpu/avr/avr/iom32c1.h b/include/avr/iom32c1.h
index a0d4017026..a0d4017026 100644
--- a/cpukit/score/cpu/avr/avr/iom32c1.h
+++ b/include/avr/iom32c1.h
diff --git a/cpukit/score/cpu/avr/avr/iom32hvb.h b/include/avr/iom32hvb.h
index f97031727c..f97031727c 100644
--- a/cpukit/score/cpu/avr/avr/iom32hvb.h
+++ b/include/avr/iom32hvb.h
diff --git a/cpukit/score/cpu/avr/avr/iom32m1.h b/include/avr/iom32m1.h
index f8bf88396e..f8bf88396e 100644
--- a/cpukit/score/cpu/avr/avr/iom32m1.h
+++ b/include/avr/iom32m1.h
diff --git a/cpukit/score/cpu/avr/avr/iom32u4.h b/include/avr/iom32u4.h
index 263d40f9b2..263d40f9b2 100644
--- a/cpukit/score/cpu/avr/avr/iom32u4.h
+++ b/include/avr/iom32u4.h
diff --git a/cpukit/score/cpu/avr/avr/iom32u6.h b/include/avr/iom32u6.h
index 9f4211dd80..9f4211dd80 100644
--- a/cpukit/score/cpu/avr/avr/iom32u6.h
+++ b/include/avr/iom32u6.h
diff --git a/cpukit/score/cpu/avr/avr/iom406.h b/include/avr/iom406.h
index b0baafd024..b0baafd024 100644
--- a/cpukit/score/cpu/avr/avr/iom406.h
+++ b/include/avr/iom406.h
diff --git a/cpukit/score/cpu/avr/avr/iom48.h b/include/avr/iom48.h
index 2840dff539..2840dff539 100644
--- a/cpukit/score/cpu/avr/avr/iom48.h
+++ b/include/avr/iom48.h
diff --git a/cpukit/score/cpu/avr/avr/iom48p.h b/include/avr/iom48p.h
index db48949ae3..db48949ae3 100644
--- a/cpukit/score/cpu/avr/avr/iom48p.h
+++ b/include/avr/iom48p.h
diff --git a/cpukit/score/cpu/avr/avr/iom64.h b/include/avr/iom64.h
index 8164d6a420..8164d6a420 100644
--- a/cpukit/score/cpu/avr/avr/iom64.h
+++ b/include/avr/iom64.h
diff --git a/cpukit/score/cpu/avr/avr/iom640.h b/include/avr/iom640.h
index d542d2eed5..d542d2eed5 100644
--- a/cpukit/score/cpu/avr/avr/iom640.h
+++ b/include/avr/iom640.h
diff --git a/cpukit/score/cpu/avr/avr/iom644.h b/include/avr/iom644.h
index dcfab293ef..dcfab293ef 100644
--- a/cpukit/score/cpu/avr/avr/iom644.h
+++ b/include/avr/iom644.h
diff --git a/cpukit/score/cpu/avr/avr/iom645.h b/include/avr/iom645.h
index 991ff821fd..991ff821fd 100644
--- a/cpukit/score/cpu/avr/avr/iom645.h
+++ b/include/avr/iom645.h
diff --git a/cpukit/score/cpu/avr/avr/iom6450.h b/include/avr/iom6450.h
index fa2203e527..fa2203e527 100644
--- a/cpukit/score/cpu/avr/avr/iom6450.h
+++ b/include/avr/iom6450.h
diff --git a/cpukit/score/cpu/avr/avr/iom649.h b/include/avr/iom649.h
index 2064573933..2064573933 100644
--- a/cpukit/score/cpu/avr/avr/iom649.h
+++ b/include/avr/iom649.h
diff --git a/cpukit/score/cpu/avr/avr/iom6490.h b/include/avr/iom6490.h
index 10334d7677..10334d7677 100644
--- a/cpukit/score/cpu/avr/avr/iom6490.h
+++ b/include/avr/iom6490.h
diff --git a/cpukit/score/cpu/avr/avr/iom64c1.h b/include/avr/iom64c1.h
index 5895fe9857..5895fe9857 100644
--- a/cpukit/score/cpu/avr/avr/iom64c1.h
+++ b/include/avr/iom64c1.h
diff --git a/cpukit/score/cpu/avr/avr/iom64m1.h b/include/avr/iom64m1.h
index 492e524185..492e524185 100644
--- a/cpukit/score/cpu/avr/avr/iom64m1.h
+++ b/include/avr/iom64m1.h
diff --git a/cpukit/score/cpu/avr/avr/iom8.h b/include/avr/iom8.h
index c918b43dfb..c918b43dfb 100644
--- a/cpukit/score/cpu/avr/avr/iom8.h
+++ b/include/avr/iom8.h
diff --git a/cpukit/score/cpu/avr/avr/iom8515.h b/include/avr/iom8515.h
index 7576f8df4e..7576f8df4e 100644
--- a/cpukit/score/cpu/avr/avr/iom8515.h
+++ b/include/avr/iom8515.h
diff --git a/cpukit/score/cpu/avr/avr/iom8535.h b/include/avr/iom8535.h
index 061a0fce6b..061a0fce6b 100644
--- a/cpukit/score/cpu/avr/avr/iom8535.h
+++ b/include/avr/iom8535.h
diff --git a/cpukit/score/cpu/avr/avr/iom88.h b/include/avr/iom88.h
index f3e5e64c45..f3e5e64c45 100644
--- a/cpukit/score/cpu/avr/avr/iom88.h
+++ b/include/avr/iom88.h
diff --git a/cpukit/score/cpu/avr/avr/iom88p.h b/include/avr/iom88p.h
index 0c98183d58..0c98183d58 100644
--- a/cpukit/score/cpu/avr/avr/iom88p.h
+++ b/include/avr/iom88p.h
diff --git a/cpukit/score/cpu/avr/avr/iom8hva.h b/include/avr/iom8hva.h
index fc36eabb25..fc36eabb25 100644
--- a/cpukit/score/cpu/avr/avr/iom8hva.h
+++ b/include/avr/iom8hva.h
diff --git a/cpukit/score/cpu/avr/avr/iomx8.h b/include/avr/iomx8.h
index f145d9d27d..f145d9d27d 100644
--- a/cpukit/score/cpu/avr/avr/iomx8.h
+++ b/include/avr/iomx8.h
diff --git a/cpukit/score/cpu/avr/avr/iomxx0_1.h b/include/avr/iomxx0_1.h
index 2e62117ce9..2e62117ce9 100644
--- a/cpukit/score/cpu/avr/avr/iomxx0_1.h
+++ b/include/avr/iomxx0_1.h
diff --git a/cpukit/score/cpu/avr/avr/iomxx4.h b/include/avr/iomxx4.h
index 9dd64d875d..9dd64d875d 100644
--- a/cpukit/score/cpu/avr/avr/iomxx4.h
+++ b/include/avr/iomxx4.h
diff --git a/cpukit/score/cpu/avr/avr/iomxxhva.h b/include/avr/iomxxhva.h
index 2f62e18a0b..2f62e18a0b 100644
--- a/cpukit/score/cpu/avr/avr/iomxxhva.h
+++ b/include/avr/iomxxhva.h
diff --git a/cpukit/score/cpu/avr/avr/iotn11.h b/include/avr/iotn11.h
index 8310f560ed..8310f560ed 100644
--- a/cpukit/score/cpu/avr/avr/iotn11.h
+++ b/include/avr/iotn11.h
diff --git a/cpukit/score/cpu/avr/avr/iotn12.h b/include/avr/iotn12.h
index 5851dee68b..5851dee68b 100644
--- a/cpukit/score/cpu/avr/avr/iotn12.h
+++ b/include/avr/iotn12.h
diff --git a/cpukit/score/cpu/avr/avr/iotn13.h b/include/avr/iotn13.h
index 3f491fa914..3f491fa914 100644
--- a/cpukit/score/cpu/avr/avr/iotn13.h
+++ b/include/avr/iotn13.h
diff --git a/cpukit/score/cpu/avr/avr/iotn13a.h b/include/avr/iotn13a.h
index 689f4032d6..689f4032d6 100644
--- a/cpukit/score/cpu/avr/avr/iotn13a.h
+++ b/include/avr/iotn13a.h
diff --git a/cpukit/score/cpu/avr/avr/iotn15.h b/include/avr/iotn15.h
index 3e7ac81487..3e7ac81487 100644
--- a/cpukit/score/cpu/avr/avr/iotn15.h
+++ b/include/avr/iotn15.h
diff --git a/cpukit/score/cpu/avr/avr/iotn167.h b/include/avr/iotn167.h
index 53202b33a2..53202b33a2 100644
--- a/cpukit/score/cpu/avr/avr/iotn167.h
+++ b/include/avr/iotn167.h
diff --git a/cpukit/score/cpu/avr/avr/iotn22.h b/include/avr/iotn22.h
index 6eda011fc9..6eda011fc9 100644
--- a/cpukit/score/cpu/avr/avr/iotn22.h
+++ b/include/avr/iotn22.h
diff --git a/cpukit/score/cpu/avr/avr/iotn2313.h b/include/avr/iotn2313.h
index 21a00522a3..21a00522a3 100644
--- a/cpukit/score/cpu/avr/avr/iotn2313.h
+++ b/include/avr/iotn2313.h
diff --git a/cpukit/score/cpu/avr/avr/iotn24.h b/include/avr/iotn24.h
index 2fc94b10da..2fc94b10da 100644
--- a/cpukit/score/cpu/avr/avr/iotn24.h
+++ b/include/avr/iotn24.h
diff --git a/cpukit/score/cpu/avr/avr/iotn25.h b/include/avr/iotn25.h
index bd2b5b8f5e..bd2b5b8f5e 100644
--- a/cpukit/score/cpu/avr/avr/iotn25.h
+++ b/include/avr/iotn25.h
diff --git a/cpukit/score/cpu/avr/avr/iotn26.h b/include/avr/iotn26.h
index 7fcf2a3b59..7fcf2a3b59 100644
--- a/cpukit/score/cpu/avr/avr/iotn26.h
+++ b/include/avr/iotn26.h
diff --git a/cpukit/score/cpu/avr/avr/iotn261.h b/include/avr/iotn261.h
index 129e595a34..129e595a34 100644
--- a/cpukit/score/cpu/avr/avr/iotn261.h
+++ b/include/avr/iotn261.h
diff --git a/cpukit/score/cpu/avr/avr/iotn28.h b/include/avr/iotn28.h
index 28a68e5ca2..28a68e5ca2 100644
--- a/cpukit/score/cpu/avr/avr/iotn28.h
+++ b/include/avr/iotn28.h
diff --git a/cpukit/score/cpu/avr/avr/iotn43u.h b/include/avr/iotn43u.h
index 52038673ad..52038673ad 100644
--- a/cpukit/score/cpu/avr/avr/iotn43u.h
+++ b/include/avr/iotn43u.h
diff --git a/cpukit/score/cpu/avr/avr/iotn44.h b/include/avr/iotn44.h
index 5c41ef5484..5c41ef5484 100644
--- a/cpukit/score/cpu/avr/avr/iotn44.h
+++ b/include/avr/iotn44.h
diff --git a/cpukit/score/cpu/avr/avr/iotn45.h b/include/avr/iotn45.h
index b8351210b0..b8351210b0 100644
--- a/cpukit/score/cpu/avr/avr/iotn45.h
+++ b/include/avr/iotn45.h
diff --git a/cpukit/score/cpu/avr/avr/iotn461.h b/include/avr/iotn461.h
index 0b14646486..0b14646486 100644
--- a/cpukit/score/cpu/avr/avr/iotn461.h
+++ b/include/avr/iotn461.h
diff --git a/cpukit/score/cpu/avr/avr/iotn48.h b/include/avr/iotn48.h
index d878e98305..d878e98305 100644
--- a/cpukit/score/cpu/avr/avr/iotn48.h
+++ b/include/avr/iotn48.h
diff --git a/cpukit/score/cpu/avr/avr/iotn84.h b/include/avr/iotn84.h
index 13ba31c309..13ba31c309 100644
--- a/cpukit/score/cpu/avr/avr/iotn84.h
+++ b/include/avr/iotn84.h
diff --git a/cpukit/score/cpu/avr/avr/iotn85.h b/include/avr/iotn85.h
index 2fa4d3f0b1..2fa4d3f0b1 100644
--- a/cpukit/score/cpu/avr/avr/iotn85.h
+++ b/include/avr/iotn85.h
diff --git a/cpukit/score/cpu/avr/avr/iotn861.h b/include/avr/iotn861.h
index 54c86570c0..54c86570c0 100644
--- a/cpukit/score/cpu/avr/avr/iotn861.h
+++ b/include/avr/iotn861.h
diff --git a/cpukit/score/cpu/avr/avr/iotn87.h b/include/avr/iotn87.h
index 099d81c05f..099d81c05f 100644
--- a/cpukit/score/cpu/avr/avr/iotn87.h
+++ b/include/avr/iotn87.h
diff --git a/cpukit/score/cpu/avr/avr/iotn88.h b/include/avr/iotn88.h
index 829d13f283..829d13f283 100644
--- a/cpukit/score/cpu/avr/avr/iotn88.h
+++ b/include/avr/iotn88.h
diff --git a/cpukit/score/cpu/avr/avr/iotnx4.h b/include/avr/iotnx4.h
index 8bb310ba13..8bb310ba13 100644
--- a/cpukit/score/cpu/avr/avr/iotnx4.h
+++ b/include/avr/iotnx4.h
diff --git a/cpukit/score/cpu/avr/avr/iotnx5.h b/include/avr/iotnx5.h
index 34edf06e8b..34edf06e8b 100644
--- a/cpukit/score/cpu/avr/avr/iotnx5.h
+++ b/include/avr/iotnx5.h
diff --git a/cpukit/score/cpu/avr/avr/iotnx61.h b/include/avr/iotnx61.h
index 58cba5c493..58cba5c493 100644
--- a/cpukit/score/cpu/avr/avr/iotnx61.h
+++ b/include/avr/iotnx61.h
diff --git a/cpukit/score/cpu/avr/avr/iousb1286.h b/include/avr/iousb1286.h
index 5f9411daff..5f9411daff 100644
--- a/cpukit/score/cpu/avr/avr/iousb1286.h
+++ b/include/avr/iousb1286.h
diff --git a/cpukit/score/cpu/avr/avr/iousb1287.h b/include/avr/iousb1287.h
index f75894bdbc..f75894bdbc 100644
--- a/cpukit/score/cpu/avr/avr/iousb1287.h
+++ b/include/avr/iousb1287.h
diff --git a/cpukit/score/cpu/avr/avr/iousb162.h b/include/avr/iousb162.h
index 89709a7279..89709a7279 100644
--- a/cpukit/score/cpu/avr/avr/iousb162.h
+++ b/include/avr/iousb162.h
diff --git a/cpukit/score/cpu/avr/avr/iousb646.h b/include/avr/iousb646.h
index 035cbcd2bc..035cbcd2bc 100644
--- a/cpukit/score/cpu/avr/avr/iousb646.h
+++ b/include/avr/iousb646.h
diff --git a/cpukit/score/cpu/avr/avr/iousb647.h b/include/avr/iousb647.h
index 2e1288accb..2e1288accb 100644
--- a/cpukit/score/cpu/avr/avr/iousb647.h
+++ b/include/avr/iousb647.h
diff --git a/cpukit/score/cpu/avr/avr/iousb82.h b/include/avr/iousb82.h
index 2d66bd5d70..2d66bd5d70 100644
--- a/cpukit/score/cpu/avr/avr/iousb82.h
+++ b/include/avr/iousb82.h
diff --git a/cpukit/score/cpu/avr/avr/iousbxx2.h b/include/avr/iousbxx2.h
index 3dcbc76262..3dcbc76262 100644
--- a/cpukit/score/cpu/avr/avr/iousbxx2.h
+++ b/include/avr/iousbxx2.h
diff --git a/cpukit/score/cpu/avr/avr/iousbxx6_7.h b/include/avr/iousbxx6_7.h
index c923c22c82..c923c22c82 100644
--- a/cpukit/score/cpu/avr/avr/iousbxx6_7.h
+++ b/include/avr/iousbxx6_7.h
diff --git a/cpukit/score/cpu/avr/avr/iox128a1.h b/include/avr/iox128a1.h
index 4ce4c47e64..4ce4c47e64 100644
--- a/cpukit/score/cpu/avr/avr/iox128a1.h
+++ b/include/avr/iox128a1.h
diff --git a/cpukit/score/cpu/avr/avr/iox128a3.h b/include/avr/iox128a3.h
index e5edf62944..e5edf62944 100644
--- a/cpukit/score/cpu/avr/avr/iox128a3.h
+++ b/include/avr/iox128a3.h
diff --git a/cpukit/score/cpu/avr/avr/iox16a4.h b/include/avr/iox16a4.h
index cff1d53360..cff1d53360 100644
--- a/cpukit/score/cpu/avr/avr/iox16a4.h
+++ b/include/avr/iox16a4.h
diff --git a/cpukit/score/cpu/avr/avr/iox16d4.h b/include/avr/iox16d4.h
index 0bb088759c..0bb088759c 100644
--- a/cpukit/score/cpu/avr/avr/iox16d4.h
+++ b/include/avr/iox16d4.h
diff --git a/cpukit/score/cpu/avr/avr/iox256a3.h b/include/avr/iox256a3.h
index 7d7aca4890..7d7aca4890 100644
--- a/cpukit/score/cpu/avr/avr/iox256a3.h
+++ b/include/avr/iox256a3.h
diff --git a/cpukit/score/cpu/avr/avr/iox256a3b.h b/include/avr/iox256a3b.h
index deee492cca..deee492cca 100644
--- a/cpukit/score/cpu/avr/avr/iox256a3b.h
+++ b/include/avr/iox256a3b.h
diff --git a/cpukit/score/cpu/avr/avr/iox32a4.h b/include/avr/iox32a4.h
index f0eba4ecc0..f0eba4ecc0 100644
--- a/cpukit/score/cpu/avr/avr/iox32a4.h
+++ b/include/avr/iox32a4.h
diff --git a/cpukit/score/cpu/avr/avr/iox32d4.h b/include/avr/iox32d4.h
index 248e32cadf..248e32cadf 100644
--- a/cpukit/score/cpu/avr/avr/iox32d4.h
+++ b/include/avr/iox32d4.h
diff --git a/cpukit/score/cpu/avr/avr/iox64a1.h b/include/avr/iox64a1.h
index 73acf1afdc..73acf1afdc 100644
--- a/cpukit/score/cpu/avr/avr/iox64a1.h
+++ b/include/avr/iox64a1.h
diff --git a/cpukit/score/cpu/avr/avr/iox64a3.h b/include/avr/iox64a3.h
index a3a73a44e9..a3a73a44e9 100644
--- a/cpukit/score/cpu/avr/avr/iox64a3.h
+++ b/include/avr/iox64a3.h
diff --git a/cpukit/score/cpu/avr/avr/lock.h b/include/avr/lock.h
index 182f0f4cd8..182f0f4cd8 100644
--- a/cpukit/score/cpu/avr/avr/lock.h
+++ b/include/avr/lock.h
diff --git a/cpukit/score/cpu/avr/avr/parity.h b/include/avr/parity.h
index e01148e7dd..e01148e7dd 100644
--- a/cpukit/score/cpu/avr/avr/parity.h
+++ b/include/avr/parity.h
diff --git a/cpukit/score/cpu/avr/avr/pgmspace.h b/include/avr/pgmspace.h
index 42010168b1..42010168b1 100644
--- a/cpukit/score/cpu/avr/avr/pgmspace.h
+++ b/include/avr/pgmspace.h
diff --git a/cpukit/score/cpu/avr/avr/portpins.h b/include/avr/portpins.h
index 5c84e9db89..5c84e9db89 100644
--- a/cpukit/score/cpu/avr/avr/portpins.h
+++ b/include/avr/portpins.h
diff --git a/cpukit/score/cpu/avr/avr/power.h b/include/avr/power.h
index b101f3bcbd..b101f3bcbd 100644
--- a/cpukit/score/cpu/avr/avr/power.h
+++ b/include/avr/power.h
diff --git a/cpukit/score/cpu/avr/avr/sfr_defs.h b/include/avr/sfr_defs.h
index 2b8392689a..2b8392689a 100644
--- a/cpukit/score/cpu/avr/avr/sfr_defs.h
+++ b/include/avr/sfr_defs.h
diff --git a/cpukit/score/cpu/avr/avr/signal.h b/include/avr/signal.h
index 898df4acb8..898df4acb8 100644
--- a/cpukit/score/cpu/avr/avr/signal.h
+++ b/include/avr/signal.h
diff --git a/cpukit/score/cpu/avr/avr/sleep.h b/include/avr/sleep.h
index 9a2556c85c..9a2556c85c 100644
--- a/cpukit/score/cpu/avr/avr/sleep.h
+++ b/include/avr/sleep.h
diff --git a/cpukit/score/cpu/avr/avr/version.h b/include/avr/version.h
index 7af5025921..7af5025921 100644
--- a/cpukit/score/cpu/avr/avr/version.h
+++ b/include/avr/version.h
diff --git a/cpukit/score/cpu/avr/avr/wdt.h b/include/avr/wdt.h
index 7337e273b3..7337e273b3 100644
--- a/cpukit/score/cpu/avr/avr/wdt.h
+++ b/include/avr/wdt.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553brm.h b/include/b1553brm.h
index 2cc5b8b267..2cc5b8b267 100644
--- a/c/src/lib/libbsp/sparc/shared/include/b1553brm.h
+++ b/include/b1553brm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553brm_pci.h b/include/b1553brm_pci.h
index e7ed277c46..e7ed277c46 100644
--- a/c/src/lib/libbsp/sparc/shared/include/b1553brm_pci.h
+++ b/include/b1553brm_pci.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553brm_rasta.h b/include/b1553brm_rasta.h
index bc196441b7..bc196441b7 100644
--- a/c/src/lib/libbsp/sparc/shared/include/b1553brm_rasta.h
+++ b/include/b1553brm_rasta.h
diff --git a/c/src/lib/libbsp/m68k/ods68302/include/bare.h b/include/bare.h
index 825acafc0a..825acafc0a 100644
--- a/c/src/lib/libbsp/m68k/ods68302/include/bare.h
+++ b/include/bare.h
diff --git a/c/src/lib/libcpu/bfin/bf52x/include/bf52x.h b/include/bf52x.h
index 6c3d087c79..6c3d087c79 100644
--- a/c/src/lib/libcpu/bfin/bf52x/include/bf52x.h
+++ b/include/bf52x.h
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h b/include/bfin/TLL6527M/bsp.h
index e9063a291f..e9063a291f 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h
+++ b/include/bfin/TLL6527M/bsp.h
diff --git a/include/bfin/TLL6527M/coverhd.h b/include/bfin/TLL6527M/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/bfin/TLL6527M/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/include/cplb.h b/include/bfin/TLL6527M/cplb.h
index b6035ca142..b6035ca142 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/include/cplb.h
+++ b/include/bfin/TLL6527M/cplb.h
diff --git a/c/src/lib/libcpu/bfin/mmu/mmu.h b/include/bfin/TLL6527M/libcpu/mmu.h
index d6e2ea58a9..d6e2ea58a9 100644
--- a/c/src/lib/libcpu/bfin/mmu/mmu.h
+++ b/include/bfin/TLL6527M/libcpu/mmu.h
diff --git a/cpukit/score/cpu/bfin/rtems/asm.h b/include/bfin/TLL6527M/rtems/asm.h
index 5d133ddbdd..5d133ddbdd 100644
--- a/cpukit/score/cpu/bfin/rtems/asm.h
+++ b/include/bfin/TLL6527M/rtems/asm.h
diff --git a/cpukit/score/cpu/bfin/rtems/score/cpu.h b/include/bfin/TLL6527M/rtems/score/cpu.h
index 0b728e7a1c..0b728e7a1c 100644
--- a/cpukit/score/cpu/bfin/rtems/score/cpu.h
+++ b/include/bfin/TLL6527M/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/bfin/rtems/score/cpu_asm.h b/include/bfin/TLL6527M/rtems/score/cpu_asm.h
index 4f78c9d358..4f78c9d358 100644
--- a/cpukit/score/cpu/bfin/rtems/score/cpu_asm.h
+++ b/include/bfin/TLL6527M/rtems/score/cpu_asm.h
diff --git a/include/bfin/TLL6527M/rtems/score/cpuatomic.h b/include/bfin/TLL6527M/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/bfin/TLL6527M/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/bfin/rtems/score/types.h b/include/bfin/TLL6527M/rtems/score/types.h
index ff120b9e80..ff120b9e80 100644
--- a/cpukit/score/cpu/bfin/rtems/score/types.h
+++ b/include/bfin/TLL6527M/rtems/score/types.h
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/include/tm27.h b/include/bfin/TLL6527M/tm27.h
index 787004f8a6..787004f8a6 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/include/tm27.h
+++ b/include/bfin/TLL6527M/tm27.h
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h b/include/bfin/bf537Stamp/bsp.h
index 578918dfcb..578918dfcb 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h
+++ b/include/bfin/bf537Stamp/bsp.h
diff --git a/include/bfin/bf537Stamp/coverhd.h b/include/bfin/bf537Stamp/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/bfin/bf537Stamp/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/bfin/bf537Stamp/libcpu/mmu.h b/include/bfin/bf537Stamp/libcpu/mmu.h
new file mode 100644
index 0000000000..fa1bccec22
--- /dev/null
+++ b/include/bfin/bf537Stamp/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* bfin/TLL6527M/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <bfin/TLL6527M/libcpu/mmu.h>
diff --git a/include/bfin/bf537Stamp/rtems/asm.h b/include/bfin/bf537Stamp/rtems/asm.h
new file mode 100644
index 0000000000..b8cc0207f8
--- /dev/null
+++ b/include/bfin/bf537Stamp/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* bfin/TLL6527M/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <bfin/TLL6527M/rtems/asm.h>
diff --git a/include/bfin/bf537Stamp/rtems/score/cpu.h b/include/bfin/bf537Stamp/rtems/score/cpu.h
new file mode 100644
index 0000000000..cad4927464
--- /dev/null
+++ b/include/bfin/bf537Stamp/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* bfin/TLL6527M/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <bfin/TLL6527M/rtems/score/cpu.h>
diff --git a/include/bfin/bf537Stamp/rtems/score/cpu_asm.h b/include/bfin/bf537Stamp/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..ef90324239
--- /dev/null
+++ b/include/bfin/bf537Stamp/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* bfin/TLL6527M/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <bfin/TLL6527M/rtems/score/cpu_asm.h>
diff --git a/include/bfin/bf537Stamp/rtems/score/cpuatomic.h b/include/bfin/bf537Stamp/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/bfin/bf537Stamp/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/bfin/bf537Stamp/rtems/score/types.h b/include/bfin/bf537Stamp/rtems/score/types.h
new file mode 100644
index 0000000000..240f0c8146
--- /dev/null
+++ b/include/bfin/bf537Stamp/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* bfin/TLL6527M/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <bfin/TLL6527M/rtems/score/types.h>
diff --git a/include/bfin/bf537Stamp/tm27.h b/include/bfin/bf537Stamp/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/bfin/bf537Stamp/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h b/include/bfin/eZKit533/bsp.h
index b654d2d7b7..b654d2d7b7 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h
+++ b/include/bfin/eZKit533/bsp.h
diff --git a/include/bfin/eZKit533/coverhd.h b/include/bfin/eZKit533/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/bfin/eZKit533/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/cplb.h b/include/bfin/eZKit533/cplb.h
index 2c215e8954..2c215e8954 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/include/cplb.h
+++ b/include/bfin/eZKit533/cplb.h
diff --git a/include/bfin/eZKit533/libcpu/mmu.h b/include/bfin/eZKit533/libcpu/mmu.h
new file mode 100644
index 0000000000..fa1bccec22
--- /dev/null
+++ b/include/bfin/eZKit533/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* bfin/TLL6527M/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <bfin/TLL6527M/libcpu/mmu.h>
diff --git a/include/bfin/eZKit533/rtems/asm.h b/include/bfin/eZKit533/rtems/asm.h
new file mode 100644
index 0000000000..b8cc0207f8
--- /dev/null
+++ b/include/bfin/eZKit533/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* bfin/TLL6527M/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <bfin/TLL6527M/rtems/asm.h>
diff --git a/include/bfin/eZKit533/rtems/score/cpu.h b/include/bfin/eZKit533/rtems/score/cpu.h
new file mode 100644
index 0000000000..cad4927464
--- /dev/null
+++ b/include/bfin/eZKit533/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* bfin/TLL6527M/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <bfin/TLL6527M/rtems/score/cpu.h>
diff --git a/include/bfin/eZKit533/rtems/score/cpu_asm.h b/include/bfin/eZKit533/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..ef90324239
--- /dev/null
+++ b/include/bfin/eZKit533/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* bfin/TLL6527M/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <bfin/TLL6527M/rtems/score/cpu_asm.h>
diff --git a/include/bfin/eZKit533/rtems/score/cpuatomic.h b/include/bfin/eZKit533/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/bfin/eZKit533/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/bfin/eZKit533/rtems/score/types.h b/include/bfin/eZKit533/rtems/score/types.h
new file mode 100644
index 0000000000..240f0c8146
--- /dev/null
+++ b/include/bfin/eZKit533/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* bfin/TLL6527M/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <bfin/TLL6527M/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/tm27.h b/include/bfin/eZKit533/tm27.h
index 6aaf4cfa1d..6aaf4cfa1d 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/include/tm27.h
+++ b/include/bfin/eZKit533/tm27.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/bits.h b/include/bits.h
index 6f2c4036b6..6f2c4036b6 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/bits.h
+++ b/include/bits.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/align.h b/include/boot/align.h
index 96229101ed..96229101ed 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/align.h
+++ b/include/boot/align.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/balloc.h b/include/boot/balloc.h
index 8e502c0c58..8e502c0c58 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/balloc.h
+++ b/include/boot/balloc.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/gentypes.h b/include/boot/gentypes.h
index a3e82d6eef..a3e82d6eef 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/gentypes.h
+++ b/include/boot/gentypes.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/main.h b/include/boot/main.h
index 5ddc814ac8..5ddc814ac8 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/main.h
+++ b/include/boot/main.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw.h b/include/boot/ofw.h
index c562b675a2..c562b675a2 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw.h
+++ b/include/boot/ofw.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw_tree.h b/include/boot/ofw_tree.h
index 5872ade261..5872ade261 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw_tree.h
+++ b/include/boot/ofw_tree.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofwarch.h b/include/boot/ofwarch.h
index 2d4f7643c0..2d4f7643c0 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofwarch.h
+++ b/include/boot/ofwarch.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/register.h b/include/boot/register.h
index 61bf34ac66..61bf34ac66 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/register.h
+++ b/include/boot/register.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/stack.h b/include/boot/stack.h
index 1486dd21b4..1486dd21b4 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/stack.h
+++ b/include/boot/stack.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/types.h b/include/boot/types.h
index 095e25233d..095e25233d 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/types.h
+++ b/include/boot/types.h
diff --git a/include/bsp.h b/include/bsp.h
new file mode 100644
index 0000000000..83b02c2e00
--- /dev/null
+++ b/include/bsp.h
@@ -0,0 +1,382 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_altcycv_devkit__)
+#  include <arm/altcycv_devkit/bsp.h>
+#elif defined(__rtems_arm_altcycv_devkit_smp__)
+#  include <arm/altcycv_devkit_smp/bsp.h>
+#elif defined(__rtems_arm_arm1136jfs__)
+#  include <arm/arm1136jfs/bsp.h>
+#elif defined(__rtems_arm_arm1136js__)
+#  include <arm/arm1136js/bsp.h>
+#elif defined(__rtems_arm_arm7tdmi__)
+#  include <arm/arm7tdmi/bsp.h>
+#elif defined(__rtems_arm_arm920__)
+#  include <arm/arm920/bsp.h>
+#elif defined(__rtems_arm_armcortexa9__)
+#  include <arm/armcortexa9/bsp.h>
+#elif defined(__rtems_arm_beagleboardorig__)
+#  include <arm/beagleboardorig/bsp.h>
+#elif defined(__rtems_arm_beagleboardxm__)
+#  include <arm/beagleboardxm/bsp.h>
+#elif defined(__rtems_arm_beagleboneblack__)
+#  include <arm/beagleboneblack/bsp.h>
+#elif defined(__rtems_arm_beaglebonewhite__)
+#  include <arm/beaglebonewhite/bsp.h>
+#elif defined(__rtems_arm_csb336__)
+#  include <arm/csb336/bsp.h>
+#elif defined(__rtems_arm_csb337__)
+#  include <arm/csb337/bsp.h>
+#elif defined(__rtems_arm_csb637__)
+#  include <arm/csb637/bsp.h>
+#elif defined(__rtems_arm_edb7312__)
+#  include <arm/edb7312/bsp.h>
+#elif defined(__rtems_arm_gba__)
+#  include <arm/gba/bsp.h>
+#elif defined(__rtems_arm_gp32__)
+#  include <arm/gp32/bsp.h>
+#elif defined(__rtems_arm_gumstix__)
+#  include <arm/gumstix/bsp.h>
+#elif defined(__rtems_arm_kit637_v6__)
+#  include <arm/kit637_v6/bsp.h>
+#elif defined(__rtems_arm_lm3s3749__)
+#  include <arm/lm3s3749/bsp.h>
+#elif defined(__rtems_arm_lm3s6965__)
+#  include <arm/lm3s6965/bsp.h>
+#elif defined(__rtems_arm_lm3s6965_qemu__)
+#  include <arm/lm3s6965_qemu/bsp.h>
+#elif defined(__rtems_arm_lm4f120__)
+#  include <arm/lm4f120/bsp.h>
+#elif defined(__rtems_arm_lpc1768_mbed__)
+#  include <arm/lpc1768_mbed/bsp.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram__)
+#  include <arm/lpc1768_mbed_ahb_ram/bsp.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram_eth__)
+#  include <arm/lpc1768_mbed_ahb_ram_eth/bsp.h>
+#elif defined(__rtems_arm_lpc17xx_ea_ram__)
+#  include <arm/lpc17xx_ea_ram/bsp.h>
+#elif defined(__rtems_arm_lpc17xx_ea_rom_int__)
+#  include <arm/lpc17xx_ea_rom_int/bsp.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_ram__)
+#  include <arm/lpc17xx_plx800_ram/bsp.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_rom_int__)
+#  include <arm/lpc17xx_plx800_rom_int/bsp.h>
+#elif defined(__rtems_arm_lpc2362__)
+#  include <arm/lpc2362/bsp.h>
+#elif defined(__rtems_arm_lpc23xx_tli800__)
+#  include <arm/lpc23xx_tli800/bsp.h>
+#elif defined(__rtems_arm_lpc24xx_ea__)
+#  include <arm/lpc24xx_ea/bsp.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_ram__)
+#  include <arm/lpc24xx_ncs_ram/bsp.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_ext__)
+#  include <arm/lpc24xx_ncs_rom_ext/bsp.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_int__)
+#  include <arm/lpc24xx_ncs_rom_int/bsp.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_ram__)
+#  include <arm/lpc24xx_plx800_ram/bsp.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_rom_int__)
+#  include <arm/lpc24xx_plx800_rom_int/bsp.h>
+#elif defined(__rtems_arm_lpc32xx_mzx__)
+#  include <arm/lpc32xx_mzx/bsp.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_1__)
+#  include <arm/lpc32xx_mzx_stage_1/bsp.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_2__)
+#  include <arm/lpc32xx_mzx_stage_2/bsp.h>
+#elif defined(__rtems_arm_lpc32xx_phycore__)
+#  include <arm/lpc32xx_phycore/bsp.h>
+#elif defined(__rtems_arm_lpc40xx_ea_ram__)
+#  include <arm/lpc40xx_ea_ram/bsp.h>
+#elif defined(__rtems_arm_lpc40xx_ea_rom_int__)
+#  include <arm/lpc40xx_ea_rom_int/bsp.h>
+#elif defined(__rtems_arm_nds__)
+#  include <arm/nds/bsp.h>
+#elif defined(__rtems_arm_raspberrypi__)
+#  include <arm/raspberrypi/bsp.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu__)
+#  include <arm/realview_pbx_a9_qemu/bsp.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu_smp__)
+#  include <arm/realview_pbx_a9_qemu_smp/bsp.h>
+#elif defined(__rtems_arm_rtl22xx__)
+#  include <arm/rtl22xx/bsp.h>
+#elif defined(__rtems_arm_rtl22xx_t__)
+#  include <arm/rtl22xx_t/bsp.h>
+#elif defined(__rtems_arm_smdk2410__)
+#  include <arm/smdk2410/bsp.h>
+#elif defined(__rtems_arm_stm32f105rc__)
+#  include <arm/stm32f105rc/bsp.h>
+#elif defined(__rtems_arm_stm32f4__)
+#  include <arm/stm32f4/bsp.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk__)
+#  include <arm/tms570ls3137_hdk/bsp.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_intram__)
+#  include <arm/tms570ls3137_hdk_intram/bsp.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_sdram__)
+#  include <arm/tms570ls3137_hdk_sdram/bsp.h>
+#elif defined(__rtems_arm_xilinx_zynq_a9_qemu__)
+#  include <arm/xilinx_zynq_a9_qemu/bsp.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc702__)
+#  include <arm/xilinx_zynq_zc702/bsp.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc706__)
+#  include <arm/xilinx_zynq_zc706/bsp.h>
+#elif defined(__rtems_arm_xilinx_zynq_zedboard__)
+#  include <arm/xilinx_zynq_zedboard/bsp.h>
+#elif defined(__rtems_avr_avrtest__)
+#  include <avr/avrtest/bsp.h>
+#elif defined(__rtems_bfin_TLL6527M__)
+#  include <bfin/TLL6527M/bsp.h>
+#elif defined(__rtems_bfin_bf537Stamp__)
+#  include <bfin/bf537Stamp/bsp.h>
+#elif defined(__rtems_bfin_eZKit533__)
+#  include <bfin/eZKit533/bsp.h>
+#elif defined(__rtems_h8300_h8sim__)
+#  include <h8300/h8sim/bsp.h>
+#elif defined(__rtems_h8300_h8sxsim__)
+#  include <h8300/h8sxsim/bsp.h>
+#elif defined(__rtems_i386_pc386__)
+#  include <i386/pc386/bsp.h>
+#elif defined(__rtems_i386_pc486__)
+#  include <i386/pc486/bsp.h>
+#elif defined(__rtems_i386_pc586__)
+#  include <i386/pc586/bsp.h>
+#elif defined(__rtems_i386_pc586_sse__)
+#  include <i386/pc586-sse/bsp.h>
+#elif defined(__rtems_i386_pc686__)
+#  include <i386/pc686/bsp.h>
+#elif defined(__rtems_i386_pcp4__)
+#  include <i386/pcp4/bsp.h>
+#elif defined(__rtems_lm32_lm32_evr__)
+#  include <lm32/lm32_evr/bsp.h>
+#elif defined(__rtems_lm32_milkymist__)
+#  include <lm32/milkymist/bsp.h>
+#elif defined(__rtems_m32c_m32csim__)
+#  include <m32c/m32csim/bsp.h>
+#elif defined(__rtems_m32r_m32rsim__)
+#  include <m32r/m32rsim/bsp.h>
+#elif defined(__rtems_m68k_COBRA5475__)
+#  include <m68k/COBRA5475/bsp.h>
+#elif defined(__rtems_m68k_av5282__)
+#  include <m68k/av5282/bsp.h>
+#elif defined(__rtems_m68k_csb360__)
+#  include <m68k/csb360/bsp.h>
+#elif defined(__rtems_m68k_gen68302__)
+#  include <m68k/gen68302/bsp.h>
+#elif defined(__rtems_m68k_gen68340__)
+#  include <m68k/gen68340/bsp.h>
+#elif defined(__rtems_m68k_gen68360__)
+#  include <m68k/gen68360/bsp.h>
+#elif defined(__rtems_m68k_gen68360_040__)
+#  include <m68k/gen68360_040/bsp.h>
+#elif defined(__rtems_m68k_idp__)
+#  include <m68k/idp/bsp.h>
+#elif defined(__rtems_m68k_m5484FireEngine__)
+#  include <m68k/m5484FireEngine/bsp.h>
+#elif defined(__rtems_m68k_mcf5206elite__)
+#  include <m68k/mcf5206elite/bsp.h>
+#elif defined(__rtems_m68k_mcf52235__)
+#  include <m68k/mcf52235/bsp.h>
+#elif defined(__rtems_m68k_mcf5225x__)
+#  include <m68k/mcf5225x/bsp.h>
+#elif defined(__rtems_m68k_mcf5235__)
+#  include <m68k/mcf5235/bsp.h>
+#elif defined(__rtems_m68k_mcf5329__)
+#  include <m68k/mcf5329/bsp.h>
+#elif defined(__rtems_m68k_mrm332__)
+#  include <m68k/mrm332/bsp.h>
+#elif defined(__rtems_m68k_mvme136__)
+#  include <m68k/mvme136/bsp.h>
+#elif defined(__rtems_m68k_mvme147__)
+#  include <m68k/mvme147/bsp.h>
+#elif defined(__rtems_m68k_mvme147s__)
+#  include <m68k/mvme147s/bsp.h>
+#elif defined(__rtems_m68k_mvme162__)
+#  include <m68k/mvme162/bsp.h>
+#elif defined(__rtems_m68k_mvme162lx__)
+#  include <m68k/mvme162lx/bsp.h>
+#elif defined(__rtems_m68k_mvme167__)
+#  include <m68k/mvme167/bsp.h>
+#elif defined(__rtems_m68k_ods68302__)
+#  include <m68k/ods68302/bsp.h>
+#elif defined(__rtems_m68k_pgh360__)
+#  include <m68k/pgh360/bsp.h>
+#elif defined(__rtems_m68k_sim68000__)
+#  include <m68k/sim68000/bsp.h>
+#elif defined(__rtems_m68k_simcpu32__)
+#  include <m68k/simcpu32/bsp.h>
+#elif defined(__rtems_m68k_uC5282__)
+#  include <m68k/uC5282/bsp.h>
+#elif defined(__rtems_mips_csb350__)
+#  include <mips/csb350/bsp.h>
+#elif defined(__rtems_mips_genmongoosev__)
+#  include <mips/genmongoosev/bsp.h>
+#elif defined(__rtems_mips_hurricane__)
+#  include <mips/hurricane/bsp.h>
+#elif defined(__rtems_mips_jmr3904__)
+#  include <mips/jmr3904/bsp.h>
+#elif defined(__rtems_mips_malta__)
+#  include <mips/malta/bsp.h>
+#elif defined(__rtems_mips_rbtx4925__)
+#  include <mips/rbtx4925/bsp.h>
+#elif defined(__rtems_mips_rbtx4938__)
+#  include <mips/rbtx4938/bsp.h>
+#elif defined(__rtems_moxie_moxiesim__)
+#  include <moxie/moxiesim/bsp.h>
+#elif defined(__rtems_nios2_nios2_iss__)
+#  include <nios2/nios2_iss/bsp.h>
+#elif defined(__rtems_or1k_or1ksim__)
+#  include <or1k/or1ksim/bsp.h>
+#elif defined(__rtems_powerpc_beatnik__)
+#  include <powerpc/beatnik/bsp.h>
+#elif defined(__rtems_powerpc_br_uid__)
+#  include <powerpc/br_uid/bsp.h>
+#elif defined(__rtems_powerpc_brs5l__)
+#  include <powerpc/brs5l/bsp.h>
+#elif defined(__rtems_powerpc_brs6l__)
+#  include <powerpc/brs6l/bsp.h>
+#elif defined(__rtems_powerpc_dp2__)
+#  include <powerpc/dp2/bsp.h>
+#elif defined(__rtems_powerpc_ep1a__)
+#  include <powerpc/ep1a/bsp.h>
+#elif defined(__rtems_powerpc_gwlcfm__)
+#  include <powerpc/gwlcfm/bsp.h>
+#elif defined(__rtems_powerpc_haleakala__)
+#  include <powerpc/haleakala/bsp.h>
+#elif defined(__rtems_powerpc_hsc_cm01__)
+#  include <powerpc/hsc_cm01/bsp.h>
+#elif defined(__rtems_powerpc_icecube__)
+#  include <powerpc/icecube/bsp.h>
+#elif defined(__rtems_powerpc_mbx821_001__)
+#  include <powerpc/mbx821_001/bsp.h>
+#elif defined(__rtems_powerpc_mbx821_002__)
+#  include <powerpc/mbx821_002/bsp.h>
+#elif defined(__rtems_powerpc_mbx821_002b__)
+#  include <powerpc/mbx821_002b/bsp.h>
+#elif defined(__rtems_powerpc_mbx860_001b__)
+#  include <powerpc/mbx860_001b/bsp.h>
+#elif defined(__rtems_powerpc_mbx860_002__)
+#  include <powerpc/mbx860_002/bsp.h>
+#elif defined(__rtems_powerpc_mbx860_005b__)
+#  include <powerpc/mbx860_005b/bsp.h>
+#elif defined(__rtems_powerpc_mbx860_1b__)
+#  include <powerpc/mbx860_1b/bsp.h>
+#elif defined(__rtems_powerpc_mcp750__)
+#  include <powerpc/mcp750/bsp.h>
+#elif defined(__rtems_powerpc_mpc5566evb__)
+#  include <powerpc/mpc5566evb/bsp.h>
+#elif defined(__rtems_powerpc_mpc5566evb_spe__)
+#  include <powerpc/mpc5566evb_spe/bsp.h>
+#elif defined(__rtems_powerpc_mpc5643l_dpu__)
+#  include <powerpc/mpc5643l_dpu/bsp.h>
+#elif defined(__rtems_powerpc_mpc5643l_evb__)
+#  include <powerpc/mpc5643l_evb/bsp.h>
+#elif defined(__rtems_powerpc_mpc5668g__)
+#  include <powerpc/mpc5668g/bsp.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_app__)
+#  include <powerpc/mpc5674f_ecu508_app/bsp.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_boot__)
+#  include <powerpc/mpc5674f_ecu508_boot/bsp.h>
+#elif defined(__rtems_powerpc_mpc5674f_rsm6__)
+#  include <powerpc/mpc5674f_rsm6/bsp.h>
+#elif defined(__rtems_powerpc_mpc5674fevb__)
+#  include <powerpc/mpc5674fevb/bsp.h>
+#elif defined(__rtems_powerpc_mpc5674fevb_spe__)
+#  include <powerpc/mpc5674fevb_spe/bsp.h>
+#elif defined(__rtems_powerpc_mpc8260ads__)
+#  include <powerpc/mpc8260ads/bsp.h>
+#elif defined(__rtems_powerpc_mpc8309som__)
+#  include <powerpc/mpc8309som/bsp.h>
+#elif defined(__rtems_powerpc_mpc8313erdb__)
+#  include <powerpc/mpc8313erdb/bsp.h>
+#elif defined(__rtems_powerpc_mpc8349eamds__)
+#  include <powerpc/mpc8349eamds/bsp.h>
+#elif defined(__rtems_powerpc_mtx603e__)
+#  include <powerpc/mtx603e/bsp.h>
+#elif defined(__rtems_powerpc_mvme2100__)
+#  include <powerpc/mvme2100/bsp.h>
+#elif defined(__rtems_powerpc_mvme2307__)
+#  include <powerpc/mvme2307/bsp.h>
+#elif defined(__rtems_powerpc_mvme3100__)
+#  include <powerpc/mvme3100/bsp.h>
+#elif defined(__rtems_powerpc_mvme5500__)
+#  include <powerpc/mvme5500/bsp.h>
+#elif defined(__rtems_powerpc_pghplus__)
+#  include <powerpc/pghplus/bsp.h>
+#elif defined(__rtems_powerpc_phycore_mpc5554__)
+#  include <powerpc/phycore_mpc5554/bsp.h>
+#elif defined(__rtems_powerpc_pm520_cr825__)
+#  include <powerpc/pm520_cr825/bsp.h>
+#elif defined(__rtems_powerpc_pm520_ze30__)
+#  include <powerpc/pm520_ze30/bsp.h>
+#elif defined(__rtems_powerpc_psim__)
+#  include <powerpc/psim/bsp.h>
+#elif defined(__rtems_powerpc_qemuppc__)
+#  include <powerpc/qemuppc/bsp.h>
+#elif defined(__rtems_powerpc_qemuprep__)
+#  include <powerpc/qemuprep/bsp.h>
+#elif defined(__rtems_powerpc_qemuprep_altivec__)
+#  include <powerpc/qemuprep-altivec/bsp.h>
+#elif defined(__rtems_powerpc_qoriq_core_0__)
+#  include <powerpc/qoriq_core_0/bsp.h>
+#elif defined(__rtems_powerpc_qoriq_core_1__)
+#  include <powerpc/qoriq_core_1/bsp.h>
+#elif defined(__rtems_powerpc_qoriq_p1020rdb__)
+#  include <powerpc/qoriq_p1020rdb/bsp.h>
+#elif defined(__rtems_powerpc_score603e__)
+#  include <powerpc/score603e/bsp.h>
+#elif defined(__rtems_powerpc_ss555__)
+#  include <powerpc/ss555/bsp.h>
+#elif defined(__rtems_powerpc_t32mppc__)
+#  include <powerpc/t32mppc/bsp.h>
+#elif defined(__rtems_powerpc_tqm8xx_stk8xx__)
+#  include <powerpc/tqm8xx_stk8xx/bsp.h>
+#elif defined(__rtems_powerpc_virtex__)
+#  include <powerpc/virtex/bsp.h>
+#elif defined(__rtems_powerpc_virtex4__)
+#  include <powerpc/virtex4/bsp.h>
+#elif defined(__rtems_powerpc_virtex5__)
+#  include <powerpc/virtex5/bsp.h>
+#elif defined(__rtems_sh_gensh1__)
+#  include <sh/gensh1/bsp.h>
+#elif defined(__rtems_sh_gensh2__)
+#  include <sh/gensh2/bsp.h>
+#elif defined(__rtems_sh_gensh4__)
+#  include <sh/gensh4/bsp.h>
+#elif defined(__rtems_sh_simsh1__)
+#  include <sh/simsh1/bsp.h>
+#elif defined(__rtems_sh_simsh2__)
+#  include <sh/simsh2/bsp.h>
+#elif defined(__rtems_sh_simsh2e__)
+#  include <sh/simsh2e/bsp.h>
+#elif defined(__rtems_sh_simsh4__)
+#  include <sh/simsh4/bsp.h>
+#elif defined(__rtems_sparc_erc32__)
+#  include <sparc/erc32/bsp.h>
+#elif defined(__rtems_sparc_leon2__)
+#  include <sparc/leon2/bsp.h>
+#elif defined(__rtems_sparc_leon3__)
+#  include <sparc/leon3/bsp.h>
+#elif defined(__rtems_sparc_ngmp__)
+#  include <sparc/ngmp/bsp.h>
+#elif defined(__rtems_sparc_sis__)
+#  include <sparc/sis/bsp.h>
+#elif defined(__rtems_sparc64_niagara__)
+#  include <sparc64/niagara/bsp.h>
+#elif defined(__rtems_sparc64_usiii__)
+#  include <sparc64/usiii/bsp.h>
+#elif defined(__rtems_v850_v850e1sim__)
+#  include <v850/v850e1sim/bsp.h>
+#elif defined(__rtems_v850_v850e2sim__)
+#  include <v850/v850e2sim/bsp.h>
+#elif defined(__rtems_v850_v850e2v3sim__)
+#  include <v850/v850e2v3sim/bsp.h>
+#elif defined(__rtems_v850_v850esim__)
+#  include <v850/v850esim/bsp.h>
+#elif defined(__rtems_v850_v850essim__)
+#  include <v850/v850essim/bsp.h>
+#elif defined(__rtems_v850_v850sim__)
+#  include <v850/v850sim/bsp.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/include/bsp/8xx_immap.h b/include/bsp/8xx_immap.h
new file mode 100644
index 0000000000..6710183a63
--- /dev/null
+++ b/include/bsp/8xx_immap.h
@@ -0,0 +1,26 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_powerpc_mbx821_001__)
+#  include <powerpc/mbx821_001/bsp/8xx_immap.h>
+#elif defined(__rtems_powerpc_mbx821_002__)
+#  include <powerpc/mbx821_002/bsp/8xx_immap.h>
+#elif defined(__rtems_powerpc_mbx821_002b__)
+#  include <powerpc/mbx821_002b/bsp/8xx_immap.h>
+#elif defined(__rtems_powerpc_mbx860_001b__)
+#  include <powerpc/mbx860_001b/bsp/8xx_immap.h>
+#elif defined(__rtems_powerpc_mbx860_002__)
+#  include <powerpc/mbx860_002/bsp/8xx_immap.h>
+#elif defined(__rtems_powerpc_mbx860_005b__)
+#  include <powerpc/mbx860_005b/bsp/8xx_immap.h>
+#elif defined(__rtems_powerpc_mbx860_1b__)
+#  include <powerpc/mbx860_1b/bsp/8xx_immap.h>
+#elif defined(__rtems_powerpc_pghplus__)
+#  include <powerpc/pghplus/bsp/8xx_immap.h>
+#elif defined(__rtems_powerpc_tqm8xx_stk8xx__)
+#  include <powerpc/tqm8xx_stk8xx/bsp/8xx_immap.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/GT64260TWSI.h b/include/bsp/GT64260TWSI.h
index 1377e6f607..1377e6f607 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/GT64260TWSI.h
+++ b/include/bsp/GT64260TWSI.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.h b/include/bsp/GT64260eth.h
index 2703bb423e..2703bb423e 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.h
+++ b/include/bsp/GT64260eth.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260ethreg.h b/include/bsp/GT64260ethreg.h
index d9081ccb53..d9081ccb53 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260ethreg.h
+++ b/include/bsp/GT64260ethreg.h
diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.h b/include/bsp/PCI.h
index 7b1526f84a..7b1526f84a 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/PCI.h
+++ b/include/bsp/PCI.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/VME.h b/include/bsp/VME.h
index bdaa45870e..bdaa45870e 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/VME.h
+++ b/include/bsp/VME.h
diff --git a/include/bsp/VMEConfig.h b/include/bsp/VMEConfig.h
new file mode 100644
index 0000000000..e169c64fec
--- /dev/null
+++ b/include/bsp/VMEConfig.h
@@ -0,0 +1,28 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_powerpc_beatnik__)
+#  include <powerpc/beatnik/bsp/VMEConfig.h>
+#elif defined(__rtems_powerpc_ep1a__)
+#  include <powerpc/ep1a/bsp/VMEConfig.h>
+#elif defined(__rtems_powerpc_mcp750__)
+#  include <powerpc/mcp750/bsp/VMEConfig.h>
+#elif defined(__rtems_powerpc_mtx603e__)
+#  include <powerpc/mtx603e/bsp/VMEConfig.h>
+#elif defined(__rtems_powerpc_mvme2100__)
+#  include <powerpc/mvme2100/bsp/VMEConfig.h>
+#elif defined(__rtems_powerpc_mvme2307__)
+#  include <powerpc/mvme2307/bsp/VMEConfig.h>
+#elif defined(__rtems_powerpc_mvme3100__)
+#  include <powerpc/mvme3100/bsp/VMEConfig.h>
+#elif defined(__rtems_powerpc_mvme5500__)
+#  include <powerpc/mvme5500/bsp/VMEConfig.h>
+#elif defined(__rtems_powerpc_qemuprep__)
+#  include <powerpc/qemuprep/bsp/VMEConfig.h>
+#elif defined(__rtems_powerpc_qemuprep_altivec__)
+#  include <powerpc/qemuprep-altivec/bsp/VMEConfig.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/VMEDMA.h b/include/bsp/VMEDMA.h
index 636f6d365c..636f6d365c 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/VMEDMA.h
+++ b/include/bsp/VMEDMA.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/VPD.h b/include/bsp/VPD.h
index 33aec8b74c..33aec8b74c 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/VPD.h
+++ b/include/bsp/VPD.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_16550_uart.h b/include/bsp/alt_16550_uart.h
index bca6f63e00..bca6f63e00 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_16550_uart.h
+++ b/include/bsp/alt_16550_uart.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_address_space.h b/include/bsp/alt_address_space.h
index 781cc49aa3..781cc49aa3 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_address_space.h
+++ b/include/bsp/alt_address_space.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_cache.h b/include/bsp/alt_cache.h
index 8d088ab744..8d088ab744 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_cache.h
+++ b/include/bsp/alt_cache.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_clock_group.h b/include/bsp/alt_clock_group.h
index a43608e9f3..a43608e9f3 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_clock_group.h
+++ b/include/bsp/alt_clock_group.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_clock_manager.h b/include/bsp/alt_clock_manager.h
index d6d96544f7..d6d96544f7 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_clock_manager.h
+++ b/include/bsp/alt_clock_manager.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma.h b/include/bsp/alt_dma.h
index 6be93fbd32..6be93fbd32 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma.h
+++ b/include/bsp/alt_dma.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma_common.h b/include/bsp/alt_dma_common.h
index e82bc1ae4d..e82bc1ae4d 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma_common.h
+++ b/include/bsp/alt_dma_common.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma_program.h b/include/bsp/alt_dma_program.h
index 5fa876f237..5fa876f237 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma_program.h
+++ b/include/bsp/alt_dma_program.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_generalpurpose_io.h b/include/bsp/alt_generalpurpose_io.h
index 0a7abaef8e..0a7abaef8e 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_generalpurpose_io.h
+++ b/include/bsp/alt_generalpurpose_io.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_hwlibs_ver.h b/include/bsp/alt_hwlibs_ver.h
index 7596d50d66..7596d50d66 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_hwlibs_ver.h
+++ b/include/bsp/alt_hwlibs_ver.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_i2c.h b/include/bsp/alt_i2c.h
index 7af55cf4ac..7af55cf4ac 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_i2c.h
+++ b/include/bsp/alt_i2c.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_interrupt_common.h b/include/bsp/alt_interrupt_common.h
index 004fd3188c..004fd3188c 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_interrupt_common.h
+++ b/include/bsp/alt_interrupt_common.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_mpu_registers.h b/include/bsp/alt_mpu_registers.h
index 2ead15df86..2ead15df86 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_mpu_registers.h
+++ b/include/bsp/alt_mpu_registers.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_qspi_private.h b/include/bsp/alt_qspi_private.h
index 21fd3a957d..21fd3a957d 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_qspi_private.h
+++ b/include/bsp/alt_qspi_private.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_reset_manager.h b/include/bsp/alt_reset_manager.h
index d719e3f05e..d719e3f05e 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_reset_manager.h
+++ b/include/bsp/alt_reset_manager.h
diff --git a/c/src/lib/libbsp/i386/shared/irq/apic.h b/include/bsp/apic.h
index 9ae103b963..9ae103b963 100644
--- a/c/src/lib/libbsp/i386/shared/irq/apic.h
+++ b/include/bsp/apic.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a8core-start.h b/include/bsp/arm-a8core-start.h
index 416f282028..416f282028 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-a8core-start.h
+++ b/include/bsp/arm-a8core-start.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-clock.h b/include/bsp/arm-a9mpcore-clock.h
index 9a8c653801..9a8c653801 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-clock.h
+++ b/include/bsp/arm-a9mpcore-clock.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-irq.h b/include/bsp/arm-a9mpcore-irq.h
index f0d3c1b983..f0d3c1b983 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-irq.h
+++ b/include/bsp/arm-a9mpcore-irq.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-regs.h b/include/bsp/arm-a9mpcore-regs.h
index d1538357d8..d1538357d8 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-regs.h
+++ b/include/bsp/arm-a9mpcore-regs.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h b/include/bsp/arm-a9mpcore-start.h
index 7d6185b39e..7d6185b39e 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h
+++ b/include/bsp/arm-a9mpcore-start.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-cp15-start.h b/include/bsp/arm-cp15-start.h
index c70ebf9570..c70ebf9570 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-cp15-start.h
+++ b/include/bsp/arm-cp15-start.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-errata.h b/include/bsp/arm-errata.h
index c58084a25b..c58084a25b 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-errata.h
+++ b/include/bsp/arm-errata.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-gic-irq.h b/include/bsp/arm-gic-irq.h
index 7765c003ae..7765c003ae 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-gic-irq.h
+++ b/include/bsp/arm-gic-irq.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-gic-regs.h b/include/bsp/arm-gic-regs.h
index 2375b5cf74..2375b5cf74 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-gic-regs.h
+++ b/include/bsp/arm-gic-regs.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-gic-tm27.h b/include/bsp/arm-gic-tm27.h
index 95f3077716..95f3077716 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-gic-tm27.h
+++ b/include/bsp/arm-gic-tm27.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-gic.h b/include/bsp/arm-gic.h
index 942db8555b..942db8555b 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-gic.h
+++ b/include/bsp/arm-gic.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl011-regs.h b/include/bsp/arm-pl011-regs.h
index 2b930f4b4c..2b930f4b4c 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-pl011-regs.h
+++ b/include/bsp/arm-pl011-regs.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl011.h b/include/bsp/arm-pl011.h
index 08189c477c..08189c477c 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-pl011.h
+++ b/include/bsp/arm-pl011.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl050-regs.h b/include/bsp/arm-pl050-regs.h
index f90aeb6cf9..f90aeb6cf9 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-pl050-regs.h
+++ b/include/bsp/arm-pl050-regs.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl050.h b/include/bsp/arm-pl050.h
index af4e246124..af4e246124 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-pl050.h
+++ b/include/bsp/arm-pl050.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl111-fb.h b/include/bsp/arm-pl111-fb.h
index 0c8c6231e1..0c8c6231e1 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-pl111-fb.h
+++ b/include/bsp/arm-pl111-fb.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl111-regs.h b/include/bsp/arm-pl111-regs.h
index ed27ba41a0..ed27ba41a0 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-pl111-regs.h
+++ b/include/bsp/arm-pl111-regs.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-release-id.h b/include/bsp/arm-release-id.h
index e06be006da..e06be006da 100644
--- a/c/src/lib/libbsp/arm/shared/include/arm-release-id.h
+++ b/include/bsp/arm-release-id.h
diff --git a/c/src/lib/libbsp/arm/shared/armv7m/include/armv7m-irq.h b/include/bsp/armv7m-irq.h
index f91ab362e7..f91ab362e7 100644
--- a/c/src/lib/libbsp/arm/shared/armv7m/include/armv7m-irq.h
+++ b/include/bsp/armv7m-irq.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/ata.h b/include/bsp/ata.h
index 3d8ccfc49a..3d8ccfc49a 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/ata.h
+++ b/include/bsp/ata.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm.h b/include/bsp/bestcomm.h
index 366465565a..366465565a 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm.h
+++ b/include/bsp/bestcomm.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.h b/include/bsp/bestcomm/bestcomm_api.h
index f1fa22d1d5..f1fa22d1d5 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.h
+++ b/include/bsp/bestcomm/bestcomm_api.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.h b/include/bsp/bestcomm/bestcomm_glue.h
index 18827b77c7..18827b77c7 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.h
+++ b/include/bsp/bestcomm/bestcomm_glue.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_priv.h b/include/bsp/bestcomm/bestcomm_priv.h
index 102fc082cb..102fc082cb 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_priv.h
+++ b/include/bsp/bestcomm/bestcomm_priv.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.capi.h b/include/bsp/bestcomm/dma_image.capi.h
index 6b07cbcb2a..6b07cbcb2a 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.capi.h
+++ b/include/bsp/bestcomm/dma_image.capi.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.h b/include/bsp/bestcomm/dma_image.h
index 1f8b86cded..1f8b86cded 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.h
+++ b/include/bsp/bestcomm/dma_image.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/mgt5200.h b/include/bsp/bestcomm/include/mgt5200/mgt5200.h
index 9e4b94cd10..9e4b94cd10 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/mgt5200.h
+++ b/include/bsp/bestcomm/include/mgt5200/mgt5200.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/ppctypes.h b/include/bsp/bestcomm/include/ppctypes.h
index ff2aed1997..ff2aed1997 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/ppctypes.h
+++ b/include/bsp/bestcomm/include/ppctypes.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/sdma.h b/include/bsp/bestcomm/include/sdma.h
index 52d84777ad..52d84777ad 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/sdma.h
+++ b/include/bsp/bestcomm/include/sdma.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_api_mem.h b/include/bsp/bestcomm/task_api/bestcomm_api_mem.h
index dc529d6a22..dc529d6a22 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_api_mem.h
+++ b/include/bsp/bestcomm/task_api/bestcomm_api_mem.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_cntrl.h b/include/bsp/bestcomm/task_api/bestcomm_cntrl.h
index 3712bae3d0..3712bae3d0 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_cntrl.h
+++ b/include/bsp/bestcomm/task_api/bestcomm_cntrl.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_bdtable.h b/include/bsp/bestcomm/task_api/tasksetup_bdtable.h
index 7f261d21ee..7f261d21ee 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_bdtable.h
+++ b/include/bsp/bestcomm/task_api/tasksetup_bdtable.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h b/include/bsp/bestcomm/task_api/tasksetup_general.h
index be7bb9d7b0..be7bb9d7b0 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h
+++ b/include/bsp/bestcomm/task_api/tasksetup_general.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm_ops.h b/include/bsp/bestcomm_ops.h
index 2b74adf366..2b74adf366 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm_ops.h
+++ b/include/bsp/bestcomm_ops.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/boot.h b/include/bsp/boot.h
index b9c845bc8f..b9c845bc8f 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/boot.h
+++ b/include/bsp/boot.h
diff --git a/c/src/lib/libbsp/shared/include/bootcard.h b/include/bsp/bootcard.h
index 5e31fcfb97..5e31fcfb97 100644
--- a/c/src/lib/libbsp/shared/include/bootcard.h
+++ b/include/bsp/bootcard.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/vectors/bspException.h b/include/bsp/bspException.h
index 7cd816e818..7cd816e818 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/vectors/bspException.h
+++ b/include/bsp/bspException.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/bspMvme5500.h b/include/bsp/bspMvme5500.h
index 9fb53869ff..9fb53869ff 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/bspMvme5500.h
+++ b/include/bsp/bspMvme5500.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.h b/include/bsp/bspVmeDmaList.h
index 414afab5c9..414afab5c9 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.h
+++ b/include/bsp/bspVmeDmaList.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/support/bsp_bsdnet_attach.h b/include/bsp/bsp_bsdnet_attach.h
index a12e9e2c86..a12e9e2c86 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/support/bsp_bsdnet_attach.h
+++ b/include/bsp/bsp_bsdnet_attach.h
diff --git a/c/src/lib/libbsp/or1k/shared/include/cache_.h b/include/bsp/cache_.h
index ed2053858e..ed2053858e 100644
--- a/c/src/lib/libbsp/or1k/shared/include/cache_.h
+++ b/include/bsp/cache_.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c-regs.h b/include/bsp/cadence-i2c-regs.h
index c06a47c7f1..c06a47c7f1 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c-regs.h
+++ b/include/bsp/cadence-i2c-regs.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c.h b/include/bsp/cadence-i2c.h
index 9697cf3354..9697cf3354 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c.h
+++ b/include/bsp/cadence-i2c.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/common-types.h b/include/bsp/common-types.h
index dec487c68d..dec487c68d 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/common-types.h
+++ b/include/bsp/common-types.h
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/include/commproc.h b/include/bsp/commproc.h
index 1e0d14a8b8..1e0d14a8b8 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/include/commproc.h
+++ b/include/bsp/commproc.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-esci.h b/include/bsp/console-esci.h
index 4be6788141..4be6788141 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-esci.h
+++ b/include/bsp/console-esci.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-generic.h b/include/bsp/console-generic.h
index c3f7a4628f..c3f7a4628f 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-generic.h
+++ b/include/bsp/console-generic.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-linflex.h b/include/bsp/console-linflex.h
index c70f36d13b..c70f36d13b 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-linflex.h
+++ b/include/bsp/console-linflex.h
diff --git a/c/src/lib/libbsp/shared/include/console-polled.h b/include/bsp/console-polled.h
index 09a99c30cb..09a99c30cb 100644
--- a/c/src/lib/libbsp/shared/include/console-polled.h
+++ b/include/bsp/console-polled.h
diff --git a/c/src/lib/libbsp/shared/include/console-termios.h b/include/bsp/console-termios.h
index bbb9f357df..bbb9f357df 100644
--- a/c/src/lib/libbsp/shared/include/console-termios.h
+++ b/include/bsp/console-termios.h
diff --git a/c/src/lib/libbsp/powerpc/shared/console/consoleIo.h b/include/bsp/consoleIo.h
index e62c9d143c..e62c9d143c 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/consoleIo.h
+++ b/include/bsp/consoleIo.h
diff --git a/c/src/lib/libbsp/shared/console_private.h b/include/bsp/console_private.h
index 52dc421e14..52dc421e14 100644
--- a/c/src/lib/libbsp/shared/console_private.h
+++ b/include/bsp/console_private.h
diff --git a/c/src/lib/libbsp/shared/include/default-initial-extension.h b/include/bsp/default-initial-extension.h
index c3e5ceace7..c3e5ceace7 100644
--- a/c/src/lib/libbsp/shared/include/default-initial-extension.h
+++ b/include/bsp/default-initial-extension.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/dma.h b/include/bsp/dma.h
index c7c84d1004..c7c84d1004 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/dma.h
+++ b/include/bsp/dma.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/support/early_enet_link_status.h b/include/bsp/early_enet_link_status.h
index 74160a3b84..74160a3b84 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/support/early_enet_link_status.h
+++ b/include/bsp/early_enet_link_status.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/emc.h b/include/bsp/emc.h
index c0ae18b395..c0ae18b395 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/emc.h
+++ b/include/bsp/emc.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/exar17d15x.h b/include/bsp/exar17d15x.h
index 9e1194ffec..9e1194ffec 100644
--- a/c/src/lib/libbsp/i386/pc386/console/exar17d15x.h
+++ b/include/bsp/exar17d15x.h
diff --git a/c/src/lib/libbsp/shared/include/fatal.h b/include/bsp/fatal.h
index ba6cd51fa7..ba6cd51fa7 100644
--- a/c/src/lib/libbsp/shared/include/fatal.h
+++ b/include/bsp/fatal.h
diff --git a/c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h b/include/bsp/flashPgm.h
index 19f2c4708e..19f2c4708e 100644
--- a/c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h
+++ b/include/bsp/flashPgm.h
diff --git a/c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h b/include/bsp/flashPgmPvt.h
index c26b8ed01d..c26b8ed01d 100644
--- a/c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h
+++ b/include/bsp/flashPgmPvt.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gnatcommon.h b/include/bsp/gnatcommon.h
index 1a04449293..1a04449293 100644
--- a/c/src/lib/libbsp/sparc/shared/include/gnatcommon.h
+++ b/include/bsp/gnatcommon.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/gpio-defs.h b/include/bsp/gpio-defs.h
index b185ae2257..b185ae2257 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/gpio-defs.h
+++ b/include/bsp/gpio-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/gpio.h b/include/bsp/gpio.h
index af5f9ec09c..af5f9ec09c 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/gpio.h
+++ b/include/bsp/gpio.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gt_timer.h b/include/bsp/gt_timer.h
index 4a68971d13..4a68971d13 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gt_timer.h
+++ b/include/bsp/gt_timer.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gti2c_busdrv.h b/include/bsp/gti2c_busdrv.h
index b75e16cdf8..b75e16cdf8 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gti2c_busdrv.h
+++ b/include/bsp/gti2c_busdrv.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gti2creg.h b/include/bsp/gti2creg.h
index 33e566f5bc..33e566f5bc 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gti2creg.h
+++ b/include/bsp/gti2creg.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtintrreg.h b/include/bsp/gtintrreg.h
index bd3f69514e..bd3f69514e 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtintrreg.h
+++ b/include/bsp/gtintrreg.h
diff --git a/include/bsp/gtpcireg.h b/include/bsp/gtpcireg.h
new file mode 100644
index 0000000000..c8e091f52d
--- /dev/null
+++ b/include/bsp/gtpcireg.h
@@ -0,0 +1,12 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_powerpc_beatnik__)
+#  include <powerpc/beatnik/bsp/gtpcireg.h>
+#elif defined(__rtems_powerpc_mvme5500__)
+#  include <powerpc/mvme5500/bsp/gtpcireg.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/include/bsp/gtreg.h b/include/bsp/gtreg.h
new file mode 100644
index 0000000000..5b9c107e34
--- /dev/null
+++ b/include/bsp/gtreg.h
@@ -0,0 +1,12 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_powerpc_beatnik__)
+#  include <powerpc/beatnik/bsp/gtreg.h>
+#elif defined(__rtems_powerpc_mvme5500__)
+#  include <powerpc/mvme5500/bsp/gtreg.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/hsu.h b/include/bsp/hsu.h
index ba97dfb423..ba97dfb423 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/hsu.h
+++ b/include/bsp/hsu.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/hwlib.h b/include/bsp/hwlib.h
index aba7e877c4..aba7e877c4 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/hwlib.h
+++ b/include/bsp/hwlib.h
diff --git a/include/bsp/hwreg_vals.h b/include/bsp/hwreg_vals.h
new file mode 100644
index 0000000000..419b5a0af4
--- /dev/null
+++ b/include/bsp/hwreg_vals.h
@@ -0,0 +1,18 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_powerpc_br_uid__)
+#  include <powerpc/br_uid/bsp/hwreg_vals.h>
+#elif defined(__rtems_powerpc_hsc_cm01__)
+#  include <powerpc/hsc_cm01/bsp/hwreg_vals.h>
+#elif defined(__rtems_powerpc_mpc8309som__)
+#  include <powerpc/mpc8309som/bsp/hwreg_vals.h>
+#elif defined(__rtems_powerpc_mpc8313erdb__)
+#  include <powerpc/mpc8313erdb/bsp/hwreg_vals.h>
+#elif defined(__rtems_powerpc_mpc8349eamds__)
+#  include <powerpc/mpc8349eamds/bsp/hwreg_vals.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/include/bsp/i2c.h b/include/bsp/i2c.h
new file mode 100644
index 0000000000..1283ec7c78
--- /dev/null
+++ b/include/bsp/i2c.h
@@ -0,0 +1,76 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_beagleboardorig__)
+#  include <arm/beagleboardorig/bsp/i2c.h>
+#elif defined(__rtems_arm_beagleboardxm__)
+#  include <arm/beagleboardxm/bsp/i2c.h>
+#elif defined(__rtems_arm_beagleboneblack__)
+#  include <arm/beagleboneblack/bsp/i2c.h>
+#elif defined(__rtems_arm_beaglebonewhite__)
+#  include <arm/beaglebonewhite/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc17xx_ea_ram__)
+#  include <arm/lpc17xx_ea_ram/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc17xx_ea_rom_int__)
+#  include <arm/lpc17xx_ea_rom_int/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_ram__)
+#  include <arm/lpc17xx_plx800_ram/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_rom_int__)
+#  include <arm/lpc17xx_plx800_rom_int/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc2362__)
+#  include <arm/lpc2362/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc23xx_tli800__)
+#  include <arm/lpc23xx_tli800/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc24xx_ea__)
+#  include <arm/lpc24xx_ea/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_ram__)
+#  include <arm/lpc24xx_ncs_ram/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_ext__)
+#  include <arm/lpc24xx_ncs_rom_ext/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_int__)
+#  include <arm/lpc24xx_ncs_rom_int/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_ram__)
+#  include <arm/lpc24xx_plx800_ram/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_rom_int__)
+#  include <arm/lpc24xx_plx800_rom_int/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc32xx_mzx__)
+#  include <arm/lpc32xx_mzx/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_1__)
+#  include <arm/lpc32xx_mzx_stage_1/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_2__)
+#  include <arm/lpc32xx_mzx_stage_2/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc32xx_phycore__)
+#  include <arm/lpc32xx_phycore/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc40xx_ea_ram__)
+#  include <arm/lpc40xx_ea_ram/bsp/i2c.h>
+#elif defined(__rtems_arm_lpc40xx_ea_rom_int__)
+#  include <arm/lpc40xx_ea_rom_int/bsp/i2c.h>
+#elif defined(__rtems_arm_stm32f105rc__)
+#  include <arm/stm32f105rc/bsp/i2c.h>
+#elif defined(__rtems_arm_stm32f4__)
+#  include <arm/stm32f4/bsp/i2c.h>
+#elif defined(__rtems_arm_xilinx_zynq_a9_qemu__)
+#  include <arm/xilinx_zynq_a9_qemu/bsp/i2c.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc702__)
+#  include <arm/xilinx_zynq_zc702/bsp/i2c.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc706__)
+#  include <arm/xilinx_zynq_zc706/bsp/i2c.h>
+#elif defined(__rtems_arm_xilinx_zynq_zedboard__)
+#  include <arm/xilinx_zynq_zedboard/bsp/i2c.h>
+#elif defined(__rtems_powerpc_brs5l__)
+#  include <powerpc/brs5l/bsp/i2c.h>
+#elif defined(__rtems_powerpc_brs6l__)
+#  include <powerpc/brs6l/bsp/i2c.h>
+#elif defined(__rtems_powerpc_dp2__)
+#  include <powerpc/dp2/bsp/i2c.h>
+#elif defined(__rtems_powerpc_icecube__)
+#  include <powerpc/icecube/bsp/i2c.h>
+#elif defined(__rtems_powerpc_pm520_cr825__)
+#  include <powerpc/pm520_cr825/bsp/i2c.h>
+#elif defined(__rtems_powerpc_pm520_ze30__)
+#  include <powerpc/pm520_ze30/bsp/i2c.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/include/i2cdrv.h b/include/bsp/i2cdrv.h
index 9a4411d637..9a4411d637 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/include/i2cdrv.h
+++ b/include/bsp/i2cdrv.h
diff --git a/c/src/lib/libbsp/mips/shared/irq/i8259.h b/include/bsp/i8259.h
index 8d10523b40..8d10523b40 100644
--- a/c/src/lib/libbsp/mips/shared/irq/i8259.h
+++ b/include/bsp/i8259.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_pub.h b/include/bsp/if_em_pub.h
index eb970e465b..eb970e465b 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_pub.h
+++ b/include/bsp/if_em_pub.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe_pub.h b/include/bsp/if_gfe_pub.h
index 8ea849efb1..8ea849efb1 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe_pub.h
+++ b/include/bsp/if_gfe_pub.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/if_mve_pub.h b/include/bsp/if_mve_pub.h
index 0a84310d72..0a84310d72 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/if_mve_pub.h
+++ b/include/bsp/if_mve_pub.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/network/if_tsec_pub.h b/include/bsp/if_tsec_pub.h
index 7eb0358eae..7eb0358eae 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/network/if_tsec_pub.h
+++ b/include/bsp/if_tsec_pub.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wmreg.h b/include/bsp/if_wmreg.h
index 3e21c62581..3e21c62581 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wmreg.h
+++ b/include/bsp/if_wmreg.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/intercom.h b/include/bsp/intercom.h
index 39b2ba938e..39b2ba938e 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/intercom.h
+++ b/include/bsp/intercom.h
diff --git a/c/src/lib/libcpu/bfin/bf52x/interrupt/interrupt.h b/include/bsp/interrupt.h
index 7a98775dd5..7a98775dd5 100644
--- a/c/src/lib/libcpu/bfin/bf52x/interrupt/interrupt.h
+++ b/include/bsp/interrupt.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/io-defs.h b/include/bsp/io-defs.h
index a0afdf47ae..a0afdf47ae 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/io-defs.h
+++ b/include/bsp/io-defs.h
diff --git a/include/bsp/io.h b/include/bsp/io.h
new file mode 100644
index 0000000000..e690608f7c
--- /dev/null
+++ b/include/bsp/io.h
@@ -0,0 +1,54 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_lm3s3749__)
+#  include <arm/lm3s3749/bsp/io.h>
+#elif defined(__rtems_arm_lm3s6965__)
+#  include <arm/lm3s6965/bsp/io.h>
+#elif defined(__rtems_arm_lm3s6965_qemu__)
+#  include <arm/lm3s6965_qemu/bsp/io.h>
+#elif defined(__rtems_arm_lm4f120__)
+#  include <arm/lm4f120/bsp/io.h>
+#elif defined(__rtems_arm_lpc1768_mbed__)
+#  include <arm/lpc1768_mbed/bsp/io.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram__)
+#  include <arm/lpc1768_mbed_ahb_ram/bsp/io.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram_eth__)
+#  include <arm/lpc1768_mbed_ahb_ram_eth/bsp/io.h>
+#elif defined(__rtems_arm_lpc17xx_ea_ram__)
+#  include <arm/lpc17xx_ea_ram/bsp/io.h>
+#elif defined(__rtems_arm_lpc17xx_ea_rom_int__)
+#  include <arm/lpc17xx_ea_rom_int/bsp/io.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_ram__)
+#  include <arm/lpc17xx_plx800_ram/bsp/io.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_rom_int__)
+#  include <arm/lpc17xx_plx800_rom_int/bsp/io.h>
+#elif defined(__rtems_arm_lpc2362__)
+#  include <arm/lpc2362/bsp/io.h>
+#elif defined(__rtems_arm_lpc23xx_tli800__)
+#  include <arm/lpc23xx_tli800/bsp/io.h>
+#elif defined(__rtems_arm_lpc24xx_ea__)
+#  include <arm/lpc24xx_ea/bsp/io.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_ram__)
+#  include <arm/lpc24xx_ncs_ram/bsp/io.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_ext__)
+#  include <arm/lpc24xx_ncs_rom_ext/bsp/io.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_int__)
+#  include <arm/lpc24xx_ncs_rom_int/bsp/io.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_ram__)
+#  include <arm/lpc24xx_plx800_ram/bsp/io.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_rom_int__)
+#  include <arm/lpc24xx_plx800_rom_int/bsp/io.h>
+#elif defined(__rtems_arm_lpc40xx_ea_ram__)
+#  include <arm/lpc40xx_ea_ram/bsp/io.h>
+#elif defined(__rtems_arm_lpc40xx_ea_rom_int__)
+#  include <arm/lpc40xx_ea_rom_int/bsp/io.h>
+#elif defined(__rtems_arm_stm32f105rc__)
+#  include <arm/stm32f105rc/bsp/io.h>
+#elif defined(__rtems_arm_stm32f4__)
+#  include <arm/stm32f4/bsp/io.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/shared/include/irq-generic.h b/include/bsp/irq-generic.h
index 51de092806..51de092806 100644
--- a/c/src/lib/libbsp/shared/include/irq-generic.h
+++ b/include/bsp/irq-generic.h
diff --git a/c/src/lib/libbsp/shared/include/irq-info.h b/include/bsp/irq-info.h
index df85c8e568..df85c8e568 100644
--- a/c/src/lib/libbsp/shared/include/irq-info.h
+++ b/include/bsp/irq-info.h
diff --git a/include/bsp/irq.h b/include/bsp/irq.h
new file mode 100644
index 0000000000..d9d7f6631f
--- /dev/null
+++ b/include/bsp/irq.h
@@ -0,0 +1,282 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_altcycv_devkit__)
+#  include <arm/altcycv_devkit/bsp/irq.h>
+#elif defined(__rtems_arm_altcycv_devkit_smp__)
+#  include <arm/altcycv_devkit_smp/bsp/irq.h>
+#elif defined(__rtems_arm_arm1136jfs__)
+#  include <arm/arm1136jfs/bsp/irq.h>
+#elif defined(__rtems_arm_arm1136js__)
+#  include <arm/arm1136js/bsp/irq.h>
+#elif defined(__rtems_arm_arm7tdmi__)
+#  include <arm/arm7tdmi/bsp/irq.h>
+#elif defined(__rtems_arm_arm920__)
+#  include <arm/arm920/bsp/irq.h>
+#elif defined(__rtems_arm_armcortexa9__)
+#  include <arm/armcortexa9/bsp/irq.h>
+#elif defined(__rtems_arm_beagleboardorig__)
+#  include <arm/beagleboardorig/bsp/irq.h>
+#elif defined(__rtems_arm_beagleboardxm__)
+#  include <arm/beagleboardxm/bsp/irq.h>
+#elif defined(__rtems_arm_beagleboneblack__)
+#  include <arm/beagleboneblack/bsp/irq.h>
+#elif defined(__rtems_arm_beaglebonewhite__)
+#  include <arm/beaglebonewhite/bsp/irq.h>
+#elif defined(__rtems_arm_csb336__)
+#  include <arm/csb336/bsp/irq.h>
+#elif defined(__rtems_arm_csb337__)
+#  include <arm/csb337/bsp/irq.h>
+#elif defined(__rtems_arm_csb637__)
+#  include <arm/csb637/bsp/irq.h>
+#elif defined(__rtems_arm_edb7312__)
+#  include <arm/edb7312/bsp/irq.h>
+#elif defined(__rtems_arm_gba__)
+#  include <arm/gba/bsp/irq.h>
+#elif defined(__rtems_arm_gp32__)
+#  include <arm/gp32/bsp/irq.h>
+#elif defined(__rtems_arm_gumstix__)
+#  include <arm/gumstix/bsp/irq.h>
+#elif defined(__rtems_arm_kit637_v6__)
+#  include <arm/kit637_v6/bsp/irq.h>
+#elif defined(__rtems_arm_lm3s3749__)
+#  include <arm/lm3s3749/bsp/irq.h>
+#elif defined(__rtems_arm_lm3s6965__)
+#  include <arm/lm3s6965/bsp/irq.h>
+#elif defined(__rtems_arm_lm3s6965_qemu__)
+#  include <arm/lm3s6965_qemu/bsp/irq.h>
+#elif defined(__rtems_arm_lm4f120__)
+#  include <arm/lm4f120/bsp/irq.h>
+#elif defined(__rtems_arm_lpc1768_mbed__)
+#  include <arm/lpc1768_mbed/bsp/irq.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram__)
+#  include <arm/lpc1768_mbed_ahb_ram/bsp/irq.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram_eth__)
+#  include <arm/lpc1768_mbed_ahb_ram_eth/bsp/irq.h>
+#elif defined(__rtems_arm_lpc17xx_ea_ram__)
+#  include <arm/lpc17xx_ea_ram/bsp/irq.h>
+#elif defined(__rtems_arm_lpc17xx_ea_rom_int__)
+#  include <arm/lpc17xx_ea_rom_int/bsp/irq.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_ram__)
+#  include <arm/lpc17xx_plx800_ram/bsp/irq.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_rom_int__)
+#  include <arm/lpc17xx_plx800_rom_int/bsp/irq.h>
+#elif defined(__rtems_arm_lpc2362__)
+#  include <arm/lpc2362/bsp/irq.h>
+#elif defined(__rtems_arm_lpc23xx_tli800__)
+#  include <arm/lpc23xx_tli800/bsp/irq.h>
+#elif defined(__rtems_arm_lpc24xx_ea__)
+#  include <arm/lpc24xx_ea/bsp/irq.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_ram__)
+#  include <arm/lpc24xx_ncs_ram/bsp/irq.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_ext__)
+#  include <arm/lpc24xx_ncs_rom_ext/bsp/irq.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_int__)
+#  include <arm/lpc24xx_ncs_rom_int/bsp/irq.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_ram__)
+#  include <arm/lpc24xx_plx800_ram/bsp/irq.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_rom_int__)
+#  include <arm/lpc24xx_plx800_rom_int/bsp/irq.h>
+#elif defined(__rtems_arm_lpc32xx_mzx__)
+#  include <arm/lpc32xx_mzx/bsp/irq.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_1__)
+#  include <arm/lpc32xx_mzx_stage_1/bsp/irq.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_2__)
+#  include <arm/lpc32xx_mzx_stage_2/bsp/irq.h>
+#elif defined(__rtems_arm_lpc32xx_phycore__)
+#  include <arm/lpc32xx_phycore/bsp/irq.h>
+#elif defined(__rtems_arm_lpc40xx_ea_ram__)
+#  include <arm/lpc40xx_ea_ram/bsp/irq.h>
+#elif defined(__rtems_arm_lpc40xx_ea_rom_int__)
+#  include <arm/lpc40xx_ea_rom_int/bsp/irq.h>
+#elif defined(__rtems_arm_nds__)
+#  include <arm/nds/bsp/irq.h>
+#elif defined(__rtems_arm_raspberrypi__)
+#  include <arm/raspberrypi/bsp/irq.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu__)
+#  include <arm/realview_pbx_a9_qemu/bsp/irq.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu_smp__)
+#  include <arm/realview_pbx_a9_qemu_smp/bsp/irq.h>
+#elif defined(__rtems_arm_rtl22xx__)
+#  include <arm/rtl22xx/bsp/irq.h>
+#elif defined(__rtems_arm_rtl22xx_t__)
+#  include <arm/rtl22xx_t/bsp/irq.h>
+#elif defined(__rtems_arm_smdk2410__)
+#  include <arm/smdk2410/bsp/irq.h>
+#elif defined(__rtems_arm_stm32f105rc__)
+#  include <arm/stm32f105rc/bsp/irq.h>
+#elif defined(__rtems_arm_stm32f4__)
+#  include <arm/stm32f4/bsp/irq.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk__)
+#  include <arm/tms570ls3137_hdk/bsp/irq.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_intram__)
+#  include <arm/tms570ls3137_hdk_intram/bsp/irq.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_sdram__)
+#  include <arm/tms570ls3137_hdk_sdram/bsp/irq.h>
+#elif defined(__rtems_arm_xilinx_zynq_a9_qemu__)
+#  include <arm/xilinx_zynq_a9_qemu/bsp/irq.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc702__)
+#  include <arm/xilinx_zynq_zc702/bsp/irq.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc706__)
+#  include <arm/xilinx_zynq_zc706/bsp/irq.h>
+#elif defined(__rtems_arm_xilinx_zynq_zedboard__)
+#  include <arm/xilinx_zynq_zedboard/bsp/irq.h>
+#elif defined(__rtems_i386_pc386__)
+#  include <i386/pc386/bsp/irq.h>
+#elif defined(__rtems_i386_pc486__)
+#  include <i386/pc486/bsp/irq.h>
+#elif defined(__rtems_i386_pc586__)
+#  include <i386/pc586/bsp/irq.h>
+#elif defined(__rtems_i386_pc586_sse__)
+#  include <i386/pc586-sse/bsp/irq.h>
+#elif defined(__rtems_i386_pc686__)
+#  include <i386/pc686/bsp/irq.h>
+#elif defined(__rtems_i386_pcp4__)
+#  include <i386/pcp4/bsp/irq.h>
+#elif defined(__rtems_lm32_milkymist__)
+#  include <lm32/milkymist/bsp/irq.h>
+#elif defined(__rtems_m68k_COBRA5475__)
+#  include <m68k/COBRA5475/bsp/irq.h>
+#elif defined(__rtems_m68k_m5484FireEngine__)
+#  include <m68k/m5484FireEngine/bsp/irq.h>
+#elif defined(__rtems_mips_csb350__)
+#  include <mips/csb350/bsp/irq.h>
+#elif defined(__rtems_mips_genmongoosev__)
+#  include <mips/genmongoosev/bsp/irq.h>
+#elif defined(__rtems_mips_hurricane__)
+#  include <mips/hurricane/bsp/irq.h>
+#elif defined(__rtems_mips_jmr3904__)
+#  include <mips/jmr3904/bsp/irq.h>
+#elif defined(__rtems_mips_malta__)
+#  include <mips/malta/bsp/irq.h>
+#elif defined(__rtems_mips_rbtx4925__)
+#  include <mips/rbtx4925/bsp/irq.h>
+#elif defined(__rtems_mips_rbtx4938__)
+#  include <mips/rbtx4938/bsp/irq.h>
+#elif defined(__rtems_or1k_or1ksim__)
+#  include <or1k/or1ksim/bsp/irq.h>
+#elif defined(__rtems_powerpc_beatnik__)
+#  include <powerpc/beatnik/bsp/irq.h>
+#elif defined(__rtems_powerpc_br_uid__)
+#  include <powerpc/br_uid/bsp/irq.h>
+#elif defined(__rtems_powerpc_brs5l__)
+#  include <powerpc/brs5l/bsp/irq.h>
+#elif defined(__rtems_powerpc_brs6l__)
+#  include <powerpc/brs6l/bsp/irq.h>
+#elif defined(__rtems_powerpc_dp2__)
+#  include <powerpc/dp2/bsp/irq.h>
+#elif defined(__rtems_powerpc_ep1a__)
+#  include <powerpc/ep1a/bsp/irq.h>
+#elif defined(__rtems_powerpc_gwlcfm__)
+#  include <powerpc/gwlcfm/bsp/irq.h>
+#elif defined(__rtems_powerpc_haleakala__)
+#  include <powerpc/haleakala/bsp/irq.h>
+#elif defined(__rtems_powerpc_hsc_cm01__)
+#  include <powerpc/hsc_cm01/bsp/irq.h>
+#elif defined(__rtems_powerpc_icecube__)
+#  include <powerpc/icecube/bsp/irq.h>
+#elif defined(__rtems_powerpc_mbx821_001__)
+#  include <powerpc/mbx821_001/bsp/irq.h>
+#elif defined(__rtems_powerpc_mbx821_002__)
+#  include <powerpc/mbx821_002/bsp/irq.h>
+#elif defined(__rtems_powerpc_mbx821_002b__)
+#  include <powerpc/mbx821_002b/bsp/irq.h>
+#elif defined(__rtems_powerpc_mbx860_001b__)
+#  include <powerpc/mbx860_001b/bsp/irq.h>
+#elif defined(__rtems_powerpc_mbx860_002__)
+#  include <powerpc/mbx860_002/bsp/irq.h>
+#elif defined(__rtems_powerpc_mbx860_005b__)
+#  include <powerpc/mbx860_005b/bsp/irq.h>
+#elif defined(__rtems_powerpc_mbx860_1b__)
+#  include <powerpc/mbx860_1b/bsp/irq.h>
+#elif defined(__rtems_powerpc_mcp750__)
+#  include <powerpc/mcp750/bsp/irq.h>
+#elif defined(__rtems_powerpc_mpc5566evb__)
+#  include <powerpc/mpc5566evb/bsp/irq.h>
+#elif defined(__rtems_powerpc_mpc5566evb_spe__)
+#  include <powerpc/mpc5566evb_spe/bsp/irq.h>
+#elif defined(__rtems_powerpc_mpc5643l_dpu__)
+#  include <powerpc/mpc5643l_dpu/bsp/irq.h>
+#elif defined(__rtems_powerpc_mpc5643l_evb__)
+#  include <powerpc/mpc5643l_evb/bsp/irq.h>
+#elif defined(__rtems_powerpc_mpc5668g__)
+#  include <powerpc/mpc5668g/bsp/irq.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_app__)
+#  include <powerpc/mpc5674f_ecu508_app/bsp/irq.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_boot__)
+#  include <powerpc/mpc5674f_ecu508_boot/bsp/irq.h>
+#elif defined(__rtems_powerpc_mpc5674f_rsm6__)
+#  include <powerpc/mpc5674f_rsm6/bsp/irq.h>
+#elif defined(__rtems_powerpc_mpc5674fevb__)
+#  include <powerpc/mpc5674fevb/bsp/irq.h>
+#elif defined(__rtems_powerpc_mpc5674fevb_spe__)
+#  include <powerpc/mpc5674fevb_spe/bsp/irq.h>
+#elif defined(__rtems_powerpc_mpc8260ads__)
+#  include <powerpc/mpc8260ads/bsp/irq.h>
+#elif defined(__rtems_powerpc_mpc8309som__)
+#  include <powerpc/mpc8309som/bsp/irq.h>
+#elif defined(__rtems_powerpc_mpc8313erdb__)
+#  include <powerpc/mpc8313erdb/bsp/irq.h>
+#elif defined(__rtems_powerpc_mpc8349eamds__)
+#  include <powerpc/mpc8349eamds/bsp/irq.h>
+#elif defined(__rtems_powerpc_mtx603e__)
+#  include <powerpc/mtx603e/bsp/irq.h>
+#elif defined(__rtems_powerpc_mvme2100__)
+#  include <powerpc/mvme2100/bsp/irq.h>
+#elif defined(__rtems_powerpc_mvme2307__)
+#  include <powerpc/mvme2307/bsp/irq.h>
+#elif defined(__rtems_powerpc_mvme3100__)
+#  include <powerpc/mvme3100/bsp/irq.h>
+#elif defined(__rtems_powerpc_mvme5500__)
+#  include <powerpc/mvme5500/bsp/irq.h>
+#elif defined(__rtems_powerpc_pghplus__)
+#  include <powerpc/pghplus/bsp/irq.h>
+#elif defined(__rtems_powerpc_phycore_mpc5554__)
+#  include <powerpc/phycore_mpc5554/bsp/irq.h>
+#elif defined(__rtems_powerpc_pm520_cr825__)
+#  include <powerpc/pm520_cr825/bsp/irq.h>
+#elif defined(__rtems_powerpc_pm520_ze30__)
+#  include <powerpc/pm520_ze30/bsp/irq.h>
+#elif defined(__rtems_powerpc_psim__)
+#  include <powerpc/psim/bsp/irq.h>
+#elif defined(__rtems_powerpc_qemuppc__)
+#  include <powerpc/qemuppc/bsp/irq.h>
+#elif defined(__rtems_powerpc_qemuprep__)
+#  include <powerpc/qemuprep/bsp/irq.h>
+#elif defined(__rtems_powerpc_qemuprep_altivec__)
+#  include <powerpc/qemuprep-altivec/bsp/irq.h>
+#elif defined(__rtems_powerpc_qoriq_core_0__)
+#  include <powerpc/qoriq_core_0/bsp/irq.h>
+#elif defined(__rtems_powerpc_qoriq_core_1__)
+#  include <powerpc/qoriq_core_1/bsp/irq.h>
+#elif defined(__rtems_powerpc_qoriq_p1020rdb__)
+#  include <powerpc/qoriq_p1020rdb/bsp/irq.h>
+#elif defined(__rtems_powerpc_score603e__)
+#  include <powerpc/score603e/bsp/irq.h>
+#elif defined(__rtems_powerpc_ss555__)
+#  include <powerpc/ss555/bsp/irq.h>
+#elif defined(__rtems_powerpc_t32mppc__)
+#  include <powerpc/t32mppc/bsp/irq.h>
+#elif defined(__rtems_powerpc_tqm8xx_stk8xx__)
+#  include <powerpc/tqm8xx_stk8xx/bsp/irq.h>
+#elif defined(__rtems_powerpc_virtex__)
+#  include <powerpc/virtex/bsp/irq.h>
+#elif defined(__rtems_powerpc_virtex4__)
+#  include <powerpc/virtex4/bsp/irq.h>
+#elif defined(__rtems_powerpc_virtex5__)
+#  include <powerpc/virtex5/bsp/irq.h>
+#elif defined(__rtems_sparc_erc32__)
+#  include <sparc/erc32/bsp/irq.h>
+#elif defined(__rtems_sparc_leon2__)
+#  include <sparc/leon2/bsp/irq.h>
+#elif defined(__rtems_sparc_leon3__)
+#  include <sparc/leon3/bsp/irq.h>
+#elif defined(__rtems_sparc_ngmp__)
+#  include <sparc/ngmp/bsp/irq.h>
+#elif defined(__rtems_sparc_sis__)
+#  include <sparc/sis/bsp/irq.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/i386/shared/irq/irq_asm.h b/include/bsp/irq_asm.h
index 31575adb94..31575adb94 100644
--- a/c/src/lib/libbsp/i386/shared/irq/irq_asm.h
+++ b/include/bsp/irq_asm.h
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq_supp.h b/include/bsp/irq_supp.h
index 1a2d195057..1a2d195057 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq_supp.h
+++ b/include/bsp/irq_supp.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lcd.h b/include/bsp/lcd.h
index c415074bd4..c415074bd4 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/lcd.h
+++ b/include/bsp/lcd.h
diff --git a/include/bsp/linker-symbols.h b/include/bsp/linker-symbols.h
new file mode 100644
index 0000000000..f72425dd01
--- /dev/null
+++ b/include/bsp/linker-symbols.h
@@ -0,0 +1,228 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_altcycv_devkit__)
+#  include <arm/altcycv_devkit/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_altcycv_devkit_smp__)
+#  include <arm/altcycv_devkit_smp/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_arm1136jfs__)
+#  include <arm/arm1136jfs/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_arm1136js__)
+#  include <arm/arm1136js/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_arm7tdmi__)
+#  include <arm/arm7tdmi/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_arm920__)
+#  include <arm/arm920/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_armcortexa9__)
+#  include <arm/armcortexa9/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_beagleboardorig__)
+#  include <arm/beagleboardorig/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_beagleboardxm__)
+#  include <arm/beagleboardxm/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_beagleboneblack__)
+#  include <arm/beagleboneblack/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_beaglebonewhite__)
+#  include <arm/beaglebonewhite/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_csb336__)
+#  include <arm/csb336/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_csb337__)
+#  include <arm/csb337/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_csb637__)
+#  include <arm/csb637/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_edb7312__)
+#  include <arm/edb7312/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_gba__)
+#  include <arm/gba/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_gp32__)
+#  include <arm/gp32/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_gumstix__)
+#  include <arm/gumstix/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_kit637_v6__)
+#  include <arm/kit637_v6/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lm3s3749__)
+#  include <arm/lm3s3749/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lm3s6965__)
+#  include <arm/lm3s6965/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lm3s6965_qemu__)
+#  include <arm/lm3s6965_qemu/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lm4f120__)
+#  include <arm/lm4f120/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc1768_mbed__)
+#  include <arm/lpc1768_mbed/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram__)
+#  include <arm/lpc1768_mbed_ahb_ram/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram_eth__)
+#  include <arm/lpc1768_mbed_ahb_ram_eth/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc17xx_ea_ram__)
+#  include <arm/lpc17xx_ea_ram/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc17xx_ea_rom_int__)
+#  include <arm/lpc17xx_ea_rom_int/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_ram__)
+#  include <arm/lpc17xx_plx800_ram/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_rom_int__)
+#  include <arm/lpc17xx_plx800_rom_int/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc2362__)
+#  include <arm/lpc2362/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc23xx_tli800__)
+#  include <arm/lpc23xx_tli800/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc24xx_ea__)
+#  include <arm/lpc24xx_ea/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_ram__)
+#  include <arm/lpc24xx_ncs_ram/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_ext__)
+#  include <arm/lpc24xx_ncs_rom_ext/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_int__)
+#  include <arm/lpc24xx_ncs_rom_int/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_ram__)
+#  include <arm/lpc24xx_plx800_ram/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_rom_int__)
+#  include <arm/lpc24xx_plx800_rom_int/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc32xx_mzx__)
+#  include <arm/lpc32xx_mzx/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_1__)
+#  include <arm/lpc32xx_mzx_stage_1/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_2__)
+#  include <arm/lpc32xx_mzx_stage_2/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc32xx_phycore__)
+#  include <arm/lpc32xx_phycore/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc40xx_ea_ram__)
+#  include <arm/lpc40xx_ea_ram/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_lpc40xx_ea_rom_int__)
+#  include <arm/lpc40xx_ea_rom_int/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_nds__)
+#  include <arm/nds/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_raspberrypi__)
+#  include <arm/raspberrypi/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu__)
+#  include <arm/realview_pbx_a9_qemu/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu_smp__)
+#  include <arm/realview_pbx_a9_qemu_smp/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_rtl22xx__)
+#  include <arm/rtl22xx/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_rtl22xx_t__)
+#  include <arm/rtl22xx_t/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_smdk2410__)
+#  include <arm/smdk2410/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_stm32f105rc__)
+#  include <arm/stm32f105rc/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_stm32f4__)
+#  include <arm/stm32f4/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk__)
+#  include <arm/tms570ls3137_hdk/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_intram__)
+#  include <arm/tms570ls3137_hdk_intram/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_sdram__)
+#  include <arm/tms570ls3137_hdk_sdram/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_xilinx_zynq_a9_qemu__)
+#  include <arm/xilinx_zynq_a9_qemu/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc702__)
+#  include <arm/xilinx_zynq_zc702/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc706__)
+#  include <arm/xilinx_zynq_zc706/bsp/linker-symbols.h>
+#elif defined(__rtems_arm_xilinx_zynq_zedboard__)
+#  include <arm/xilinx_zynq_zedboard/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_COBRA5475__)
+#  include <m68k/COBRA5475/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_av5282__)
+#  include <m68k/av5282/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_csb360__)
+#  include <m68k/csb360/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_gen68302__)
+#  include <m68k/gen68302/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_gen68340__)
+#  include <m68k/gen68340/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_gen68360__)
+#  include <m68k/gen68360/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_gen68360_040__)
+#  include <m68k/gen68360_040/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_idp__)
+#  include <m68k/idp/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_m5484FireEngine__)
+#  include <m68k/m5484FireEngine/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_mcf5206elite__)
+#  include <m68k/mcf5206elite/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_mcf52235__)
+#  include <m68k/mcf52235/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_mcf5225x__)
+#  include <m68k/mcf5225x/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_mcf5235__)
+#  include <m68k/mcf5235/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_mcf5329__)
+#  include <m68k/mcf5329/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_mrm332__)
+#  include <m68k/mrm332/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_mvme136__)
+#  include <m68k/mvme136/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_mvme147__)
+#  include <m68k/mvme147/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_mvme147s__)
+#  include <m68k/mvme147s/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_mvme162__)
+#  include <m68k/mvme162/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_mvme162lx__)
+#  include <m68k/mvme162lx/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_mvme167__)
+#  include <m68k/mvme167/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_ods68302__)
+#  include <m68k/ods68302/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_pgh360__)
+#  include <m68k/pgh360/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_sim68000__)
+#  include <m68k/sim68000/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_simcpu32__)
+#  include <m68k/simcpu32/bsp/linker-symbols.h>
+#elif defined(__rtems_m68k_uC5282__)
+#  include <m68k/uC5282/bsp/linker-symbols.h>
+#elif defined(__rtems_or1k_or1ksim__)
+#  include <or1k/or1ksim/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_br_uid__)
+#  include <powerpc/br_uid/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_gwlcfm__)
+#  include <powerpc/gwlcfm/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_hsc_cm01__)
+#  include <powerpc/hsc_cm01/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_mpc5566evb__)
+#  include <powerpc/mpc5566evb/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_mpc5566evb_spe__)
+#  include <powerpc/mpc5566evb_spe/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_mpc5643l_dpu__)
+#  include <powerpc/mpc5643l_dpu/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_mpc5643l_evb__)
+#  include <powerpc/mpc5643l_evb/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_mpc5668g__)
+#  include <powerpc/mpc5668g/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_app__)
+#  include <powerpc/mpc5674f_ecu508_app/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_boot__)
+#  include <powerpc/mpc5674f_ecu508_boot/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_mpc5674f_rsm6__)
+#  include <powerpc/mpc5674f_rsm6/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_mpc5674fevb__)
+#  include <powerpc/mpc5674fevb/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_mpc5674fevb_spe__)
+#  include <powerpc/mpc5674fevb_spe/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_mpc8309som__)
+#  include <powerpc/mpc8309som/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_mpc8313erdb__)
+#  include <powerpc/mpc8313erdb/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_mpc8349eamds__)
+#  include <powerpc/mpc8349eamds/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_phycore_mpc5554__)
+#  include <powerpc/phycore_mpc5554/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_psim__)
+#  include <powerpc/psim/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_qoriq_core_0__)
+#  include <powerpc/qoriq_core_0/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_qoriq_core_1__)
+#  include <powerpc/qoriq_core_1/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_qoriq_p1020rdb__)
+#  include <powerpc/qoriq_p1020rdb/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_t32mppc__)
+#  include <powerpc/t32mppc/bsp/linker-symbols.h>
+#elif defined(__rtems_powerpc_virtex__)
+#  include <powerpc/virtex/bsp/linker-symbols.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/lm3s69xx.h b/include/bsp/lm3s69xx.h
index ce3548d376..ce3548d376 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/include/lm3s69xx.h
+++ b/include/bsp/lm3s69xx.h
diff --git a/include/bsp/lpc-clock-config.h b/include/bsp/lpc-clock-config.h
new file mode 100644
index 0000000000..cfdd9024a4
--- /dev/null
+++ b/include/bsp/lpc-clock-config.h
@@ -0,0 +1,50 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_lpc1768_mbed__)
+#  include <arm/lpc1768_mbed/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram__)
+#  include <arm/lpc1768_mbed_ahb_ram/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram_eth__)
+#  include <arm/lpc1768_mbed_ahb_ram_eth/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc17xx_ea_ram__)
+#  include <arm/lpc17xx_ea_ram/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc17xx_ea_rom_int__)
+#  include <arm/lpc17xx_ea_rom_int/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_ram__)
+#  include <arm/lpc17xx_plx800_ram/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_rom_int__)
+#  include <arm/lpc17xx_plx800_rom_int/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc2362__)
+#  include <arm/lpc2362/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc23xx_tli800__)
+#  include <arm/lpc23xx_tli800/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc24xx_ea__)
+#  include <arm/lpc24xx_ea/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_ram__)
+#  include <arm/lpc24xx_ncs_ram/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_ext__)
+#  include <arm/lpc24xx_ncs_rom_ext/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_int__)
+#  include <arm/lpc24xx_ncs_rom_int/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_ram__)
+#  include <arm/lpc24xx_plx800_ram/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_rom_int__)
+#  include <arm/lpc24xx_plx800_rom_int/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc32xx_mzx__)
+#  include <arm/lpc32xx_mzx/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_1__)
+#  include <arm/lpc32xx_mzx_stage_1/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_2__)
+#  include <arm/lpc32xx_mzx_stage_2/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc32xx_phycore__)
+#  include <arm/lpc32xx_phycore/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc40xx_ea_ram__)
+#  include <arm/lpc40xx_ea_ram/bsp/lpc-clock-config.h>
+#elif defined(__rtems_arm_lpc40xx_ea_rom_int__)
+#  include <arm/lpc40xx_ea_rom_int/bsp/lpc-clock-config.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-dma.h b/include/bsp/lpc-dma.h
index 45d567b36c..45d567b36c 100644
--- a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-dma.h
+++ b/include/bsp/lpc-dma.h
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-emc.h b/include/bsp/lpc-emc.h
index 31cb4241c8..31cb4241c8 100644
--- a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-emc.h
+++ b/include/bsp/lpc-emc.h
diff --git a/include/bsp/lpc-ethernet-config.h b/include/bsp/lpc-ethernet-config.h
new file mode 100644
index 0000000000..2fb254ff36
--- /dev/null
+++ b/include/bsp/lpc-ethernet-config.h
@@ -0,0 +1,44 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_lpc17xx_ea_ram__)
+#  include <arm/lpc17xx_ea_ram/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc17xx_ea_rom_int__)
+#  include <arm/lpc17xx_ea_rom_int/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_ram__)
+#  include <arm/lpc17xx_plx800_ram/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_rom_int__)
+#  include <arm/lpc17xx_plx800_rom_int/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc2362__)
+#  include <arm/lpc2362/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc23xx_tli800__)
+#  include <arm/lpc23xx_tli800/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc24xx_ea__)
+#  include <arm/lpc24xx_ea/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_ram__)
+#  include <arm/lpc24xx_ncs_ram/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_ext__)
+#  include <arm/lpc24xx_ncs_rom_ext/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_int__)
+#  include <arm/lpc24xx_ncs_rom_int/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_ram__)
+#  include <arm/lpc24xx_plx800_ram/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_rom_int__)
+#  include <arm/lpc24xx_plx800_rom_int/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc32xx_mzx__)
+#  include <arm/lpc32xx_mzx/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_1__)
+#  include <arm/lpc32xx_mzx_stage_1/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_2__)
+#  include <arm/lpc32xx_mzx_stage_2/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc32xx_phycore__)
+#  include <arm/lpc32xx_phycore/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc40xx_ea_ram__)
+#  include <arm/lpc40xx_ea_ram/bsp/lpc-ethernet-config.h>
+#elif defined(__rtems_arm_lpc40xx_ea_rom_int__)
+#  include <arm/lpc40xx_ea_rom_int/bsp/lpc-ethernet-config.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-i2s.h b/include/bsp/lpc-i2s.h
index 65e951b7d7..65e951b7d7 100644
--- a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-i2s.h
+++ b/include/bsp/lpc-i2s.h
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-lcd.h b/include/bsp/lpc-lcd.h
index a3ca4fe11a..a3ca4fe11a 100644
--- a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-lcd.h
+++ b/include/bsp/lpc-lcd.h
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-timer.h b/include/bsp/lpc-timer.h
index 4c7ad4f1d1..4c7ad4f1d1 100644
--- a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-timer.h
+++ b/include/bsp/lpc-timer.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/lpc176x.h b/include/bsp/lpc176x.h
index 951c33bc9d..951c33bc9d 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/lpc176x.h
+++ b/include/bsp/lpc176x.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lpc17xx.h b/include/bsp/lpc17xx.h
index 9c35102e98..9c35102e98 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/lpc17xx.h
+++ b/include/bsp/lpc17xx.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lpc24xx.h b/include/bsp/lpc24xx.h
index 64a910c041..64a910c041 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/lpc24xx.h
+++ b/include/bsp/lpc24xx.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/lpc32xx.h b/include/bsp/lpc32xx.h
index 2edb1e334e..2edb1e334e 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/lpc32xx.h
+++ b/include/bsp/lpc32xx.h
diff --git a/c/src/lib/libbsp/mips/genmongoosev/include/lr33000.h b/include/bsp/lr33000.h
index 348cfe8887..348cfe8887 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/include/lr33000.h
+++ b/include/bsp/lr33000.h
diff --git a/c/src/lib/libbsp/mips/genmongoosev/include/lr333x0.h b/include/bsp/lr333x0.h
index 17ada5d3d1..17ada5d3d1 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/include/lr333x0.h
+++ b/include/bsp/lr333x0.h
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/include/mbx.h b/include/bsp/mbx.h
index 266f985348..266f985348 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/include/mbx.h
+++ b/include/bsp/mbx.h
diff --git a/c/src/lib/libbsp/mips/genmongoosev/console/mg5uart.h b/include/bsp/mg5uart.h
index b9e69f27ba..b9e69f27ba 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/console/mg5uart.h
+++ b/include/bsp/mg5uart.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_ac97/milkymist_ac97.h b/include/bsp/milkymist_ac97.h
index 37415a1f5e..37415a1f5e 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_ac97/milkymist_ac97.h
+++ b/include/bsp/milkymist_ac97.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_buttons/milkymist_buttons.h b/include/bsp/milkymist_buttons.h
index de6ee51438..de6ee51438 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_buttons/milkymist_buttons.h
+++ b/include/bsp/milkymist_buttons.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_dmx/milkymist_dmx.h b/include/bsp/milkymist_dmx.h
index a933e3423f..a933e3423f 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_dmx/milkymist_dmx.h
+++ b/include/bsp/milkymist_dmx.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_flash/milkymist_flash.h b/include/bsp/milkymist_flash.h
index 2acf855096..2acf855096 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_flash/milkymist_flash.h
+++ b/include/bsp/milkymist_flash.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_gpio/milkymist_gpio.h b/include/bsp/milkymist_gpio.h
index 1e30b9c280..1e30b9c280 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_gpio/milkymist_gpio.h
+++ b/include/bsp/milkymist_gpio.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_ir/milkymist_ir.h b/include/bsp/milkymist_ir.h
index 4df7f3550c..4df7f3550c 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_ir/milkymist_ir.h
+++ b/include/bsp/milkymist_ir.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_memcard/milkymist_memcard.h b/include/bsp/milkymist_memcard.h
index 713b45be07..713b45be07 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_memcard/milkymist_memcard.h
+++ b/include/bsp/milkymist_memcard.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_midi/milkymist_midi.h b/include/bsp/milkymist_midi.h
index da53de6af5..da53de6af5 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_midi/milkymist_midi.h
+++ b/include/bsp/milkymist_midi.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_pfpu/milkymist_pfpu.h b/include/bsp/milkymist_pfpu.h
index 73ea5fa28e..73ea5fa28e 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_pfpu/milkymist_pfpu.h
+++ b/include/bsp/milkymist_pfpu.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_tmu/milkymist_tmu.h b/include/bsp/milkymist_tmu.h
index 94f8394ef7..94f8394ef7 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_tmu/milkymist_tmu.h
+++ b/include/bsp/milkymist_tmu.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_usbinput/milkymist_usbinput.h b/include/bsp/milkymist_usbinput.h
index 04c376fa8a..04c376fa8a 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_usbinput/milkymist_usbinput.h
+++ b/include/bsp/milkymist_usbinput.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_versions/milkymist_versions.h b/include/bsp/milkymist_versions.h
index 3b5063f306..3b5063f306 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_versions/milkymist_versions.h
+++ b/include/bsp/milkymist_versions.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_video/milkymist_video.h b/include/bsp/milkymist_video.h
index 6ec3cc0a83..6ec3cc0a83 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_video/milkymist_video.h
+++ b/include/bsp/milkymist_video.h
diff --git a/c/src/lib/libbsp/shared/include/mm.h b/include/bsp/mm.h
index 2152f686ba..2152f686ba 100644
--- a/c/src/lib/libbsp/shared/include/mm.h
+++ b/include/bsp/mm.h
diff --git a/include/bsp/mmu.h b/include/bsp/mmu.h
new file mode 100644
index 0000000000..cf1962b39c
--- /dev/null
+++ b/include/bsp/mmu.h
@@ -0,0 +1,28 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_lpc32xx_mzx__)
+#  include <arm/lpc32xx_mzx/bsp/mmu.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_1__)
+#  include <arm/lpc32xx_mzx_stage_1/bsp/mmu.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_2__)
+#  include <arm/lpc32xx_mzx_stage_2/bsp/mmu.h>
+#elif defined(__rtems_arm_lpc32xx_phycore__)
+#  include <arm/lpc32xx_phycore/bsp/mmu.h>
+#elif defined(__rtems_arm_raspberrypi__)
+#  include <arm/raspberrypi/bsp/mmu.h>
+#elif defined(__rtems_powerpc_qoriq_core_0__)
+#  include <powerpc/qoriq_core_0/bsp/mmu.h>
+#elif defined(__rtems_powerpc_qoriq_core_1__)
+#  include <powerpc/qoriq_core_1/bsp/mmu.h>
+#elif defined(__rtems_powerpc_qoriq_p1020rdb__)
+#  include <powerpc/qoriq_p1020rdb/bsp/mmu.h>
+#elif defined(__rtems_powerpc_virtex4__)
+#  include <powerpc/virtex4/bsp/mmu.h>
+#elif defined(__rtems_powerpc_virtex5__)
+#  include <powerpc/virtex5/bsp/mmu.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/mips/genmongoosev/include/mongoose-v.h b/include/bsp/mongoose-v.h
index b8ded3d9ed..b8ded3d9ed 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/include/mongoose-v.h
+++ b/include/bsp/mongoose-v.h
diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h b/include/bsp/motorola.h
index 14360d56d1..14360d56d1 100644
--- a/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h
+++ b/include/bsp/motorola.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/mpc5200.h b/include/bsp/mpc5200.h
index 263e66fb9e..263e66fb9e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/mpc5200.h
+++ b/include/bsp/mpc5200.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/mpc55xx-config.h b/include/bsp/mpc55xx-config.h
index b432b9cecd..b432b9cecd 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/mpc55xx-config.h
+++ b/include/bsp/mpc55xx-config.h
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h b/include/bsp/mpc83xx_i2cdrv.h
index 09cca4e99b..09cca4e99b 100644
--- a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h
+++ b/include/bsp/mpc83xx_i2cdrv.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/i2c/mpc8540_i2c_busdrv.h b/include/bsp/mpc8540_i2c_busdrv.h
index 181b45f468..181b45f468 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/i2c/mpc8540_i2c_busdrv.h
+++ b/include/bsp/mpc8540_i2c_busdrv.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h b/include/bsp/mscan-base.h
index a2b8737d8e..a2b8737d8e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h
+++ b/include/bsp/mscan-base.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.h b/include/bsp/mscan.h
index 9cb7fd44e7..9cb7fd44e7 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.h
+++ b/include/bsp/mscan.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/nand-mlc.h b/include/bsp/nand-mlc.h
index db5b1d5b8b..db5b1d5b8b 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/include/nand-mlc.h
+++ b/include/bsp/nand-mlc.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.h b/include/bsp/nvram.h
index b05c35986f..b05c35986f 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.h
+++ b/include/bsp/nvram.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/opbintctrl.h b/include/bsp/opbintctrl.h
index 4ade0e48f8..4ade0e48f8 100644
--- a/c/src/lib/libbsp/powerpc/virtex/include/opbintctrl.h
+++ b/include/bsp/opbintctrl.h
diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h b/include/bsp/openpic.h
index df782596b5..df782596b5 100644
--- a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h
+++ b/include/bsp/openpic.h
diff --git a/c/src/lib/libbsp/or1k/or1ksim/include/or1ksim.h b/include/bsp/or1ksim.h
index 827956634f..827956634f 100644
--- a/c/src/lib/libbsp/or1k/or1ksim/include/or1ksim.h
+++ b/include/bsp/or1ksim.h
diff --git a/include/bsp/pci.h b/include/bsp/pci.h
new file mode 100644
index 0000000000..7cfd2a8213
--- /dev/null
+++ b/include/bsp/pci.h
@@ -0,0 +1,32 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_mips_malta__)
+#  include <mips/malta/bsp/pci.h>
+#elif defined(__rtems_powerpc_beatnik__)
+#  include <powerpc/beatnik/bsp/pci.h>
+#elif defined(__rtems_powerpc_ep1a__)
+#  include <powerpc/ep1a/bsp/pci.h>
+#elif defined(__rtems_powerpc_mcp750__)
+#  include <powerpc/mcp750/bsp/pci.h>
+#elif defined(__rtems_powerpc_mtx603e__)
+#  include <powerpc/mtx603e/bsp/pci.h>
+#elif defined(__rtems_powerpc_mvme2100__)
+#  include <powerpc/mvme2100/bsp/pci.h>
+#elif defined(__rtems_powerpc_mvme2307__)
+#  include <powerpc/mvme2307/bsp/pci.h>
+#elif defined(__rtems_powerpc_mvme3100__)
+#  include <powerpc/mvme3100/bsp/pci.h>
+#elif defined(__rtems_powerpc_mvme5500__)
+#  include <powerpc/mvme5500/bsp/pci.h>
+#elif defined(__rtems_powerpc_qemuprep__)
+#  include <powerpc/qemuprep/bsp/pci.h>
+#elif defined(__rtems_powerpc_qemuprep_altivec__)
+#  include <powerpc/qemuprep-altivec/bsp/pci.h>
+#elif defined(__rtems_powerpc_score603e__)
+#  include <powerpc/score603e/bsp/pci.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pcireg.h b/include/bsp/pcireg.h
index 2b8b10d853..2b8b10d853 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pcireg.h
+++ b/include/bsp/pcireg.h
diff --git a/c/src/lib/libbsp/powerpc/shared/residual/pnp.h b/include/bsp/pnp.h
index 203a1a46d3..203a1a46d3 100644
--- a/c/src/lib/libbsp/powerpc/shared/residual/pnp.h
+++ b/include/bsp/pnp.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/qoriq.h b/include/bsp/qoriq.h
index e56c30fc16..e56c30fc16 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/qoriq.h
+++ b/include/bsp/qoriq.h
diff --git a/c/src/lib/libbsp/mips/genmongoosev/include/r3000.h b/include/bsp/r3000.h
index 0d0670a137..0d0670a137 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/include/r3000.h
+++ b/include/bsp/r3000.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h b/include/bsp/raspberrypi.h
index 4cc7eec81a..4cc7eec81a 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h
+++ b/include/bsp/raspberrypi.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/rcc.h b/include/bsp/rcc.h
index f1bd7d173c..f1bd7d173c 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/rcc.h
+++ b/include/bsp/rcc.h
diff --git a/c/src/lib/libbsp/i386/shared/realmode_int/realmode_int.h b/include/bsp/realmode_int.h
index 6f77ec92ea..6f77ec92ea 100644
--- a/c/src/lib/libbsp/i386/shared/realmode_int/realmode_int.h
+++ b/include/bsp/realmode_int.h
diff --git a/include/bsp/regs.h b/include/bsp/regs.h
new file mode 100644
index 0000000000..eff4daec9f
--- /dev/null
+++ b/include/bsp/regs.h
@@ -0,0 +1,22 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_mips_csb350__)
+#  include <mips/csb350/bsp/regs.h>
+#elif defined(__rtems_mips_genmongoosev__)
+#  include <mips/genmongoosev/bsp/regs.h>
+#elif defined(__rtems_mips_hurricane__)
+#  include <mips/hurricane/bsp/regs.h>
+#elif defined(__rtems_mips_jmr3904__)
+#  include <mips/jmr3904/bsp/regs.h>
+#elif defined(__rtems_mips_malta__)
+#  include <mips/malta/bsp/regs.h>
+#elif defined(__rtems_mips_rbtx4925__)
+#  include <mips/rbtx4925/bsp/regs.h>
+#elif defined(__rtems_mips_rbtx4938__)
+#  include <mips/rbtx4938/bsp/regs.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/powerpc/shared/residual/residual.h b/include/bsp/residual.h
index 1bf1a34e20..1bf1a34e20 100644
--- a/c/src/lib/libbsp/powerpc/shared/residual/residual.h
+++ b/include/bsp/residual.h
diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h b/include/bsp/rsPMCQ1.h
index c0c0924766..c0c0924766 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h
+++ b/include/bsp/rsPMCQ1.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/rtd316.h b/include/bsp/rtd316.h
index aabad2c263..aabad2c263 100644
--- a/c/src/lib/libbsp/i386/pc386/console/rtd316.h
+++ b/include/bsp/rtd316.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.h b/include/bsp/slicetimer.h
index e089dbc8ad..e089dbc8ad 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.h
+++ b/include/bsp/slicetimer.h
diff --git a/c/src/lib/libbsp/i386/shared/smp/smp-imps.h b/include/bsp/smp-imps.h
index 60e688547b..60e688547b 100644
--- a/c/src/lib/libbsp/i386/shared/smp/smp-imps.h
+++ b/include/bsp/smp-imps.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/smsc9218i.h b/include/bsp/smsc9218i.h
index e4366b039c..e4366b039c 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/smsc9218i.h
+++ b/include/bsp/smsc9218i.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_acpidmap.h b/include/bsp/socal/alt_acpidmap.h
index 3a6bf0fffa..3a6bf0fffa 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_acpidmap.h
+++ b/include/bsp/socal/alt_acpidmap.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_clkmgr.h b/include/bsp/socal/alt_clkmgr.h
index 1875a84f10..1875a84f10 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_clkmgr.h
+++ b/include/bsp/socal/alt_clkmgr.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_dmanonsecure.h b/include/bsp/socal/alt_dmanonsecure.h
index 1425708983..1425708983 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_dmanonsecure.h
+++ b/include/bsp/socal/alt_dmanonsecure.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_dmasecure.h b/include/bsp/socal/alt_dmasecure.h
index 5941433268..5941433268 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_dmasecure.h
+++ b/include/bsp/socal/alt_dmasecure.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_gpio.h b/include/bsp/socal/alt_gpio.h
index 8bc4640161..8bc4640161 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_gpio.h
+++ b/include/bsp/socal/alt_gpio.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_i2c.h b/include/bsp/socal/alt_i2c.h
index b50543a884..b50543a884 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_i2c.h
+++ b/include/bsp/socal/alt_i2c.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_l3.h b/include/bsp/socal/alt_l3.h
index 12e6f21b89..12e6f21b89 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_l3.h
+++ b/include/bsp/socal/alt_l3.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_qspi.h b/include/bsp/socal/alt_qspi.h
index cbec31b76f..cbec31b76f 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_qspi.h
+++ b/include/bsp/socal/alt_qspi.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_qspidata.h b/include/bsp/socal/alt_qspidata.h
index 19383eefe5..19383eefe5 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_qspidata.h
+++ b/include/bsp/socal/alt_qspidata.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_rstmgr.h b/include/bsp/socal/alt_rstmgr.h
index ab4ac65dcb..ab4ac65dcb 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_rstmgr.h
+++ b/include/bsp/socal/alt_rstmgr.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_sdr.h b/include/bsp/socal/alt_sdr.h
index 785aa743cb..785aa743cb 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_sdr.h
+++ b/include/bsp/socal/alt_sdr.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_sysmgr.h b/include/bsp/socal/alt_sysmgr.h
index fce6d6e11e..fce6d6e11e 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_sysmgr.h
+++ b/include/bsp/socal/alt_sysmgr.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_uart.h b/include/bsp/socal/alt_uart.h
index b64111960b..b64111960b 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_uart.h
+++ b/include/bsp/socal/alt_uart.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/hps.h b/include/bsp/socal/hps.h
index c6b312b415..c6b312b415 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/hps.h
+++ b/include/bsp/socal/hps.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/socal.h b/include/bsp/socal/socal.h
index f6090cd0ca..f6090cd0ca 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/socal.h
+++ b/include/bsp/socal/socal.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/spi/spi.h b/include/bsp/spi.h
index e2af971c8d..e2af971c8d 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/spi/spi.h
+++ b/include/bsp/spi.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/ssi.h b/include/bsp/ssi.h
index e6e44c5aae..e6e44c5aae 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/include/ssi.h
+++ b/include/bsp/ssi.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/ssp.h b/include/bsp/ssp.h
index 1a77219d0e..1a77219d0e 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/ssp.h
+++ b/include/bsp/ssp.h
diff --git a/c/src/lib/libbsp/shared/include/stackalloc.h b/include/bsp/stackalloc.h
index 89414c8e6e..89414c8e6e 100644
--- a/c/src/lib/libbsp/shared/include/stackalloc.h
+++ b/include/bsp/stackalloc.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/start-config.h b/include/bsp/start-config.h
index 4476cbdebe..4476cbdebe 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/start-config.h
+++ b/include/bsp/start-config.h
diff --git a/include/bsp/start.h b/include/bsp/start.h
new file mode 100644
index 0000000000..16c2fe8496
--- /dev/null
+++ b/include/bsp/start.h
@@ -0,0 +1,146 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_altcycv_devkit__)
+#  include <arm/altcycv_devkit/bsp/start.h>
+#elif defined(__rtems_arm_altcycv_devkit_smp__)
+#  include <arm/altcycv_devkit_smp/bsp/start.h>
+#elif defined(__rtems_arm_arm1136jfs__)
+#  include <arm/arm1136jfs/bsp/start.h>
+#elif defined(__rtems_arm_arm1136js__)
+#  include <arm/arm1136js/bsp/start.h>
+#elif defined(__rtems_arm_arm7tdmi__)
+#  include <arm/arm7tdmi/bsp/start.h>
+#elif defined(__rtems_arm_arm920__)
+#  include <arm/arm920/bsp/start.h>
+#elif defined(__rtems_arm_armcortexa9__)
+#  include <arm/armcortexa9/bsp/start.h>
+#elif defined(__rtems_arm_beagleboardorig__)
+#  include <arm/beagleboardorig/bsp/start.h>
+#elif defined(__rtems_arm_beagleboardxm__)
+#  include <arm/beagleboardxm/bsp/start.h>
+#elif defined(__rtems_arm_beagleboneblack__)
+#  include <arm/beagleboneblack/bsp/start.h>
+#elif defined(__rtems_arm_beaglebonewhite__)
+#  include <arm/beaglebonewhite/bsp/start.h>
+#elif defined(__rtems_arm_lm3s3749__)
+#  include <arm/lm3s3749/bsp/start.h>
+#elif defined(__rtems_arm_lm3s6965__)
+#  include <arm/lm3s6965/bsp/start.h>
+#elif defined(__rtems_arm_lm3s6965_qemu__)
+#  include <arm/lm3s6965_qemu/bsp/start.h>
+#elif defined(__rtems_arm_lm4f120__)
+#  include <arm/lm4f120/bsp/start.h>
+#elif defined(__rtems_arm_lpc1768_mbed__)
+#  include <arm/lpc1768_mbed/bsp/start.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram__)
+#  include <arm/lpc1768_mbed_ahb_ram/bsp/start.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram_eth__)
+#  include <arm/lpc1768_mbed_ahb_ram_eth/bsp/start.h>
+#elif defined(__rtems_arm_lpc17xx_ea_ram__)
+#  include <arm/lpc17xx_ea_ram/bsp/start.h>
+#elif defined(__rtems_arm_lpc17xx_ea_rom_int__)
+#  include <arm/lpc17xx_ea_rom_int/bsp/start.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_ram__)
+#  include <arm/lpc17xx_plx800_ram/bsp/start.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_rom_int__)
+#  include <arm/lpc17xx_plx800_rom_int/bsp/start.h>
+#elif defined(__rtems_arm_lpc2362__)
+#  include <arm/lpc2362/bsp/start.h>
+#elif defined(__rtems_arm_lpc23xx_tli800__)
+#  include <arm/lpc23xx_tli800/bsp/start.h>
+#elif defined(__rtems_arm_lpc24xx_ea__)
+#  include <arm/lpc24xx_ea/bsp/start.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_ram__)
+#  include <arm/lpc24xx_ncs_ram/bsp/start.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_ext__)
+#  include <arm/lpc24xx_ncs_rom_ext/bsp/start.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_int__)
+#  include <arm/lpc24xx_ncs_rom_int/bsp/start.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_ram__)
+#  include <arm/lpc24xx_plx800_ram/bsp/start.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_rom_int__)
+#  include <arm/lpc24xx_plx800_rom_int/bsp/start.h>
+#elif defined(__rtems_arm_lpc32xx_mzx__)
+#  include <arm/lpc32xx_mzx/bsp/start.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_1__)
+#  include <arm/lpc32xx_mzx_stage_1/bsp/start.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_2__)
+#  include <arm/lpc32xx_mzx_stage_2/bsp/start.h>
+#elif defined(__rtems_arm_lpc32xx_phycore__)
+#  include <arm/lpc32xx_phycore/bsp/start.h>
+#elif defined(__rtems_arm_lpc40xx_ea_ram__)
+#  include <arm/lpc40xx_ea_ram/bsp/start.h>
+#elif defined(__rtems_arm_lpc40xx_ea_rom_int__)
+#  include <arm/lpc40xx_ea_rom_int/bsp/start.h>
+#elif defined(__rtems_arm_raspberrypi__)
+#  include <arm/raspberrypi/bsp/start.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu__)
+#  include <arm/realview_pbx_a9_qemu/bsp/start.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu_smp__)
+#  include <arm/realview_pbx_a9_qemu_smp/bsp/start.h>
+#elif defined(__rtems_arm_stm32f105rc__)
+#  include <arm/stm32f105rc/bsp/start.h>
+#elif defined(__rtems_arm_stm32f4__)
+#  include <arm/stm32f4/bsp/start.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk__)
+#  include <arm/tms570ls3137_hdk/bsp/start.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_intram__)
+#  include <arm/tms570ls3137_hdk_intram/bsp/start.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_sdram__)
+#  include <arm/tms570ls3137_hdk_sdram/bsp/start.h>
+#elif defined(__rtems_arm_xilinx_zynq_a9_qemu__)
+#  include <arm/xilinx_zynq_a9_qemu/bsp/start.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc702__)
+#  include <arm/xilinx_zynq_zc702/bsp/start.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc706__)
+#  include <arm/xilinx_zynq_zc706/bsp/start.h>
+#elif defined(__rtems_arm_xilinx_zynq_zedboard__)
+#  include <arm/xilinx_zynq_zedboard/bsp/start.h>
+#elif defined(__rtems_powerpc_br_uid__)
+#  include <powerpc/br_uid/bsp/start.h>
+#elif defined(__rtems_powerpc_gwlcfm__)
+#  include <powerpc/gwlcfm/bsp/start.h>
+#elif defined(__rtems_powerpc_hsc_cm01__)
+#  include <powerpc/hsc_cm01/bsp/start.h>
+#elif defined(__rtems_powerpc_mpc5566evb__)
+#  include <powerpc/mpc5566evb/bsp/start.h>
+#elif defined(__rtems_powerpc_mpc5566evb_spe__)
+#  include <powerpc/mpc5566evb_spe/bsp/start.h>
+#elif defined(__rtems_powerpc_mpc5643l_dpu__)
+#  include <powerpc/mpc5643l_dpu/bsp/start.h>
+#elif defined(__rtems_powerpc_mpc5643l_evb__)
+#  include <powerpc/mpc5643l_evb/bsp/start.h>
+#elif defined(__rtems_powerpc_mpc5668g__)
+#  include <powerpc/mpc5668g/bsp/start.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_app__)
+#  include <powerpc/mpc5674f_ecu508_app/bsp/start.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_boot__)
+#  include <powerpc/mpc5674f_ecu508_boot/bsp/start.h>
+#elif defined(__rtems_powerpc_mpc5674f_rsm6__)
+#  include <powerpc/mpc5674f_rsm6/bsp/start.h>
+#elif defined(__rtems_powerpc_mpc5674fevb__)
+#  include <powerpc/mpc5674fevb/bsp/start.h>
+#elif defined(__rtems_powerpc_mpc5674fevb_spe__)
+#  include <powerpc/mpc5674fevb_spe/bsp/start.h>
+#elif defined(__rtems_powerpc_mpc8309som__)
+#  include <powerpc/mpc8309som/bsp/start.h>
+#elif defined(__rtems_powerpc_mpc8313erdb__)
+#  include <powerpc/mpc8313erdb/bsp/start.h>
+#elif defined(__rtems_powerpc_mpc8349eamds__)
+#  include <powerpc/mpc8349eamds/bsp/start.h>
+#elif defined(__rtems_powerpc_phycore_mpc5554__)
+#  include <powerpc/phycore_mpc5554/bsp/start.h>
+#elif defined(__rtems_powerpc_qoriq_core_0__)
+#  include <powerpc/qoriq_core_0/bsp/start.h>
+#elif defined(__rtems_powerpc_qoriq_core_1__)
+#  include <powerpc/qoriq_core_1/bsp/start.h>
+#elif defined(__rtems_powerpc_qoriq_p1020rdb__)
+#  include <powerpc/qoriq_p1020rdb/bsp/start.h>
+#elif defined(__rtems_powerpc_t32mppc__)
+#  include <powerpc/t32mppc/bsp/start.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32_i2c.h b/include/bsp/stm32_i2c.h
index 21d9b34ed1..21d9b34ed1 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32_i2c.h
+++ b/include/bsp/stm32_i2c.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32_usart.h b/include/bsp/stm32_usart.h
index c9c269533f..c9c269533f 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32_usart.h
+++ b/include/bsp/stm32_usart.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_exti.h b/include/bsp/stm32f10xxx_exti.h
index ecb4bb900c..ecb4bb900c 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_exti.h
+++ b/include/bsp/stm32f10xxx_exti.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_gpio.h b/include/bsp/stm32f10xxx_gpio.h
index ec7e675844..ec7e675844 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_gpio.h
+++ b/include/bsp/stm32f10xxx_gpio.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_rcc.h b/include/bsp/stm32f10xxx_rcc.h
index c1c6629810..c1c6629810 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_rcc.h
+++ b/include/bsp/stm32f10xxx_rcc.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4.h b/include/bsp/stm32f4.h
index 154d4f6d7b..154d4f6d7b 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4.h
+++ b/include/bsp/stm32f4.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_adc.h b/include/bsp/stm32f4xxxx_adc.h
index 81801525f1..81801525f1 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_adc.h
+++ b/include/bsp/stm32f4xxxx_adc.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_exti.h b/include/bsp/stm32f4xxxx_exti.h
index feff2c6082..feff2c6082 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_exti.h
+++ b/include/bsp/stm32f4xxxx_exti.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_flash.h b/include/bsp/stm32f4xxxx_flash.h
index 13f9045439..13f9045439 100755
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_flash.h
+++ b/include/bsp/stm32f4xxxx_flash.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_gpio.h b/include/bsp/stm32f4xxxx_gpio.h
index b129c23595..b129c23595 100644
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_gpio.h
+++ b/include/bsp/stm32f4xxxx_gpio.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_otgfs.h b/include/bsp/stm32f4xxxx_otgfs.h
index 49beadc7af..49beadc7af 100755
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_otgfs.h
+++ b/include/bsp/stm32f4xxxx_otgfs.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_pwr.h b/include/bsp/stm32f4xxxx_pwr.h
index 48ed66ddc6..48ed66ddc6 100755
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_pwr.h
+++ b/include/bsp/stm32f4xxxx_pwr.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_rcc.h b/include/bsp/stm32f4xxxx_rcc.h
index 5c004328d7..5c004328d7 100755
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_rcc.h
+++ b/include/bsp/stm32f4xxxx_rcc.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_syscfg.h b/include/bsp/stm32f4xxxx_syscfg.h
index f7e81db639..f7e81db639 100755
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_syscfg.h
+++ b/include/bsp/stm32f4xxxx_syscfg.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_tim.h b/include/bsp/stm32f4xxxx_tim.h
index c7317ebf41..c7317ebf41 100755
--- a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_tim.h
+++ b/include/bsp/stm32f4xxxx_tim.h
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/include/swi.h b/include/bsp/swi.h
index e9eb434a58..e9eb434a58 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/include/swi.h
+++ b/include/bsp/swi.h
diff --git a/include/bsp/syscall.h b/include/bsp/syscall.h
new file mode 100644
index 0000000000..e29427de7c
--- /dev/null
+++ b/include/bsp/syscall.h
@@ -0,0 +1,28 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_sh_simsh1__)
+#  include <sh/simsh1/bsp/syscall.h>
+#elif defined(__rtems_sh_simsh2__)
+#  include <sh/simsh2/bsp/syscall.h>
+#elif defined(__rtems_sh_simsh2e__)
+#  include <sh/simsh2e/bsp/syscall.h>
+#elif defined(__rtems_sh_simsh4__)
+#  include <sh/simsh4/bsp/syscall.h>
+#elif defined(__rtems_v850_v850e1sim__)
+#  include <v850/v850e1sim/bsp/syscall.h>
+#elif defined(__rtems_v850_v850e2sim__)
+#  include <v850/v850e2sim/bsp/syscall.h>
+#elif defined(__rtems_v850_v850e2v3sim__)
+#  include <v850/v850e2v3sim/bsp/syscall.h>
+#elif defined(__rtems_v850_v850esim__)
+#  include <v850/v850esim/bsp/syscall.h>
+#elif defined(__rtems_v850_v850essim__)
+#  include <v850/v850essim/bsp/syscall.h>
+#elif defined(__rtems_v850_v850sim__)
+#  include <v850/v850sim/bsp/syscall.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/syscon.h b/include/bsp/syscon.h
index 016839b5e5..016839b5e5 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/include/syscon.h
+++ b/include/bsp/syscon.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/system-clocks.h b/include/bsp/system-clocks.h
index d441ec475a..d441ec475a 100644
--- a/c/src/lib/libbsp/arm/tms570/include/system-clocks.h
+++ b/include/bsp/system-clocks.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/tblsizes.h b/include/bsp/tblsizes.h
index bd4e9896bf..bd4e9896bf 100644
--- a/c/src/lib/libbsp/i386/pc386/include/tblsizes.h
+++ b/include/bsp/tblsizes.h
diff --git a/c/src/lib/libbsp/powerpc/shared/include/tictac.h b/include/bsp/tictac.h
index 31c7386943..31c7386943 100644
--- a/c/src/lib/libbsp/powerpc/shared/include/tictac.h
+++ b/include/bsp/tictac.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/timer-defs.h b/include/bsp/timer-defs.h
index f984248e02..f984248e02 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/timer-defs.h
+++ b/include/bsp/timer-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/timer.h b/include/bsp/timer.h
index 944d3cd7dd..944d3cd7dd 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/timer.h
+++ b/include/bsp/timer.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-pom.h b/include/bsp/tms570-pom.h
index a44771157d..a44771157d 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-pom.h
+++ b/include/bsp/tms570-pom.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-rti.h b/include/bsp/tms570-rti.h
index 25c02e5906..25c02e5906 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-rti.h
+++ b/include/bsp/tms570-rti.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-sci-driver.h b/include/bsp/tms570-sci-driver.h
index f32eaea875..f32eaea875 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-sci-driver.h
+++ b/include/bsp/tms570-sci-driver.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-sci.h b/include/bsp/tms570-sci.h
index 6ed68e24bf..6ed68e24bf 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-sci.h
+++ b/include/bsp/tms570-sci.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-vim.h b/include/bsp/tms570-vim.h
index 136af531f8..136af531f8 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-vim.h
+++ b/include/bsp/tms570-vim.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570.h b/include/bsp/tms570.h
index 2023a29040..2023a29040 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570.h
+++ b/include/bsp/tms570.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/tqm.h b/include/bsp/tqm.h
index 11f6001304..11f6001304 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/include/tqm.h
+++ b/include/bsp/tqm.h
diff --git a/include/bsp/tsec-config.h b/include/bsp/tsec-config.h
new file mode 100644
index 0000000000..4e155a4096
--- /dev/null
+++ b/include/bsp/tsec-config.h
@@ -0,0 +1,24 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_powerpc_br_uid__)
+#  include <powerpc/br_uid/bsp/tsec-config.h>
+#elif defined(__rtems_powerpc_hsc_cm01__)
+#  include <powerpc/hsc_cm01/bsp/tsec-config.h>
+#elif defined(__rtems_powerpc_mpc8309som__)
+#  include <powerpc/mpc8309som/bsp/tsec-config.h>
+#elif defined(__rtems_powerpc_mpc8313erdb__)
+#  include <powerpc/mpc8313erdb/bsp/tsec-config.h>
+#elif defined(__rtems_powerpc_mpc8349eamds__)
+#  include <powerpc/mpc8349eamds/bsp/tsec-config.h>
+#elif defined(__rtems_powerpc_qoriq_core_0__)
+#  include <powerpc/qoriq_core_0/bsp/tsec-config.h>
+#elif defined(__rtems_powerpc_qoriq_core_1__)
+#  include <powerpc/qoriq_core_1/bsp/tsec-config.h>
+#elif defined(__rtems_powerpc_qoriq_p1020rdb__)
+#  include <powerpc/qoriq_p1020rdb/bsp/tsec-config.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.h b/include/bsp/tsec.h
index 4efbfa2ab0..4efbfa2ab0 100644
--- a/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.h
+++ b/include/bsp/tsec.h
diff --git a/c/src/lib/libbsp/i386/shared/comm/tty_drv.h b/include/bsp/tty_drv.h
index cbfb346f22..cbfb346f22 100644
--- a/c/src/lib/libbsp/i386/shared/comm/tty_drv.h
+++ b/include/bsp/tty_drv.h
diff --git a/c/src/lib/libbsp/powerpc/shared/include/u-boot-board-info.h b/include/bsp/u-boot-board-info.h
index b377705687..b377705687 100644
--- a/c/src/lib/libbsp/powerpc/shared/include/u-boot-board-info.h
+++ b/include/bsp/u-boot-board-info.h
diff --git a/include/bsp/u-boot-config.h b/include/bsp/u-boot-config.h
new file mode 100644
index 0000000000..ff0ef75fc1
--- /dev/null
+++ b/include/bsp/u-boot-config.h
@@ -0,0 +1,36 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_powerpc_br_uid__)
+#  include <powerpc/br_uid/bsp/u-boot-config.h>
+#elif defined(__rtems_powerpc_brs5l__)
+#  include <powerpc/brs5l/bsp/u-boot-config.h>
+#elif defined(__rtems_powerpc_brs6l__)
+#  include <powerpc/brs6l/bsp/u-boot-config.h>
+#elif defined(__rtems_powerpc_dp2__)
+#  include <powerpc/dp2/bsp/u-boot-config.h>
+#elif defined(__rtems_powerpc_hsc_cm01__)
+#  include <powerpc/hsc_cm01/bsp/u-boot-config.h>
+#elif defined(__rtems_powerpc_icecube__)
+#  include <powerpc/icecube/bsp/u-boot-config.h>
+#elif defined(__rtems_powerpc_mpc8309som__)
+#  include <powerpc/mpc8309som/bsp/u-boot-config.h>
+#elif defined(__rtems_powerpc_mpc8313erdb__)
+#  include <powerpc/mpc8313erdb/bsp/u-boot-config.h>
+#elif defined(__rtems_powerpc_mpc8349eamds__)
+#  include <powerpc/mpc8349eamds/bsp/u-boot-config.h>
+#elif defined(__rtems_powerpc_pm520_cr825__)
+#  include <powerpc/pm520_cr825/bsp/u-boot-config.h>
+#elif defined(__rtems_powerpc_pm520_ze30__)
+#  include <powerpc/pm520_ze30/bsp/u-boot-config.h>
+#elif defined(__rtems_powerpc_qoriq_core_0__)
+#  include <powerpc/qoriq_core_0/bsp/u-boot-config.h>
+#elif defined(__rtems_powerpc_qoriq_core_1__)
+#  include <powerpc/qoriq_core_1/bsp/u-boot-config.h>
+#elif defined(__rtems_powerpc_qoriq_p1020rdb__)
+#  include <powerpc/qoriq_p1020rdb/bsp/u-boot-config.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/shared/include/u-boot.h b/include/bsp/u-boot.h
index a6daa29e56..a6daa29e56 100644
--- a/c/src/lib/libbsp/shared/include/u-boot.h
+++ b/include/bsp/u-boot.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/uart-bridge.h b/include/bsp/uart-bridge.h
index cd342ffcb6..cd342ffcb6 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/uart-bridge.h
+++ b/include/bsp/uart-bridge.h
diff --git a/c/src/lib/libbsp/shared/include/uart-output-char.h b/include/bsp/uart-output-char.h
index 4242901db4..4242901db4 100644
--- a/c/src/lib/libbsp/shared/include/uart-output-char.h
+++ b/include/bsp/uart-output-char.h
diff --git a/c/src/lib/libbsp/powerpc/shared/console/uart.h b/include/bsp/uart.h
index b7539b5b7b..b7539b5b7b 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/uart.h
+++ b/include/bsp/uart.h
diff --git a/include/bsp/usart.h b/include/bsp/usart.h
new file mode 100644
index 0000000000..5bf37eb92a
--- /dev/null
+++ b/include/bsp/usart.h
@@ -0,0 +1,14 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_raspberrypi__)
+#  include <arm/raspberrypi/bsp/usart.h>
+#elif defined(__rtems_arm_stm32f105rc__)
+#  include <arm/stm32f105rc/bsp/usart.h>
+#elif defined(__rtems_arm_stm32f4__)
+#  include <arm/stm32f4/bsp/usart.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/shared/include/utility.h b/include/bsp/utility.h
index fee28f445a..fee28f445a 100644
--- a/c/src/lib/libbsp/shared/include/utility.h
+++ b/include/bsp/utility.h
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h b/include/bsp/vectors.h
index 9e5f466f75..9e5f466f75 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h
+++ b/include/bsp/vectors.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h b/include/bsp/vmeTsi148.h
index 6183940a2d..6183940a2d 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h
+++ b/include/bsp/vmeTsi148.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148DMA.h b/include/bsp/vmeTsi148DMA.h
index da7c99302b..da7c99302b 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148DMA.h
+++ b/include/bsp/vmeTsi148DMA.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h b/include/bsp/vmeUniverse.h
index 7cb9f8d2de..7cb9f8d2de 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h
+++ b/include/bsp/vmeUniverse.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverseDMA.h b/include/bsp/vmeUniverseDMA.h
index d0a3d6f0e7..d0a3d6f0e7 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverseDMA.h
+++ b/include/bsp/vmeUniverseDMA.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h b/include/bsp/vme_am_defs.h
index efa28b3aa0..efa28b3aa0 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h
+++ b/include/bsp/vme_am_defs.h
diff --git a/include/bsp/vpd.h b/include/bsp/vpd.h
new file mode 100644
index 0000000000..94a4bdfe0d
--- /dev/null
+++ b/include/bsp/vpd.h
@@ -0,0 +1,12 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_powerpc_beatnik__)
+#  include <powerpc/beatnik/bsp/vpd.h>
+#elif defined(__rtems_powerpc_mvme3100__)
+#  include <powerpc/mvme3100/bsp/vpd.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/watchdog-defs.h b/include/bsp/watchdog-defs.h
index f91360b3a9..f91360b3a9 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/watchdog-defs.h
+++ b/include/bsp/watchdog-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/watchdog.h b/include/bsp/watchdog.h
index 241180e429..241180e429 100644
--- a/c/src/lib/libbsp/arm/lpc176x/include/watchdog.h
+++ b/include/bsp/watchdog.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart-regs.h b/include/bsp/zynq-uart-regs.h
index f8f902bbde..f8f902bbde 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart-regs.h
+++ b/include/bsp/zynq-uart-regs.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart.h b/include/bsp/zynq-uart.h
index bb0ff56598..bb0ff56598 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart.h
+++ b/include/bsp/zynq-uart.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/cchip.h b/include/cchip.h
index d8d1e46a7a..d8d1e46a7a 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/cchip.h
+++ b/include/cchip.h
diff --git a/c/src/lib/libbsp/arm/gba/include/conio.h b/include/conio.h
index 8b4699479b..8b4699479b 100644
--- a/c/src/lib/libbsp/arm/gba/include/conio.h
+++ b/include/conio.h
diff --git a/include/coverhd.h b/include/coverhd.h
new file mode 100644
index 0000000000..55d368f9c0
--- /dev/null
+++ b/include/coverhd.h
@@ -0,0 +1,382 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_altcycv_devkit__)
+#  include <arm/altcycv_devkit/coverhd.h>
+#elif defined(__rtems_arm_altcycv_devkit_smp__)
+#  include <arm/altcycv_devkit_smp/coverhd.h>
+#elif defined(__rtems_arm_arm1136jfs__)
+#  include <arm/arm1136jfs/coverhd.h>
+#elif defined(__rtems_arm_arm1136js__)
+#  include <arm/arm1136js/coverhd.h>
+#elif defined(__rtems_arm_arm7tdmi__)
+#  include <arm/arm7tdmi/coverhd.h>
+#elif defined(__rtems_arm_arm920__)
+#  include <arm/arm920/coverhd.h>
+#elif defined(__rtems_arm_armcortexa9__)
+#  include <arm/armcortexa9/coverhd.h>
+#elif defined(__rtems_arm_beagleboardorig__)
+#  include <arm/beagleboardorig/coverhd.h>
+#elif defined(__rtems_arm_beagleboardxm__)
+#  include <arm/beagleboardxm/coverhd.h>
+#elif defined(__rtems_arm_beagleboneblack__)
+#  include <arm/beagleboneblack/coverhd.h>
+#elif defined(__rtems_arm_beaglebonewhite__)
+#  include <arm/beaglebonewhite/coverhd.h>
+#elif defined(__rtems_arm_csb336__)
+#  include <arm/csb336/coverhd.h>
+#elif defined(__rtems_arm_csb337__)
+#  include <arm/csb337/coverhd.h>
+#elif defined(__rtems_arm_csb637__)
+#  include <arm/csb637/coverhd.h>
+#elif defined(__rtems_arm_edb7312__)
+#  include <arm/edb7312/coverhd.h>
+#elif defined(__rtems_arm_gba__)
+#  include <arm/gba/coverhd.h>
+#elif defined(__rtems_arm_gp32__)
+#  include <arm/gp32/coverhd.h>
+#elif defined(__rtems_arm_gumstix__)
+#  include <arm/gumstix/coverhd.h>
+#elif defined(__rtems_arm_kit637_v6__)
+#  include <arm/kit637_v6/coverhd.h>
+#elif defined(__rtems_arm_lm3s3749__)
+#  include <arm/lm3s3749/coverhd.h>
+#elif defined(__rtems_arm_lm3s6965__)
+#  include <arm/lm3s6965/coverhd.h>
+#elif defined(__rtems_arm_lm3s6965_qemu__)
+#  include <arm/lm3s6965_qemu/coverhd.h>
+#elif defined(__rtems_arm_lm4f120__)
+#  include <arm/lm4f120/coverhd.h>
+#elif defined(__rtems_arm_lpc1768_mbed__)
+#  include <arm/lpc1768_mbed/coverhd.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram__)
+#  include <arm/lpc1768_mbed_ahb_ram/coverhd.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram_eth__)
+#  include <arm/lpc1768_mbed_ahb_ram_eth/coverhd.h>
+#elif defined(__rtems_arm_lpc17xx_ea_ram__)
+#  include <arm/lpc17xx_ea_ram/coverhd.h>
+#elif defined(__rtems_arm_lpc17xx_ea_rom_int__)
+#  include <arm/lpc17xx_ea_rom_int/coverhd.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_ram__)
+#  include <arm/lpc17xx_plx800_ram/coverhd.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_rom_int__)
+#  include <arm/lpc17xx_plx800_rom_int/coverhd.h>
+#elif defined(__rtems_arm_lpc2362__)
+#  include <arm/lpc2362/coverhd.h>
+#elif defined(__rtems_arm_lpc23xx_tli800__)
+#  include <arm/lpc23xx_tli800/coverhd.h>
+#elif defined(__rtems_arm_lpc24xx_ea__)
+#  include <arm/lpc24xx_ea/coverhd.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_ram__)
+#  include <arm/lpc24xx_ncs_ram/coverhd.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_ext__)
+#  include <arm/lpc24xx_ncs_rom_ext/coverhd.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_int__)
+#  include <arm/lpc24xx_ncs_rom_int/coverhd.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_ram__)
+#  include <arm/lpc24xx_plx800_ram/coverhd.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_rom_int__)
+#  include <arm/lpc24xx_plx800_rom_int/coverhd.h>
+#elif defined(__rtems_arm_lpc32xx_mzx__)
+#  include <arm/lpc32xx_mzx/coverhd.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_1__)
+#  include <arm/lpc32xx_mzx_stage_1/coverhd.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_2__)
+#  include <arm/lpc32xx_mzx_stage_2/coverhd.h>
+#elif defined(__rtems_arm_lpc32xx_phycore__)
+#  include <arm/lpc32xx_phycore/coverhd.h>
+#elif defined(__rtems_arm_lpc40xx_ea_ram__)
+#  include <arm/lpc40xx_ea_ram/coverhd.h>
+#elif defined(__rtems_arm_lpc40xx_ea_rom_int__)
+#  include <arm/lpc40xx_ea_rom_int/coverhd.h>
+#elif defined(__rtems_arm_nds__)
+#  include <arm/nds/coverhd.h>
+#elif defined(__rtems_arm_raspberrypi__)
+#  include <arm/raspberrypi/coverhd.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu__)
+#  include <arm/realview_pbx_a9_qemu/coverhd.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu_smp__)
+#  include <arm/realview_pbx_a9_qemu_smp/coverhd.h>
+#elif defined(__rtems_arm_rtl22xx__)
+#  include <arm/rtl22xx/coverhd.h>
+#elif defined(__rtems_arm_rtl22xx_t__)
+#  include <arm/rtl22xx_t/coverhd.h>
+#elif defined(__rtems_arm_smdk2410__)
+#  include <arm/smdk2410/coverhd.h>
+#elif defined(__rtems_arm_stm32f105rc__)
+#  include <arm/stm32f105rc/coverhd.h>
+#elif defined(__rtems_arm_stm32f4__)
+#  include <arm/stm32f4/coverhd.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk__)
+#  include <arm/tms570ls3137_hdk/coverhd.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_intram__)
+#  include <arm/tms570ls3137_hdk_intram/coverhd.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_sdram__)
+#  include <arm/tms570ls3137_hdk_sdram/coverhd.h>
+#elif defined(__rtems_arm_xilinx_zynq_a9_qemu__)
+#  include <arm/xilinx_zynq_a9_qemu/coverhd.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc702__)
+#  include <arm/xilinx_zynq_zc702/coverhd.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc706__)
+#  include <arm/xilinx_zynq_zc706/coverhd.h>
+#elif defined(__rtems_arm_xilinx_zynq_zedboard__)
+#  include <arm/xilinx_zynq_zedboard/coverhd.h>
+#elif defined(__rtems_avr_avrtest__)
+#  include <avr/avrtest/coverhd.h>
+#elif defined(__rtems_bfin_TLL6527M__)
+#  include <bfin/TLL6527M/coverhd.h>
+#elif defined(__rtems_bfin_bf537Stamp__)
+#  include <bfin/bf537Stamp/coverhd.h>
+#elif defined(__rtems_bfin_eZKit533__)
+#  include <bfin/eZKit533/coverhd.h>
+#elif defined(__rtems_h8300_h8sim__)
+#  include <h8300/h8sim/coverhd.h>
+#elif defined(__rtems_h8300_h8sxsim__)
+#  include <h8300/h8sxsim/coverhd.h>
+#elif defined(__rtems_i386_pc386__)
+#  include <i386/pc386/coverhd.h>
+#elif defined(__rtems_i386_pc486__)
+#  include <i386/pc486/coverhd.h>
+#elif defined(__rtems_i386_pc586__)
+#  include <i386/pc586/coverhd.h>
+#elif defined(__rtems_i386_pc586_sse__)
+#  include <i386/pc586-sse/coverhd.h>
+#elif defined(__rtems_i386_pc686__)
+#  include <i386/pc686/coverhd.h>
+#elif defined(__rtems_i386_pcp4__)
+#  include <i386/pcp4/coverhd.h>
+#elif defined(__rtems_lm32_lm32_evr__)
+#  include <lm32/lm32_evr/coverhd.h>
+#elif defined(__rtems_lm32_milkymist__)
+#  include <lm32/milkymist/coverhd.h>
+#elif defined(__rtems_m32c_m32csim__)
+#  include <m32c/m32csim/coverhd.h>
+#elif defined(__rtems_m32r_m32rsim__)
+#  include <m32r/m32rsim/coverhd.h>
+#elif defined(__rtems_m68k_COBRA5475__)
+#  include <m68k/COBRA5475/coverhd.h>
+#elif defined(__rtems_m68k_av5282__)
+#  include <m68k/av5282/coverhd.h>
+#elif defined(__rtems_m68k_csb360__)
+#  include <m68k/csb360/coverhd.h>
+#elif defined(__rtems_m68k_gen68302__)
+#  include <m68k/gen68302/coverhd.h>
+#elif defined(__rtems_m68k_gen68340__)
+#  include <m68k/gen68340/coverhd.h>
+#elif defined(__rtems_m68k_gen68360__)
+#  include <m68k/gen68360/coverhd.h>
+#elif defined(__rtems_m68k_gen68360_040__)
+#  include <m68k/gen68360_040/coverhd.h>
+#elif defined(__rtems_m68k_idp__)
+#  include <m68k/idp/coverhd.h>
+#elif defined(__rtems_m68k_m5484FireEngine__)
+#  include <m68k/m5484FireEngine/coverhd.h>
+#elif defined(__rtems_m68k_mcf5206elite__)
+#  include <m68k/mcf5206elite/coverhd.h>
+#elif defined(__rtems_m68k_mcf52235__)
+#  include <m68k/mcf52235/coverhd.h>
+#elif defined(__rtems_m68k_mcf5225x__)
+#  include <m68k/mcf5225x/coverhd.h>
+#elif defined(__rtems_m68k_mcf5235__)
+#  include <m68k/mcf5235/coverhd.h>
+#elif defined(__rtems_m68k_mcf5329__)
+#  include <m68k/mcf5329/coverhd.h>
+#elif defined(__rtems_m68k_mrm332__)
+#  include <m68k/mrm332/coverhd.h>
+#elif defined(__rtems_m68k_mvme136__)
+#  include <m68k/mvme136/coverhd.h>
+#elif defined(__rtems_m68k_mvme147__)
+#  include <m68k/mvme147/coverhd.h>
+#elif defined(__rtems_m68k_mvme147s__)
+#  include <m68k/mvme147s/coverhd.h>
+#elif defined(__rtems_m68k_mvme162__)
+#  include <m68k/mvme162/coverhd.h>
+#elif defined(__rtems_m68k_mvme162lx__)
+#  include <m68k/mvme162lx/coverhd.h>
+#elif defined(__rtems_m68k_mvme167__)
+#  include <m68k/mvme167/coverhd.h>
+#elif defined(__rtems_m68k_ods68302__)
+#  include <m68k/ods68302/coverhd.h>
+#elif defined(__rtems_m68k_pgh360__)
+#  include <m68k/pgh360/coverhd.h>
+#elif defined(__rtems_m68k_sim68000__)
+#  include <m68k/sim68000/coverhd.h>
+#elif defined(__rtems_m68k_simcpu32__)
+#  include <m68k/simcpu32/coverhd.h>
+#elif defined(__rtems_m68k_uC5282__)
+#  include <m68k/uC5282/coverhd.h>
+#elif defined(__rtems_mips_csb350__)
+#  include <mips/csb350/coverhd.h>
+#elif defined(__rtems_mips_genmongoosev__)
+#  include <mips/genmongoosev/coverhd.h>
+#elif defined(__rtems_mips_hurricane__)
+#  include <mips/hurricane/coverhd.h>
+#elif defined(__rtems_mips_jmr3904__)
+#  include <mips/jmr3904/coverhd.h>
+#elif defined(__rtems_mips_malta__)
+#  include <mips/malta/coverhd.h>
+#elif defined(__rtems_mips_rbtx4925__)
+#  include <mips/rbtx4925/coverhd.h>
+#elif defined(__rtems_mips_rbtx4938__)
+#  include <mips/rbtx4938/coverhd.h>
+#elif defined(__rtems_moxie_moxiesim__)
+#  include <moxie/moxiesim/coverhd.h>
+#elif defined(__rtems_nios2_nios2_iss__)
+#  include <nios2/nios2_iss/coverhd.h>
+#elif defined(__rtems_or1k_or1ksim__)
+#  include <or1k/or1ksim/coverhd.h>
+#elif defined(__rtems_powerpc_beatnik__)
+#  include <powerpc/beatnik/coverhd.h>
+#elif defined(__rtems_powerpc_br_uid__)
+#  include <powerpc/br_uid/coverhd.h>
+#elif defined(__rtems_powerpc_brs5l__)
+#  include <powerpc/brs5l/coverhd.h>
+#elif defined(__rtems_powerpc_brs6l__)
+#  include <powerpc/brs6l/coverhd.h>
+#elif defined(__rtems_powerpc_dp2__)
+#  include <powerpc/dp2/coverhd.h>
+#elif defined(__rtems_powerpc_ep1a__)
+#  include <powerpc/ep1a/coverhd.h>
+#elif defined(__rtems_powerpc_gwlcfm__)
+#  include <powerpc/gwlcfm/coverhd.h>
+#elif defined(__rtems_powerpc_haleakala__)
+#  include <powerpc/haleakala/coverhd.h>
+#elif defined(__rtems_powerpc_hsc_cm01__)
+#  include <powerpc/hsc_cm01/coverhd.h>
+#elif defined(__rtems_powerpc_icecube__)
+#  include <powerpc/icecube/coverhd.h>
+#elif defined(__rtems_powerpc_mbx821_001__)
+#  include <powerpc/mbx821_001/coverhd.h>
+#elif defined(__rtems_powerpc_mbx821_002__)
+#  include <powerpc/mbx821_002/coverhd.h>
+#elif defined(__rtems_powerpc_mbx821_002b__)
+#  include <powerpc/mbx821_002b/coverhd.h>
+#elif defined(__rtems_powerpc_mbx860_001b__)
+#  include <powerpc/mbx860_001b/coverhd.h>
+#elif defined(__rtems_powerpc_mbx860_002__)
+#  include <powerpc/mbx860_002/coverhd.h>
+#elif defined(__rtems_powerpc_mbx860_005b__)
+#  include <powerpc/mbx860_005b/coverhd.h>
+#elif defined(__rtems_powerpc_mbx860_1b__)
+#  include <powerpc/mbx860_1b/coverhd.h>
+#elif defined(__rtems_powerpc_mcp750__)
+#  include <powerpc/mcp750/coverhd.h>
+#elif defined(__rtems_powerpc_mpc5566evb__)
+#  include <powerpc/mpc5566evb/coverhd.h>
+#elif defined(__rtems_powerpc_mpc5566evb_spe__)
+#  include <powerpc/mpc5566evb_spe/coverhd.h>
+#elif defined(__rtems_powerpc_mpc5643l_dpu__)
+#  include <powerpc/mpc5643l_dpu/coverhd.h>
+#elif defined(__rtems_powerpc_mpc5643l_evb__)
+#  include <powerpc/mpc5643l_evb/coverhd.h>
+#elif defined(__rtems_powerpc_mpc5668g__)
+#  include <powerpc/mpc5668g/coverhd.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_app__)
+#  include <powerpc/mpc5674f_ecu508_app/coverhd.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_boot__)
+#  include <powerpc/mpc5674f_ecu508_boot/coverhd.h>
+#elif defined(__rtems_powerpc_mpc5674f_rsm6__)
+#  include <powerpc/mpc5674f_rsm6/coverhd.h>
+#elif defined(__rtems_powerpc_mpc5674fevb__)
+#  include <powerpc/mpc5674fevb/coverhd.h>
+#elif defined(__rtems_powerpc_mpc5674fevb_spe__)
+#  include <powerpc/mpc5674fevb_spe/coverhd.h>
+#elif defined(__rtems_powerpc_mpc8260ads__)
+#  include <powerpc/mpc8260ads/coverhd.h>
+#elif defined(__rtems_powerpc_mpc8309som__)
+#  include <powerpc/mpc8309som/coverhd.h>
+#elif defined(__rtems_powerpc_mpc8313erdb__)
+#  include <powerpc/mpc8313erdb/coverhd.h>
+#elif defined(__rtems_powerpc_mpc8349eamds__)
+#  include <powerpc/mpc8349eamds/coverhd.h>
+#elif defined(__rtems_powerpc_mtx603e__)
+#  include <powerpc/mtx603e/coverhd.h>
+#elif defined(__rtems_powerpc_mvme2100__)
+#  include <powerpc/mvme2100/coverhd.h>
+#elif defined(__rtems_powerpc_mvme2307__)
+#  include <powerpc/mvme2307/coverhd.h>
+#elif defined(__rtems_powerpc_mvme3100__)
+#  include <powerpc/mvme3100/coverhd.h>
+#elif defined(__rtems_powerpc_mvme5500__)
+#  include <powerpc/mvme5500/coverhd.h>
+#elif defined(__rtems_powerpc_pghplus__)
+#  include <powerpc/pghplus/coverhd.h>
+#elif defined(__rtems_powerpc_phycore_mpc5554__)
+#  include <powerpc/phycore_mpc5554/coverhd.h>
+#elif defined(__rtems_powerpc_pm520_cr825__)
+#  include <powerpc/pm520_cr825/coverhd.h>
+#elif defined(__rtems_powerpc_pm520_ze30__)
+#  include <powerpc/pm520_ze30/coverhd.h>
+#elif defined(__rtems_powerpc_psim__)
+#  include <powerpc/psim/coverhd.h>
+#elif defined(__rtems_powerpc_qemuppc__)
+#  include <powerpc/qemuppc/coverhd.h>
+#elif defined(__rtems_powerpc_qemuprep__)
+#  include <powerpc/qemuprep/coverhd.h>
+#elif defined(__rtems_powerpc_qemuprep_altivec__)
+#  include <powerpc/qemuprep-altivec/coverhd.h>
+#elif defined(__rtems_powerpc_qoriq_core_0__)
+#  include <powerpc/qoriq_core_0/coverhd.h>
+#elif defined(__rtems_powerpc_qoriq_core_1__)
+#  include <powerpc/qoriq_core_1/coverhd.h>
+#elif defined(__rtems_powerpc_qoriq_p1020rdb__)
+#  include <powerpc/qoriq_p1020rdb/coverhd.h>
+#elif defined(__rtems_powerpc_score603e__)
+#  include <powerpc/score603e/coverhd.h>
+#elif defined(__rtems_powerpc_ss555__)
+#  include <powerpc/ss555/coverhd.h>
+#elif defined(__rtems_powerpc_t32mppc__)
+#  include <powerpc/t32mppc/coverhd.h>
+#elif defined(__rtems_powerpc_tqm8xx_stk8xx__)
+#  include <powerpc/tqm8xx_stk8xx/coverhd.h>
+#elif defined(__rtems_powerpc_virtex__)
+#  include <powerpc/virtex/coverhd.h>
+#elif defined(__rtems_powerpc_virtex4__)
+#  include <powerpc/virtex4/coverhd.h>
+#elif defined(__rtems_powerpc_virtex5__)
+#  include <powerpc/virtex5/coverhd.h>
+#elif defined(__rtems_sh_gensh1__)
+#  include <sh/gensh1/coverhd.h>
+#elif defined(__rtems_sh_gensh2__)
+#  include <sh/gensh2/coverhd.h>
+#elif defined(__rtems_sh_gensh4__)
+#  include <sh/gensh4/coverhd.h>
+#elif defined(__rtems_sh_simsh1__)
+#  include <sh/simsh1/coverhd.h>
+#elif defined(__rtems_sh_simsh2__)
+#  include <sh/simsh2/coverhd.h>
+#elif defined(__rtems_sh_simsh2e__)
+#  include <sh/simsh2e/coverhd.h>
+#elif defined(__rtems_sh_simsh4__)
+#  include <sh/simsh4/coverhd.h>
+#elif defined(__rtems_sparc_erc32__)
+#  include <sparc/erc32/coverhd.h>
+#elif defined(__rtems_sparc_leon2__)
+#  include <sparc/leon2/coverhd.h>
+#elif defined(__rtems_sparc_leon3__)
+#  include <sparc/leon3/coverhd.h>
+#elif defined(__rtems_sparc_ngmp__)
+#  include <sparc/ngmp/coverhd.h>
+#elif defined(__rtems_sparc_sis__)
+#  include <sparc/sis/coverhd.h>
+#elif defined(__rtems_sparc64_niagara__)
+#  include <sparc64/niagara/coverhd.h>
+#elif defined(__rtems_sparc64_usiii__)
+#  include <sparc64/usiii/coverhd.h>
+#elif defined(__rtems_v850_v850e1sim__)
+#  include <v850/v850e1sim/coverhd.h>
+#elif defined(__rtems_v850_v850e2sim__)
+#  include <v850/v850e2sim/coverhd.h>
+#elif defined(__rtems_v850_v850e2v3sim__)
+#  include <v850/v850e2v3sim/coverhd.h>
+#elif defined(__rtems_v850_v850esim__)
+#  include <v850/v850esim/coverhd.h>
+#elif defined(__rtems_v850_v850essim__)
+#  include <v850/v850essim/coverhd.h>
+#elif defined(__rtems_v850_v850sim__)
+#  include <v850/v850sim/coverhd.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/include/cplb.h b/include/cplb.h
new file mode 100644
index 0000000000..a31063fcb4
--- /dev/null
+++ b/include/cplb.h
@@ -0,0 +1,12 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_bfin_TLL6527M__)
+#  include <bfin/TLL6527M/cplb.h>
+#elif defined(__rtems_bfin_eZKit533__)
+#  include <bfin/eZKit533/cplb.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/m68k/ods68302/include/crc.h b/include/crc.h
index ac0ffa5ba8..ac0ffa5ba8 100644
--- a/c/src/lib/libbsp/m68k/ods68302/include/crc.h
+++ b/include/crc.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/crt.h b/include/crt.h
index ba0534a5aa..ba0534a5aa 100644
--- a/c/src/lib/libbsp/i386/pc386/include/crt.h
+++ b/include/crt.h
diff --git a/cpukit/include/crypt.h b/include/crypt.h
index 7696aa36ea..7696aa36ea 100644
--- a/cpukit/include/crypt.h
+++ b/include/crypt.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/debug_defs.h b/include/debug_defs.h
index 58f7460f52..58f7460f52 100644
--- a/c/src/lib/libbsp/sparc/shared/include/debug_defs.h
+++ b/include/debug_defs.h
diff --git a/c/src/lib/libbsp/m68k/ods68302/include/debugport.h b/include/debugport.h
index c79f4aa2e4..c79f4aa2e4 100644
--- a/c/src/lib/libbsp/m68k/ods68302/include/debugport.h
+++ b/include/debugport.h
diff --git a/cpukit/dev/include/dev/i2c/eeprom.h b/include/dev/i2c/eeprom.h
index 73df5ad9f4..73df5ad9f4 100644
--- a/cpukit/dev/include/dev/i2c/eeprom.h
+++ b/include/dev/i2c/eeprom.h
diff --git a/cpukit/dev/include/dev/i2c/gpio-nxp-pca9535.h b/include/dev/i2c/gpio-nxp-pca9535.h
index 1ebc1a3d4d..1ebc1a3d4d 100644
--- a/cpukit/dev/include/dev/i2c/gpio-nxp-pca9535.h
+++ b/include/dev/i2c/gpio-nxp-pca9535.h
diff --git a/cpukit/dev/include/dev/i2c/i2c.h b/include/dev/i2c/i2c.h
index 4b966057a1..4b966057a1 100644
--- a/cpukit/dev/include/dev/i2c/i2c.h
+++ b/include/dev/i2c/i2c.h
diff --git a/cpukit/dev/include/dev/i2c/switch-nxp-pca9548a.h b/include/dev/i2c/switch-nxp-pca9548a.h
index ce8ef2c809..ce8ef2c809 100644
--- a/cpukit/dev/include/dev/i2c/switch-nxp-pca9548a.h
+++ b/include/dev/i2c/switch-nxp-pca9548a.h
diff --git a/cpukit/libnetworking/dev/mii/mii.h b/include/dev/mii/mii.h
index 14e45b0462..14e45b0462 100644
--- a/cpukit/libnetworking/dev/mii/mii.h
+++ b/include/dev/mii/mii.h
diff --git a/cpukit/libdl/dlfcn.h b/include/dlfcn.h
index 1ac3ba1330..1ac3ba1330 100644
--- a/cpukit/libdl/dlfcn.h
+++ b/include/dlfcn.h
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/ds1307.h b/include/ds1307.h
index 8e5636a0c8..8e5636a0c8 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/ds1307.h
+++ b/include/ds1307.h
diff --git a/c/src/lib/libbsp/arm/edb7312/include/ep7312.h b/include/ep7312.h
index ba9d430bc6..ba9d430bc6 100644
--- a/c/src/lib/libbsp/arm/edb7312/include/ep7312.h
+++ b/include/ep7312.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/erc32.h b/include/erc32.h
index 7db4a6c91b..7db4a6c91b 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/erc32.h
+++ b/include/erc32.h
diff --git a/c/src/lib/libcpu/arm/pxa255/include/ffuart.h b/include/ffuart.h
index 68df822183..68df822183 100644
--- a/c/src/lib/libcpu/arm/pxa255/include/ffuart.h
+++ b/include/ffuart.h
diff --git a/c/src/lib/libbsp/arm/gba/include/gba.h b/include/gba.h
index 4e25093dbd..4e25093dbd 100644
--- a/c/src/lib/libbsp/arm/gba/include/gba.h
+++ b/include/gba.h
diff --git a/c/src/lib/libbsp/arm/gba/include/gba_registers.h b/include/gba_registers.h
index 4be8543aa2..4be8543aa2 100644
--- a/c/src/lib/libbsp/arm/gba/include/gba_registers.h
+++ b/include/gba_registers.h
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/gen2.h b/include/gen2.h
index 8e79c33df5..8e79c33df5 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/gen2.h
+++ b/include/gen2.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/genarch/include/ofw/ofw_tree.h b/include/genarch/ofw/ofw_tree.h
index f62d545527..f62d545527 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/genarch/include/ofw/ofw_tree.h
+++ b/include/genarch/ofw/ofw_tree.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grcan.h b/include/grcan.h
index e76dee74a0..e76dee74a0 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grcan.h
+++ b/include/grcan.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grcan_rasta.h b/include/grcan_rasta.h
index dd5ef9518d..dd5ef9518d 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grcan_rasta.h
+++ b/include/grcan_rasta.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grlib.h b/include/grlib.h
index 3c207933a9..3c207933a9 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grlib.h
+++ b/include/grlib.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw.h b/include/grspw.h
index 77495be009..77495be009 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grspw.h
+++ b/include/grspw.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw_pci.h b/include/grspw_pci.h
index 0e1c6f98db..0e1c6f98db 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grspw_pci.h
+++ b/include/grspw_pci.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw_rasta.h b/include/grspw_rasta.h
index 1d336030d0..1d336030d0 100644
--- a/c/src/lib/libbsp/sparc/shared/include/grspw_rasta.h
+++ b/include/grspw_rasta.h
diff --git a/c/src/lib/libbsp/h8300/h8sim/include/bsp.h b/include/h8300/h8sim/bsp.h
index f21917917c..f21917917c 100644
--- a/c/src/lib/libbsp/h8300/h8sim/include/bsp.h
+++ b/include/h8300/h8sim/bsp.h
diff --git a/include/h8300/h8sim/coverhd.h b/include/h8300/h8sim/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/h8300/h8sim/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/cpukit/score/cpu/h8300/rtems/asm.h b/include/h8300/h8sim/rtems/asm.h
index 6c1a643db4..6c1a643db4 100644
--- a/cpukit/score/cpu/h8300/rtems/asm.h
+++ b/include/h8300/h8sim/rtems/asm.h
diff --git a/cpukit/score/cpu/h8300/rtems/score/cpu.h b/include/h8300/h8sim/rtems/score/cpu.h
index 334cfbd778..334cfbd778 100644
--- a/cpukit/score/cpu/h8300/rtems/score/cpu.h
+++ b/include/h8300/h8sim/rtems/score/cpu.h
diff --git a/include/h8300/h8sim/rtems/score/cpuatomic.h b/include/h8300/h8sim/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/h8300/h8sim/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/h8300/rtems/score/types.h b/include/h8300/h8sim/rtems/score/types.h
index 7ac2b18f93..7ac2b18f93 100644
--- a/cpukit/score/cpu/h8300/rtems/score/types.h
+++ b/include/h8300/h8sim/rtems/score/types.h
diff --git a/include/h8300/h8sim/tm27.h b/include/h8300/h8sim/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/h8300/h8sim/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/h8300/h8sxsim/bsp.h b/include/h8300/h8sxsim/bsp.h
new file mode 100644
index 0000000000..5c20daa520
--- /dev/null
+++ b/include/h8300/h8sxsim/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* h8300/h8sim/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <h8300/h8sim/bsp.h>
diff --git a/include/h8300/h8sxsim/coverhd.h b/include/h8300/h8sxsim/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/h8300/h8sxsim/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/h8300/h8sxsim/rtems/asm.h b/include/h8300/h8sxsim/rtems/asm.h
new file mode 100644
index 0000000000..10a648c2fa
--- /dev/null
+++ b/include/h8300/h8sxsim/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* h8300/h8sim/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <h8300/h8sim/rtems/asm.h>
diff --git a/include/h8300/h8sxsim/rtems/score/cpu.h b/include/h8300/h8sxsim/rtems/score/cpu.h
new file mode 100644
index 0000000000..3bad3dc653
--- /dev/null
+++ b/include/h8300/h8sxsim/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* h8300/h8sim/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <h8300/h8sim/rtems/score/cpu.h>
diff --git a/include/h8300/h8sxsim/rtems/score/cpuatomic.h b/include/h8300/h8sxsim/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/h8300/h8sxsim/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/h8300/h8sxsim/rtems/score/types.h b/include/h8300/h8sxsim/rtems/score/types.h
new file mode 100644
index 0000000000..1c949741f1
--- /dev/null
+++ b/include/h8300/h8sxsim/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* h8300/h8sim/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <h8300/h8sim/rtems/score/types.h>
diff --git a/include/h8300/h8sxsim/tm27.h b/include/h8300/h8sxsim/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/h8300/h8sxsim/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h b/include/i2c.h
index da73ebc0c0..da73ebc0c0 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h
+++ b/include/i2c.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/i2cdrv.h b/include/i2cdrv.h
index 4b4a1ec141..4b4a1ec141 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/i2cdrv.h
+++ b/include/i2cdrv.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/i2cmst.h b/include/i2cmst.h
index 2db5cd0f4f..2db5cd0f4f 100644
--- a/c/src/lib/libbsp/sparc/shared/include/i2cmst.h
+++ b/include/i2cmst.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/include/i386/pc386/bsp.h
index 26d4fa47a1..26d4fa47a1 100644
--- a/c/src/lib/libbsp/i386/pc386/include/bsp.h
+++ b/include/i386/pc386/bsp.h
diff --git a/c/src/lib/libbsp/i386/shared/irq/irq.h b/include/i386/pc386/bsp/irq.h
index 90cf71c6ee..90cf71c6ee 100644
--- a/c/src/lib/libbsp/i386/shared/irq/irq.h
+++ b/include/i386/pc386/bsp/irq.h
diff --git a/include/i386/pc386/coverhd.h b/include/i386/pc386/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/i386/pc386/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/c/src/lib/libcpu/i386/byteorder.h b/include/i386/pc386/libcpu/byteorder.h
index 939e51fe84..939e51fe84 100644
--- a/c/src/lib/libcpu/i386/byteorder.h
+++ b/include/i386/pc386/libcpu/byteorder.h
diff --git a/cpukit/score/cpu/i386/rtems/asm.h b/include/i386/pc386/rtems/asm.h
index 50b0fd71a0..50b0fd71a0 100644
--- a/cpukit/score/cpu/i386/rtems/asm.h
+++ b/include/i386/pc386/rtems/asm.h
diff --git a/cpukit/score/cpu/i386/rtems/score/cpu.h b/include/i386/pc386/rtems/score/cpu.h
index 13d31a41ae..13d31a41ae 100644
--- a/cpukit/score/cpu/i386/rtems/score/cpu.h
+++ b/include/i386/pc386/rtems/score/cpu.h
diff --git a/include/i386/pc386/rtems/score/cpuatomic.h b/include/i386/pc386/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/i386/pc386/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/i386/rtems/score/types.h b/include/i386/pc386/rtems/score/types.h
index 72461fbb21..72461fbb21 100644
--- a/cpukit/score/cpu/i386/rtems/score/types.h
+++ b/include/i386/pc386/rtems/score/types.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/tm27.h b/include/i386/pc386/tm27.h
index b53ab8e97a..b53ab8e97a 100644
--- a/c/src/lib/libbsp/i386/pc386/include/tm27.h
+++ b/include/i386/pc386/tm27.h
diff --git a/c/src/lib/libbsp/i386/shared/comm/uart.h b/include/i386/pc386/uart.h
index 96e4a312b4..96e4a312b4 100644
--- a/c/src/lib/libbsp/i386/shared/comm/uart.h
+++ b/include/i386/pc386/uart.h
diff --git a/include/i386/pc486/bsp.h b/include/i386/pc486/bsp.h
new file mode 100644
index 0000000000..a676f1fd3e
--- /dev/null
+++ b/include/i386/pc486/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/bsp.h>
diff --git a/include/i386/pc486/bsp/irq.h b/include/i386/pc486/bsp/irq.h
new file mode 100644
index 0000000000..41f0aced2d
--- /dev/null
+++ b/include/i386/pc486/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/bsp/irq.h>
diff --git a/include/i386/pc486/coverhd.h b/include/i386/pc486/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/i386/pc486/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/i386/pc486/libcpu/byteorder.h b/include/i386/pc486/libcpu/byteorder.h
new file mode 100644
index 0000000000..038aa18dca
--- /dev/null
+++ b/include/i386/pc486/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/libcpu/byteorder.h>
diff --git a/include/i386/pc486/rtems/asm.h b/include/i386/pc486/rtems/asm.h
new file mode 100644
index 0000000000..8fc40f9291
--- /dev/null
+++ b/include/i386/pc486/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/rtems/asm.h>
diff --git a/include/i386/pc486/rtems/score/cpu.h b/include/i386/pc486/rtems/score/cpu.h
new file mode 100644
index 0000000000..e77fe2b281
--- /dev/null
+++ b/include/i386/pc486/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/rtems/score/cpu.h>
diff --git a/include/i386/pc486/rtems/score/cpuatomic.h b/include/i386/pc486/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/i386/pc486/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/i386/pc486/rtems/score/types.h b/include/i386/pc486/rtems/score/types.h
new file mode 100644
index 0000000000..18353ddf52
--- /dev/null
+++ b/include/i386/pc486/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/rtems/score/types.h>
diff --git a/include/i386/pc486/tm27.h b/include/i386/pc486/tm27.h
new file mode 100644
index 0000000000..163a8c8178
--- /dev/null
+++ b/include/i386/pc486/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/tm27.h>
diff --git a/include/i386/pc486/uart.h b/include/i386/pc486/uart.h
new file mode 100644
index 0000000000..2799b97732
--- /dev/null
+++ b/include/i386/pc486/uart.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/uart.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/uart.h>
diff --git a/include/i386/pc586-sse/bsp.h b/include/i386/pc586-sse/bsp.h
new file mode 100644
index 0000000000..a676f1fd3e
--- /dev/null
+++ b/include/i386/pc586-sse/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/bsp.h>
diff --git a/include/i386/pc586-sse/bsp/irq.h b/include/i386/pc586-sse/bsp/irq.h
new file mode 100644
index 0000000000..41f0aced2d
--- /dev/null
+++ b/include/i386/pc586-sse/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/bsp/irq.h>
diff --git a/include/i386/pc586-sse/coverhd.h b/include/i386/pc586-sse/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/i386/pc586-sse/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/i386/pc586-sse/libcpu/byteorder.h b/include/i386/pc586-sse/libcpu/byteorder.h
new file mode 100644
index 0000000000..038aa18dca
--- /dev/null
+++ b/include/i386/pc586-sse/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/libcpu/byteorder.h>
diff --git a/include/i386/pc586-sse/rtems/asm.h b/include/i386/pc586-sse/rtems/asm.h
new file mode 100644
index 0000000000..8fc40f9291
--- /dev/null
+++ b/include/i386/pc586-sse/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/rtems/asm.h>
diff --git a/include/i386/pc586-sse/rtems/score/cpu.h b/include/i386/pc586-sse/rtems/score/cpu.h
new file mode 100644
index 0000000000..e77fe2b281
--- /dev/null
+++ b/include/i386/pc586-sse/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/rtems/score/cpu.h>
diff --git a/include/i386/pc586-sse/rtems/score/cpuatomic.h b/include/i386/pc586-sse/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/i386/pc586-sse/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/i386/pc586-sse/rtems/score/types.h b/include/i386/pc586-sse/rtems/score/types.h
new file mode 100644
index 0000000000..18353ddf52
--- /dev/null
+++ b/include/i386/pc586-sse/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/rtems/score/types.h>
diff --git a/include/i386/pc586-sse/tm27.h b/include/i386/pc586-sse/tm27.h
new file mode 100644
index 0000000000..163a8c8178
--- /dev/null
+++ b/include/i386/pc586-sse/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/tm27.h>
diff --git a/include/i386/pc586-sse/uart.h b/include/i386/pc586-sse/uart.h
new file mode 100644
index 0000000000..2799b97732
--- /dev/null
+++ b/include/i386/pc586-sse/uart.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/uart.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/uart.h>
diff --git a/include/i386/pc586/bsp.h b/include/i386/pc586/bsp.h
new file mode 100644
index 0000000000..a676f1fd3e
--- /dev/null
+++ b/include/i386/pc586/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/bsp.h>
diff --git a/include/i386/pc586/bsp/irq.h b/include/i386/pc586/bsp/irq.h
new file mode 100644
index 0000000000..41f0aced2d
--- /dev/null
+++ b/include/i386/pc586/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/bsp/irq.h>
diff --git a/include/i386/pc586/coverhd.h b/include/i386/pc586/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/i386/pc586/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/i386/pc586/libcpu/byteorder.h b/include/i386/pc586/libcpu/byteorder.h
new file mode 100644
index 0000000000..038aa18dca
--- /dev/null
+++ b/include/i386/pc586/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/libcpu/byteorder.h>
diff --git a/include/i386/pc586/rtems/asm.h b/include/i386/pc586/rtems/asm.h
new file mode 100644
index 0000000000..8fc40f9291
--- /dev/null
+++ b/include/i386/pc586/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/rtems/asm.h>
diff --git a/include/i386/pc586/rtems/score/cpu.h b/include/i386/pc586/rtems/score/cpu.h
new file mode 100644
index 0000000000..e77fe2b281
--- /dev/null
+++ b/include/i386/pc586/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/rtems/score/cpu.h>
diff --git a/include/i386/pc586/rtems/score/cpuatomic.h b/include/i386/pc586/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/i386/pc586/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/i386/pc586/rtems/score/types.h b/include/i386/pc586/rtems/score/types.h
new file mode 100644
index 0000000000..18353ddf52
--- /dev/null
+++ b/include/i386/pc586/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/rtems/score/types.h>
diff --git a/include/i386/pc586/tm27.h b/include/i386/pc586/tm27.h
new file mode 100644
index 0000000000..163a8c8178
--- /dev/null
+++ b/include/i386/pc586/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/tm27.h>
diff --git a/include/i386/pc586/uart.h b/include/i386/pc586/uart.h
new file mode 100644
index 0000000000..2799b97732
--- /dev/null
+++ b/include/i386/pc586/uart.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/uart.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/uart.h>
diff --git a/include/i386/pc686/bsp.h b/include/i386/pc686/bsp.h
new file mode 100644
index 0000000000..a676f1fd3e
--- /dev/null
+++ b/include/i386/pc686/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/bsp.h>
diff --git a/include/i386/pc686/bsp/irq.h b/include/i386/pc686/bsp/irq.h
new file mode 100644
index 0000000000..41f0aced2d
--- /dev/null
+++ b/include/i386/pc686/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/bsp/irq.h>
diff --git a/include/i386/pc686/coverhd.h b/include/i386/pc686/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/i386/pc686/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/i386/pc686/libcpu/byteorder.h b/include/i386/pc686/libcpu/byteorder.h
new file mode 100644
index 0000000000..038aa18dca
--- /dev/null
+++ b/include/i386/pc686/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/libcpu/byteorder.h>
diff --git a/include/i386/pc686/rtems/asm.h b/include/i386/pc686/rtems/asm.h
new file mode 100644
index 0000000000..8fc40f9291
--- /dev/null
+++ b/include/i386/pc686/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/rtems/asm.h>
diff --git a/include/i386/pc686/rtems/score/cpu.h b/include/i386/pc686/rtems/score/cpu.h
new file mode 100644
index 0000000000..e77fe2b281
--- /dev/null
+++ b/include/i386/pc686/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/rtems/score/cpu.h>
diff --git a/include/i386/pc686/rtems/score/cpuatomic.h b/include/i386/pc686/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/i386/pc686/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/i386/pc686/rtems/score/types.h b/include/i386/pc686/rtems/score/types.h
new file mode 100644
index 0000000000..18353ddf52
--- /dev/null
+++ b/include/i386/pc686/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/rtems/score/types.h>
diff --git a/include/i386/pc686/tm27.h b/include/i386/pc686/tm27.h
new file mode 100644
index 0000000000..163a8c8178
--- /dev/null
+++ b/include/i386/pc686/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/tm27.h>
diff --git a/include/i386/pc686/uart.h b/include/i386/pc686/uart.h
new file mode 100644
index 0000000000..2799b97732
--- /dev/null
+++ b/include/i386/pc686/uart.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/uart.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/uart.h>
diff --git a/include/i386/pcp4/bsp.h b/include/i386/pcp4/bsp.h
new file mode 100644
index 0000000000..a676f1fd3e
--- /dev/null
+++ b/include/i386/pcp4/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/bsp.h>
diff --git a/include/i386/pcp4/bsp/irq.h b/include/i386/pcp4/bsp/irq.h
new file mode 100644
index 0000000000..41f0aced2d
--- /dev/null
+++ b/include/i386/pcp4/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/bsp/irq.h>
diff --git a/include/i386/pcp4/coverhd.h b/include/i386/pcp4/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/i386/pcp4/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/i386/pcp4/libcpu/byteorder.h b/include/i386/pcp4/libcpu/byteorder.h
new file mode 100644
index 0000000000..038aa18dca
--- /dev/null
+++ b/include/i386/pcp4/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/libcpu/byteorder.h>
diff --git a/include/i386/pcp4/rtems/asm.h b/include/i386/pcp4/rtems/asm.h
new file mode 100644
index 0000000000..8fc40f9291
--- /dev/null
+++ b/include/i386/pcp4/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/rtems/asm.h>
diff --git a/include/i386/pcp4/rtems/score/cpu.h b/include/i386/pcp4/rtems/score/cpu.h
new file mode 100644
index 0000000000..e77fe2b281
--- /dev/null
+++ b/include/i386/pcp4/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/rtems/score/cpu.h>
diff --git a/include/i386/pcp4/rtems/score/cpuatomic.h b/include/i386/pcp4/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/i386/pcp4/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/i386/pcp4/rtems/score/types.h b/include/i386/pcp4/rtems/score/types.h
new file mode 100644
index 0000000000..18353ddf52
--- /dev/null
+++ b/include/i386/pcp4/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/rtems/score/types.h>
diff --git a/include/i386/pcp4/tm27.h b/include/i386/pcp4/tm27.h
new file mode 100644
index 0000000000..163a8c8178
--- /dev/null
+++ b/include/i386/pcp4/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/tm27.h>
diff --git a/include/i386/pcp4/uart.h b/include/i386/pcp4/uart.h
new file mode 100644
index 0000000000..2799b97732
--- /dev/null
+++ b/include/i386/pcp4/uart.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* i386/pc386/uart.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <i386/pc386/uart.h>
diff --git a/c/src/lib/libbsp/i386/shared/comm/i386_io.h b/include/i386_io.h
index 1308d58b6b..1308d58b6b 100644
--- a/c/src/lib/libbsp/i386/shared/comm/i386_io.h
+++ b/include/i386_io.h
diff --git a/cpukit/libnetworking/ifaddrs.h b/include/ifaddrs.h
index 7d3aa953ec..7d3aa953ec 100644
--- a/cpukit/libnetworking/ifaddrs.h
+++ b/include/ifaddrs.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/generic/include/align.h b/include/kernel/align.h
index 6003ea9c4e..6003ea9c4e 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/generic/include/align.h
+++ b/include/kernel/align.h
diff --git a/c/src/lib/libbsp/m68k/idp/include/leds.h b/include/leds.h
index 4c0313ca0d..4c0313ca0d 100644
--- a/c/src/lib/libbsp/m68k/idp/include/leds.h
+++ b/include/leds.h
diff --git a/include/leon.h b/include/leon.h
new file mode 100644
index 0000000000..47ef5fb6ad
--- /dev/null
+++ b/include/leon.h
@@ -0,0 +1,14 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_sparc_leon2__)
+#  include <sparc/leon2/leon.h>
+#elif defined(__rtems_sparc_leon3__)
+#  include <sparc/leon3/leon.h>
+#elif defined(__rtems_sparc_ngmp__)
+#  include <sparc/ngmp/leon.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/libchip/flash/am29lv160.h b/include/libchip/am29lv160.h
index 49d8e248ac..49d8e248ac 100644
--- a/c/src/libchip/flash/am29lv160.h
+++ b/include/libchip/am29lv160.h
diff --git a/c/src/libchip/ide/ata.h b/include/libchip/ata.h
index 66cc46747d..66cc46747d 100644
--- a/c/src/libchip/ide/ata.h
+++ b/include/libchip/ata.h
diff --git a/c/src/libchip/ide/ata_internal.h b/include/libchip/ata_internal.h
index 887199d213..887199d213 100644
--- a/c/src/libchip/ide/ata_internal.h
+++ b/include/libchip/ata_internal.h
diff --git a/c/src/libchip/network/cs8900.h b/include/libchip/cs8900.h
index 79c943842d..79c943842d 100644
--- a/c/src/libchip/network/cs8900.h
+++ b/include/libchip/cs8900.h
diff --git a/c/src/libchip/display/disp_hcms29xx.h b/include/libchip/disp_hcms29xx.h
index 84b74b6910..84b74b6910 100644
--- a/c/src/libchip/display/disp_hcms29xx.h
+++ b/include/libchip/disp_hcms29xx.h
diff --git a/c/src/libchip/rtc/ds1375-rtc.h b/include/libchip/ds1375-rtc.h
index a5be96293f..a5be96293f 100644
--- a/c/src/libchip/rtc/ds1375-rtc.h
+++ b/include/libchip/ds1375-rtc.h
diff --git a/c/src/libchip/network/dwmac.h b/include/libchip/dwmac.h
index 8270988b1e..8270988b1e 100644
--- a/c/src/libchip/network/dwmac.h
+++ b/include/libchip/dwmac.h
diff --git a/c/src/libchip/network/greth.h b/include/libchip/greth.h
index c6e000dbd3..c6e000dbd3 100644
--- a/c/src/libchip/network/greth.h
+++ b/include/libchip/greth.h
diff --git a/c/src/libchip/i2c/i2c-2b-eeprom.h b/include/libchip/i2c-2b-eeprom.h
index 93730d1e3b..93730d1e3b 100644
--- a/c/src/libchip/i2c/i2c-2b-eeprom.h
+++ b/include/libchip/i2c-2b-eeprom.h
diff --git a/c/src/libchip/i2c/i2c-ds1621.h b/include/libchip/i2c-ds1621.h
index 64df69f465..64df69f465 100644
--- a/c/src/libchip/i2c/i2c-ds1621.h
+++ b/include/libchip/i2c-ds1621.h
diff --git a/c/src/libchip/i2c/i2c-sc620.h b/include/libchip/i2c-sc620.h
index 27721b91c3..27721b91c3 100644
--- a/c/src/libchip/i2c/i2c-sc620.h
+++ b/include/libchip/i2c-sc620.h
diff --git a/c/src/libchip/network/i82586var.h b/include/libchip/i82586var.h
index c9421a6732..c9421a6732 100644
--- a/c/src/libchip/network/i82586var.h
+++ b/include/libchip/i82586var.h
diff --git a/c/src/libchip/rtc/icm7170.h b/include/libchip/icm7170.h
index 6b95c905a4..6b95c905a4 100644
--- a/c/src/libchip/rtc/icm7170.h
+++ b/include/libchip/icm7170.h
diff --git a/c/src/libchip/ide/ide_ctrl.h b/include/libchip/ide_ctrl.h
index de32e4bed9..de32e4bed9 100644
--- a/c/src/libchip/ide/ide_ctrl.h
+++ b/include/libchip/ide_ctrl.h
diff --git a/c/src/libchip/ide/ide_ctrl_cfg.h b/include/libchip/ide_ctrl_cfg.h
index 3339a28d2b..3339a28d2b 100644
--- a/c/src/libchip/ide/ide_ctrl_cfg.h
+++ b/include/libchip/ide_ctrl_cfg.h
diff --git a/c/src/libchip/ide/ide_ctrl_io.h b/include/libchip/ide_ctrl_io.h
index 9534b0e88f..9534b0e88f 100644
--- a/c/src/libchip/ide/ide_ctrl_io.h
+++ b/include/libchip/ide_ctrl_io.h
diff --git a/c/src/libchip/network/if_dcreg.h b/include/libchip/if_dcreg.h
index 07395c1884..07395c1884 100644
--- a/c/src/libchip/network/if_dcreg.h
+++ b/include/libchip/if_dcreg.h
diff --git a/c/src/libchip/network/if_fxpvar.h b/include/libchip/if_fxpvar.h
index 85844773e1..85844773e1 100644
--- a/c/src/libchip/network/if_fxpvar.h
+++ b/include/libchip/if_fxpvar.h
diff --git a/c/src/libchip/rtc/m48t08.h b/include/libchip/m48t08.h
index 3c46d384d5..3c46d384d5 100644
--- a/c/src/libchip/rtc/m48t08.h
+++ b/include/libchip/m48t08.h
diff --git a/c/src/libchip/rtc/mc146818a.h b/include/libchip/mc146818a.h
index 4eb5af04d7..4eb5af04d7 100644
--- a/c/src/libchip/rtc/mc146818a.h
+++ b/include/libchip/mc146818a.h
diff --git a/c/src/libchip/serial/mc68681.h b/include/libchip/mc68681.h
index ec58318dab..ec58318dab 100644
--- a/c/src/libchip/serial/mc68681.h
+++ b/include/libchip/mc68681.h
diff --git a/c/src/libchip/serial/ns16550.h b/include/libchip/ns16550.h
index 19ac3f1152..19ac3f1152 100644
--- a/c/src/libchip/serial/ns16550.h
+++ b/include/libchip/ns16550.h
diff --git a/c/src/libchip/serial/ns16550_p.h b/include/libchip/ns16550_p.h
index 0fe817ad6b..0fe817ad6b 100644
--- a/c/src/libchip/serial/ns16550_p.h
+++ b/include/libchip/ns16550_p.h
diff --git a/c/src/libchip/network/open_eth.h b/include/libchip/open_eth.h
index 66a5204230..66a5204230 100644
--- a/c/src/libchip/network/open_eth.h
+++ b/include/libchip/open_eth.h
diff --git a/c/src/libchip/rtc/rtc.h b/include/libchip/rtc.h
index 49dd51c2e2..49dd51c2e2 100644
--- a/c/src/libchip/rtc/rtc.h
+++ b/include/libchip/rtc.h
diff --git a/c/src/libchip/serial/serial.h b/include/libchip/serial.h
index 49a7bebdca..49a7bebdca 100644
--- a/c/src/libchip/serial/serial.h
+++ b/include/libchip/serial.h
diff --git a/c/src/libchip/serial/sersupp.h b/include/libchip/sersupp.h
index 6d24d25b61..6d24d25b61 100644
--- a/c/src/libchip/serial/sersupp.h
+++ b/include/libchip/sersupp.h
diff --git a/c/src/libchip/network/smc91111.h b/include/libchip/smc91111.h
index 7ec83716d0..7ec83716d0 100644
--- a/c/src/libchip/network/smc91111.h
+++ b/include/libchip/smc91111.h
diff --git a/c/src/libchip/network/smc91111exp.h b/include/libchip/smc91111exp.h
index 08e086d9e7..08e086d9e7 100644
--- a/c/src/libchip/network/smc91111exp.h
+++ b/include/libchip/smc91111exp.h
diff --git a/c/src/libchip/network/sonic.h b/include/libchip/sonic.h
index fe119ff20a..fe119ff20a 100644
--- a/c/src/libchip/network/sonic.h
+++ b/include/libchip/sonic.h
diff --git a/c/src/libchip/i2c/spi-flash-m25p40.h b/include/libchip/spi-flash-m25p40.h
index 2009b6fed3..2009b6fed3 100644
--- a/c/src/libchip/i2c/spi-flash-m25p40.h
+++ b/include/libchip/spi-flash-m25p40.h
diff --git a/c/src/libchip/i2c/spi-fram-fm25l256.h b/include/libchip/spi-fram-fm25l256.h
index a2167a3074..a2167a3074 100644
--- a/c/src/libchip/i2c/spi-fram-fm25l256.h
+++ b/include/libchip/spi-fram-fm25l256.h
diff --git a/c/src/libchip/i2c/spi-memdrv.h b/include/libchip/spi-memdrv.h
index ed4aa55b6f..ed4aa55b6f 100644
--- a/c/src/libchip/i2c/spi-memdrv.h
+++ b/include/libchip/spi-memdrv.h
diff --git a/c/src/libchip/i2c/spi-sd-card.h b/include/libchip/spi-sd-card.h
index 77e905a155..77e905a155 100644
--- a/c/src/libchip/i2c/spi-sd-card.h
+++ b/include/libchip/spi-sd-card.h
diff --git a/c/src/libchip/serial/z85c30.h b/include/libchip/z85c30.h
index 656d50ea1c..656d50ea1c 100644
--- a/c/src/libchip/serial/z85c30.h
+++ b/include/libchip/z85c30.h
diff --git a/c/src/lib/libcpu/sparc/include/libcpu/access.h b/include/libcpu/access.h
index cdf6b77122..cdf6b77122 100644
--- a/c/src/lib/libcpu/sparc/include/libcpu/access.h
+++ b/include/libcpu/access.h
diff --git a/c/src/lib/libcpu/arm/shared/include/am335x.h b/include/libcpu/am335x.h
index 265cc36784..265cc36784 100644
--- a/c/src/lib/libcpu/arm/shared/include/am335x.h
+++ b/include/libcpu/am335x.h
diff --git a/c/src/lib/libcpu/arm/shared/include/arm-cp15.h b/include/libcpu/arm-cp15.h
index 76b05822cd..76b05822cd 100644
--- a/c/src/lib/libcpu/arm/shared/include/arm-cp15.h
+++ b/include/libcpu/arm-cp15.h
diff --git a/c/src/lib/libcpu/mips/au1x00/include/au1x00.h b/include/libcpu/au1x00.h
index a85a39ed48..a85a39ed48 100644
--- a/c/src/lib/libcpu/mips/au1x00/include/au1x00.h
+++ b/include/libcpu/au1x00.h
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h b/include/libcpu/bat.h
index 2a27e810ee..2a27e810ee 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h
+++ b/include/libcpu/bat.h
diff --git a/c/src/lib/libcpu/bfin/include/bf533.h b/include/libcpu/bf533.h
index 78cfaa0125..78cfaa0125 100644
--- a/c/src/lib/libcpu/bfin/include/bf533.h
+++ b/include/libcpu/bf533.h
diff --git a/c/src/lib/libcpu/bfin/include/bf537.h b/include/libcpu/bf537.h
index 8ed235205f..8ed235205f 100644
--- a/c/src/lib/libcpu/bfin/include/bf537.h
+++ b/include/libcpu/bf537.h
diff --git a/include/libcpu/byteorder.h b/include/libcpu/byteorder.h
new file mode 100644
index 0000000000..829df1255c
--- /dev/null
+++ b/include/libcpu/byteorder.h
@@ -0,0 +1,140 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_i386_pc386__)
+#  include <i386/pc386/libcpu/byteorder.h>
+#elif defined(__rtems_i386_pc486__)
+#  include <i386/pc486/libcpu/byteorder.h>
+#elif defined(__rtems_i386_pc586__)
+#  include <i386/pc586/libcpu/byteorder.h>
+#elif defined(__rtems_i386_pc586_sse__)
+#  include <i386/pc586-sse/libcpu/byteorder.h>
+#elif defined(__rtems_i386_pc686__)
+#  include <i386/pc686/libcpu/byteorder.h>
+#elif defined(__rtems_i386_pcp4__)
+#  include <i386/pcp4/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_beatnik__)
+#  include <powerpc/beatnik/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_br_uid__)
+#  include <powerpc/br_uid/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_brs5l__)
+#  include <powerpc/brs5l/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_brs6l__)
+#  include <powerpc/brs6l/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_dp2__)
+#  include <powerpc/dp2/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_ep1a__)
+#  include <powerpc/ep1a/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_gwlcfm__)
+#  include <powerpc/gwlcfm/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_haleakala__)
+#  include <powerpc/haleakala/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_hsc_cm01__)
+#  include <powerpc/hsc_cm01/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_icecube__)
+#  include <powerpc/icecube/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mbx821_001__)
+#  include <powerpc/mbx821_001/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mbx821_002__)
+#  include <powerpc/mbx821_002/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mbx821_002b__)
+#  include <powerpc/mbx821_002b/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mbx860_001b__)
+#  include <powerpc/mbx860_001b/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mbx860_002__)
+#  include <powerpc/mbx860_002/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mbx860_005b__)
+#  include <powerpc/mbx860_005b/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mbx860_1b__)
+#  include <powerpc/mbx860_1b/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mcp750__)
+#  include <powerpc/mcp750/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mpc5566evb__)
+#  include <powerpc/mpc5566evb/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mpc5566evb_spe__)
+#  include <powerpc/mpc5566evb_spe/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mpc5643l_dpu__)
+#  include <powerpc/mpc5643l_dpu/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mpc5643l_evb__)
+#  include <powerpc/mpc5643l_evb/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mpc5668g__)
+#  include <powerpc/mpc5668g/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_app__)
+#  include <powerpc/mpc5674f_ecu508_app/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_boot__)
+#  include <powerpc/mpc5674f_ecu508_boot/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mpc5674f_rsm6__)
+#  include <powerpc/mpc5674f_rsm6/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mpc5674fevb__)
+#  include <powerpc/mpc5674fevb/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mpc5674fevb_spe__)
+#  include <powerpc/mpc5674fevb_spe/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mpc8260ads__)
+#  include <powerpc/mpc8260ads/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mpc8309som__)
+#  include <powerpc/mpc8309som/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mpc8313erdb__)
+#  include <powerpc/mpc8313erdb/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mpc8349eamds__)
+#  include <powerpc/mpc8349eamds/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mtx603e__)
+#  include <powerpc/mtx603e/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mvme2100__)
+#  include <powerpc/mvme2100/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mvme2307__)
+#  include <powerpc/mvme2307/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mvme3100__)
+#  include <powerpc/mvme3100/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_mvme5500__)
+#  include <powerpc/mvme5500/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_pghplus__)
+#  include <powerpc/pghplus/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_phycore_mpc5554__)
+#  include <powerpc/phycore_mpc5554/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_pm520_cr825__)
+#  include <powerpc/pm520_cr825/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_pm520_ze30__)
+#  include <powerpc/pm520_ze30/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_psim__)
+#  include <powerpc/psim/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_qemuppc__)
+#  include <powerpc/qemuppc/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_qemuprep__)
+#  include <powerpc/qemuprep/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_qemuprep_altivec__)
+#  include <powerpc/qemuprep-altivec/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_qoriq_core_0__)
+#  include <powerpc/qoriq_core_0/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_qoriq_core_1__)
+#  include <powerpc/qoriq_core_1/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_qoriq_p1020rdb__)
+#  include <powerpc/qoriq_p1020rdb/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_score603e__)
+#  include <powerpc/score603e/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_ss555__)
+#  include <powerpc/ss555/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_t32mppc__)
+#  include <powerpc/t32mppc/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_tqm8xx_stk8xx__)
+#  include <powerpc/tqm8xx_stk8xx/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_virtex__)
+#  include <powerpc/virtex/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_virtex4__)
+#  include <powerpc/virtex4/libcpu/byteorder.h>
+#elif defined(__rtems_powerpc_virtex5__)
+#  include <powerpc/virtex5/libcpu/byteorder.h>
+#elif defined(__rtems_sparc_erc32__)
+#  include <sparc/erc32/libcpu/byteorder.h>
+#elif defined(__rtems_sparc_leon2__)
+#  include <sparc/leon2/libcpu/byteorder.h>
+#elif defined(__rtems_sparc_leon3__)
+#  include <sparc/leon3/libcpu/byteorder.h>
+#elif defined(__rtems_sparc_ngmp__)
+#  include <sparc/ngmp/libcpu/byteorder.h>
+#elif defined(__rtems_sparc_sis__)
+#  include <sparc/sis/libcpu/byteorder.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h b/include/libcpu/c_clock.h
index bd4918fb44..bd4918fb44 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h
+++ b/include/libcpu/c_clock.h
diff --git a/c/src/lib/libcpu/shared/include/cache.h b/include/libcpu/cache.h
index d9df4234e7..d9df4234e7 100644
--- a/c/src/lib/libcpu/shared/include/cache.h
+++ b/include/libcpu/cache.h
diff --git a/c/src/lib/libcpu/or1k/shared/cache/cache_.h b/include/libcpu/cache_.h
index 0ea939f847..0ea939f847 100644
--- a/c/src/lib/libcpu/or1k/shared/cache/cache_.h
+++ b/include/libcpu/cache_.h
diff --git a/c/src/lib/libcpu/bfin/include/cecRegs.h b/include/libcpu/cecRegs.h
index 89564c6f70..89564c6f70 100644
--- a/c/src/lib/libcpu/bfin/include/cecRegs.h
+++ b/include/libcpu/cecRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/coreTimerRegs.h b/include/libcpu/coreTimerRegs.h
index c5b257783c..c5b257783c 100644
--- a/c/src/lib/libcpu/bfin/include/coreTimerRegs.h
+++ b/include/libcpu/coreTimerRegs.h
diff --git a/c/src/lib/libcpu/i386/cpu.h b/include/libcpu/cpu.h
index 0242e270ee..0242e270ee 100644
--- a/c/src/lib/libcpu/i386/cpu.h
+++ b/include/libcpu/cpu.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h b/include/libcpu/cpuIdent.h
index 0231de77c4..0231de77c4 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h
+++ b/include/libcpu/cpuIdent.h
diff --git a/c/src/lib/libcpu/i386/cpuModel.h b/include/libcpu/cpuModel.h
index d17839b7ea..d17839b7ea 100644
--- a/c/src/lib/libcpu/i386/cpuModel.h
+++ b/include/libcpu/cpuModel.h
diff --git a/c/src/lib/libcpu/bfin/include/dmaRegs.h b/include/libcpu/dmaRegs.h
index 7c895b7cab..7c895b7cab 100644
--- a/c/src/lib/libcpu/bfin/include/dmaRegs.h
+++ b/include/libcpu/dmaRegs.h
diff --git a/c/src/lib/libcpu/powerpc/e500/mmu/e500_mmu.h b/include/libcpu/e500_mmu.h
index 84920e0d14..84920e0d14 100644
--- a/c/src/lib/libcpu/powerpc/e500/mmu/e500_mmu.h
+++ b/include/libcpu/e500_mmu.h
diff --git a/c/src/lib/libcpu/bfin/include/ebiuRegs.h b/include/libcpu/ebiuRegs.h
index 1a07ff6985..1a07ff6985 100644
--- a/c/src/lib/libcpu/bfin/include/ebiuRegs.h
+++ b/include/libcpu/ebiuRegs.h
diff --git a/c/src/lib/libcpu/bfin/network/ethernet.h b/include/libcpu/ethernet.h
index 0a8fc0c4b0..0a8fc0c4b0 100644
--- a/c/src/lib/libcpu/bfin/network/ethernet.h
+++ b/include/libcpu/ethernet.h
diff --git a/c/src/lib/libcpu/bfin/include/ethernetRegs.h b/include/libcpu/ethernetRegs.h
index 7bf85c576b..7bf85c576b 100644
--- a/c/src/lib/libcpu/bfin/include/ethernetRegs.h
+++ b/include/libcpu/ethernetRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/gpioRegs.h b/include/libcpu/gpioRegs.h
index 02862916e1..02862916e1 100644
--- a/c/src/lib/libcpu/bfin/include/gpioRegs.h
+++ b/include/libcpu/gpioRegs.h
diff --git a/c/src/lib/libcpu/bfin/interrupt/interrupt.h b/include/libcpu/interrupt.h
index 2c6b538bde..2c6b538bde 100644
--- a/c/src/lib/libcpu/bfin/interrupt/interrupt.h
+++ b/include/libcpu/interrupt.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/io.h b/include/libcpu/io.h
index 841df81f47..841df81f47 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/io.h
+++ b/include/libcpu/io.h
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.h b/include/libcpu/irq.h
index c1ec40341d..c1ec40341d 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.h
+++ b/include/libcpu/irq.h
diff --git a/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h b/include/libcpu/isr_entries.h
index d31c334e65..d31c334e65 100644
--- a/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h
+++ b/include/libcpu/isr_entries.h
diff --git a/c/src/lib/libcpu/bfin/include/memoryRegs.h b/include/libcpu/memoryRegs.h
index 130235e3d1..130235e3d1 100644
--- a/c/src/lib/libcpu/bfin/include/memoryRegs.h
+++ b/include/libcpu/memoryRegs.h
diff --git a/include/libcpu/mmu.h b/include/libcpu/mmu.h
new file mode 100644
index 0000000000..ea26cb44f1
--- /dev/null
+++ b/include/libcpu/mmu.h
@@ -0,0 +1,138 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_csb336__)
+#  include <arm/csb336/libcpu/mmu.h>
+#elif defined(__rtems_arm_csb337__)
+#  include <arm/csb337/libcpu/mmu.h>
+#elif defined(__rtems_arm_csb637__)
+#  include <arm/csb637/libcpu/mmu.h>
+#elif defined(__rtems_arm_gp32__)
+#  include <arm/gp32/libcpu/mmu.h>
+#elif defined(__rtems_arm_gumstix__)
+#  include <arm/gumstix/libcpu/mmu.h>
+#elif defined(__rtems_arm_kit637_v6__)
+#  include <arm/kit637_v6/libcpu/mmu.h>
+#elif defined(__rtems_arm_smdk2410__)
+#  include <arm/smdk2410/libcpu/mmu.h>
+#elif defined(__rtems_bfin_TLL6527M__)
+#  include <bfin/TLL6527M/libcpu/mmu.h>
+#elif defined(__rtems_bfin_bf537Stamp__)
+#  include <bfin/bf537Stamp/libcpu/mmu.h>
+#elif defined(__rtems_bfin_eZKit533__)
+#  include <bfin/eZKit533/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_beatnik__)
+#  include <powerpc/beatnik/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_br_uid__)
+#  include <powerpc/br_uid/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_brs5l__)
+#  include <powerpc/brs5l/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_brs6l__)
+#  include <powerpc/brs6l/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_dp2__)
+#  include <powerpc/dp2/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_ep1a__)
+#  include <powerpc/ep1a/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_gwlcfm__)
+#  include <powerpc/gwlcfm/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_haleakala__)
+#  include <powerpc/haleakala/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_hsc_cm01__)
+#  include <powerpc/hsc_cm01/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_icecube__)
+#  include <powerpc/icecube/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mbx821_001__)
+#  include <powerpc/mbx821_001/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mbx821_002__)
+#  include <powerpc/mbx821_002/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mbx821_002b__)
+#  include <powerpc/mbx821_002b/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mbx860_001b__)
+#  include <powerpc/mbx860_001b/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mbx860_002__)
+#  include <powerpc/mbx860_002/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mbx860_005b__)
+#  include <powerpc/mbx860_005b/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mbx860_1b__)
+#  include <powerpc/mbx860_1b/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mcp750__)
+#  include <powerpc/mcp750/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mpc5566evb__)
+#  include <powerpc/mpc5566evb/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mpc5566evb_spe__)
+#  include <powerpc/mpc5566evb_spe/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mpc5643l_dpu__)
+#  include <powerpc/mpc5643l_dpu/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mpc5643l_evb__)
+#  include <powerpc/mpc5643l_evb/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mpc5668g__)
+#  include <powerpc/mpc5668g/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_app__)
+#  include <powerpc/mpc5674f_ecu508_app/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_boot__)
+#  include <powerpc/mpc5674f_ecu508_boot/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mpc5674f_rsm6__)
+#  include <powerpc/mpc5674f_rsm6/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mpc5674fevb__)
+#  include <powerpc/mpc5674fevb/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mpc5674fevb_spe__)
+#  include <powerpc/mpc5674fevb_spe/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mpc8260ads__)
+#  include <powerpc/mpc8260ads/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mpc8309som__)
+#  include <powerpc/mpc8309som/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mpc8313erdb__)
+#  include <powerpc/mpc8313erdb/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mpc8349eamds__)
+#  include <powerpc/mpc8349eamds/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mtx603e__)
+#  include <powerpc/mtx603e/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mvme2100__)
+#  include <powerpc/mvme2100/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mvme2307__)
+#  include <powerpc/mvme2307/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mvme3100__)
+#  include <powerpc/mvme3100/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_mvme5500__)
+#  include <powerpc/mvme5500/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_pghplus__)
+#  include <powerpc/pghplus/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_phycore_mpc5554__)
+#  include <powerpc/phycore_mpc5554/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_pm520_cr825__)
+#  include <powerpc/pm520_cr825/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_pm520_ze30__)
+#  include <powerpc/pm520_ze30/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_psim__)
+#  include <powerpc/psim/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_qemuppc__)
+#  include <powerpc/qemuppc/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_qemuprep__)
+#  include <powerpc/qemuprep/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_qemuprep_altivec__)
+#  include <powerpc/qemuprep-altivec/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_qoriq_core_0__)
+#  include <powerpc/qoriq_core_0/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_qoriq_core_1__)
+#  include <powerpc/qoriq_core_1/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_qoriq_p1020rdb__)
+#  include <powerpc/qoriq_p1020rdb/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_score603e__)
+#  include <powerpc/score603e/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_ss555__)
+#  include <powerpc/ss555/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_t32mppc__)
+#  include <powerpc/t32mppc/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_tqm8xx_stk8xx__)
+#  include <powerpc/tqm8xx_stk8xx/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_virtex__)
+#  include <powerpc/virtex/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_virtex4__)
+#  include <powerpc/virtex4/libcpu/mmu.h>
+#elif defined(__rtems_powerpc_virtex5__)
+#  include <powerpc/virtex5/libcpu/mmu.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libcpu/bfin/include/mmuRegs.h b/include/libcpu/mmuRegs.h
index 271ef4dcf5..271ef4dcf5 100644
--- a/c/src/lib/libcpu/bfin/include/mmuRegs.h
+++ b/include/libcpu/mmuRegs.h
diff --git a/c/src/lib/libcpu/arm/shared/include/omap3.h b/include/libcpu/omap3.h
index 2c044a1702..2c044a1702 100644
--- a/c/src/lib/libcpu/arm/shared/include/omap3.h
+++ b/include/libcpu/omap3.h
diff --git a/c/src/lib/libcpu/arm/shared/include/omap_timer.h b/include/libcpu/omap_timer.h
index ef8787a571..ef8787a571 100644
--- a/c/src/lib/libcpu/arm/shared/include/omap_timer.h
+++ b/include/libcpu/omap_timer.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/page.h b/include/libcpu/page.h
index 3efbdef5bc..3efbdef5bc 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/page.h
+++ b/include/libcpu/page.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/pgtable.h b/include/libcpu/pgtable.h
index 5be5874b4f..5be5874b4f 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/pgtable.h
+++ b/include/libcpu/pgtable.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h b/include/libcpu/powerpc-utility.h
index 1cceb75512..1cceb75512 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h
+++ b/include/libcpu/powerpc-utility.h
diff --git a/c/src/lib/libcpu/bfin/include/ppiRegs.h b/include/libcpu/ppiRegs.h
index 0ff301aefc..0ff301aefc 100644
--- a/c/src/lib/libcpu/bfin/include/ppiRegs.h
+++ b/include/libcpu/ppiRegs.h
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.h b/include/libcpu/pte121.h
index a07e063f03..a07e063f03 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.h
+++ b/include/libcpu/pte121.h
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.h b/include/libcpu/raw_exception.h
index dd0c483b0d..dd0c483b0d 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.h
+++ b/include/libcpu/raw_exception.h
diff --git a/c/src/lib/libcpu/mips/rm52xx/include/rm5231.h b/include/libcpu/rm5231.h
index c9ad3f9861..c9ad3f9861 100644
--- a/c/src/lib/libcpu/mips/rm52xx/include/rm5231.h
+++ b/include/libcpu/rm5231.h
diff --git a/c/src/lib/libcpu/bfin/include/rtcRegs.h b/include/libcpu/rtcRegs.h
index 09245c2b91..09245c2b91 100644
--- a/c/src/lib/libcpu/bfin/include/rtcRegs.h
+++ b/include/libcpu/rtcRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/sicRegs.h b/include/libcpu/sicRegs.h
index 79fdd0d77c..79fdd0d77c 100644
--- a/c/src/lib/libcpu/bfin/include/sicRegs.h
+++ b/include/libcpu/sicRegs.h
diff --git a/c/src/lib/libcpu/bfin/serial/spi.h b/include/libcpu/spi.h
index db8bfaa612..db8bfaa612 100644
--- a/c/src/lib/libcpu/bfin/serial/spi.h
+++ b/include/libcpu/spi.h
diff --git a/c/src/lib/libcpu/bfin/include/spiRegs.h b/include/libcpu/spiRegs.h
index dcf792bb69..dcf792bb69 100644
--- a/c/src/lib/libcpu/bfin/include/spiRegs.h
+++ b/include/libcpu/spiRegs.h
diff --git a/c/src/lib/libcpu/bfin/serial/sport.h b/include/libcpu/sport.h
index 6ed481b593..6ed481b593 100644
--- a/c/src/lib/libcpu/bfin/serial/sport.h
+++ b/include/libcpu/sport.h
diff --git a/c/src/lib/libcpu/bfin/include/sportRegs.h b/include/libcpu/sportRegs.h
index f9f263b024..f9f263b024 100644
--- a/c/src/lib/libcpu/bfin/include/sportRegs.h
+++ b/include/libcpu/sportRegs.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/spr.h b/include/libcpu/spr.h
index 6c81d0ee91..6c81d0ee91 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/spr.h
+++ b/include/libcpu/spr.h
diff --git a/c/src/lib/libcpu/powerpc/shared/src/stackTrace.h b/include/libcpu/stackTrace.h
index f73dc2eff2..f73dc2eff2 100644
--- a/c/src/lib/libcpu/powerpc/shared/src/stackTrace.h
+++ b/include/libcpu/stackTrace.h
diff --git a/c/src/lib/libcpu/bfin/include/timerRegs.h b/include/libcpu/timerRegs.h
index b66bae3339..b66bae3339 100644
--- a/c/src/lib/libcpu/bfin/include/timerRegs.h
+++ b/include/libcpu/timerRegs.h
diff --git a/c/src/lib/libcpu/bfin/serial/twi.h b/include/libcpu/twi.h
index 2392ba532b..2392ba532b 100644
--- a/c/src/lib/libcpu/bfin/serial/twi.h
+++ b/include/libcpu/twi.h
diff --git a/c/src/lib/libcpu/bfin/include/twiRegs.h b/include/libcpu/twiRegs.h
index c776f7886e..c776f7886e 100644
--- a/c/src/lib/libcpu/bfin/include/twiRegs.h
+++ b/include/libcpu/twiRegs.h
diff --git a/c/src/lib/libcpu/mips/tx39/include/tx3904.h b/include/libcpu/tx3904.h
index b573d3c7d9..b573d3c7d9 100644
--- a/c/src/lib/libcpu/mips/tx39/include/tx3904.h
+++ b/include/libcpu/tx3904.h
diff --git a/c/src/lib/libcpu/mips/tx49/include/tx4925.h b/include/libcpu/tx4925.h
index 56f58d9bf3..56f58d9bf3 100644
--- a/c/src/lib/libcpu/mips/tx49/include/tx4925.h
+++ b/include/libcpu/tx4925.h
diff --git a/c/src/lib/libcpu/mips/tx49/include/tx4938.h b/include/libcpu/tx4938.h
index 5005cc4149..5005cc4149 100644
--- a/c/src/lib/libcpu/mips/tx49/include/tx4938.h
+++ b/include/libcpu/tx4938.h
diff --git a/c/src/lib/libcpu/bfin/serial/uart.h b/include/libcpu/uart.h
index 730e0e261f..730e0e261f 100644
--- a/c/src/lib/libcpu/bfin/serial/uart.h
+++ b/include/libcpu/uart.h
diff --git a/c/src/lib/libcpu/bfin/include/uartRegs.h b/include/libcpu/uartRegs.h
index f48052e49b..f48052e49b 100644
--- a/c/src/lib/libcpu/bfin/include/uartRegs.h
+++ b/include/libcpu/uartRegs.h
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.h b/include/libcpu/vectors.h
index 2c8914e2a4..2c8914e2a4 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.h
+++ b/include/libcpu/vectors.h
diff --git a/c/src/lib/libcpu/bfin/include/wdogRegs.h b/include/libcpu/wdogRegs.h
index 9e76d345b0..9e76d345b0 100644
--- a/c/src/lib/libcpu/bfin/include/wdogRegs.h
+++ b/include/libcpu/wdogRegs.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/gbfs.h b/include/libnds/gbfs.h
index 84fbae5dc5..84fbae5dc5 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/gbfs.h
+++ b/include/libnds/gbfs.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds.h b/include/libnds/nds.h
index cf8d9e4606..cf8d9e4606 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds.h
+++ b/include/libnds/nds.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/audio.h b/include/libnds/nds/arm7/audio.h
index 9c0c2e4502..9c0c2e4502 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/audio.h
+++ b/include/libnds/nds/arm7/audio.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/clock.h b/include/libnds/nds/arm7/clock.h
index 57cba7c1ef..57cba7c1ef 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/clock.h
+++ b/include/libnds/nds/arm7/clock.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/serial.h b/include/libnds/nds/arm7/serial.h
index 9814ecaec0..9814ecaec0 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/serial.h
+++ b/include/libnds/nds/arm7/serial.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/touch.h b/include/libnds/nds/arm7/touch.h
index 91285d314d..91285d314d 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/touch.h
+++ b/include/libnds/nds/arm7/touch.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/background.h b/include/libnds/nds/arm9/background.h
index 4aa8287161..4aa8287161 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/background.h
+++ b/include/libnds/nds/arm9/background.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/boxtest.h b/include/libnds/nds/arm9/boxtest.h
index 5591bddd72..5591bddd72 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/boxtest.h
+++ b/include/libnds/nds/arm9/boxtest.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/cache.h b/include/libnds/nds/arm9/cache.h
index d2ba67158f..d2ba67158f 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/cache.h
+++ b/include/libnds/nds/arm9/cache.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/console.h b/include/libnds/nds/arm9/console.h
index c258401070..c258401070 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/console.h
+++ b/include/libnds/nds/arm9/console.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/exceptions.h b/include/libnds/nds/arm9/exceptions.h
index 1127e3ff4c..1127e3ff4c 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/exceptions.h
+++ b/include/libnds/nds/arm9/exceptions.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/image.h b/include/libnds/nds/arm9/image.h
index b2a5d00821..b2a5d00821 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/image.h
+++ b/include/libnds/nds/arm9/image.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/input.h b/include/libnds/nds/arm9/input.h
index c08eed1e5d..c08eed1e5d 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/input.h
+++ b/include/libnds/nds/arm9/input.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/math.h b/include/libnds/nds/arm9/math.h
index f1296a19fc..f1296a19fc 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/math.h
+++ b/include/libnds/nds/arm9/math.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/ndsmotion.h b/include/libnds/nds/arm9/ndsmotion.h
index f3940f5f2f..f3940f5f2f 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/ndsmotion.h
+++ b/include/libnds/nds/arm9/ndsmotion.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/pcx.h b/include/libnds/nds/arm9/pcx.h
index f050224cd0..f050224cd0 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/pcx.h
+++ b/include/libnds/nds/arm9/pcx.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/postest.h b/include/libnds/nds/arm9/postest.h
index e08b3f4702..e08b3f4702 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/postest.h
+++ b/include/libnds/nds/arm9/postest.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/rumble.h b/include/libnds/nds/arm9/rumble.h
index 0361052827..0361052827 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/rumble.h
+++ b/include/libnds/nds/arm9/rumble.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/sound.h b/include/libnds/nds/arm9/sound.h
index 96b63f4405..96b63f4405 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/sound.h
+++ b/include/libnds/nds/arm9/sound.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/sprite.h b/include/libnds/nds/arm9/sprite.h
index bbfefad6a3..bbfefad6a3 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/sprite.h
+++ b/include/libnds/nds/arm9/sprite.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/trig_lut.h b/include/libnds/nds/arm9/trig_lut.h
index 7d946bfafc..7d946bfafc 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/trig_lut.h
+++ b/include/libnds/nds/arm9/trig_lut.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/video.h b/include/libnds/nds/arm9/video.h
index 9e910c621f..9e910c621f 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/video.h
+++ b/include/libnds/nds/arm9/video.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/videoGL.h b/include/libnds/nds/arm9/videoGL.h
index 0f402b434e..0f402b434e 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/videoGL.h
+++ b/include/libnds/nds/arm9/videoGL.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/bios.h b/include/libnds/nds/bios.h
index 0b91c4cbef..0b91c4cbef 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/bios.h
+++ b/include/libnds/nds/bios.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/card.h b/include/libnds/nds/card.h
index 7e82b2f693..7e82b2f693 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/card.h
+++ b/include/libnds/nds/card.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/dma.h b/include/libnds/nds/dma.h
index e7b7f3ab7c..e7b7f3ab7c 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/dma.h
+++ b/include/libnds/nds/dma.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/interrupts.h b/include/libnds/nds/interrupts.h
index 5f31190fda..5f31190fda 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/interrupts.h
+++ b/include/libnds/nds/interrupts.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/ipc.h b/include/libnds/nds/ipc.h
index 968d6c2ea5..968d6c2ea5 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/ipc.h
+++ b/include/libnds/nds/ipc.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/jtypes.h b/include/libnds/nds/jtypes.h
index afd93c6d05..afd93c6d05 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/jtypes.h
+++ b/include/libnds/nds/jtypes.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/memory.h b/include/libnds/nds/memory.h
index 46864e50a7..46864e50a7 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/memory.h
+++ b/include/libnds/nds/memory.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/registers_alt.h b/include/libnds/nds/registers_alt.h
index 1c9eb33993..1c9eb33993 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/registers_alt.h
+++ b/include/libnds/nds/registers_alt.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/reload.h b/include/libnds/nds/reload.h
index c95ae3aaa4..c95ae3aaa4 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/reload.h
+++ b/include/libnds/nds/reload.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/system.h b/include/libnds/nds/system.h
index 8e4e5b5920..8e4e5b5920 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/system.h
+++ b/include/libnds/nds/system.h
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/timers.h b/include/libnds/nds/timers.h
index 12f94b582a..12f94b582a 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/timers.h
+++ b/include/libnds/nds/timers.h
diff --git a/cpukit/libfs/src/nfsclient/src/librtemsNfs.h b/include/librtemsNfs.h
index 530eee2144..530eee2144 100644
--- a/cpukit/libfs/src/nfsclient/src/librtemsNfs.h
+++ b/include/librtemsNfs.h
diff --git a/cpukit/libdl/include/link.h b/include/link.h
index c93efd9e78..c93efd9e78 100644
--- a/cpukit/libdl/include/link.h
+++ b/include/link.h
diff --git a/cpukit/libdl/include/link_elf.h b/include/link_elf.h
index d2691b68b0..d2691b68b0 100644
--- a/cpukit/libdl/include/link_elf.h
+++ b/include/link_elf.h
diff --git a/cpukit/dev/include/linux/i2c-dev.h b/include/linux/i2c-dev.h
index c0db3fe06c..c0db3fe06c 100644
--- a/cpukit/dev/include/linux/i2c-dev.h
+++ b/include/linux/i2c-dev.h
diff --git a/cpukit/dev/include/linux/i2c.h b/include/linux/i2c.h
index eacacd7087..eacacd7087 100644
--- a/cpukit/dev/include/linux/i2c.h
+++ b/include/linux/i2c.h
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h b/include/lm32/lm32_evr/bsp.h
index facfc2d89c..facfc2d89c 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h
+++ b/include/lm32/lm32_evr/bsp.h
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/coverhd.h b/include/lm32/lm32_evr/coverhd.h
index bdef537e71..bdef537e71 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/include/coverhd.h
+++ b/include/lm32/lm32_evr/coverhd.h
diff --git a/cpukit/score/cpu/lm32/rtems/asm.h b/include/lm32/lm32_evr/rtems/asm.h
index 15046df81c..15046df81c 100644
--- a/cpukit/score/cpu/lm32/rtems/asm.h
+++ b/include/lm32/lm32_evr/rtems/asm.h
diff --git a/cpukit/score/cpu/lm32/rtems/score/cpu.h b/include/lm32/lm32_evr/rtems/score/cpu.h
index 67d7ebebac..67d7ebebac 100644
--- a/cpukit/score/cpu/lm32/rtems/score/cpu.h
+++ b/include/lm32/lm32_evr/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/lm32/rtems/score/cpu_asm.h b/include/lm32/lm32_evr/rtems/score/cpu_asm.h
index 3909c1d608..3909c1d608 100644
--- a/cpukit/score/cpu/lm32/rtems/score/cpu_asm.h
+++ b/include/lm32/lm32_evr/rtems/score/cpu_asm.h
diff --git a/include/lm32/lm32_evr/rtems/score/cpuatomic.h b/include/lm32/lm32_evr/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/lm32/lm32_evr/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/lm32/rtems/score/types.h b/include/lm32/lm32_evr/rtems/score/types.h
index ab9dcbdae7..ab9dcbdae7 100644
--- a/cpukit/score/cpu/lm32/rtems/score/types.h
+++ b/include/lm32/lm32_evr/rtems/score/types.h
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/system_conf.h b/include/lm32/lm32_evr/system_conf.h
index 41f17e2be0..41f17e2be0 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/include/system_conf.h
+++ b/include/lm32/lm32_evr/system_conf.h
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/tm27.h b/include/lm32/lm32_evr/tm27.h
index f62e62e73f..f62e62e73f 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/include/tm27.h
+++ b/include/lm32/lm32_evr/tm27.h
diff --git a/c/src/lib/libbsp/lm32/milkymist/include/bsp.h b/include/lm32/milkymist/bsp.h
index f802ff562e..f802ff562e 100644
--- a/c/src/lib/libbsp/lm32/milkymist/include/bsp.h
+++ b/include/lm32/milkymist/bsp.h
diff --git a/c/src/lib/libbsp/lm32/shared/include/irq.h b/include/lm32/milkymist/bsp/irq.h
index b1ccd66339..b1ccd66339 100644
--- a/c/src/lib/libbsp/lm32/shared/include/irq.h
+++ b/include/lm32/milkymist/bsp/irq.h
diff --git a/include/lm32/milkymist/coverhd.h b/include/lm32/milkymist/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/lm32/milkymist/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/lm32/milkymist/rtems/asm.h b/include/lm32/milkymist/rtems/asm.h
new file mode 100644
index 0000000000..4d4f77100a
--- /dev/null
+++ b/include/lm32/milkymist/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* lm32/lm32_evr/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <lm32/lm32_evr/rtems/asm.h>
diff --git a/include/lm32/milkymist/rtems/score/cpu.h b/include/lm32/milkymist/rtems/score/cpu.h
new file mode 100644
index 0000000000..9e182db94b
--- /dev/null
+++ b/include/lm32/milkymist/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* lm32/lm32_evr/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <lm32/lm32_evr/rtems/score/cpu.h>
diff --git a/include/lm32/milkymist/rtems/score/cpu_asm.h b/include/lm32/milkymist/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..c225584a27
--- /dev/null
+++ b/include/lm32/milkymist/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* lm32/lm32_evr/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <lm32/lm32_evr/rtems/score/cpu_asm.h>
diff --git a/include/lm32/milkymist/rtems/score/cpuatomic.h b/include/lm32/milkymist/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/lm32/milkymist/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/lm32/milkymist/rtems/score/types.h b/include/lm32/milkymist/rtems/score/types.h
new file mode 100644
index 0000000000..2826444745
--- /dev/null
+++ b/include/lm32/milkymist/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* lm32/lm32_evr/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <lm32/lm32_evr/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/lm32/milkymist/include/system_conf.h b/include/lm32/milkymist/system_conf.h
index 8ba4a1cf43..8ba4a1cf43 100644
--- a/c/src/lib/libbsp/lm32/milkymist/include/system_conf.h
+++ b/include/lm32/milkymist/system_conf.h
diff --git a/include/lm32/milkymist/tm27.h b/include/lm32/milkymist/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/lm32/milkymist/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libcpu/arm/lpc22xx/include/lpc22xx.h b/include/lpc22xx.h
index babaf8343d..babaf8343d 100644
--- a/c/src/lib/libcpu/arm/lpc22xx/include/lpc22xx.h
+++ b/include/lpc22xx.h
diff --git a/c/src/lib/libbsp/m68k/gen68302/include/m302_int.h b/include/m302_int.h
index 3634787337..3634787337 100644
--- a/c/src/lib/libbsp/m68k/gen68302/include/m302_int.h
+++ b/include/m302_int.h
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/include/bsp.h b/include/m32c/m32csim/bsp.h
index 6c1509e04a..6c1509e04a 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/include/bsp.h
+++ b/include/m32c/m32csim/bsp.h
diff --git a/include/m32c/m32csim/coverhd.h b/include/m32c/m32csim/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/m32c/m32csim/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/cpukit/score/cpu/m32c/rtems/asm.h b/include/m32c/m32csim/rtems/asm.h
index f3f244d066..f3f244d066 100644
--- a/cpukit/score/cpu/m32c/rtems/asm.h
+++ b/include/m32c/m32csim/rtems/asm.h
diff --git a/cpukit/score/cpu/m32c/rtems/score/cpu.h b/include/m32c/m32csim/rtems/score/cpu.h
index 55e9853aad..55e9853aad 100644
--- a/cpukit/score/cpu/m32c/rtems/score/cpu.h
+++ b/include/m32c/m32csim/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/m32c/rtems/score/cpu_asm.h b/include/m32c/m32csim/rtems/score/cpu_asm.h
index 451c022d75..451c022d75 100644
--- a/cpukit/score/cpu/m32c/rtems/score/cpu_asm.h
+++ b/include/m32c/m32csim/rtems/score/cpu_asm.h
diff --git a/include/m32c/m32csim/rtems/score/cpuatomic.h b/include/m32c/m32csim/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m32c/m32csim/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/m32c/rtems/score/types.h b/include/m32c/m32csim/rtems/score/types.h
index 5c476c6d3a..5c476c6d3a 100644
--- a/cpukit/score/cpu/m32c/rtems/score/types.h
+++ b/include/m32c/m32csim/rtems/score/types.h
diff --git a/include/m32c/m32csim/tm27.h b/include/m32c/m32csim/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/m32c/m32csim/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/m32r/m32rsim/include/bsp.h b/include/m32r/m32rsim/bsp.h
index 26074f6868..26074f6868 100644
--- a/c/src/lib/libbsp/m32r/m32rsim/include/bsp.h
+++ b/include/m32r/m32rsim/bsp.h
diff --git a/include/m32r/m32rsim/coverhd.h b/include/m32r/m32rsim/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/m32r/m32rsim/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/cpukit/score/cpu/m32r/rtems/asm.h b/include/m32r/m32rsim/rtems/asm.h
index 11f5b876b9..11f5b876b9 100644
--- a/cpukit/score/cpu/m32r/rtems/asm.h
+++ b/include/m32r/m32rsim/rtems/asm.h
diff --git a/cpukit/score/cpu/m32r/rtems/score/cpu.h b/include/m32r/m32rsim/rtems/score/cpu.h
index 940804596c..940804596c 100644
--- a/cpukit/score/cpu/m32r/rtems/score/cpu.h
+++ b/include/m32r/m32rsim/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/m32r/rtems/score/cpu_asm.h b/include/m32r/m32rsim/rtems/score/cpu_asm.h
index ac6aac41a8..ac6aac41a8 100644
--- a/cpukit/score/cpu/m32r/rtems/score/cpu_asm.h
+++ b/include/m32r/m32rsim/rtems/score/cpu_asm.h
diff --git a/include/m32r/m32rsim/rtems/score/cpuatomic.h b/include/m32r/m32rsim/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m32r/m32rsim/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/m32r/rtems/score/types.h b/include/m32r/m32rsim/rtems/score/types.h
index 2439fb5153..2439fb5153 100644
--- a/cpukit/score/cpu/m32r/rtems/score/types.h
+++ b/include/m32r/m32rsim/rtems/score/types.h
diff --git a/c/src/lib/libbsp/m32r/m32rsim/include/tm27.h b/include/m32r/m32rsim/tm27.h
index a775386b9e..a775386b9e 100644
--- a/c/src/lib/libbsp/m32r/m32rsim/include/tm27.h
+++ b/include/m32r/m32rsim/tm27.h
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m340timer.h b/include/m340timer.h
index 892c690e5f..892c690e5f 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/m340timer.h
+++ b/include/m340timer.h
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h b/include/m340uart.h
index 619a732a14..619a732a14 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h
+++ b/include/m340uart.h
diff --git a/c/src/lib/libbsp/m68k/ods68302/include/m68302scc.h b/include/m68302scc.h
index bd0b13d5c4..bd0b13d5c4 100644
--- a/c/src/lib/libbsp/m68k/ods68302/include/m68302scc.h
+++ b/include/m68302scc.h
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m68340.h b/include/m68340.h
index 37440f3098..37440f3098 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/m68340.h
+++ b/include/m68340.h
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m68340.inc b/include/m68340.inc
index 5c1ba36799..5c1ba36799 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/m68340.inc
+++ b/include/m68340.inc
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m68349.inc b/include/m68349.inc
index 4e3ce53d29..4e3ce53d29 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/m68349.inc
+++ b/include/m68349.inc
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h b/include/m68k/COBRA5475/bsp.h
index d8187630cb..d8187630cb 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
+++ b/include/m68k/COBRA5475/bsp.h
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/irq.h b/include/m68k/COBRA5475/bsp/irq.h
index 825cc0d104..825cc0d104 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/include/irq.h
+++ b/include/m68k/COBRA5475/bsp/irq.h
diff --git a/c/src/lib/libbsp/m68k/shared/include/linker-symbols.h b/include/m68k/COBRA5475/bsp/linker-symbols.h
index 8bf5ebfa07..8bf5ebfa07 100644
--- a/c/src/lib/libbsp/m68k/shared/include/linker-symbols.h
+++ b/include/m68k/COBRA5475/bsp/linker-symbols.h
diff --git a/include/m68k/COBRA5475/coverhd.h b/include/m68k/COBRA5475/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/m68k/COBRA5475/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/cpukit/score/cpu/m68k/rtems/asm.h b/include/m68k/COBRA5475/rtems/asm.h
index cbd2a7f8b2..cbd2a7f8b2 100644
--- a/cpukit/score/cpu/m68k/rtems/asm.h
+++ b/include/m68k/COBRA5475/rtems/asm.h
diff --git a/cpukit/score/cpu/m68k/rtems/score/cpu.h b/include/m68k/COBRA5475/rtems/score/cpu.h
index c36b2f1739..c36b2f1739 100644
--- a/cpukit/score/cpu/m68k/rtems/score/cpu.h
+++ b/include/m68k/COBRA5475/rtems/score/cpu.h
diff --git a/include/m68k/COBRA5475/rtems/score/cpuatomic.h b/include/m68k/COBRA5475/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/COBRA5475/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/m68k/rtems/score/types.h b/include/m68k/COBRA5475/rtems/score/types.h
index b5af1c86b0..b5af1c86b0 100644
--- a/cpukit/score/cpu/m68k/rtems/score/types.h
+++ b/include/m68k/COBRA5475/rtems/score/types.h
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/tm27.h b/include/m68k/COBRA5475/tm27.h
index 31ea8bca0c..31ea8bca0c 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/include/tm27.h
+++ b/include/m68k/COBRA5475/tm27.h
diff --git a/c/src/lib/libbsp/m68k/av5282/include/bsp.h b/include/m68k/av5282/bsp.h
index 007fc40faa..007fc40faa 100644
--- a/c/src/lib/libbsp/m68k/av5282/include/bsp.h
+++ b/include/m68k/av5282/bsp.h
diff --git a/include/m68k/av5282/bsp/linker-symbols.h b/include/m68k/av5282/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/av5282/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/include/m68k/av5282/coverhd.h b/include/m68k/av5282/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/m68k/av5282/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/m68k/av5282/rtems/asm.h b/include/m68k/av5282/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/av5282/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/av5282/rtems/score/cpu.h b/include/m68k/av5282/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/av5282/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/av5282/rtems/score/cpuatomic.h b/include/m68k/av5282/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/av5282/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/av5282/rtems/score/types.h b/include/m68k/av5282/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/av5282/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/m68k/av5282/include/tm27.h b/include/m68k/av5282/tm27.h
index 1e1dc77e59..1e1dc77e59 100644
--- a/c/src/lib/libbsp/m68k/av5282/include/tm27.h
+++ b/include/m68k/av5282/tm27.h
diff --git a/c/src/lib/libbsp/m68k/csb360/include/bsp.h b/include/m68k/csb360/bsp.h
index 12b2c906d0..12b2c906d0 100644
--- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h
+++ b/include/m68k/csb360/bsp.h
diff --git a/include/m68k/csb360/bsp/linker-symbols.h b/include/m68k/csb360/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/csb360/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/m68k/csb360/include/coverhd.h b/include/m68k/csb360/coverhd.h
index c5ff33b21d..c5ff33b21d 100644
--- a/c/src/lib/libbsp/m68k/csb360/include/coverhd.h
+++ b/include/m68k/csb360/coverhd.h
diff --git a/include/m68k/csb360/rtems/asm.h b/include/m68k/csb360/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/csb360/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/csb360/rtems/score/cpu.h b/include/m68k/csb360/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/csb360/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/csb360/rtems/score/cpuatomic.h b/include/m68k/csb360/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/csb360/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/csb360/rtems/score/types.h b/include/m68k/csb360/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/csb360/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/m68k/csb360/include/tm27.h b/include/m68k/csb360/tm27.h
index 5f2fd8a383..5f2fd8a383 100644
--- a/c/src/lib/libbsp/m68k/csb360/include/tm27.h
+++ b/include/m68k/csb360/tm27.h
diff --git a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h b/include/m68k/gen68302/bsp.h
index 5e86dfeb38..5e86dfeb38 100644
--- a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h
+++ b/include/m68k/gen68302/bsp.h
diff --git a/include/m68k/gen68302/bsp/linker-symbols.h b/include/m68k/gen68302/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/gen68302/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/m68k/gen68302/include/coverhd.h b/include/m68k/gen68302/coverhd.h
index 65d586c0fc..65d586c0fc 100644
--- a/c/src/lib/libbsp/m68k/gen68302/include/coverhd.h
+++ b/include/m68k/gen68302/coverhd.h
diff --git a/include/m68k/gen68302/rtems/asm.h b/include/m68k/gen68302/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/gen68302/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/gen68302/rtems/score/cpu.h b/include/m68k/gen68302/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/gen68302/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/gen68302/rtems/score/cpuatomic.h b/include/m68k/gen68302/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/gen68302/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/gen68302/rtems/score/types.h b/include/m68k/gen68302/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/gen68302/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/include/m68k/gen68302/tm27.h b/include/m68k/gen68302/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/m68k/gen68302/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/include/m68k/gen68340/bsp.h
index 4f789d288b..4f789d288b 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
+++ b/include/m68k/gen68340/bsp.h
diff --git a/include/m68k/gen68340/bsp/linker-symbols.h b/include/m68k/gen68340/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/gen68340/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/coverhd.h b/include/m68k/gen68340/coverhd.h
index 9e8796b38a..9e8796b38a 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/coverhd.h
+++ b/include/m68k/gen68340/coverhd.h
diff --git a/include/m68k/gen68340/rtems/asm.h b/include/m68k/gen68340/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/gen68340/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/gen68340/rtems/score/cpu.h b/include/m68k/gen68340/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/gen68340/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/gen68340/rtems/score/cpuatomic.h b/include/m68k/gen68340/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/gen68340/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/gen68340/rtems/score/types.h b/include/m68k/gen68340/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/gen68340/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/include/m68k/gen68340/tm27.h b/include/m68k/gen68340/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/m68k/gen68340/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/include/m68k/gen68360/bsp.h
index a6c6254eb9..a6c6254eb9 100644
--- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
+++ b/include/m68k/gen68360/bsp.h
diff --git a/include/m68k/gen68360/bsp/linker-symbols.h b/include/m68k/gen68360/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/gen68360/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/m68k/gen68360/include/coverhd.h b/include/m68k/gen68360/coverhd.h
index c199d6212c..c199d6212c 100644
--- a/c/src/lib/libbsp/m68k/gen68360/include/coverhd.h
+++ b/include/m68k/gen68360/coverhd.h
diff --git a/include/m68k/gen68360/rtems/asm.h b/include/m68k/gen68360/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/gen68360/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/gen68360/rtems/score/cpu.h b/include/m68k/gen68360/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/gen68360/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/gen68360/rtems/score/cpuatomic.h b/include/m68k/gen68360/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/gen68360/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/gen68360/rtems/score/types.h b/include/m68k/gen68360/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/gen68360/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/m68k/gen68360/include/tm27.h b/include/m68k/gen68360/tm27.h
index c71eed3897..c71eed3897 100644
--- a/c/src/lib/libbsp/m68k/gen68360/include/tm27.h
+++ b/include/m68k/gen68360/tm27.h
diff --git a/include/m68k/gen68360_040/bsp.h b/include/m68k/gen68360_040/bsp.h
new file mode 100644
index 0000000000..c7b63bf7ee
--- /dev/null
+++ b/include/m68k/gen68360_040/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/gen68360/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/gen68360/bsp.h>
diff --git a/include/m68k/gen68360_040/bsp/linker-symbols.h b/include/m68k/gen68360_040/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/gen68360_040/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/include/m68k/gen68360_040/coverhd.h b/include/m68k/gen68360_040/coverhd.h
new file mode 100644
index 0000000000..0455eba347
--- /dev/null
+++ b/include/m68k/gen68360_040/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/gen68360/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/gen68360/coverhd.h>
diff --git a/include/m68k/gen68360_040/rtems/asm.h b/include/m68k/gen68360_040/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/gen68360_040/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/gen68360_040/rtems/score/cpu.h b/include/m68k/gen68360_040/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/gen68360_040/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/gen68360_040/rtems/score/cpuatomic.h b/include/m68k/gen68360_040/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/gen68360_040/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/gen68360_040/rtems/score/types.h b/include/m68k/gen68360_040/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/gen68360_040/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/include/m68k/gen68360_040/tm27.h b/include/m68k/gen68360_040/tm27.h
new file mode 100644
index 0000000000..94b0132440
--- /dev/null
+++ b/include/m68k/gen68360_040/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/gen68360/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/gen68360/tm27.h>
diff --git a/c/src/lib/libbsp/m68k/idp/include/bsp.h b/include/m68k/idp/bsp.h
index e3c6a0d2a3..e3c6a0d2a3 100644
--- a/c/src/lib/libbsp/m68k/idp/include/bsp.h
+++ b/include/m68k/idp/bsp.h
diff --git a/include/m68k/idp/bsp/linker-symbols.h b/include/m68k/idp/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/idp/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/include/m68k/idp/coverhd.h b/include/m68k/idp/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/m68k/idp/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/m68k/idp/rtems/asm.h b/include/m68k/idp/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/idp/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/idp/rtems/score/cpu.h b/include/m68k/idp/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/idp/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/idp/rtems/score/cpuatomic.h b/include/m68k/idp/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/idp/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/idp/rtems/score/types.h b/include/m68k/idp/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/idp/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/include/m68k/idp/tm27.h b/include/m68k/idp/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/m68k/idp/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/m68k/m5484FireEngine/bsp.h b/include/m68k/m5484FireEngine/bsp.h
new file mode 100644
index 0000000000..7f8508278a
--- /dev/null
+++ b/include/m68k/m5484FireEngine/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp.h>
diff --git a/include/m68k/m5484FireEngine/bsp/irq.h b/include/m68k/m5484FireEngine/bsp/irq.h
new file mode 100644
index 0000000000..3ab167b318
--- /dev/null
+++ b/include/m68k/m5484FireEngine/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/irq.h>
diff --git a/include/m68k/m5484FireEngine/bsp/linker-symbols.h b/include/m68k/m5484FireEngine/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/m5484FireEngine/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/include/m68k/m5484FireEngine/coverhd.h b/include/m68k/m5484FireEngine/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/m68k/m5484FireEngine/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/m68k/m5484FireEngine/rtems/asm.h b/include/m68k/m5484FireEngine/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/m5484FireEngine/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/m5484FireEngine/rtems/score/cpu.h b/include/m68k/m5484FireEngine/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/m5484FireEngine/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/m5484FireEngine/rtems/score/cpuatomic.h b/include/m68k/m5484FireEngine/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/m5484FireEngine/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/m5484FireEngine/rtems/score/types.h b/include/m68k/m5484FireEngine/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/m5484FireEngine/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/include/m68k/m5484FireEngine/tm27.h b/include/m68k/m5484FireEngine/tm27.h
new file mode 100644
index 0000000000..5ab6c62686
--- /dev/null
+++ b/include/m68k/m5484FireEngine/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/tm27.h>
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h b/include/m68k/mcf5206elite/bsp.h
index 6c4dd9f7cb..6c4dd9f7cb 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h
+++ b/include/m68k/mcf5206elite/bsp.h
diff --git a/include/m68k/mcf5206elite/bsp/linker-symbols.h b/include/m68k/mcf5206elite/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/mcf5206elite/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/coverhd.h b/include/m68k/mcf5206elite/coverhd.h
index 1ff260d1a1..1ff260d1a1 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/coverhd.h
+++ b/include/m68k/mcf5206elite/coverhd.h
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/nvram.h b/include/m68k/mcf5206elite/nvram.h
index fd75db2363..fd75db2363 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/nvram.h
+++ b/include/m68k/mcf5206elite/nvram.h
diff --git a/include/m68k/mcf5206elite/rtems/asm.h b/include/m68k/mcf5206elite/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/mcf5206elite/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/mcf5206elite/rtems/score/cpu.h b/include/m68k/mcf5206elite/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/mcf5206elite/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/mcf5206elite/rtems/score/cpuatomic.h b/include/m68k/mcf5206elite/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/mcf5206elite/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/mcf5206elite/rtems/score/types.h b/include/m68k/mcf5206elite/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/mcf5206elite/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/tm27.h b/include/m68k/mcf5206elite/tm27.h
index 2abef68311..2abef68311 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/tm27.h
+++ b/include/m68k/mcf5206elite/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h b/include/m68k/mcf52235/bsp.h
index f8073bc988..f8073bc988 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h
+++ b/include/m68k/mcf52235/bsp.h
diff --git a/include/m68k/mcf52235/bsp/linker-symbols.h b/include/m68k/mcf52235/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/mcf52235/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/include/m68k/mcf52235/coverhd.h b/include/m68k/mcf52235/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/m68k/mcf52235/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/m68k/mcf52235/rtems/asm.h b/include/m68k/mcf52235/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/mcf52235/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/mcf52235/rtems/score/cpu.h b/include/m68k/mcf52235/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/mcf52235/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/mcf52235/rtems/score/cpuatomic.h b/include/m68k/mcf52235/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/mcf52235/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/mcf52235/rtems/score/types.h b/include/m68k/mcf52235/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/mcf52235/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/m68k/mcf52235/include/tm27.h b/include/m68k/mcf52235/tm27.h
index b4b62ef721..b4b62ef721 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/include/tm27.h
+++ b/include/m68k/mcf52235/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h b/include/m68k/mcf5225x/bsp.h
index 2d71dff1b3..2d71dff1b3 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h
+++ b/include/m68k/mcf5225x/bsp.h
diff --git a/include/m68k/mcf5225x/bsp/linker-symbols.h b/include/m68k/mcf5225x/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/mcf5225x/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/include/m68k/mcf5225x/coverhd.h b/include/m68k/mcf5225x/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/m68k/mcf5225x/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/m68k/mcf5225x/rtems/asm.h b/include/m68k/mcf5225x/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/mcf5225x/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/mcf5225x/rtems/score/cpu.h b/include/m68k/mcf5225x/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/mcf5225x/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/mcf5225x/rtems/score/cpuatomic.h b/include/m68k/mcf5225x/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/mcf5225x/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/mcf5225x/rtems/score/types.h b/include/m68k/mcf5225x/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/mcf5225x/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/include/tm27.h b/include/m68k/mcf5225x/tm27.h
index fcf1c4f8aa..fcf1c4f8aa 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/include/tm27.h
+++ b/include/m68k/mcf5225x/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h b/include/m68k/mcf5235/bsp.h
index 38eb68bc19..38eb68bc19 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h
+++ b/include/m68k/mcf5235/bsp.h
diff --git a/include/m68k/mcf5235/bsp/linker-symbols.h b/include/m68k/mcf5235/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/mcf5235/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/include/m68k/mcf5235/coverhd.h b/include/m68k/mcf5235/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/m68k/mcf5235/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/m68k/mcf5235/rtems/asm.h b/include/m68k/mcf5235/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/mcf5235/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/mcf5235/rtems/score/cpu.h b/include/m68k/mcf5235/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/mcf5235/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/mcf5235/rtems/score/cpuatomic.h b/include/m68k/mcf5235/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/mcf5235/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/mcf5235/rtems/score/types.h b/include/m68k/mcf5235/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/mcf5235/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/m68k/mcf5235/include/tm27.h b/include/m68k/mcf5235/tm27.h
index 92a85c789a..92a85c789a 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/include/tm27.h
+++ b/include/m68k/mcf5235/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h b/include/m68k/mcf5329/bsp.h
index 706583b0f6..706583b0f6 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h
+++ b/include/m68k/mcf5329/bsp.h
diff --git a/include/m68k/mcf5329/bsp/linker-symbols.h b/include/m68k/mcf5329/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/mcf5329/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/include/m68k/mcf5329/coverhd.h b/include/m68k/mcf5329/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/m68k/mcf5329/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/m68k/mcf5329/rtems/asm.h b/include/m68k/mcf5329/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/mcf5329/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/mcf5329/rtems/score/cpu.h b/include/m68k/mcf5329/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/mcf5329/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/mcf5329/rtems/score/cpuatomic.h b/include/m68k/mcf5329/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/mcf5329/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/mcf5329/rtems/score/types.h b/include/m68k/mcf5329/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/mcf5329/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/m68k/mcf5329/include/tm27.h b/include/m68k/mcf5329/tm27.h
index 33376540ac..33376540ac 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/include/tm27.h
+++ b/include/m68k/mcf5329/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/include/m68k/mrm332/bsp.h
index 54f7ae37ac..54f7ae37ac 100644
--- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
+++ b/include/m68k/mrm332/bsp.h
diff --git a/include/m68k/mrm332/bsp/linker-symbols.h b/include/m68k/mrm332/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/mrm332/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/include/m68k/mrm332/coverhd.h b/include/m68k/mrm332/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/m68k/mrm332/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/m68k/mrm332/rtems/asm.h b/include/m68k/mrm332/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/mrm332/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/mrm332/rtems/score/cpu.h b/include/m68k/mrm332/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/mrm332/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/mrm332/rtems/score/cpuatomic.h b/include/m68k/mrm332/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/mrm332/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/mrm332/rtems/score/types.h b/include/m68k/mrm332/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/mrm332/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/include/m68k/mrm332/tm27.h b/include/m68k/mrm332/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/m68k/mrm332/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/include/m68k/mvme136/bsp.h
index d99b87849a..d99b87849a 100644
--- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
+++ b/include/m68k/mvme136/bsp.h
diff --git a/include/m68k/mvme136/bsp/linker-symbols.h b/include/m68k/mvme136/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/mvme136/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/m68k/mvme136/include/coverhd.h b/include/m68k/mvme136/coverhd.h
index 025b9cdcc9..025b9cdcc9 100644
--- a/c/src/lib/libbsp/m68k/mvme136/include/coverhd.h
+++ b/include/m68k/mvme136/coverhd.h
diff --git a/include/m68k/mvme136/rtems/asm.h b/include/m68k/mvme136/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/mvme136/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/mvme136/rtems/score/cpu.h b/include/m68k/mvme136/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/mvme136/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/mvme136/rtems/score/cpuatomic.h b/include/m68k/mvme136/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/mvme136/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/mvme136/rtems/score/types.h b/include/m68k/mvme136/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/mvme136/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/m68k/mvme136/include/tm27.h b/include/m68k/mvme136/tm27.h
index 66771bfdd6..66771bfdd6 100644
--- a/c/src/lib/libbsp/m68k/mvme136/include/tm27.h
+++ b/include/m68k/mvme136/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h b/include/m68k/mvme147/bsp.h
index 33c86d58fc..33c86d58fc 100644
--- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h
+++ b/include/m68k/mvme147/bsp.h
diff --git a/include/m68k/mvme147/bsp/linker-symbols.h b/include/m68k/mvme147/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/mvme147/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/m68k/mvme147/include/coverhd.h b/include/m68k/mvme147/coverhd.h
index 9804440497..9804440497 100644
--- a/c/src/lib/libbsp/m68k/mvme147/include/coverhd.h
+++ b/include/m68k/mvme147/coverhd.h
diff --git a/include/m68k/mvme147/rtems/asm.h b/include/m68k/mvme147/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/mvme147/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/mvme147/rtems/score/cpu.h b/include/m68k/mvme147/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/mvme147/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/mvme147/rtems/score/cpuatomic.h b/include/m68k/mvme147/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/mvme147/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/mvme147/rtems/score/types.h b/include/m68k/mvme147/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/mvme147/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/m68k/mvme147/include/tm27.h b/include/m68k/mvme147/tm27.h
index 5b548a888a..5b548a888a 100644
--- a/c/src/lib/libbsp/m68k/mvme147/include/tm27.h
+++ b/include/m68k/mvme147/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h b/include/m68k/mvme147s/bsp.h
index 71bd56bbdc..71bd56bbdc 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
+++ b/include/m68k/mvme147s/bsp.h
diff --git a/include/m68k/mvme147s/bsp/linker-symbols.h b/include/m68k/mvme147s/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/mvme147s/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/coverhd.h b/include/m68k/mvme147s/coverhd.h
index d4c0d8bca3..d4c0d8bca3 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/include/coverhd.h
+++ b/include/m68k/mvme147s/coverhd.h
diff --git a/include/m68k/mvme147s/rtems/asm.h b/include/m68k/mvme147s/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/mvme147s/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/mvme147s/rtems/score/cpu.h b/include/m68k/mvme147s/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/mvme147s/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/mvme147s/rtems/score/cpuatomic.h b/include/m68k/mvme147s/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/mvme147s/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/mvme147s/rtems/score/types.h b/include/m68k/mvme147s/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/mvme147s/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/tm27.h b/include/m68k/mvme147s/tm27.h
index 48ae0f459a..48ae0f459a 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/include/tm27.h
+++ b/include/m68k/mvme147s/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/include/m68k/mvme162/bsp.h
index c0d370f947..c0d370f947 100644
--- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h
+++ b/include/m68k/mvme162/bsp.h
diff --git a/include/m68k/mvme162/bsp/linker-symbols.h b/include/m68k/mvme162/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/mvme162/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/coverhd.h b/include/m68k/mvme162/coverhd.h
index 3752286643..3752286643 100644
--- a/c/src/lib/libbsp/m68k/mvme162/include/coverhd.h
+++ b/include/m68k/mvme162/coverhd.h
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/page_table.h b/include/m68k/mvme162/page_table.h
index 09b93a49bd..09b93a49bd 100644
--- a/c/src/lib/libbsp/m68k/mvme162/include/page_table.h
+++ b/include/m68k/mvme162/page_table.h
diff --git a/include/m68k/mvme162/rtems/asm.h b/include/m68k/mvme162/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/mvme162/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/mvme162/rtems/score/cpu.h b/include/m68k/mvme162/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/mvme162/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/mvme162/rtems/score/cpuatomic.h b/include/m68k/mvme162/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/mvme162/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/mvme162/rtems/score/types.h b/include/m68k/mvme162/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/mvme162/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/tm27.h b/include/m68k/mvme162/tm27.h
index 750408d009..750408d009 100644
--- a/c/src/lib/libbsp/m68k/mvme162/include/tm27.h
+++ b/include/m68k/mvme162/tm27.h
diff --git a/include/m68k/mvme162lx/bsp.h b/include/m68k/mvme162lx/bsp.h
new file mode 100644
index 0000000000..60f963d3a9
--- /dev/null
+++ b/include/m68k/mvme162lx/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/mvme162/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/mvme162/bsp.h>
diff --git a/include/m68k/mvme162lx/bsp/linker-symbols.h b/include/m68k/mvme162lx/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/mvme162lx/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/include/m68k/mvme162lx/coverhd.h b/include/m68k/mvme162lx/coverhd.h
new file mode 100644
index 0000000000..9a310e4862
--- /dev/null
+++ b/include/m68k/mvme162lx/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/mvme162/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/mvme162/coverhd.h>
diff --git a/include/m68k/mvme162lx/page_table.h b/include/m68k/mvme162lx/page_table.h
new file mode 100644
index 0000000000..7de2ed21dd
--- /dev/null
+++ b/include/m68k/mvme162lx/page_table.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/mvme162/page_table.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/mvme162/page_table.h>
diff --git a/include/m68k/mvme162lx/rtems/asm.h b/include/m68k/mvme162lx/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/mvme162lx/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/mvme162lx/rtems/score/cpu.h b/include/m68k/mvme162lx/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/mvme162lx/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/mvme162lx/rtems/score/cpuatomic.h b/include/m68k/mvme162lx/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/mvme162lx/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/mvme162lx/rtems/score/types.h b/include/m68k/mvme162lx/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/mvme162lx/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/include/m68k/mvme162lx/tm27.h b/include/m68k/mvme162lx/tm27.h
new file mode 100644
index 0000000000..caa03e0904
--- /dev/null
+++ b/include/m68k/mvme162lx/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/mvme162/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/mvme162/tm27.h>
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/include/m68k/mvme167/bsp.h
index b15462c01f..b15462c01f 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
+++ b/include/m68k/mvme167/bsp.h
diff --git a/include/m68k/mvme167/bsp/linker-symbols.h b/include/m68k/mvme167/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/mvme167/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/coverhd.h b/include/m68k/mvme167/coverhd.h
index e7b48dcd59..e7b48dcd59 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/coverhd.h
+++ b/include/m68k/mvme167/coverhd.h
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/page_table.h b/include/m68k/mvme167/page_table.h
index 2db5591729..2db5591729 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/page_table.h
+++ b/include/m68k/mvme167/page_table.h
diff --git a/include/m68k/mvme167/rtems/asm.h b/include/m68k/mvme167/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/mvme167/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/mvme167/rtems/score/cpu.h b/include/m68k/mvme167/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/mvme167/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/mvme167/rtems/score/cpuatomic.h b/include/m68k/mvme167/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/mvme167/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/mvme167/rtems/score/types.h b/include/m68k/mvme167/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/mvme167/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/tm27.h b/include/m68k/mvme167/tm27.h
index 5b65311794..5b65311794 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/tm27.h
+++ b/include/m68k/mvme167/tm27.h
diff --git a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h b/include/m68k/ods68302/bsp.h
index fa4daab526..fa4daab526 100644
--- a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h
+++ b/include/m68k/ods68302/bsp.h
diff --git a/include/m68k/ods68302/bsp/linker-symbols.h b/include/m68k/ods68302/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/ods68302/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/m68k/ods68302/include/coverhd.h b/include/m68k/ods68302/coverhd.h
index 84ca3a8f03..84ca3a8f03 100644
--- a/c/src/lib/libbsp/m68k/ods68302/include/coverhd.h
+++ b/include/m68k/ods68302/coverhd.h
diff --git a/include/m68k/ods68302/rtems/asm.h b/include/m68k/ods68302/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/ods68302/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/ods68302/rtems/score/cpu.h b/include/m68k/ods68302/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/ods68302/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/ods68302/rtems/score/cpuatomic.h b/include/m68k/ods68302/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/ods68302/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/ods68302/rtems/score/types.h b/include/m68k/ods68302/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/ods68302/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/include/m68k/ods68302/tm27.h b/include/m68k/ods68302/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/m68k/ods68302/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/m68k/pgh360/bsp.h b/include/m68k/pgh360/bsp.h
new file mode 100644
index 0000000000..c7b63bf7ee
--- /dev/null
+++ b/include/m68k/pgh360/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/gen68360/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/gen68360/bsp.h>
diff --git a/include/m68k/pgh360/bsp/linker-symbols.h b/include/m68k/pgh360/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/pgh360/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/include/m68k/pgh360/coverhd.h b/include/m68k/pgh360/coverhd.h
new file mode 100644
index 0000000000..0455eba347
--- /dev/null
+++ b/include/m68k/pgh360/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/gen68360/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/gen68360/coverhd.h>
diff --git a/include/m68k/pgh360/rtems/asm.h b/include/m68k/pgh360/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/pgh360/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/pgh360/rtems/score/cpu.h b/include/m68k/pgh360/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/pgh360/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/pgh360/rtems/score/cpuatomic.h b/include/m68k/pgh360/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/pgh360/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/pgh360/rtems/score/types.h b/include/m68k/pgh360/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/pgh360/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/include/m68k/pgh360/tm27.h b/include/m68k/pgh360/tm27.h
new file mode 100644
index 0000000000..94b0132440
--- /dev/null
+++ b/include/m68k/pgh360/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/gen68360/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/gen68360/tm27.h>
diff --git a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h b/include/m68k/sim68000/bsp.h
index fbfc37ce53..fbfc37ce53 100644
--- a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
+++ b/include/m68k/sim68000/bsp.h
diff --git a/include/m68k/sim68000/bsp/linker-symbols.h b/include/m68k/sim68000/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/sim68000/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/include/m68k/sim68000/coverhd.h b/include/m68k/sim68000/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/m68k/sim68000/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/m68k/sim68000/rtems/asm.h b/include/m68k/sim68000/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/sim68000/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/sim68000/rtems/score/cpu.h b/include/m68k/sim68000/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/sim68000/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/sim68000/rtems/score/cpuatomic.h b/include/m68k/sim68000/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/sim68000/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/sim68000/rtems/score/types.h b/include/m68k/sim68000/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/sim68000/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/include/m68k/sim68000/tm27.h b/include/m68k/sim68000/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/m68k/sim68000/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/m68k/simcpu32/bsp.h b/include/m68k/simcpu32/bsp.h
new file mode 100644
index 0000000000..6da6d6a863
--- /dev/null
+++ b/include/m68k/simcpu32/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/sim68000/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/sim68000/bsp.h>
diff --git a/include/m68k/simcpu32/bsp/linker-symbols.h b/include/m68k/simcpu32/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/simcpu32/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/include/m68k/simcpu32/coverhd.h b/include/m68k/simcpu32/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/m68k/simcpu32/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/m68k/simcpu32/rtems/asm.h b/include/m68k/simcpu32/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/simcpu32/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/simcpu32/rtems/score/cpu.h b/include/m68k/simcpu32/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/simcpu32/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/simcpu32/rtems/score/cpuatomic.h b/include/m68k/simcpu32/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/simcpu32/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/simcpu32/rtems/score/types.h b/include/m68k/simcpu32/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/simcpu32/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/include/m68k/simcpu32/tm27.h b/include/m68k/simcpu32/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/m68k/simcpu32/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h b/include/m68k/uC5282/bsp.h
index 3e646becd8..3e646becd8 100644
--- a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h
+++ b/include/m68k/uC5282/bsp.h
diff --git a/include/m68k/uC5282/bsp/linker-symbols.h b/include/m68k/uC5282/bsp/linker-symbols.h
new file mode 100644
index 0000000000..88d2379072
--- /dev/null
+++ b/include/m68k/uC5282/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/bsp/linker-symbols.h>
diff --git a/include/m68k/uC5282/coverhd.h b/include/m68k/uC5282/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/m68k/uC5282/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/m68k/uC5282/rtems/asm.h b/include/m68k/uC5282/rtems/asm.h
new file mode 100644
index 0000000000..cf5a65b045
--- /dev/null
+++ b/include/m68k/uC5282/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/asm.h>
diff --git a/include/m68k/uC5282/rtems/score/cpu.h b/include/m68k/uC5282/rtems/score/cpu.h
new file mode 100644
index 0000000000..0fd8b681da
--- /dev/null
+++ b/include/m68k/uC5282/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/cpu.h>
diff --git a/include/m68k/uC5282/rtems/score/cpuatomic.h b/include/m68k/uC5282/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/m68k/uC5282/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/m68k/uC5282/rtems/score/types.h b/include/m68k/uC5282/rtems/score/types.h
new file mode 100644
index 0000000000..033536bc34
--- /dev/null
+++ b/include/m68k/uC5282/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* m68k/COBRA5475/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <m68k/COBRA5475/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/m68k/uC5282/include/tm27.h b/include/m68k/uC5282/tm27.h
index 9a24da3755..9a24da3755 100644
--- a/c/src/lib/libbsp/m68k/uC5282/include/tm27.h
+++ b/include/m68k/uC5282/tm27.h
diff --git a/cpukit/libdl/include/arch/bfin/machine/elf_machdep.h b/include/machine/elf_machdep.h
index cf0dc19221..cf0dc19221 100644
--- a/cpukit/libdl/include/arch/bfin/machine/elf_machdep.h
+++ b/include/machine/elf_machdep.h
diff --git a/cpukit/libnetworking/machine/in_cksum.h b/include/machine/in_cksum.h
index 67dafb644c..67dafb644c 100644
--- a/cpukit/libnetworking/machine/in_cksum.h
+++ b/include/machine/in_cksum.h
diff --git a/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h b/include/mc9328mxl.h
index dd0516283a..dd0516283a 100644
--- a/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h
+++ b/include/mc9328mxl.h
diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcf5206e.h b/include/mcf5206/mcf5206e.h
index 06dadca9b1..06dadca9b1 100644
--- a/c/src/lib/libcpu/m68k/mcf5206/include/mcf5206e.h
+++ b/include/mcf5206/mcf5206e.h
diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h b/include/mcf5206/mcfmbus.h
index f70a70e483..f70a70e483 100644
--- a/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h
+++ b/include/mcf5206/mcfmbus.h
diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h b/include/mcf5206/mcfuart.h
index bd9df5bb56..bd9df5bb56 100644
--- a/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h
+++ b/include/mcf5206/mcfuart.h
diff --git a/c/src/lib/libcpu/m68k/mcf5223x/include/mcf5223x.h b/include/mcf5223x/mcf5223x.h
index 0886105b17..0886105b17 100644
--- a/c/src/lib/libcpu/m68k/mcf5223x/include/mcf5223x.h
+++ b/include/mcf5223x/mcf5223x.h
diff --git a/c/src/lib/libcpu/m68k/mcf5225x/include/fec.h b/include/mcf5225x/fec.h
index 8d8d6c3763..8d8d6c3763 100644
--- a/c/src/lib/libcpu/m68k/mcf5225x/include/fec.h
+++ b/include/mcf5225x/fec.h
diff --git a/c/src/lib/libcpu/m68k/mcf5225x/include/mcf5225x.h b/include/mcf5225x/mcf5225x.h
index ded447ffac..ded447ffac 100644
--- a/c/src/lib/libcpu/m68k/mcf5225x/include/mcf5225x.h
+++ b/include/mcf5225x/mcf5225x.h
diff --git a/c/src/lib/libcpu/m68k/mcf5235/include/mcf5235.h b/include/mcf5235/mcf5235.h
index 87e0d91541..87e0d91541 100644
--- a/c/src/lib/libcpu/m68k/mcf5235/include/mcf5235.h
+++ b/include/mcf5235/mcf5235.h
diff --git a/c/src/lib/libcpu/m68k/mcf5272/include/mcf5272.h b/include/mcf5272/mcf5272.h
index 37dae92d98..37dae92d98 100644
--- a/c/src/lib/libcpu/m68k/mcf5272/include/mcf5272.h
+++ b/include/mcf5272/mcf5272.h
diff --git a/c/src/lib/libcpu/m68k/mcf5282/include/mcf5282.h b/include/mcf5282/mcf5282.h
index 3724f489de..3724f489de 100644
--- a/c/src/lib/libcpu/m68k/mcf5282/include/mcf5282.h
+++ b/include/mcf5282/mcf5282.h
diff --git a/c/src/lib/libcpu/m68k/mcf532x/include/mcf532x.h b/include/mcf532x/mcf532x.h
index 798fb1175b..798fb1175b 100644
--- a/c/src/lib/libcpu/m68k/mcf532x/include/mcf532x.h
+++ b/include/mcf532x/mcf532x.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h b/include/mcf548x/MCD_dma.h
index ea6f8863cb..ea6f8863cb 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h
+++ b/include/mcf548x/MCD_dma.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_progCheck.h b/include/mcf548x/MCD_progCheck.h
index e0f578fdaf..e0f578fdaf 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_progCheck.h
+++ b/include/mcf548x/MCD_progCheck.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.h b/include/mcf548x/MCD_tasksInit.h
index daf871cd6d..daf871cd6d 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.h
+++ b/include/mcf548x/MCD_tasksInit.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.h b/include/mcf548x/mcdma_glue.h
index de0621120f..de0621120f 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.h
+++ b/include/mcf548x/mcdma_glue.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/include/mcf548x.h b/include/mcf548x/mcf548x.h
index 440f6a74bb..440f6a74bb 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/include/mcf548x.h
+++ b/include/mcf548x/mcf548x.h
diff --git a/cpukit/libmd/md4.h b/include/md4.h
index c5ae2f13ef..c5ae2f13ef 100644
--- a/cpukit/libmd/md4.h
+++ b/include/md4.h
diff --git a/cpukit/libmd/md5.h b/include/md5.h
index ca48d61d7b..ca48d61d7b 100644
--- a/cpukit/libmd/md5.h
+++ b/include/md5.h
diff --git a/cpukit/include/memory.h b/include/memory.h
index 99fdb5e1e4..99fdb5e1e4 100644
--- a/cpukit/include/memory.h
+++ b/include/memory.h
diff --git a/cpukit/mghttpd/mongoose.h b/include/mghttpd/mongoose.h
index ad7c40f2dd..ad7c40f2dd 100644
--- a/cpukit/mghttpd/mongoose.h
+++ b/include/mghttpd/mongoose.h
diff --git a/c/src/lib/libbsp/mips/csb350/include/bsp.h b/include/mips/csb350/bsp.h
index aeffce35bf..aeffce35bf 100644
--- a/c/src/lib/libbsp/mips/csb350/include/bsp.h
+++ b/include/mips/csb350/bsp.h
diff --git a/c/src/lib/libbsp/mips/csb350/include/irq.h b/include/mips/csb350/bsp/irq.h
index 4f006fdd5f..4f006fdd5f 100644
--- a/c/src/lib/libbsp/mips/csb350/include/irq.h
+++ b/include/mips/csb350/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/shared/liblnk/regs.h b/include/mips/csb350/bsp/regs.h
index 5cc9fac745..5cc9fac745 100644
--- a/c/src/lib/libbsp/mips/shared/liblnk/regs.h
+++ b/include/mips/csb350/bsp/regs.h
diff --git a/include/mips/csb350/coverhd.h b/include/mips/csb350/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/mips/csb350/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/cpukit/score/cpu/mips/rtems/asm.h b/include/mips/csb350/rtems/asm.h
index 9c84f61990..9c84f61990 100644
--- a/cpukit/score/cpu/mips/rtems/asm.h
+++ b/include/mips/csb350/rtems/asm.h
diff --git a/cpukit/score/cpu/mips/rtems/score/cpu.h b/include/mips/csb350/rtems/score/cpu.h
index c1bdc318c4..c1bdc318c4 100644
--- a/cpukit/score/cpu/mips/rtems/score/cpu.h
+++ b/include/mips/csb350/rtems/score/cpu.h
diff --git a/include/mips/csb350/rtems/score/cpuatomic.h b/include/mips/csb350/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/mips/csb350/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/mips/rtems/score/types.h b/include/mips/csb350/rtems/score/types.h
index 3f9429b1c6..3f9429b1c6 100644
--- a/cpukit/score/cpu/mips/rtems/score/types.h
+++ b/include/mips/csb350/rtems/score/types.h
diff --git a/c/src/lib/libbsp/mips/csb350/include/tm27.h b/include/mips/csb350/tm27.h
index 3a8957d698..3a8957d698 100644
--- a/c/src/lib/libbsp/mips/csb350/include/tm27.h
+++ b/include/mips/csb350/tm27.h
diff --git a/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h b/include/mips/genmongoosev/bsp.h
index a55162b44f..a55162b44f 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h
+++ b/include/mips/genmongoosev/bsp.h
diff --git a/c/src/lib/libbsp/mips/genmongoosev/include/irq.h b/include/mips/genmongoosev/bsp/irq.h
index 7cfca650aa..7cfca650aa 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/include/irq.h
+++ b/include/mips/genmongoosev/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/genmongoosev/start/regs.h b/include/mips/genmongoosev/bsp/regs.h
index e63544f738..e63544f738 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/start/regs.h
+++ b/include/mips/genmongoosev/bsp/regs.h
diff --git a/include/mips/genmongoosev/coverhd.h b/include/mips/genmongoosev/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/mips/genmongoosev/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/mips/genmongoosev/rtems/asm.h b/include/mips/genmongoosev/rtems/asm.h
new file mode 100644
index 0000000000..2c01b09f45
--- /dev/null
+++ b/include/mips/genmongoosev/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/asm.h>
diff --git a/include/mips/genmongoosev/rtems/score/cpu.h b/include/mips/genmongoosev/rtems/score/cpu.h
new file mode 100644
index 0000000000..bb07e691b1
--- /dev/null
+++ b/include/mips/genmongoosev/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/score/cpu.h>
diff --git a/include/mips/genmongoosev/rtems/score/cpuatomic.h b/include/mips/genmongoosev/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/mips/genmongoosev/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/mips/genmongoosev/rtems/score/types.h b/include/mips/genmongoosev/rtems/score/types.h
new file mode 100644
index 0000000000..6948492a1e
--- /dev/null
+++ b/include/mips/genmongoosev/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/mips/genmongoosev/include/tm27.h b/include/mips/genmongoosev/tm27.h
index 8c2dd5e481..8c2dd5e481 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/include/tm27.h
+++ b/include/mips/genmongoosev/tm27.h
diff --git a/c/src/lib/libbsp/mips/hurricane/include/bsp.h b/include/mips/hurricane/bsp.h
index 5b4dab18fe..5b4dab18fe 100644
--- a/c/src/lib/libbsp/mips/hurricane/include/bsp.h
+++ b/include/mips/hurricane/bsp.h
diff --git a/c/src/lib/libbsp/mips/hurricane/include/irq.h b/include/mips/hurricane/bsp/irq.h
index 3347ecb2a6..3347ecb2a6 100644
--- a/c/src/lib/libbsp/mips/hurricane/include/irq.h
+++ b/include/mips/hurricane/bsp/irq.h
diff --git a/include/mips/hurricane/bsp/regs.h b/include/mips/hurricane/bsp/regs.h
new file mode 100644
index 0000000000..79259a838f
--- /dev/null
+++ b/include/mips/hurricane/bsp/regs.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/bsp/regs.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/bsp/regs.h>
diff --git a/include/mips/hurricane/coverhd.h b/include/mips/hurricane/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/mips/hurricane/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/mips/hurricane/rtems/asm.h b/include/mips/hurricane/rtems/asm.h
new file mode 100644
index 0000000000..2c01b09f45
--- /dev/null
+++ b/include/mips/hurricane/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/asm.h>
diff --git a/include/mips/hurricane/rtems/score/cpu.h b/include/mips/hurricane/rtems/score/cpu.h
new file mode 100644
index 0000000000..bb07e691b1
--- /dev/null
+++ b/include/mips/hurricane/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/score/cpu.h>
diff --git a/include/mips/hurricane/rtems/score/cpuatomic.h b/include/mips/hurricane/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/mips/hurricane/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/mips/hurricane/rtems/score/types.h b/include/mips/hurricane/rtems/score/types.h
new file mode 100644
index 0000000000..6948492a1e
--- /dev/null
+++ b/include/mips/hurricane/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/score/types.h>
diff --git a/include/mips/hurricane/tm27.h b/include/mips/hurricane/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/mips/hurricane/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h b/include/mips/jmr3904/bsp.h
index 3af8ccaf65..3af8ccaf65 100644
--- a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h
+++ b/include/mips/jmr3904/bsp.h
diff --git a/c/src/lib/libbsp/mips/jmr3904/include/irq.h b/include/mips/jmr3904/bsp/irq.h
index cdb50e244e..cdb50e244e 100644
--- a/c/src/lib/libbsp/mips/jmr3904/include/irq.h
+++ b/include/mips/jmr3904/bsp/irq.h
diff --git a/include/mips/jmr3904/bsp/regs.h b/include/mips/jmr3904/bsp/regs.h
new file mode 100644
index 0000000000..79259a838f
--- /dev/null
+++ b/include/mips/jmr3904/bsp/regs.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/bsp/regs.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/bsp/regs.h>
diff --git a/include/mips/jmr3904/coverhd.h b/include/mips/jmr3904/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/mips/jmr3904/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/mips/jmr3904/rtems/asm.h b/include/mips/jmr3904/rtems/asm.h
new file mode 100644
index 0000000000..2c01b09f45
--- /dev/null
+++ b/include/mips/jmr3904/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/asm.h>
diff --git a/include/mips/jmr3904/rtems/score/cpu.h b/include/mips/jmr3904/rtems/score/cpu.h
new file mode 100644
index 0000000000..bb07e691b1
--- /dev/null
+++ b/include/mips/jmr3904/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/score/cpu.h>
diff --git a/include/mips/jmr3904/rtems/score/cpuatomic.h b/include/mips/jmr3904/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/mips/jmr3904/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/mips/jmr3904/rtems/score/types.h b/include/mips/jmr3904/rtems/score/types.h
new file mode 100644
index 0000000000..6948492a1e
--- /dev/null
+++ b/include/mips/jmr3904/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/mips/jmr3904/include/tm27.h b/include/mips/jmr3904/tm27.h
index f73ccdea40..f73ccdea40 100644
--- a/c/src/lib/libbsp/mips/jmr3904/include/tm27.h
+++ b/include/mips/jmr3904/tm27.h
diff --git a/c/src/lib/libbsp/mips/malta/include/bsp.h b/include/mips/malta/bsp.h
index e99804c425..e99804c425 100644
--- a/c/src/lib/libbsp/mips/malta/include/bsp.h
+++ b/include/mips/malta/bsp.h
diff --git a/c/src/lib/libbsp/mips/malta/include/irq.h b/include/mips/malta/bsp/irq.h
index 3ca6f964a9..3ca6f964a9 100644
--- a/c/src/lib/libbsp/mips/malta/include/irq.h
+++ b/include/mips/malta/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/malta/include/pci.h b/include/mips/malta/bsp/pci.h
index ad69e3a592..ad69e3a592 100644
--- a/c/src/lib/libbsp/mips/malta/include/pci.h
+++ b/include/mips/malta/bsp/pci.h
diff --git a/include/mips/malta/bsp/regs.h b/include/mips/malta/bsp/regs.h
new file mode 100644
index 0000000000..79259a838f
--- /dev/null
+++ b/include/mips/malta/bsp/regs.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/bsp/regs.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/bsp/regs.h>
diff --git a/include/mips/malta/coverhd.h b/include/mips/malta/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/mips/malta/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/mips/malta/rtems/asm.h b/include/mips/malta/rtems/asm.h
new file mode 100644
index 0000000000..2c01b09f45
--- /dev/null
+++ b/include/mips/malta/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/asm.h>
diff --git a/include/mips/malta/rtems/score/cpu.h b/include/mips/malta/rtems/score/cpu.h
new file mode 100644
index 0000000000..bb07e691b1
--- /dev/null
+++ b/include/mips/malta/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/score/cpu.h>
diff --git a/include/mips/malta/rtems/score/cpuatomic.h b/include/mips/malta/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/mips/malta/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/mips/malta/rtems/score/types.h b/include/mips/malta/rtems/score/types.h
new file mode 100644
index 0000000000..6948492a1e
--- /dev/null
+++ b/include/mips/malta/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/score/types.h>
diff --git a/include/mips/malta/tm27.h b/include/mips/malta/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/mips/malta/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h b/include/mips/rbtx4925/bsp.h
index 58bdb5850a..58bdb5850a 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h
+++ b/include/mips/rbtx4925/bsp.h
diff --git a/c/src/lib/libbsp/mips/rbtx4925/include/irq.h b/include/mips/rbtx4925/bsp/irq.h
index d3987b2d39..d3987b2d39 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/include/irq.h
+++ b/include/mips/rbtx4925/bsp/irq.h
diff --git a/include/mips/rbtx4925/bsp/regs.h b/include/mips/rbtx4925/bsp/regs.h
new file mode 100644
index 0000000000..79259a838f
--- /dev/null
+++ b/include/mips/rbtx4925/bsp/regs.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/bsp/regs.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/bsp/regs.h>
diff --git a/include/mips/rbtx4925/coverhd.h b/include/mips/rbtx4925/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/mips/rbtx4925/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/mips/rbtx4925/rtems/asm.h b/include/mips/rbtx4925/rtems/asm.h
new file mode 100644
index 0000000000..2c01b09f45
--- /dev/null
+++ b/include/mips/rbtx4925/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/asm.h>
diff --git a/include/mips/rbtx4925/rtems/score/cpu.h b/include/mips/rbtx4925/rtems/score/cpu.h
new file mode 100644
index 0000000000..bb07e691b1
--- /dev/null
+++ b/include/mips/rbtx4925/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/score/cpu.h>
diff --git a/include/mips/rbtx4925/rtems/score/cpuatomic.h b/include/mips/rbtx4925/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/mips/rbtx4925/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/mips/rbtx4925/rtems/score/types.h b/include/mips/rbtx4925/rtems/score/types.h
new file mode 100644
index 0000000000..6948492a1e
--- /dev/null
+++ b/include/mips/rbtx4925/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/score/types.h>
diff --git a/include/mips/rbtx4925/tm27.h b/include/mips/rbtx4925/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/mips/rbtx4925/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h b/include/mips/rbtx4938/bsp.h
index 090df017d6..090df017d6 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h
+++ b/include/mips/rbtx4938/bsp.h
diff --git a/c/src/lib/libbsp/mips/rbtx4938/include/irq.h b/include/mips/rbtx4938/bsp/irq.h
index bb18dcf86d..bb18dcf86d 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/include/irq.h
+++ b/include/mips/rbtx4938/bsp/irq.h
diff --git a/include/mips/rbtx4938/bsp/regs.h b/include/mips/rbtx4938/bsp/regs.h
new file mode 100644
index 0000000000..79259a838f
--- /dev/null
+++ b/include/mips/rbtx4938/bsp/regs.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/bsp/regs.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/bsp/regs.h>
diff --git a/include/mips/rbtx4938/coverhd.h b/include/mips/rbtx4938/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/mips/rbtx4938/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/mips/rbtx4938/rtems/asm.h b/include/mips/rbtx4938/rtems/asm.h
new file mode 100644
index 0000000000..2c01b09f45
--- /dev/null
+++ b/include/mips/rbtx4938/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/asm.h>
diff --git a/include/mips/rbtx4938/rtems/score/cpu.h b/include/mips/rbtx4938/rtems/score/cpu.h
new file mode 100644
index 0000000000..bb07e691b1
--- /dev/null
+++ b/include/mips/rbtx4938/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/score/cpu.h>
diff --git a/include/mips/rbtx4938/rtems/score/cpuatomic.h b/include/mips/rbtx4938/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/mips/rbtx4938/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/mips/rbtx4938/rtems/score/types.h b/include/mips/rbtx4938/rtems/score/types.h
new file mode 100644
index 0000000000..6948492a1e
--- /dev/null
+++ b/include/mips/rbtx4938/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* mips/csb350/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <mips/csb350/rtems/score/types.h>
diff --git a/include/mips/rbtx4938/tm27.h b/include/mips/rbtx4938/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/mips/rbtx4938/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/powerpc/haleakala/include/mmu_405.h b/include/mmu_405.h
index e11cfa7738..e11cfa7738 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/include/mmu_405.h
+++ b/include/mmu_405.h
diff --git a/c/src/lib/libbsp/moxie/moxiesim/include/bsp.h b/include/moxie/moxiesim/bsp.h
index 0bca5f0d94..0bca5f0d94 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/include/bsp.h
+++ b/include/moxie/moxiesim/bsp.h
diff --git a/include/moxie/moxiesim/coverhd.h b/include/moxie/moxiesim/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/moxie/moxiesim/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/cpukit/score/cpu/moxie/rtems/asm.h b/include/moxie/moxiesim/rtems/asm.h
index fdb182f32f..fdb182f32f 100644
--- a/cpukit/score/cpu/moxie/rtems/asm.h
+++ b/include/moxie/moxiesim/rtems/asm.h
diff --git a/cpukit/score/cpu/moxie/rtems/score/cpu.h b/include/moxie/moxiesim/rtems/score/cpu.h
index 4b204cbb43..4b204cbb43 100644
--- a/cpukit/score/cpu/moxie/rtems/score/cpu.h
+++ b/include/moxie/moxiesim/rtems/score/cpu.h
diff --git a/include/moxie/moxiesim/rtems/score/cpuatomic.h b/include/moxie/moxiesim/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/moxie/moxiesim/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/moxie/rtems/score/types.h b/include/moxie/moxiesim/rtems/score/types.h
index 9cabd1559f..9cabd1559f 100644
--- a/cpukit/score/cpu/moxie/rtems/score/types.h
+++ b/include/moxie/moxiesim/rtems/score/types.h
diff --git a/include/moxie/moxiesim/tm27.h b/include/moxie/moxiesim/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/moxie/moxiesim/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/dspi.h b/include/mpc55xx/dspi.h
index 8ad98274ef..8ad98274ef 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/dspi.h
+++ b/include/mpc55xx/dspi.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/edma.h b/include/mpc55xx/edma.h
index 281cdf1c28..281cdf1c28 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/edma.h
+++ b/include/mpc55xx/edma.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/emios.h b/include/mpc55xx/emios.h
index d6ccadc07b..d6ccadc07b 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/emios.h
+++ b/include/mpc55xx/emios.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc551x.h b/include/mpc55xx/fsl-mpc551x.h
index dec0b4cf73..dec0b4cf73 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc551x.h
+++ b/include/mpc55xx/fsl-mpc551x.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc555x.h b/include/mpc55xx/fsl-mpc555x.h
index 0dea1957cf..0dea1957cf 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc555x.h
+++ b/include/mpc55xx/fsl-mpc555x.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc556x.h b/include/mpc55xx/fsl-mpc556x.h
index 41ad83729a..41ad83729a 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc556x.h
+++ b/include/mpc55xx/fsl-mpc556x.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc564xL.h b/include/mpc55xx/fsl-mpc564xL.h
index 61217ac656..61217ac656 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc564xL.h
+++ b/include/mpc55xx/fsl-mpc564xL.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc5668.h b/include/mpc55xx/fsl-mpc5668.h
index b7a1793dca..b7a1793dca 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc5668.h
+++ b/include/mpc55xx/fsl-mpc5668.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h b/include/mpc55xx/fsl-mpc567x.h
index 31a132a096..31a132a096 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h
+++ b/include/mpc55xx/fsl-mpc567x.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/mpc55xx.h b/include/mpc55xx/mpc55xx.h
index 634be30e18..634be30e18 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/mpc55xx.h
+++ b/include/mpc55xx/mpc55xx.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h b/include/mpc55xx/reg-defs.h
index 2d66f6a8d0..2d66f6a8d0 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h
+++ b/include/mpc55xx/reg-defs.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs-edma.h b/include/mpc55xx/regs-edma.h
index 804730ccd8..804730ccd8 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs-edma.h
+++ b/include/mpc55xx/regs-edma.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs-mmu.h b/include/mpc55xx/regs-mmu.h
index e03047c4ad..e03047c4ad 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs-mmu.h
+++ b/include/mpc55xx/regs-mmu.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h b/include/mpc55xx/regs.h
index 3a4e737f1a..3a4e737f1a 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h
+++ b/include/mpc55xx/regs.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/siu.h b/include/mpc55xx/siu.h
index 3495750145..3495750145 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/siu.h
+++ b/include/mpc55xx/siu.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/watchdog.h b/include/mpc55xx/watchdog.h
index d5a8af794e..d5a8af794e 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/watchdog.h
+++ b/include/mpc55xx/watchdog.h
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/include/mpc5xx.h b/include/mpc5xx.h
index fc9b756cbf..fc9b756cbf 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/include/mpc5xx.h
+++ b/include/mpc5xx.h
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/include/console.h b/include/mpc5xx/console.h
index c0633af938..c0633af938 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/include/console.h
+++ b/include/mpc5xx/console.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h b/include/mpc8260.h
index ea088ebae8..ea088ebae8 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h
+++ b/include/mpc8260.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/console.h b/include/mpc8260/console.h
index 049cef6d89..049cef6d89 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/include/console.h
+++ b/include/mpc8260/console.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h b/include/mpc8260/cpm.h
index 31708a4199..31708a4199 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h
+++ b/include/mpc8260/cpm.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h b/include/mpc8260/mmu.h
index 9445dde3bc..9445dde3bc 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h
+++ b/include/mpc8260/mmu.h
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/include/gtm.h b/include/mpc83xx/gtm.h
index a17510ed10..a17510ed10 100644
--- a/c/src/lib/libcpu/powerpc/mpc83xx/include/gtm.h
+++ b/include/mpc83xx/gtm.h
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h b/include/mpc83xx/mpc83xx.h
index 6f7417af1c..6f7417af1c 100644
--- a/c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h
+++ b/include/mpc83xx/mpc83xx.h
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/spi/mpc83xx_spidrv.h b/include/mpc83xx/mpc83xx_spidrv.h
index 92fe66831a..92fe66831a 100644
--- a/c/src/lib/libcpu/powerpc/mpc83xx/spi/mpc83xx_spidrv.h
+++ b/include/mpc83xx/mpc83xx_spidrv.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h b/include/mpc8xx.h
index 3222e7fd03..3222e7fd03 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h
+++ b/include/mpc8xx.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/console.h b/include/mpc8xx/console.h
index eea561e7eb..eea561e7eb 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/include/console.h
+++ b/include/mpc8xx/console.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h b/include/mpc8xx/cpm.h
index 49889bdc32..49889bdc32 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h
+++ b/include/mpc8xx/cpm.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h b/include/mpc8xx/mmu.h
index f818b14be1..f818b14be1 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h
+++ b/include/mpc8xx/mmu.h
diff --git a/cpukit/posix/include/mqueue.h b/include/mqueue.h
index 36733a4730..36733a4730 100644
--- a/cpukit/posix/include/mqueue.h
+++ b/include/mqueue.h
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h b/include/mrm332.h
index 1b8672752d..1b8672752d 100644
--- a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h
+++ b/include/mrm332.h
diff --git a/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h b/include/mvme16x_hw.h
index 2ac595a0fa..2ac595a0fa 100644
--- a/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h
+++ b/include/mvme16x_hw.h
diff --git a/c/src/lib/libbsp/arm/nds/sound/sound.h b/include/nds/sound.h
index def7e723d7..def7e723d7 100644
--- a/c/src/lib/libbsp/arm/nds/sound/sound.h
+++ b/include/nds/sound.h
diff --git a/c/src/lib/libbsp/arm/nds/touchscreen/touchscreen.h b/include/nds/touchscreen.h
index d9a854c270..d9a854c270 100644
--- a/c/src/lib/libbsp/arm/nds/touchscreen/touchscreen.h
+++ b/include/nds/touchscreen.h
diff --git a/cpukit/libnetworking/net/bpf.h b/include/net/bpf.h
index caac0441bd..caac0441bd 100644
--- a/cpukit/libnetworking/net/bpf.h
+++ b/include/net/bpf.h
diff --git a/cpukit/libnetworking/net/ethernet.h b/include/net/ethernet.h
index 86a89fca98..86a89fca98 100644
--- a/cpukit/libnetworking/net/ethernet.h
+++ b/include/net/ethernet.h
diff --git a/cpukit/libnetworking/net/if.h b/include/net/if.h
index cfa140bb1c..cfa140bb1c 100644
--- a/cpukit/libnetworking/net/if.h
+++ b/include/net/if.h
diff --git a/cpukit/libnetworking/net/if_arp.h b/include/net/if_arp.h
index 76546784b6..76546784b6 100644
--- a/cpukit/libnetworking/net/if_arp.h
+++ b/include/net/if_arp.h
diff --git a/cpukit/libnetworking/net/if_dl.h b/include/net/if_dl.h
index 4048528fea..4048528fea 100644
--- a/cpukit/libnetworking/net/if_dl.h
+++ b/include/net/if_dl.h
diff --git a/cpukit/libnetworking/net/if_llc.h b/include/net/if_llc.h
index 5f95f3fd78..5f95f3fd78 100644
--- a/cpukit/libnetworking/net/if_llc.h
+++ b/include/net/if_llc.h
diff --git a/cpukit/libnetworking/net/if_media.h b/include/net/if_media.h
index 9a2b179061..9a2b179061 100644
--- a/cpukit/libnetworking/net/if_media.h
+++ b/include/net/if_media.h
diff --git a/cpukit/libnetworking/net/if_ppp.h b/include/net/if_ppp.h
index c8dcfc87ed..c8dcfc87ed 100644
--- a/cpukit/libnetworking/net/if_ppp.h
+++ b/include/net/if_ppp.h
diff --git a/cpukit/libnetworking/net/if_pppvar.h b/include/net/if_pppvar.h
index 9d708a4fcc..9d708a4fcc 100644
--- a/cpukit/libnetworking/net/if_pppvar.h
+++ b/include/net/if_pppvar.h
diff --git a/cpukit/libnetworking/net/if_types.h b/include/net/if_types.h
index aa924d3c1a..aa924d3c1a 100644
--- a/cpukit/libnetworking/net/if_types.h
+++ b/include/net/if_types.h
diff --git a/cpukit/libnetworking/net/if_var.h b/include/net/if_var.h
index 222862c451..222862c451 100644
--- a/cpukit/libnetworking/net/if_var.h
+++ b/include/net/if_var.h
diff --git a/cpukit/libnetworking/net/netisr.h b/include/net/netisr.h
index eb204e78c2..eb204e78c2 100644
--- a/cpukit/libnetworking/net/netisr.h
+++ b/include/net/netisr.h
diff --git a/cpukit/libnetworking/net/ppp_comp.h b/include/net/ppp_comp.h
index c78997d2e2..c78997d2e2 100644
--- a/cpukit/libnetworking/net/ppp_comp.h
+++ b/include/net/ppp_comp.h
diff --git a/cpukit/libnetworking/net/ppp_defs.h b/include/net/ppp_defs.h
index 3636bf9f0e..3636bf9f0e 100644
--- a/cpukit/libnetworking/net/ppp_defs.h
+++ b/include/net/ppp_defs.h
diff --git a/cpukit/libnetworking/net/radix.h b/include/net/radix.h
index cf132a4ab9..cf132a4ab9 100644
--- a/cpukit/libnetworking/net/radix.h
+++ b/include/net/radix.h
diff --git a/cpukit/libnetworking/net/raw_cb.h b/include/net/raw_cb.h
index 907e3c08e1..907e3c08e1 100644
--- a/cpukit/libnetworking/net/raw_cb.h
+++ b/include/net/raw_cb.h
diff --git a/cpukit/libnetworking/net/route.h b/include/net/route.h
index a9a07839e4..a9a07839e4 100644
--- a/cpukit/libnetworking/net/route.h
+++ b/include/net/route.h
diff --git a/cpukit/libnetworking/net/slcompress.h b/include/net/slcompress.h
index 511a8d8554..511a8d8554 100644
--- a/cpukit/libnetworking/net/slcompress.h
+++ b/include/net/slcompress.h
diff --git a/cpukit/libnetworking/netdb.h b/include/netdb.h
index 92e283b2ec..92e283b2ec 100644
--- a/cpukit/libnetworking/netdb.h
+++ b/include/netdb.h
diff --git a/cpukit/libnetworking/netinet/icmp_var.h b/include/netinet/icmp_var.h
index 31eea3bea0..31eea3bea0 100644
--- a/cpukit/libnetworking/netinet/icmp_var.h
+++ b/include/netinet/icmp_var.h
diff --git a/cpukit/libnetworking/netinet/if_ether.h b/include/netinet/if_ether.h
index f45c4149c9..f45c4149c9 100644
--- a/cpukit/libnetworking/netinet/if_ether.h
+++ b/include/netinet/if_ether.h
diff --git a/cpukit/libnetworking/netinet/igmp.h b/include/netinet/igmp.h
index b397ccd156..b397ccd156 100644
--- a/cpukit/libnetworking/netinet/igmp.h
+++ b/include/netinet/igmp.h
diff --git a/cpukit/libnetworking/netinet/igmp_var.h b/include/netinet/igmp_var.h
index d1454e0521..d1454e0521 100644
--- a/cpukit/libnetworking/netinet/igmp_var.h
+++ b/include/netinet/igmp_var.h
diff --git a/cpukit/libnetworking/netinet/in.h b/include/netinet/in.h
index 5a264e0e75..5a264e0e75 100644
--- a/cpukit/libnetworking/netinet/in.h
+++ b/include/netinet/in.h
diff --git a/cpukit/libnetworking/netinet/in_pcb.h b/include/netinet/in_pcb.h
index ad8b99cf09..ad8b99cf09 100644
--- a/cpukit/libnetworking/netinet/in_pcb.h
+++ b/include/netinet/in_pcb.h
diff --git a/cpukit/libnetworking/netinet/in_systm.h b/include/netinet/in_systm.h
index f0f3fa9a41..f0f3fa9a41 100644
--- a/cpukit/libnetworking/netinet/in_systm.h
+++ b/include/netinet/in_systm.h
diff --git a/cpukit/libnetworking/netinet/in_var.h b/include/netinet/in_var.h
index 9ade9c482e..9ade9c482e 100644
--- a/cpukit/libnetworking/netinet/in_var.h
+++ b/include/netinet/in_var.h
diff --git a/cpukit/libnetworking/netinet/ip.h b/include/netinet/ip.h
index 6a2dcad65b..6a2dcad65b 100644
--- a/cpukit/libnetworking/netinet/ip.h
+++ b/include/netinet/ip.h
diff --git a/cpukit/libnetworking/netinet/ip_fw.h b/include/netinet/ip_fw.h
index c511154617..c511154617 100644
--- a/cpukit/libnetworking/netinet/ip_fw.h
+++ b/include/netinet/ip_fw.h
diff --git a/cpukit/libnetworking/netinet/ip_icmp.h b/include/netinet/ip_icmp.h
index 2e66a5f68f..2e66a5f68f 100644
--- a/cpukit/libnetworking/netinet/ip_icmp.h
+++ b/include/netinet/ip_icmp.h
diff --git a/cpukit/libnetworking/netinet/ip_mroute.h b/include/netinet/ip_mroute.h
index 9a28574ff8..9a28574ff8 100644
--- a/cpukit/libnetworking/netinet/ip_mroute.h
+++ b/include/netinet/ip_mroute.h
diff --git a/cpukit/libnetworking/netinet/ip_var.h b/include/netinet/ip_var.h
index a6e0bc87cc..a6e0bc87cc 100644
--- a/cpukit/libnetworking/netinet/ip_var.h
+++ b/include/netinet/ip_var.h
diff --git a/cpukit/libnetworking/netinet/tcp.h b/include/netinet/tcp.h
index 2262803b5e..2262803b5e 100644
--- a/cpukit/libnetworking/netinet/tcp.h
+++ b/include/netinet/tcp.h
diff --git a/cpukit/libnetworking/netinet/tcp_debug.h b/include/netinet/tcp_debug.h
index 55004f3aa4..55004f3aa4 100644
--- a/cpukit/libnetworking/netinet/tcp_debug.h
+++ b/include/netinet/tcp_debug.h
diff --git a/cpukit/libnetworking/netinet/tcp_fsm.h b/include/netinet/tcp_fsm.h
index ceb053ecb3..ceb053ecb3 100644
--- a/cpukit/libnetworking/netinet/tcp_fsm.h
+++ b/include/netinet/tcp_fsm.h
diff --git a/cpukit/libnetworking/netinet/tcp_seq.h b/include/netinet/tcp_seq.h
index c24b294250..c24b294250 100644
--- a/cpukit/libnetworking/netinet/tcp_seq.h
+++ b/include/netinet/tcp_seq.h
diff --git a/cpukit/libnetworking/netinet/tcp_timer.h b/include/netinet/tcp_timer.h
index 4bbbb712b6..4bbbb712b6 100644
--- a/cpukit/libnetworking/netinet/tcp_timer.h
+++ b/include/netinet/tcp_timer.h
diff --git a/cpukit/libnetworking/netinet/tcp_var.h b/include/netinet/tcp_var.h
index cd70970641..cd70970641 100644
--- a/cpukit/libnetworking/netinet/tcp_var.h
+++ b/include/netinet/tcp_var.h
diff --git a/cpukit/libnetworking/netinet/tcpip.h b/include/netinet/tcpip.h
index 1f16bd0f1c..1f16bd0f1c 100644
--- a/cpukit/libnetworking/netinet/tcpip.h
+++ b/include/netinet/tcpip.h
diff --git a/cpukit/libnetworking/netinet/udp.h b/include/netinet/udp.h
index 98fc433e28..98fc433e28 100644
--- a/cpukit/libnetworking/netinet/udp.h
+++ b/include/netinet/udp.h
diff --git a/cpukit/libnetworking/netinet/udp_var.h b/include/netinet/udp_var.h
index c06e12d19a..c06e12d19a 100644
--- a/cpukit/libnetworking/netinet/udp_var.h
+++ b/include/netinet/udp_var.h
diff --git a/cpukit/libnetworking/nfs/nfsproto.h b/include/nfs/nfsproto.h
index 6eebd81d94..6eebd81d94 100644
--- a/cpukit/libnetworking/nfs/nfsproto.h
+++ b/include/nfs/nfsproto.h
diff --git a/cpukit/libnetworking/nfs/rpcv2.h b/include/nfs/rpcv2.h
index 9d49133ea2..9d49133ea2 100644
--- a/cpukit/libnetworking/nfs/rpcv2.h
+++ b/include/nfs/rpcv2.h
diff --git a/cpukit/libnetworking/nfs/xdr_subs.h b/include/nfs/xdr_subs.h
index b29c172615..b29c172615 100644
--- a/cpukit/libnetworking/nfs/xdr_subs.h
+++ b/include/nfs/xdr_subs.h
diff --git a/cpukit/libnetworking/nfsclient/nfsargs.h b/include/nfsclient/nfsargs.h
index c8609721df..c8609721df 100644
--- a/cpukit/libnetworking/nfsclient/nfsargs.h
+++ b/include/nfsclient/nfsargs.h
diff --git a/cpukit/libnetworking/nfsclient/nfsdiskless.h b/include/nfsclient/nfsdiskless.h
index ee6be125cc..ee6be125cc 100644
--- a/cpukit/libnetworking/nfsclient/nfsdiskless.h
+++ b/include/nfsclient/nfsdiskless.h
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h b/include/nios2/nios2_iss/bsp.h
index c87009d5a1..c87009d5a1 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h
+++ b/include/nios2/nios2_iss/bsp.h
diff --git a/include/nios2/nios2_iss/coverhd.h b/include/nios2/nios2_iss/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/nios2/nios2_iss/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/cpukit/score/cpu/nios2/rtems/asm.h b/include/nios2/nios2_iss/rtems/asm.h
index 45ccd8b050..45ccd8b050 100644
--- a/cpukit/score/cpu/nios2/rtems/asm.h
+++ b/include/nios2/nios2_iss/rtems/asm.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/cpu.h b/include/nios2/nios2_iss/rtems/score/cpu.h
index a14392c821..a14392c821 100644
--- a/cpukit/score/cpu/nios2/rtems/score/cpu.h
+++ b/include/nios2/nios2_iss/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/cpu_asm.h b/include/nios2/nios2_iss/rtems/score/cpu_asm.h
index 81a19c8d69..81a19c8d69 100644
--- a/cpukit/score/cpu/nios2/rtems/score/cpu_asm.h
+++ b/include/nios2/nios2_iss/rtems/score/cpu_asm.h
diff --git a/include/nios2/nios2_iss/rtems/score/cpuatomic.h b/include/nios2/nios2_iss/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/nios2/nios2_iss/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/nios2/rtems/score/types.h b/include/nios2/nios2_iss/rtems/score/types.h
index d81d19a77e..d81d19a77e 100644
--- a/cpukit/score/cpu/nios2/rtems/score/types.h
+++ b/include/nios2/nios2_iss/rtems/score/types.h
diff --git a/include/nios2/nios2_iss/tm27.h b/include/nios2/nios2_iss/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/nios2/nios2_iss/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/nvram.h b/include/nvram.h
new file mode 100644
index 0000000000..f053b39ada
--- /dev/null
+++ b/include/nvram.h
@@ -0,0 +1,22 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_m68k_mcf5206elite__)
+#  include <m68k/mcf5206elite/nvram.h>
+#elif defined(__rtems_powerpc_mcp750__)
+#  include <powerpc/mcp750/nvram.h>
+#elif defined(__rtems_powerpc_mtx603e__)
+#  include <powerpc/mtx603e/nvram.h>
+#elif defined(__rtems_powerpc_mvme2100__)
+#  include <powerpc/mvme2100/nvram.h>
+#elif defined(__rtems_powerpc_mvme2307__)
+#  include <powerpc/mvme2307/nvram.h>
+#elif defined(__rtems_powerpc_qemuprep__)
+#  include <powerpc/qemuprep/nvram.h>
+#elif defined(__rtems_powerpc_qemuprep_altivec__)
+#  include <powerpc/qemuprep-altivec/nvram.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/sparc/shared/include/occan.h b/include/occan.h
index 0217446c42..0217446c42 100644
--- a/c/src/lib/libbsp/sparc/shared/include/occan.h
+++ b/include/occan.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/occan_pci.h b/include/occan_pci.h
index d3c6d1b75c..d3c6d1b75c 100644
--- a/c/src/lib/libbsp/sparc/shared/include/occan_pci.h
+++ b/include/occan_pci.h
diff --git a/c/src/lib/libbsp/or1k/or1ksim/include/bsp.h b/include/or1k/or1ksim/bsp.h
index 502e4d9302..502e4d9302 100644
--- a/c/src/lib/libbsp/or1k/or1ksim/include/bsp.h
+++ b/include/or1k/or1ksim/bsp.h
diff --git a/c/src/lib/libbsp/or1k/or1ksim/include/irq.h b/include/or1k/or1ksim/bsp/irq.h
index be669d84a0..be669d84a0 100644
--- a/c/src/lib/libbsp/or1k/or1ksim/include/irq.h
+++ b/include/or1k/or1ksim/bsp/irq.h
diff --git a/c/src/lib/libbsp/or1k/shared/include/linker-symbols.h b/include/or1k/or1ksim/bsp/linker-symbols.h
index f0f8377892..f0f8377892 100644
--- a/c/src/lib/libbsp/or1k/shared/include/linker-symbols.h
+++ b/include/or1k/or1ksim/bsp/linker-symbols.h
diff --git a/include/or1k/or1ksim/coverhd.h b/include/or1k/or1ksim/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/or1k/or1ksim/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/cpukit/score/cpu/or1k/rtems/asm.h b/include/or1k/or1ksim/rtems/asm.h
index 4d2c22698b..4d2c22698b 100644
--- a/cpukit/score/cpu/or1k/rtems/asm.h
+++ b/include/or1k/or1ksim/rtems/asm.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/cpu.h b/include/or1k/or1ksim/rtems/score/cpu.h
index 0be9bcae31..0be9bcae31 100644
--- a/cpukit/score/cpu/or1k/rtems/score/cpu.h
+++ b/include/or1k/or1ksim/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/cpu_asm.h b/include/or1k/or1ksim/rtems/score/cpu_asm.h
index a5659f35ce..a5659f35ce 100644
--- a/cpukit/score/cpu/or1k/rtems/score/cpu_asm.h
+++ b/include/or1k/or1ksim/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/types.h b/include/or1k/or1ksim/rtems/score/types.h
index 843a10f89a..843a10f89a 100644
--- a/cpukit/score/cpu/or1k/rtems/score/types.h
+++ b/include/or1k/or1ksim/rtems/score/types.h
diff --git a/include/or1k/or1ksim/tm27.h b/include/or1k/or1ksim/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/or1k/or1ksim/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/page_table.h b/include/page_table.h
new file mode 100644
index 0000000000..00ae7fe69a
--- /dev/null
+++ b/include/page_table.h
@@ -0,0 +1,14 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_m68k_mvme162__)
+#  include <m68k/mvme162/page_table.h>
+#elif defined(__rtems_m68k_mvme162lx__)
+#  include <m68k/mvme162lx/page_table.h>
+#elif defined(__rtems_m68k_mvme167__)
+#  include <m68k/mvme167/page_table.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/sparc/shared/include/pci.h b/include/pci.h
index bb7afd2d4d..bb7afd2d4d 100644
--- a/c/src/lib/libbsp/sparc/shared/include/pci.h
+++ b/include/pci.h
diff --git a/c/src/lib/libbsp/i386/shared/pci/pcibios.h b/include/pcibios.h
index 0bd693ab0e..0bd693ab0e 100644
--- a/c/src/lib/libbsp/i386/shared/pci/pcibios.h
+++ b/include/pcibios.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h b/include/powerpc/beatnik/bsp.h
index 9cc9ae085f..9cc9ae085f 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h
+++ b/include/powerpc/beatnik/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/vme/VMEConfig.h b/include/powerpc/beatnik/bsp/VMEConfig.h
index 986a01674e..986a01674e 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/vme/VMEConfig.h
+++ b/include/powerpc/beatnik/bsp/VMEConfig.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtpcireg.h b/include/powerpc/beatnik/bsp/gtpcireg.h
index d01fc702ac..d01fc702ac 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtpcireg.h
+++ b/include/powerpc/beatnik/bsp/gtpcireg.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtreg.h b/include/powerpc/beatnik/bsp/gtreg.h
index a6c87e2047..a6c87e2047 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtreg.h
+++ b/include/powerpc/beatnik/bsp/gtreg.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/irq/irq.h b/include/powerpc/beatnik/bsp/irq.h
index e5f9558ecf..e5f9558ecf 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/irq/irq.h
+++ b/include/powerpc/beatnik/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pci.h b/include/powerpc/beatnik/bsp/pci.h
index 42dc43875b..42dc43875b 100644
--- a/c/src/lib/libbsp/powerpc/shared/pci/pci.h
+++ b/include/powerpc/beatnik/bsp/pci.h
diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/vpd.h b/include/powerpc/beatnik/bsp/vpd.h
index 23e49ac9f0..23e49ac9f0 100644
--- a/c/src/lib/libbsp/powerpc/shared/motorola/vpd.h
+++ b/include/powerpc/beatnik/bsp/vpd.h
diff --git a/include/powerpc/beatnik/coverhd.h b/include/powerpc/beatnik/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/beatnik/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/c/src/lib/libcpu/powerpc/shared/include/byteorder.h b/include/powerpc/beatnik/libcpu/byteorder.h
index 0654fefb58..0654fefb58 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/byteorder.h
+++ b/include/powerpc/beatnik/libcpu/byteorder.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/mmu.h b/include/powerpc/beatnik/libcpu/mmu.h
index d3081316eb..d3081316eb 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/mmu.h
+++ b/include/powerpc/beatnik/libcpu/mmu.h
diff --git a/cpukit/score/cpu/powerpc/rtems/asm.h b/include/powerpc/beatnik/rtems/asm.h
index 62571ad4eb..62571ad4eb 100644
--- a/cpukit/score/cpu/powerpc/rtems/asm.h
+++ b/include/powerpc/beatnik/rtems/asm.h
diff --git a/cpukit/score/cpu/powerpc/rtems/score/cpu.h b/include/powerpc/beatnik/rtems/score/cpu.h
index 15854d54aa..15854d54aa 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/cpu.h
+++ b/include/powerpc/beatnik/rtems/score/cpu.h
diff --git a/include/powerpc/beatnik/rtems/score/cpuatomic.h b/include/powerpc/beatnik/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/beatnik/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/powerpc/rtems/score/types.h b/include/powerpc/beatnik/rtems/score/types.h
index 0679f40202..0679f40202 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/types.h
+++ b/include/powerpc/beatnik/rtems/score/types.h
diff --git a/include/powerpc/beatnik/tm27.h b/include/powerpc/beatnik/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/beatnik/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h b/include/powerpc/br_uid/bsp.h
index b9033c1351..b9033c1351 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h
+++ b/include/powerpc/br_uid/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/hwreg_vals.h b/include/powerpc/br_uid/bsp/hwreg_vals.h
index c7a5bac9c2..c7a5bac9c2 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/hwreg_vals.h
+++ b/include/powerpc/br_uid/bsp/hwreg_vals.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/irq.h b/include/powerpc/br_uid/bsp/irq.h
index dc084ed2a2..dc084ed2a2 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/irq.h
+++ b/include/powerpc/br_uid/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/shared/include/linker-symbols.h b/include/powerpc/br_uid/bsp/linker-symbols.h
index 747457e9aa..747457e9aa 100644
--- a/c/src/lib/libbsp/powerpc/shared/include/linker-symbols.h
+++ b/include/powerpc/br_uid/bsp/linker-symbols.h
diff --git a/c/src/lib/libbsp/powerpc/shared/include/start.h b/include/powerpc/br_uid/bsp/start.h
index ab718a87ee..ab718a87ee 100644
--- a/c/src/lib/libbsp/powerpc/shared/include/start.h
+++ b/include/powerpc/br_uid/bsp/start.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/tsec-config.h b/include/powerpc/br_uid/bsp/tsec-config.h
index 5ec0ccbad1..5ec0ccbad1 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/tsec-config.h
+++ b/include/powerpc/br_uid/bsp/tsec-config.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/u-boot-config.h b/include/powerpc/br_uid/bsp/u-boot-config.h
index c2271c965b..c2271c965b 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/u-boot-config.h
+++ b/include/powerpc/br_uid/bsp/u-boot-config.h
diff --git a/include/powerpc/br_uid/coverhd.h b/include/powerpc/br_uid/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/br_uid/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/br_uid/libcpu/byteorder.h b/include/powerpc/br_uid/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/br_uid/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/br_uid/libcpu/mmu.h b/include/powerpc/br_uid/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/br_uid/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/br_uid/rtems/asm.h b/include/powerpc/br_uid/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/br_uid/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/br_uid/rtems/score/cpu.h b/include/powerpc/br_uid/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/br_uid/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/br_uid/rtems/score/cpuatomic.h b/include/powerpc/br_uid/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/br_uid/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/br_uid/rtems/score/types.h b/include/powerpc/br_uid/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/br_uid/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h b/include/powerpc/br_uid/tm27.h
index 22787473a5..22787473a5 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h
+++ b/include/powerpc/br_uid/tm27.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h b/include/powerpc/brs5l/bsp.h
index d27c9c1b8c..d27c9c1b8c 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h
+++ b/include/powerpc/brs5l/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h b/include/powerpc/brs5l/bsp/i2c.h
index e5d7d472dd..e5d7d472dd 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h
+++ b/include/powerpc/brs5l/bsp/i2c.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/irq.h b/include/powerpc/brs5l/bsp/irq.h
index 5a0b3bd29e..5a0b3bd29e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/irq.h
+++ b/include/powerpc/brs5l/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/u-boot-config.h b/include/powerpc/brs5l/bsp/u-boot-config.h
index 2fee83bce9..2fee83bce9 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/u-boot-config.h
+++ b/include/powerpc/brs5l/bsp/u-boot-config.h
diff --git a/include/powerpc/brs5l/coverhd.h b/include/powerpc/brs5l/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/brs5l/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/brs5l/libcpu/byteorder.h b/include/powerpc/brs5l/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/brs5l/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/brs5l/libcpu/mmu.h b/include/powerpc/brs5l/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/brs5l/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/brs5l/rtems/asm.h b/include/powerpc/brs5l/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/brs5l/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/brs5l/rtems/score/cpu.h b/include/powerpc/brs5l/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/brs5l/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/brs5l/rtems/score/cpuatomic.h b/include/powerpc/brs5l/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/brs5l/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/brs5l/rtems/score/types.h b/include/powerpc/brs5l/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/brs5l/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h b/include/powerpc/brs5l/tm27.h
index ff43cc9ab6..ff43cc9ab6 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h
+++ b/include/powerpc/brs5l/tm27.h
diff --git a/include/powerpc/brs6l/bsp.h b/include/powerpc/brs6l/bsp.h
new file mode 100644
index 0000000000..743a5e4e2a
--- /dev/null
+++ b/include/powerpc/brs6l/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp.h>
diff --git a/include/powerpc/brs6l/bsp/i2c.h b/include/powerpc/brs6l/bsp/i2c.h
new file mode 100644
index 0000000000..64bbd7315f
--- /dev/null
+++ b/include/powerpc/brs6l/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp/i2c.h>
diff --git a/include/powerpc/brs6l/bsp/irq.h b/include/powerpc/brs6l/bsp/irq.h
new file mode 100644
index 0000000000..bb70d84443
--- /dev/null
+++ b/include/powerpc/brs6l/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp/irq.h>
diff --git a/include/powerpc/brs6l/bsp/u-boot-config.h b/include/powerpc/brs6l/bsp/u-boot-config.h
new file mode 100644
index 0000000000..3fefe50889
--- /dev/null
+++ b/include/powerpc/brs6l/bsp/u-boot-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp/u-boot-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp/u-boot-config.h>
diff --git a/include/powerpc/brs6l/coverhd.h b/include/powerpc/brs6l/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/brs6l/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/brs6l/libcpu/byteorder.h b/include/powerpc/brs6l/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/brs6l/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/brs6l/libcpu/mmu.h b/include/powerpc/brs6l/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/brs6l/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/brs6l/rtems/asm.h b/include/powerpc/brs6l/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/brs6l/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/brs6l/rtems/score/cpu.h b/include/powerpc/brs6l/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/brs6l/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/brs6l/rtems/score/cpuatomic.h b/include/powerpc/brs6l/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/brs6l/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/brs6l/rtems/score/types.h b/include/powerpc/brs6l/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/brs6l/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/brs6l/tm27.h b/include/powerpc/brs6l/tm27.h
new file mode 100644
index 0000000000..3d7f96390a
--- /dev/null
+++ b/include/powerpc/brs6l/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/tm27.h>
diff --git a/include/powerpc/dp2/bsp.h b/include/powerpc/dp2/bsp.h
new file mode 100644
index 0000000000..743a5e4e2a
--- /dev/null
+++ b/include/powerpc/dp2/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp.h>
diff --git a/include/powerpc/dp2/bsp/i2c.h b/include/powerpc/dp2/bsp/i2c.h
new file mode 100644
index 0000000000..64bbd7315f
--- /dev/null
+++ b/include/powerpc/dp2/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp/i2c.h>
diff --git a/include/powerpc/dp2/bsp/irq.h b/include/powerpc/dp2/bsp/irq.h
new file mode 100644
index 0000000000..bb70d84443
--- /dev/null
+++ b/include/powerpc/dp2/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp/irq.h>
diff --git a/include/powerpc/dp2/bsp/u-boot-config.h b/include/powerpc/dp2/bsp/u-boot-config.h
new file mode 100644
index 0000000000..3fefe50889
--- /dev/null
+++ b/include/powerpc/dp2/bsp/u-boot-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp/u-boot-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp/u-boot-config.h>
diff --git a/include/powerpc/dp2/coverhd.h b/include/powerpc/dp2/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/dp2/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/dp2/libcpu/byteorder.h b/include/powerpc/dp2/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/dp2/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/dp2/libcpu/mmu.h b/include/powerpc/dp2/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/dp2/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/dp2/rtems/asm.h b/include/powerpc/dp2/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/dp2/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/dp2/rtems/score/cpu.h b/include/powerpc/dp2/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/dp2/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/dp2/rtems/score/cpuatomic.h b/include/powerpc/dp2/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/dp2/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/dp2/rtems/score/types.h b/include/powerpc/dp2/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/dp2/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/dp2/tm27.h b/include/powerpc/dp2/tm27.h
new file mode 100644
index 0000000000..3d7f96390a
--- /dev/null
+++ b/include/powerpc/dp2/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/tm27.h>
diff --git a/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h b/include/powerpc/ep1a/bsp.h
index cdd3cffa65..cdd3cffa65 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h
+++ b/include/powerpc/ep1a/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/ep1a/vme/VMEConfig.h b/include/powerpc/ep1a/bsp/VMEConfig.h
index 1a57610133..1a57610133 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/vme/VMEConfig.h
+++ b/include/powerpc/ep1a/bsp/VMEConfig.h
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq.h b/include/powerpc/ep1a/bsp/irq.h
index 2d575d8122..2d575d8122 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq.h
+++ b/include/powerpc/ep1a/bsp/irq.h
diff --git a/include/powerpc/ep1a/bsp/pci.h b/include/powerpc/ep1a/bsp/pci.h
new file mode 100644
index 0000000000..784510ec0c
--- /dev/null
+++ b/include/powerpc/ep1a/bsp/pci.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/bsp/pci.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/bsp/pci.h>
diff --git a/include/powerpc/ep1a/coverhd.h b/include/powerpc/ep1a/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/ep1a/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/ep1a/libcpu/byteorder.h b/include/powerpc/ep1a/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/ep1a/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/ep1a/libcpu/mmu.h b/include/powerpc/ep1a/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/ep1a/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/ep1a/rtems/asm.h b/include/powerpc/ep1a/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/ep1a/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/ep1a/rtems/score/cpu.h b/include/powerpc/ep1a/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/ep1a/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/ep1a/rtems/score/cpuatomic.h b/include/powerpc/ep1a/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/ep1a/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/ep1a/rtems/score/types.h b/include/powerpc/ep1a/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/ep1a/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/powerpc/ep1a/include/tm27.h b/include/powerpc/ep1a/tm27.h
index 8f819a5d5c..8f819a5d5c 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/include/tm27.h
+++ b/include/powerpc/ep1a/tm27.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h b/include/powerpc/gwlcfm/bsp.h
index f860960904..f860960904 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h
+++ b/include/powerpc/gwlcfm/bsp.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/irq.h b/include/powerpc/gwlcfm/bsp/irq.h
index 4efa92219e..4efa92219e 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/irq.h
+++ b/include/powerpc/gwlcfm/bsp/irq.h
diff --git a/include/powerpc/gwlcfm/bsp/linker-symbols.h b/include/powerpc/gwlcfm/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/gwlcfm/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/gwlcfm/bsp/start.h b/include/powerpc/gwlcfm/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/gwlcfm/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/gwlcfm/coverhd.h b/include/powerpc/gwlcfm/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/gwlcfm/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/gwlcfm/libcpu/byteorder.h b/include/powerpc/gwlcfm/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/gwlcfm/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/gwlcfm/libcpu/mmu.h b/include/powerpc/gwlcfm/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/gwlcfm/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/gwlcfm/rtems/asm.h b/include/powerpc/gwlcfm/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/gwlcfm/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/gwlcfm/rtems/score/cpu.h b/include/powerpc/gwlcfm/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/gwlcfm/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/gwlcfm/rtems/score/cpuatomic.h b/include/powerpc/gwlcfm/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/gwlcfm/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/gwlcfm/rtems/score/types.h b/include/powerpc/gwlcfm/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/gwlcfm/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/gwlcfm/tm27.h b/include/powerpc/gwlcfm/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/gwlcfm/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h b/include/powerpc/haleakala/bsp.h
index e5fc4cebca..e5fc4cebca 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h
+++ b/include/powerpc/haleakala/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/haleakala/irq/irq.h b/include/powerpc/haleakala/bsp/irq.h
index c413ec3172..c413ec3172 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/irq/irq.h
+++ b/include/powerpc/haleakala/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/haleakala/include/coverhd.h b/include/powerpc/haleakala/coverhd.h
index b3323f8085..b3323f8085 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/include/coverhd.h
+++ b/include/powerpc/haleakala/coverhd.h
diff --git a/include/powerpc/haleakala/libcpu/byteorder.h b/include/powerpc/haleakala/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/haleakala/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/haleakala/libcpu/mmu.h b/include/powerpc/haleakala/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/haleakala/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/haleakala/rtems/asm.h b/include/powerpc/haleakala/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/haleakala/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/haleakala/rtems/score/cpu.h b/include/powerpc/haleakala/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/haleakala/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/haleakala/rtems/score/cpuatomic.h b/include/powerpc/haleakala/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/haleakala/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/haleakala/rtems/score/types.h b/include/powerpc/haleakala/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/haleakala/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/haleakala/tm27.h b/include/powerpc/haleakala/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/haleakala/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/hsc_cm01/bsp.h b/include/powerpc/hsc_cm01/bsp.h
new file mode 100644
index 0000000000..b4648c9a5a
--- /dev/null
+++ b/include/powerpc/hsc_cm01/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp.h>
diff --git a/include/powerpc/hsc_cm01/bsp/hwreg_vals.h b/include/powerpc/hsc_cm01/bsp/hwreg_vals.h
new file mode 100644
index 0000000000..fbfbf19f9a
--- /dev/null
+++ b/include/powerpc/hsc_cm01/bsp/hwreg_vals.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/hwreg_vals.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/hwreg_vals.h>
diff --git a/include/powerpc/hsc_cm01/bsp/irq.h b/include/powerpc/hsc_cm01/bsp/irq.h
new file mode 100644
index 0000000000..bea440f809
--- /dev/null
+++ b/include/powerpc/hsc_cm01/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/irq.h>
diff --git a/include/powerpc/hsc_cm01/bsp/linker-symbols.h b/include/powerpc/hsc_cm01/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/hsc_cm01/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/hsc_cm01/bsp/start.h b/include/powerpc/hsc_cm01/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/hsc_cm01/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/hsc_cm01/bsp/tsec-config.h b/include/powerpc/hsc_cm01/bsp/tsec-config.h
new file mode 100644
index 0000000000..8cd2099175
--- /dev/null
+++ b/include/powerpc/hsc_cm01/bsp/tsec-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/tsec-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/tsec-config.h>
diff --git a/include/powerpc/hsc_cm01/bsp/u-boot-config.h b/include/powerpc/hsc_cm01/bsp/u-boot-config.h
new file mode 100644
index 0000000000..96ed7e8401
--- /dev/null
+++ b/include/powerpc/hsc_cm01/bsp/u-boot-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/u-boot-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/u-boot-config.h>
diff --git a/include/powerpc/hsc_cm01/coverhd.h b/include/powerpc/hsc_cm01/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/hsc_cm01/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/hsc_cm01/libcpu/byteorder.h b/include/powerpc/hsc_cm01/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/hsc_cm01/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/hsc_cm01/libcpu/mmu.h b/include/powerpc/hsc_cm01/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/hsc_cm01/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/hsc_cm01/rtems/asm.h b/include/powerpc/hsc_cm01/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/hsc_cm01/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/hsc_cm01/rtems/score/cpu.h b/include/powerpc/hsc_cm01/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/hsc_cm01/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/hsc_cm01/rtems/score/cpuatomic.h b/include/powerpc/hsc_cm01/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/hsc_cm01/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/hsc_cm01/rtems/score/types.h b/include/powerpc/hsc_cm01/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/hsc_cm01/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/hsc_cm01/tm27.h b/include/powerpc/hsc_cm01/tm27.h
new file mode 100644
index 0000000000..ca150594a9
--- /dev/null
+++ b/include/powerpc/hsc_cm01/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/tm27.h>
diff --git a/include/powerpc/icecube/bsp.h b/include/powerpc/icecube/bsp.h
new file mode 100644
index 0000000000..743a5e4e2a
--- /dev/null
+++ b/include/powerpc/icecube/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp.h>
diff --git a/include/powerpc/icecube/bsp/i2c.h b/include/powerpc/icecube/bsp/i2c.h
new file mode 100644
index 0000000000..64bbd7315f
--- /dev/null
+++ b/include/powerpc/icecube/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp/i2c.h>
diff --git a/include/powerpc/icecube/bsp/irq.h b/include/powerpc/icecube/bsp/irq.h
new file mode 100644
index 0000000000..bb70d84443
--- /dev/null
+++ b/include/powerpc/icecube/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp/irq.h>
diff --git a/include/powerpc/icecube/bsp/u-boot-config.h b/include/powerpc/icecube/bsp/u-boot-config.h
new file mode 100644
index 0000000000..3fefe50889
--- /dev/null
+++ b/include/powerpc/icecube/bsp/u-boot-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp/u-boot-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp/u-boot-config.h>
diff --git a/include/powerpc/icecube/coverhd.h b/include/powerpc/icecube/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/icecube/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/icecube/libcpu/byteorder.h b/include/powerpc/icecube/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/icecube/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/icecube/libcpu/mmu.h b/include/powerpc/icecube/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/icecube/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/icecube/rtems/asm.h b/include/powerpc/icecube/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/icecube/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/icecube/rtems/score/cpu.h b/include/powerpc/icecube/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/icecube/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/icecube/rtems/score/cpuatomic.h b/include/powerpc/icecube/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/icecube/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/icecube/rtems/score/types.h b/include/powerpc/icecube/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/icecube/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/icecube/tm27.h b/include/powerpc/icecube/tm27.h
new file mode 100644
index 0000000000..3d7f96390a
--- /dev/null
+++ b/include/powerpc/icecube/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/tm27.h>
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h b/include/powerpc/mbx821_001/bsp.h
index c87350dcbb..c87350dcbb 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h
+++ b/include/powerpc/mbx821_001/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/include/8xx_immap.h b/include/powerpc/mbx821_001/bsp/8xx_immap.h
index 98258d49be..98258d49be 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/include/8xx_immap.h
+++ b/include/powerpc/mbx821_001/bsp/8xx_immap.h
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h b/include/powerpc/mbx821_001/bsp/irq.h
index b79ea96690..b79ea96690 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.h
+++ b/include/powerpc/mbx821_001/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/include/coverhd.h b/include/powerpc/mbx821_001/coverhd.h
index 4d8166847d..4d8166847d 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/include/coverhd.h
+++ b/include/powerpc/mbx821_001/coverhd.h
diff --git a/include/powerpc/mbx821_001/libcpu/byteorder.h b/include/powerpc/mbx821_001/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mbx821_001/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mbx821_001/libcpu/mmu.h b/include/powerpc/mbx821_001/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mbx821_001/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mbx821_001/rtems/asm.h b/include/powerpc/mbx821_001/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mbx821_001/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mbx821_001/rtems/score/cpu.h b/include/powerpc/mbx821_001/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mbx821_001/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mbx821_001/rtems/score/cpuatomic.h b/include/powerpc/mbx821_001/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mbx821_001/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mbx821_001/rtems/score/types.h b/include/powerpc/mbx821_001/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mbx821_001/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mbx821_001/tm27.h b/include/powerpc/mbx821_001/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mbx821_001/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/mbx821_002/bsp.h b/include/powerpc/mbx821_002/bsp.h
new file mode 100644
index 0000000000..406798b31c
--- /dev/null
+++ b/include/powerpc/mbx821_002/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp.h>
diff --git a/include/powerpc/mbx821_002/bsp/8xx_immap.h b/include/powerpc/mbx821_002/bsp/8xx_immap.h
new file mode 100644
index 0000000000..f3b724e5be
--- /dev/null
+++ b/include/powerpc/mbx821_002/bsp/8xx_immap.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp/8xx_immap.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp/8xx_immap.h>
diff --git a/include/powerpc/mbx821_002/bsp/irq.h b/include/powerpc/mbx821_002/bsp/irq.h
new file mode 100644
index 0000000000..b86d09c153
--- /dev/null
+++ b/include/powerpc/mbx821_002/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp/irq.h>
diff --git a/include/powerpc/mbx821_002/coverhd.h b/include/powerpc/mbx821_002/coverhd.h
new file mode 100644
index 0000000000..2047cf4ab8
--- /dev/null
+++ b/include/powerpc/mbx821_002/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/coverhd.h>
diff --git a/include/powerpc/mbx821_002/libcpu/byteorder.h b/include/powerpc/mbx821_002/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mbx821_002/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mbx821_002/libcpu/mmu.h b/include/powerpc/mbx821_002/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mbx821_002/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mbx821_002/rtems/asm.h b/include/powerpc/mbx821_002/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mbx821_002/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mbx821_002/rtems/score/cpu.h b/include/powerpc/mbx821_002/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mbx821_002/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mbx821_002/rtems/score/cpuatomic.h b/include/powerpc/mbx821_002/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mbx821_002/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mbx821_002/rtems/score/types.h b/include/powerpc/mbx821_002/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mbx821_002/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mbx821_002/tm27.h b/include/powerpc/mbx821_002/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mbx821_002/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/mbx821_002b/bsp.h b/include/powerpc/mbx821_002b/bsp.h
new file mode 100644
index 0000000000..406798b31c
--- /dev/null
+++ b/include/powerpc/mbx821_002b/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp.h>
diff --git a/include/powerpc/mbx821_002b/bsp/8xx_immap.h b/include/powerpc/mbx821_002b/bsp/8xx_immap.h
new file mode 100644
index 0000000000..f3b724e5be
--- /dev/null
+++ b/include/powerpc/mbx821_002b/bsp/8xx_immap.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp/8xx_immap.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp/8xx_immap.h>
diff --git a/include/powerpc/mbx821_002b/bsp/irq.h b/include/powerpc/mbx821_002b/bsp/irq.h
new file mode 100644
index 0000000000..b86d09c153
--- /dev/null
+++ b/include/powerpc/mbx821_002b/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp/irq.h>
diff --git a/include/powerpc/mbx821_002b/coverhd.h b/include/powerpc/mbx821_002b/coverhd.h
new file mode 100644
index 0000000000..2047cf4ab8
--- /dev/null
+++ b/include/powerpc/mbx821_002b/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/coverhd.h>
diff --git a/include/powerpc/mbx821_002b/libcpu/byteorder.h b/include/powerpc/mbx821_002b/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mbx821_002b/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mbx821_002b/libcpu/mmu.h b/include/powerpc/mbx821_002b/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mbx821_002b/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mbx821_002b/rtems/asm.h b/include/powerpc/mbx821_002b/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mbx821_002b/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mbx821_002b/rtems/score/cpu.h b/include/powerpc/mbx821_002b/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mbx821_002b/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mbx821_002b/rtems/score/cpuatomic.h b/include/powerpc/mbx821_002b/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mbx821_002b/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mbx821_002b/rtems/score/types.h b/include/powerpc/mbx821_002b/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mbx821_002b/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mbx821_002b/tm27.h b/include/powerpc/mbx821_002b/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mbx821_002b/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/mbx860_001b/bsp.h b/include/powerpc/mbx860_001b/bsp.h
new file mode 100644
index 0000000000..406798b31c
--- /dev/null
+++ b/include/powerpc/mbx860_001b/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp.h>
diff --git a/include/powerpc/mbx860_001b/bsp/8xx_immap.h b/include/powerpc/mbx860_001b/bsp/8xx_immap.h
new file mode 100644
index 0000000000..f3b724e5be
--- /dev/null
+++ b/include/powerpc/mbx860_001b/bsp/8xx_immap.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp/8xx_immap.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp/8xx_immap.h>
diff --git a/include/powerpc/mbx860_001b/bsp/irq.h b/include/powerpc/mbx860_001b/bsp/irq.h
new file mode 100644
index 0000000000..b86d09c153
--- /dev/null
+++ b/include/powerpc/mbx860_001b/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp/irq.h>
diff --git a/include/powerpc/mbx860_001b/coverhd.h b/include/powerpc/mbx860_001b/coverhd.h
new file mode 100644
index 0000000000..2047cf4ab8
--- /dev/null
+++ b/include/powerpc/mbx860_001b/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/coverhd.h>
diff --git a/include/powerpc/mbx860_001b/libcpu/byteorder.h b/include/powerpc/mbx860_001b/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mbx860_001b/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mbx860_001b/libcpu/mmu.h b/include/powerpc/mbx860_001b/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mbx860_001b/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mbx860_001b/rtems/asm.h b/include/powerpc/mbx860_001b/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mbx860_001b/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mbx860_001b/rtems/score/cpu.h b/include/powerpc/mbx860_001b/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mbx860_001b/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mbx860_001b/rtems/score/cpuatomic.h b/include/powerpc/mbx860_001b/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mbx860_001b/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mbx860_001b/rtems/score/types.h b/include/powerpc/mbx860_001b/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mbx860_001b/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mbx860_001b/tm27.h b/include/powerpc/mbx860_001b/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mbx860_001b/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/mbx860_002/bsp.h b/include/powerpc/mbx860_002/bsp.h
new file mode 100644
index 0000000000..406798b31c
--- /dev/null
+++ b/include/powerpc/mbx860_002/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp.h>
diff --git a/include/powerpc/mbx860_002/bsp/8xx_immap.h b/include/powerpc/mbx860_002/bsp/8xx_immap.h
new file mode 100644
index 0000000000..f3b724e5be
--- /dev/null
+++ b/include/powerpc/mbx860_002/bsp/8xx_immap.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp/8xx_immap.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp/8xx_immap.h>
diff --git a/include/powerpc/mbx860_002/bsp/irq.h b/include/powerpc/mbx860_002/bsp/irq.h
new file mode 100644
index 0000000000..b86d09c153
--- /dev/null
+++ b/include/powerpc/mbx860_002/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp/irq.h>
diff --git a/include/powerpc/mbx860_002/coverhd.h b/include/powerpc/mbx860_002/coverhd.h
new file mode 100644
index 0000000000..2047cf4ab8
--- /dev/null
+++ b/include/powerpc/mbx860_002/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/coverhd.h>
diff --git a/include/powerpc/mbx860_002/libcpu/byteorder.h b/include/powerpc/mbx860_002/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mbx860_002/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mbx860_002/libcpu/mmu.h b/include/powerpc/mbx860_002/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mbx860_002/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mbx860_002/rtems/asm.h b/include/powerpc/mbx860_002/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mbx860_002/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mbx860_002/rtems/score/cpu.h b/include/powerpc/mbx860_002/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mbx860_002/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mbx860_002/rtems/score/cpuatomic.h b/include/powerpc/mbx860_002/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mbx860_002/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mbx860_002/rtems/score/types.h b/include/powerpc/mbx860_002/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mbx860_002/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mbx860_002/tm27.h b/include/powerpc/mbx860_002/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mbx860_002/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/mbx860_005b/bsp.h b/include/powerpc/mbx860_005b/bsp.h
new file mode 100644
index 0000000000..406798b31c
--- /dev/null
+++ b/include/powerpc/mbx860_005b/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp.h>
diff --git a/include/powerpc/mbx860_005b/bsp/8xx_immap.h b/include/powerpc/mbx860_005b/bsp/8xx_immap.h
new file mode 100644
index 0000000000..f3b724e5be
--- /dev/null
+++ b/include/powerpc/mbx860_005b/bsp/8xx_immap.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp/8xx_immap.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp/8xx_immap.h>
diff --git a/include/powerpc/mbx860_005b/bsp/irq.h b/include/powerpc/mbx860_005b/bsp/irq.h
new file mode 100644
index 0000000000..b86d09c153
--- /dev/null
+++ b/include/powerpc/mbx860_005b/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp/irq.h>
diff --git a/include/powerpc/mbx860_005b/coverhd.h b/include/powerpc/mbx860_005b/coverhd.h
new file mode 100644
index 0000000000..2047cf4ab8
--- /dev/null
+++ b/include/powerpc/mbx860_005b/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/coverhd.h>
diff --git a/include/powerpc/mbx860_005b/libcpu/byteorder.h b/include/powerpc/mbx860_005b/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mbx860_005b/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mbx860_005b/libcpu/mmu.h b/include/powerpc/mbx860_005b/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mbx860_005b/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mbx860_005b/rtems/asm.h b/include/powerpc/mbx860_005b/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mbx860_005b/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mbx860_005b/rtems/score/cpu.h b/include/powerpc/mbx860_005b/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mbx860_005b/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mbx860_005b/rtems/score/cpuatomic.h b/include/powerpc/mbx860_005b/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mbx860_005b/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mbx860_005b/rtems/score/types.h b/include/powerpc/mbx860_005b/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mbx860_005b/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mbx860_005b/tm27.h b/include/powerpc/mbx860_005b/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mbx860_005b/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/mbx860_1b/bsp.h b/include/powerpc/mbx860_1b/bsp.h
new file mode 100644
index 0000000000..406798b31c
--- /dev/null
+++ b/include/powerpc/mbx860_1b/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp.h>
diff --git a/include/powerpc/mbx860_1b/bsp/8xx_immap.h b/include/powerpc/mbx860_1b/bsp/8xx_immap.h
new file mode 100644
index 0000000000..f3b724e5be
--- /dev/null
+++ b/include/powerpc/mbx860_1b/bsp/8xx_immap.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp/8xx_immap.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp/8xx_immap.h>
diff --git a/include/powerpc/mbx860_1b/bsp/irq.h b/include/powerpc/mbx860_1b/bsp/irq.h
new file mode 100644
index 0000000000..b86d09c153
--- /dev/null
+++ b/include/powerpc/mbx860_1b/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/bsp/irq.h>
diff --git a/include/powerpc/mbx860_1b/coverhd.h b/include/powerpc/mbx860_1b/coverhd.h
new file mode 100644
index 0000000000..2047cf4ab8
--- /dev/null
+++ b/include/powerpc/mbx860_1b/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mbx821_001/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mbx821_001/coverhd.h>
diff --git a/include/powerpc/mbx860_1b/libcpu/byteorder.h b/include/powerpc/mbx860_1b/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mbx860_1b/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mbx860_1b/libcpu/mmu.h b/include/powerpc/mbx860_1b/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mbx860_1b/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mbx860_1b/rtems/asm.h b/include/powerpc/mbx860_1b/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mbx860_1b/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mbx860_1b/rtems/score/cpu.h b/include/powerpc/mbx860_1b/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mbx860_1b/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mbx860_1b/rtems/score/cpuatomic.h b/include/powerpc/mbx860_1b/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mbx860_1b/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mbx860_1b/rtems/score/types.h b/include/powerpc/mbx860_1b/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mbx860_1b/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mbx860_1b/tm27.h b/include/powerpc/mbx860_1b/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mbx860_1b/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h b/include/powerpc/mcp750/bsp.h
index 975b5a3dce..975b5a3dce 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
+++ b/include/powerpc/mcp750/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h b/include/powerpc/mcp750/bsp/VMEConfig.h
index 9b355819f1..9b355819f1 100644
--- a/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h
+++ b/include/powerpc/mcp750/bsp/VMEConfig.h
diff --git a/include/powerpc/mcp750/bsp/irq.h b/include/powerpc/mcp750/bsp/irq.h
new file mode 100644
index 0000000000..511c4b7a96
--- /dev/null
+++ b/include/powerpc/mcp750/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/ep1a/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/ep1a/bsp/irq.h>
diff --git a/include/powerpc/mcp750/bsp/pci.h b/include/powerpc/mcp750/bsp/pci.h
new file mode 100644
index 0000000000..784510ec0c
--- /dev/null
+++ b/include/powerpc/mcp750/bsp/pci.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/bsp/pci.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/bsp/pci.h>
diff --git a/include/powerpc/mcp750/coverhd.h b/include/powerpc/mcp750/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mcp750/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mcp750/libcpu/byteorder.h b/include/powerpc/mcp750/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mcp750/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mcp750/libcpu/mmu.h b/include/powerpc/mcp750/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mcp750/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/c/src/lib/libbsp/powerpc/shared/include/nvram.h b/include/powerpc/mcp750/nvram.h
index f579544336..f579544336 100644
--- a/c/src/lib/libbsp/powerpc/shared/include/nvram.h
+++ b/include/powerpc/mcp750/nvram.h
diff --git a/include/powerpc/mcp750/rtems/asm.h b/include/powerpc/mcp750/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mcp750/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mcp750/rtems/score/cpu.h b/include/powerpc/mcp750/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mcp750/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mcp750/rtems/score/cpuatomic.h b/include/powerpc/mcp750/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mcp750/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mcp750/rtems/score/types.h b/include/powerpc/mcp750/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mcp750/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/tm27.h b/include/powerpc/mcp750/tm27.h
index 81eb55a54a..81eb55a54a 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/tm27.h
+++ b/include/powerpc/mcp750/tm27.h
diff --git a/include/powerpc/mpc5566evb/bsp.h b/include/powerpc/mpc5566evb/bsp.h
new file mode 100644
index 0000000000..7f5174b912
--- /dev/null
+++ b/include/powerpc/mpc5566evb/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp.h>
diff --git a/include/powerpc/mpc5566evb/bsp/irq.h b/include/powerpc/mpc5566evb/bsp/irq.h
new file mode 100644
index 0000000000..ea615705d9
--- /dev/null
+++ b/include/powerpc/mpc5566evb/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp/irq.h>
diff --git a/include/powerpc/mpc5566evb/bsp/linker-symbols.h b/include/powerpc/mpc5566evb/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/mpc5566evb/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/mpc5566evb/bsp/start.h b/include/powerpc/mpc5566evb/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/mpc5566evb/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/mpc5566evb/coverhd.h b/include/powerpc/mpc5566evb/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mpc5566evb/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mpc5566evb/libcpu/byteorder.h b/include/powerpc/mpc5566evb/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mpc5566evb/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mpc5566evb/libcpu/mmu.h b/include/powerpc/mpc5566evb/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mpc5566evb/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mpc5566evb/rtems/asm.h b/include/powerpc/mpc5566evb/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mpc5566evb/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mpc5566evb/rtems/score/cpu.h b/include/powerpc/mpc5566evb/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mpc5566evb/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mpc5566evb/rtems/score/cpuatomic.h b/include/powerpc/mpc5566evb/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mpc5566evb/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mpc5566evb/rtems/score/types.h b/include/powerpc/mpc5566evb/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mpc5566evb/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mpc5566evb/tm27.h b/include/powerpc/mpc5566evb/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mpc5566evb/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/mpc5566evb_spe/bsp.h b/include/powerpc/mpc5566evb_spe/bsp.h
new file mode 100644
index 0000000000..7f5174b912
--- /dev/null
+++ b/include/powerpc/mpc5566evb_spe/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp.h>
diff --git a/include/powerpc/mpc5566evb_spe/bsp/irq.h b/include/powerpc/mpc5566evb_spe/bsp/irq.h
new file mode 100644
index 0000000000..ea615705d9
--- /dev/null
+++ b/include/powerpc/mpc5566evb_spe/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp/irq.h>
diff --git a/include/powerpc/mpc5566evb_spe/bsp/linker-symbols.h b/include/powerpc/mpc5566evb_spe/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/mpc5566evb_spe/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/mpc5566evb_spe/bsp/start.h b/include/powerpc/mpc5566evb_spe/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/mpc5566evb_spe/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/mpc5566evb_spe/coverhd.h b/include/powerpc/mpc5566evb_spe/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mpc5566evb_spe/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mpc5566evb_spe/libcpu/byteorder.h b/include/powerpc/mpc5566evb_spe/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mpc5566evb_spe/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mpc5566evb_spe/libcpu/mmu.h b/include/powerpc/mpc5566evb_spe/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mpc5566evb_spe/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mpc5566evb_spe/rtems/asm.h b/include/powerpc/mpc5566evb_spe/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mpc5566evb_spe/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mpc5566evb_spe/rtems/score/cpu.h b/include/powerpc/mpc5566evb_spe/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mpc5566evb_spe/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mpc5566evb_spe/rtems/score/cpuatomic.h b/include/powerpc/mpc5566evb_spe/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mpc5566evb_spe/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mpc5566evb_spe/rtems/score/types.h b/include/powerpc/mpc5566evb_spe/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mpc5566evb_spe/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mpc5566evb_spe/tm27.h b/include/powerpc/mpc5566evb_spe/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mpc5566evb_spe/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/mpc5643l_dpu/bsp.h b/include/powerpc/mpc5643l_dpu/bsp.h
new file mode 100644
index 0000000000..7f5174b912
--- /dev/null
+++ b/include/powerpc/mpc5643l_dpu/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp.h>
diff --git a/include/powerpc/mpc5643l_dpu/bsp/irq.h b/include/powerpc/mpc5643l_dpu/bsp/irq.h
new file mode 100644
index 0000000000..ea615705d9
--- /dev/null
+++ b/include/powerpc/mpc5643l_dpu/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp/irq.h>
diff --git a/include/powerpc/mpc5643l_dpu/bsp/linker-symbols.h b/include/powerpc/mpc5643l_dpu/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/mpc5643l_dpu/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/mpc5643l_dpu/bsp/start.h b/include/powerpc/mpc5643l_dpu/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/mpc5643l_dpu/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/mpc5643l_dpu/coverhd.h b/include/powerpc/mpc5643l_dpu/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mpc5643l_dpu/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mpc5643l_dpu/libcpu/byteorder.h b/include/powerpc/mpc5643l_dpu/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mpc5643l_dpu/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mpc5643l_dpu/libcpu/mmu.h b/include/powerpc/mpc5643l_dpu/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mpc5643l_dpu/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mpc5643l_dpu/rtems/asm.h b/include/powerpc/mpc5643l_dpu/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mpc5643l_dpu/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mpc5643l_dpu/rtems/score/cpu.h b/include/powerpc/mpc5643l_dpu/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mpc5643l_dpu/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mpc5643l_dpu/rtems/score/cpuatomic.h b/include/powerpc/mpc5643l_dpu/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mpc5643l_dpu/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mpc5643l_dpu/rtems/score/types.h b/include/powerpc/mpc5643l_dpu/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mpc5643l_dpu/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mpc5643l_dpu/tm27.h b/include/powerpc/mpc5643l_dpu/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mpc5643l_dpu/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/mpc5643l_evb/bsp.h b/include/powerpc/mpc5643l_evb/bsp.h
new file mode 100644
index 0000000000..7f5174b912
--- /dev/null
+++ b/include/powerpc/mpc5643l_evb/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp.h>
diff --git a/include/powerpc/mpc5643l_evb/bsp/irq.h b/include/powerpc/mpc5643l_evb/bsp/irq.h
new file mode 100644
index 0000000000..ea615705d9
--- /dev/null
+++ b/include/powerpc/mpc5643l_evb/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp/irq.h>
diff --git a/include/powerpc/mpc5643l_evb/bsp/linker-symbols.h b/include/powerpc/mpc5643l_evb/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/mpc5643l_evb/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/mpc5643l_evb/bsp/start.h b/include/powerpc/mpc5643l_evb/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/mpc5643l_evb/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/mpc5643l_evb/coverhd.h b/include/powerpc/mpc5643l_evb/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mpc5643l_evb/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mpc5643l_evb/libcpu/byteorder.h b/include/powerpc/mpc5643l_evb/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mpc5643l_evb/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mpc5643l_evb/libcpu/mmu.h b/include/powerpc/mpc5643l_evb/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mpc5643l_evb/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mpc5643l_evb/rtems/asm.h b/include/powerpc/mpc5643l_evb/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mpc5643l_evb/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mpc5643l_evb/rtems/score/cpu.h b/include/powerpc/mpc5643l_evb/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mpc5643l_evb/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mpc5643l_evb/rtems/score/cpuatomic.h b/include/powerpc/mpc5643l_evb/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mpc5643l_evb/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mpc5643l_evb/rtems/score/types.h b/include/powerpc/mpc5643l_evb/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mpc5643l_evb/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mpc5643l_evb/tm27.h b/include/powerpc/mpc5643l_evb/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mpc5643l_evb/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/mpc5668g/bsp.h b/include/powerpc/mpc5668g/bsp.h
new file mode 100644
index 0000000000..7f5174b912
--- /dev/null
+++ b/include/powerpc/mpc5668g/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp.h>
diff --git a/include/powerpc/mpc5668g/bsp/irq.h b/include/powerpc/mpc5668g/bsp/irq.h
new file mode 100644
index 0000000000..ea615705d9
--- /dev/null
+++ b/include/powerpc/mpc5668g/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp/irq.h>
diff --git a/include/powerpc/mpc5668g/bsp/linker-symbols.h b/include/powerpc/mpc5668g/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/mpc5668g/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/mpc5668g/bsp/start.h b/include/powerpc/mpc5668g/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/mpc5668g/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/mpc5668g/coverhd.h b/include/powerpc/mpc5668g/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mpc5668g/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mpc5668g/libcpu/byteorder.h b/include/powerpc/mpc5668g/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mpc5668g/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mpc5668g/libcpu/mmu.h b/include/powerpc/mpc5668g/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mpc5668g/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mpc5668g/rtems/asm.h b/include/powerpc/mpc5668g/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mpc5668g/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mpc5668g/rtems/score/cpu.h b/include/powerpc/mpc5668g/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mpc5668g/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mpc5668g/rtems/score/cpuatomic.h b/include/powerpc/mpc5668g/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mpc5668g/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mpc5668g/rtems/score/types.h b/include/powerpc/mpc5668g/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mpc5668g/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mpc5668g/tm27.h b/include/powerpc/mpc5668g/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mpc5668g/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/mpc5674f_ecu508_app/bsp.h b/include/powerpc/mpc5674f_ecu508_app/bsp.h
new file mode 100644
index 0000000000..7f5174b912
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_app/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp.h>
diff --git a/include/powerpc/mpc5674f_ecu508_app/bsp/irq.h b/include/powerpc/mpc5674f_ecu508_app/bsp/irq.h
new file mode 100644
index 0000000000..ea615705d9
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_app/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp/irq.h>
diff --git a/include/powerpc/mpc5674f_ecu508_app/bsp/linker-symbols.h b/include/powerpc/mpc5674f_ecu508_app/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_app/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/mpc5674f_ecu508_app/bsp/start.h b/include/powerpc/mpc5674f_ecu508_app/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_app/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/mpc5674f_ecu508_app/coverhd.h b/include/powerpc/mpc5674f_ecu508_app/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_app/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mpc5674f_ecu508_app/libcpu/byteorder.h b/include/powerpc/mpc5674f_ecu508_app/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_app/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mpc5674f_ecu508_app/libcpu/mmu.h b/include/powerpc/mpc5674f_ecu508_app/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_app/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mpc5674f_ecu508_app/rtems/asm.h b/include/powerpc/mpc5674f_ecu508_app/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_app/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mpc5674f_ecu508_app/rtems/score/cpu.h b/include/powerpc/mpc5674f_ecu508_app/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_app/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mpc5674f_ecu508_app/rtems/score/cpuatomic.h b/include/powerpc/mpc5674f_ecu508_app/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_app/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mpc5674f_ecu508_app/rtems/score/types.h b/include/powerpc/mpc5674f_ecu508_app/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_app/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mpc5674f_ecu508_app/tm27.h b/include/powerpc/mpc5674f_ecu508_app/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_app/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/mpc5674f_ecu508_boot/bsp.h b/include/powerpc/mpc5674f_ecu508_boot/bsp.h
new file mode 100644
index 0000000000..7f5174b912
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_boot/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp.h>
diff --git a/include/powerpc/mpc5674f_ecu508_boot/bsp/irq.h b/include/powerpc/mpc5674f_ecu508_boot/bsp/irq.h
new file mode 100644
index 0000000000..ea615705d9
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_boot/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp/irq.h>
diff --git a/include/powerpc/mpc5674f_ecu508_boot/bsp/linker-symbols.h b/include/powerpc/mpc5674f_ecu508_boot/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_boot/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/mpc5674f_ecu508_boot/bsp/start.h b/include/powerpc/mpc5674f_ecu508_boot/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_boot/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/mpc5674f_ecu508_boot/coverhd.h b/include/powerpc/mpc5674f_ecu508_boot/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_boot/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mpc5674f_ecu508_boot/libcpu/byteorder.h b/include/powerpc/mpc5674f_ecu508_boot/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_boot/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mpc5674f_ecu508_boot/libcpu/mmu.h b/include/powerpc/mpc5674f_ecu508_boot/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_boot/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mpc5674f_ecu508_boot/rtems/asm.h b/include/powerpc/mpc5674f_ecu508_boot/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_boot/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mpc5674f_ecu508_boot/rtems/score/cpu.h b/include/powerpc/mpc5674f_ecu508_boot/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_boot/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mpc5674f_ecu508_boot/rtems/score/cpuatomic.h b/include/powerpc/mpc5674f_ecu508_boot/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_boot/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mpc5674f_ecu508_boot/rtems/score/types.h b/include/powerpc/mpc5674f_ecu508_boot/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_boot/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mpc5674f_ecu508_boot/tm27.h b/include/powerpc/mpc5674f_ecu508_boot/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mpc5674f_ecu508_boot/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/mpc5674f_rsm6/bsp.h b/include/powerpc/mpc5674f_rsm6/bsp.h
new file mode 100644
index 0000000000..7f5174b912
--- /dev/null
+++ b/include/powerpc/mpc5674f_rsm6/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp.h>
diff --git a/include/powerpc/mpc5674f_rsm6/bsp/irq.h b/include/powerpc/mpc5674f_rsm6/bsp/irq.h
new file mode 100644
index 0000000000..ea615705d9
--- /dev/null
+++ b/include/powerpc/mpc5674f_rsm6/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp/irq.h>
diff --git a/include/powerpc/mpc5674f_rsm6/bsp/linker-symbols.h b/include/powerpc/mpc5674f_rsm6/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/mpc5674f_rsm6/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/mpc5674f_rsm6/bsp/start.h b/include/powerpc/mpc5674f_rsm6/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/mpc5674f_rsm6/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/mpc5674f_rsm6/coverhd.h b/include/powerpc/mpc5674f_rsm6/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mpc5674f_rsm6/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mpc5674f_rsm6/libcpu/byteorder.h b/include/powerpc/mpc5674f_rsm6/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mpc5674f_rsm6/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mpc5674f_rsm6/libcpu/mmu.h b/include/powerpc/mpc5674f_rsm6/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mpc5674f_rsm6/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mpc5674f_rsm6/rtems/asm.h b/include/powerpc/mpc5674f_rsm6/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mpc5674f_rsm6/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mpc5674f_rsm6/rtems/score/cpu.h b/include/powerpc/mpc5674f_rsm6/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mpc5674f_rsm6/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mpc5674f_rsm6/rtems/score/cpuatomic.h b/include/powerpc/mpc5674f_rsm6/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mpc5674f_rsm6/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mpc5674f_rsm6/rtems/score/types.h b/include/powerpc/mpc5674f_rsm6/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mpc5674f_rsm6/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mpc5674f_rsm6/tm27.h b/include/powerpc/mpc5674f_rsm6/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mpc5674f_rsm6/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/mpc5674fevb/bsp.h b/include/powerpc/mpc5674fevb/bsp.h
new file mode 100644
index 0000000000..7f5174b912
--- /dev/null
+++ b/include/powerpc/mpc5674fevb/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp.h>
diff --git a/include/powerpc/mpc5674fevb/bsp/irq.h b/include/powerpc/mpc5674fevb/bsp/irq.h
new file mode 100644
index 0000000000..ea615705d9
--- /dev/null
+++ b/include/powerpc/mpc5674fevb/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp/irq.h>
diff --git a/include/powerpc/mpc5674fevb/bsp/linker-symbols.h b/include/powerpc/mpc5674fevb/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/mpc5674fevb/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/mpc5674fevb/bsp/start.h b/include/powerpc/mpc5674fevb/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/mpc5674fevb/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/mpc5674fevb/coverhd.h b/include/powerpc/mpc5674fevb/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mpc5674fevb/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mpc5674fevb/libcpu/byteorder.h b/include/powerpc/mpc5674fevb/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mpc5674fevb/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mpc5674fevb/libcpu/mmu.h b/include/powerpc/mpc5674fevb/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mpc5674fevb/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mpc5674fevb/rtems/asm.h b/include/powerpc/mpc5674fevb/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mpc5674fevb/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mpc5674fevb/rtems/score/cpu.h b/include/powerpc/mpc5674fevb/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mpc5674fevb/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mpc5674fevb/rtems/score/cpuatomic.h b/include/powerpc/mpc5674fevb/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mpc5674fevb/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mpc5674fevb/rtems/score/types.h b/include/powerpc/mpc5674fevb/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mpc5674fevb/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mpc5674fevb/tm27.h b/include/powerpc/mpc5674fevb/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mpc5674fevb/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/mpc5674fevb_spe/bsp.h b/include/powerpc/mpc5674fevb_spe/bsp.h
new file mode 100644
index 0000000000..7f5174b912
--- /dev/null
+++ b/include/powerpc/mpc5674fevb_spe/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp.h>
diff --git a/include/powerpc/mpc5674fevb_spe/bsp/irq.h b/include/powerpc/mpc5674fevb_spe/bsp/irq.h
new file mode 100644
index 0000000000..ea615705d9
--- /dev/null
+++ b/include/powerpc/mpc5674fevb_spe/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp/irq.h>
diff --git a/include/powerpc/mpc5674fevb_spe/bsp/linker-symbols.h b/include/powerpc/mpc5674fevb_spe/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/mpc5674fevb_spe/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/mpc5674fevb_spe/bsp/start.h b/include/powerpc/mpc5674fevb_spe/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/mpc5674fevb_spe/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/mpc5674fevb_spe/coverhd.h b/include/powerpc/mpc5674fevb_spe/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mpc5674fevb_spe/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mpc5674fevb_spe/libcpu/byteorder.h b/include/powerpc/mpc5674fevb_spe/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mpc5674fevb_spe/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mpc5674fevb_spe/libcpu/mmu.h b/include/powerpc/mpc5674fevb_spe/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mpc5674fevb_spe/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mpc5674fevb_spe/rtems/asm.h b/include/powerpc/mpc5674fevb_spe/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mpc5674fevb_spe/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mpc5674fevb_spe/rtems/score/cpu.h b/include/powerpc/mpc5674fevb_spe/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mpc5674fevb_spe/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mpc5674fevb_spe/rtems/score/cpuatomic.h b/include/powerpc/mpc5674fevb_spe/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mpc5674fevb_spe/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mpc5674fevb_spe/rtems/score/types.h b/include/powerpc/mpc5674fevb_spe/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mpc5674fevb_spe/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mpc5674fevb_spe/tm27.h b/include/powerpc/mpc5674fevb_spe/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mpc5674fevb_spe/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h b/include/powerpc/mpc8260ads/bsp.h
index 422817bf00..422817bf00 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h
+++ b/include/powerpc/mpc8260ads/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h b/include/powerpc/mpc8260ads/bsp/irq.h
index 1dd18611fc..1dd18611fc 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h
+++ b/include/powerpc/mpc8260ads/bsp/irq.h
diff --git a/include/powerpc/mpc8260ads/coverhd.h b/include/powerpc/mpc8260ads/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mpc8260ads/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mpc8260ads/libcpu/byteorder.h b/include/powerpc/mpc8260ads/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mpc8260ads/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mpc8260ads/libcpu/mmu.h b/include/powerpc/mpc8260ads/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mpc8260ads/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mpc8260ads/rtems/asm.h b/include/powerpc/mpc8260ads/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mpc8260ads/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mpc8260ads/rtems/score/cpu.h b/include/powerpc/mpc8260ads/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mpc8260ads/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mpc8260ads/rtems/score/cpuatomic.h b/include/powerpc/mpc8260ads/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mpc8260ads/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mpc8260ads/rtems/score/types.h b/include/powerpc/mpc8260ads/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mpc8260ads/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/tm27.h b/include/powerpc/mpc8260ads/tm27.h
index b1eafc47aa..b1eafc47aa 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/tm27.h
+++ b/include/powerpc/mpc8260ads/tm27.h
diff --git a/include/powerpc/mpc8309som/bsp.h b/include/powerpc/mpc8309som/bsp.h
new file mode 100644
index 0000000000..b4648c9a5a
--- /dev/null
+++ b/include/powerpc/mpc8309som/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp.h>
diff --git a/include/powerpc/mpc8309som/bsp/hwreg_vals.h b/include/powerpc/mpc8309som/bsp/hwreg_vals.h
new file mode 100644
index 0000000000..fbfbf19f9a
--- /dev/null
+++ b/include/powerpc/mpc8309som/bsp/hwreg_vals.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/hwreg_vals.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/hwreg_vals.h>
diff --git a/include/powerpc/mpc8309som/bsp/irq.h b/include/powerpc/mpc8309som/bsp/irq.h
new file mode 100644
index 0000000000..bea440f809
--- /dev/null
+++ b/include/powerpc/mpc8309som/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/irq.h>
diff --git a/include/powerpc/mpc8309som/bsp/linker-symbols.h b/include/powerpc/mpc8309som/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/mpc8309som/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/mpc8309som/bsp/start.h b/include/powerpc/mpc8309som/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/mpc8309som/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/mpc8309som/bsp/tsec-config.h b/include/powerpc/mpc8309som/bsp/tsec-config.h
new file mode 100644
index 0000000000..8cd2099175
--- /dev/null
+++ b/include/powerpc/mpc8309som/bsp/tsec-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/tsec-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/tsec-config.h>
diff --git a/include/powerpc/mpc8309som/bsp/u-boot-config.h b/include/powerpc/mpc8309som/bsp/u-boot-config.h
new file mode 100644
index 0000000000..96ed7e8401
--- /dev/null
+++ b/include/powerpc/mpc8309som/bsp/u-boot-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/u-boot-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/u-boot-config.h>
diff --git a/include/powerpc/mpc8309som/coverhd.h b/include/powerpc/mpc8309som/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mpc8309som/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mpc8309som/libcpu/byteorder.h b/include/powerpc/mpc8309som/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mpc8309som/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mpc8309som/libcpu/mmu.h b/include/powerpc/mpc8309som/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mpc8309som/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mpc8309som/rtems/asm.h b/include/powerpc/mpc8309som/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mpc8309som/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mpc8309som/rtems/score/cpu.h b/include/powerpc/mpc8309som/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mpc8309som/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mpc8309som/rtems/score/cpuatomic.h b/include/powerpc/mpc8309som/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mpc8309som/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mpc8309som/rtems/score/types.h b/include/powerpc/mpc8309som/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mpc8309som/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mpc8309som/tm27.h b/include/powerpc/mpc8309som/tm27.h
new file mode 100644
index 0000000000..ca150594a9
--- /dev/null
+++ b/include/powerpc/mpc8309som/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/tm27.h>
diff --git a/include/powerpc/mpc8313erdb/bsp.h b/include/powerpc/mpc8313erdb/bsp.h
new file mode 100644
index 0000000000..b4648c9a5a
--- /dev/null
+++ b/include/powerpc/mpc8313erdb/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp.h>
diff --git a/include/powerpc/mpc8313erdb/bsp/hwreg_vals.h b/include/powerpc/mpc8313erdb/bsp/hwreg_vals.h
new file mode 100644
index 0000000000..fbfbf19f9a
--- /dev/null
+++ b/include/powerpc/mpc8313erdb/bsp/hwreg_vals.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/hwreg_vals.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/hwreg_vals.h>
diff --git a/include/powerpc/mpc8313erdb/bsp/irq.h b/include/powerpc/mpc8313erdb/bsp/irq.h
new file mode 100644
index 0000000000..bea440f809
--- /dev/null
+++ b/include/powerpc/mpc8313erdb/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/irq.h>
diff --git a/include/powerpc/mpc8313erdb/bsp/linker-symbols.h b/include/powerpc/mpc8313erdb/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/mpc8313erdb/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/mpc8313erdb/bsp/start.h b/include/powerpc/mpc8313erdb/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/mpc8313erdb/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/mpc8313erdb/bsp/tsec-config.h b/include/powerpc/mpc8313erdb/bsp/tsec-config.h
new file mode 100644
index 0000000000..8cd2099175
--- /dev/null
+++ b/include/powerpc/mpc8313erdb/bsp/tsec-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/tsec-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/tsec-config.h>
diff --git a/include/powerpc/mpc8313erdb/bsp/u-boot-config.h b/include/powerpc/mpc8313erdb/bsp/u-boot-config.h
new file mode 100644
index 0000000000..96ed7e8401
--- /dev/null
+++ b/include/powerpc/mpc8313erdb/bsp/u-boot-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/u-boot-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/u-boot-config.h>
diff --git a/include/powerpc/mpc8313erdb/coverhd.h b/include/powerpc/mpc8313erdb/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mpc8313erdb/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mpc8313erdb/libcpu/byteorder.h b/include/powerpc/mpc8313erdb/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mpc8313erdb/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mpc8313erdb/libcpu/mmu.h b/include/powerpc/mpc8313erdb/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mpc8313erdb/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mpc8313erdb/rtems/asm.h b/include/powerpc/mpc8313erdb/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mpc8313erdb/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mpc8313erdb/rtems/score/cpu.h b/include/powerpc/mpc8313erdb/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mpc8313erdb/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mpc8313erdb/rtems/score/cpuatomic.h b/include/powerpc/mpc8313erdb/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mpc8313erdb/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mpc8313erdb/rtems/score/types.h b/include/powerpc/mpc8313erdb/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mpc8313erdb/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mpc8313erdb/tm27.h b/include/powerpc/mpc8313erdb/tm27.h
new file mode 100644
index 0000000000..ca150594a9
--- /dev/null
+++ b/include/powerpc/mpc8313erdb/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/tm27.h>
diff --git a/include/powerpc/mpc8349eamds/bsp.h b/include/powerpc/mpc8349eamds/bsp.h
new file mode 100644
index 0000000000..b4648c9a5a
--- /dev/null
+++ b/include/powerpc/mpc8349eamds/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp.h>
diff --git a/include/powerpc/mpc8349eamds/bsp/hwreg_vals.h b/include/powerpc/mpc8349eamds/bsp/hwreg_vals.h
new file mode 100644
index 0000000000..fbfbf19f9a
--- /dev/null
+++ b/include/powerpc/mpc8349eamds/bsp/hwreg_vals.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/hwreg_vals.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/hwreg_vals.h>
diff --git a/include/powerpc/mpc8349eamds/bsp/irq.h b/include/powerpc/mpc8349eamds/bsp/irq.h
new file mode 100644
index 0000000000..bea440f809
--- /dev/null
+++ b/include/powerpc/mpc8349eamds/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/irq.h>
diff --git a/include/powerpc/mpc8349eamds/bsp/linker-symbols.h b/include/powerpc/mpc8349eamds/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/mpc8349eamds/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/mpc8349eamds/bsp/start.h b/include/powerpc/mpc8349eamds/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/mpc8349eamds/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/mpc8349eamds/bsp/tsec-config.h b/include/powerpc/mpc8349eamds/bsp/tsec-config.h
new file mode 100644
index 0000000000..8cd2099175
--- /dev/null
+++ b/include/powerpc/mpc8349eamds/bsp/tsec-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/tsec-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/tsec-config.h>
diff --git a/include/powerpc/mpc8349eamds/bsp/u-boot-config.h b/include/powerpc/mpc8349eamds/bsp/u-boot-config.h
new file mode 100644
index 0000000000..96ed7e8401
--- /dev/null
+++ b/include/powerpc/mpc8349eamds/bsp/u-boot-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/u-boot-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/u-boot-config.h>
diff --git a/include/powerpc/mpc8349eamds/coverhd.h b/include/powerpc/mpc8349eamds/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mpc8349eamds/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mpc8349eamds/libcpu/byteorder.h b/include/powerpc/mpc8349eamds/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mpc8349eamds/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mpc8349eamds/libcpu/mmu.h b/include/powerpc/mpc8349eamds/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mpc8349eamds/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mpc8349eamds/rtems/asm.h b/include/powerpc/mpc8349eamds/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mpc8349eamds/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mpc8349eamds/rtems/score/cpu.h b/include/powerpc/mpc8349eamds/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mpc8349eamds/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mpc8349eamds/rtems/score/cpuatomic.h b/include/powerpc/mpc8349eamds/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mpc8349eamds/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mpc8349eamds/rtems/score/types.h b/include/powerpc/mpc8349eamds/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mpc8349eamds/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mpc8349eamds/tm27.h b/include/powerpc/mpc8349eamds/tm27.h
new file mode 100644
index 0000000000..ca150594a9
--- /dev/null
+++ b/include/powerpc/mpc8349eamds/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/tm27.h>
diff --git a/include/powerpc/mtx603e/bsp.h b/include/powerpc/mtx603e/bsp.h
new file mode 100644
index 0000000000..baca1dd5e0
--- /dev/null
+++ b/include/powerpc/mtx603e/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/bsp.h>
diff --git a/include/powerpc/mtx603e/bsp/VMEConfig.h b/include/powerpc/mtx603e/bsp/VMEConfig.h
new file mode 100644
index 0000000000..adb475852a
--- /dev/null
+++ b/include/powerpc/mtx603e/bsp/VMEConfig.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/bsp/VMEConfig.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/bsp/VMEConfig.h>
diff --git a/include/powerpc/mtx603e/bsp/irq.h b/include/powerpc/mtx603e/bsp/irq.h
new file mode 100644
index 0000000000..511c4b7a96
--- /dev/null
+++ b/include/powerpc/mtx603e/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/ep1a/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/ep1a/bsp/irq.h>
diff --git a/include/powerpc/mtx603e/bsp/pci.h b/include/powerpc/mtx603e/bsp/pci.h
new file mode 100644
index 0000000000..784510ec0c
--- /dev/null
+++ b/include/powerpc/mtx603e/bsp/pci.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/bsp/pci.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/bsp/pci.h>
diff --git a/include/powerpc/mtx603e/coverhd.h b/include/powerpc/mtx603e/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mtx603e/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mtx603e/libcpu/byteorder.h b/include/powerpc/mtx603e/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mtx603e/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mtx603e/libcpu/mmu.h b/include/powerpc/mtx603e/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mtx603e/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mtx603e/nvram.h b/include/powerpc/mtx603e/nvram.h
new file mode 100644
index 0000000000..f46fa9172d
--- /dev/null
+++ b/include/powerpc/mtx603e/nvram.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/nvram.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/nvram.h>
diff --git a/include/powerpc/mtx603e/rtems/asm.h b/include/powerpc/mtx603e/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mtx603e/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mtx603e/rtems/score/cpu.h b/include/powerpc/mtx603e/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mtx603e/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mtx603e/rtems/score/cpuatomic.h b/include/powerpc/mtx603e/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mtx603e/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mtx603e/rtems/score/types.h b/include/powerpc/mtx603e/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mtx603e/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mtx603e/tm27.h b/include/powerpc/mtx603e/tm27.h
new file mode 100644
index 0000000000..f6c938a2e2
--- /dev/null
+++ b/include/powerpc/mtx603e/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/tm27.h>
diff --git a/include/powerpc/mvme2100/bsp.h b/include/powerpc/mvme2100/bsp.h
new file mode 100644
index 0000000000..baca1dd5e0
--- /dev/null
+++ b/include/powerpc/mvme2100/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/bsp.h>
diff --git a/include/powerpc/mvme2100/bsp/VMEConfig.h b/include/powerpc/mvme2100/bsp/VMEConfig.h
new file mode 100644
index 0000000000..adb475852a
--- /dev/null
+++ b/include/powerpc/mvme2100/bsp/VMEConfig.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/bsp/VMEConfig.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/bsp/VMEConfig.h>
diff --git a/include/powerpc/mvme2100/bsp/irq.h b/include/powerpc/mvme2100/bsp/irq.h
new file mode 100644
index 0000000000..511c4b7a96
--- /dev/null
+++ b/include/powerpc/mvme2100/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/ep1a/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/ep1a/bsp/irq.h>
diff --git a/include/powerpc/mvme2100/bsp/pci.h b/include/powerpc/mvme2100/bsp/pci.h
new file mode 100644
index 0000000000..784510ec0c
--- /dev/null
+++ b/include/powerpc/mvme2100/bsp/pci.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/bsp/pci.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/bsp/pci.h>
diff --git a/include/powerpc/mvme2100/coverhd.h b/include/powerpc/mvme2100/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mvme2100/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mvme2100/libcpu/byteorder.h b/include/powerpc/mvme2100/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mvme2100/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mvme2100/libcpu/mmu.h b/include/powerpc/mvme2100/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mvme2100/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mvme2100/nvram.h b/include/powerpc/mvme2100/nvram.h
new file mode 100644
index 0000000000..f46fa9172d
--- /dev/null
+++ b/include/powerpc/mvme2100/nvram.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/nvram.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/nvram.h>
diff --git a/include/powerpc/mvme2100/rtems/asm.h b/include/powerpc/mvme2100/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mvme2100/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mvme2100/rtems/score/cpu.h b/include/powerpc/mvme2100/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mvme2100/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mvme2100/rtems/score/cpuatomic.h b/include/powerpc/mvme2100/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mvme2100/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mvme2100/rtems/score/types.h b/include/powerpc/mvme2100/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mvme2100/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mvme2100/tm27.h b/include/powerpc/mvme2100/tm27.h
new file mode 100644
index 0000000000..f6c938a2e2
--- /dev/null
+++ b/include/powerpc/mvme2100/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/tm27.h>
diff --git a/include/powerpc/mvme2307/bsp.h b/include/powerpc/mvme2307/bsp.h
new file mode 100644
index 0000000000..baca1dd5e0
--- /dev/null
+++ b/include/powerpc/mvme2307/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/bsp.h>
diff --git a/include/powerpc/mvme2307/bsp/VMEConfig.h b/include/powerpc/mvme2307/bsp/VMEConfig.h
new file mode 100644
index 0000000000..adb475852a
--- /dev/null
+++ b/include/powerpc/mvme2307/bsp/VMEConfig.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/bsp/VMEConfig.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/bsp/VMEConfig.h>
diff --git a/include/powerpc/mvme2307/bsp/irq.h b/include/powerpc/mvme2307/bsp/irq.h
new file mode 100644
index 0000000000..511c4b7a96
--- /dev/null
+++ b/include/powerpc/mvme2307/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/ep1a/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/ep1a/bsp/irq.h>
diff --git a/include/powerpc/mvme2307/bsp/pci.h b/include/powerpc/mvme2307/bsp/pci.h
new file mode 100644
index 0000000000..784510ec0c
--- /dev/null
+++ b/include/powerpc/mvme2307/bsp/pci.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/bsp/pci.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/bsp/pci.h>
diff --git a/include/powerpc/mvme2307/coverhd.h b/include/powerpc/mvme2307/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mvme2307/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mvme2307/libcpu/byteorder.h b/include/powerpc/mvme2307/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mvme2307/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mvme2307/libcpu/mmu.h b/include/powerpc/mvme2307/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mvme2307/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mvme2307/nvram.h b/include/powerpc/mvme2307/nvram.h
new file mode 100644
index 0000000000..f46fa9172d
--- /dev/null
+++ b/include/powerpc/mvme2307/nvram.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/nvram.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/nvram.h>
diff --git a/include/powerpc/mvme2307/rtems/asm.h b/include/powerpc/mvme2307/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mvme2307/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mvme2307/rtems/score/cpu.h b/include/powerpc/mvme2307/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mvme2307/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mvme2307/rtems/score/cpuatomic.h b/include/powerpc/mvme2307/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mvme2307/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mvme2307/rtems/score/types.h b/include/powerpc/mvme2307/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mvme2307/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mvme2307/tm27.h b/include/powerpc/mvme2307/tm27.h
new file mode 100644
index 0000000000..f6c938a2e2
--- /dev/null
+++ b/include/powerpc/mvme2307/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/tm27.h>
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h b/include/powerpc/mvme3100/bsp.h
index eb92150767..eb92150767 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
+++ b/include/powerpc/mvme3100/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/vme/VMEConfig.h b/include/powerpc/mvme3100/bsp/VMEConfig.h
index 10b424c2a8..10b424c2a8 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/vme/VMEConfig.h
+++ b/include/powerpc/mvme3100/bsp/VMEConfig.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/irq/irq.h b/include/powerpc/mvme3100/bsp/irq.h
index 0158e05149..0158e05149 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/irq/irq.h
+++ b/include/powerpc/mvme3100/bsp/irq.h
diff --git a/include/powerpc/mvme3100/bsp/pci.h b/include/powerpc/mvme3100/bsp/pci.h
new file mode 100644
index 0000000000..784510ec0c
--- /dev/null
+++ b/include/powerpc/mvme3100/bsp/pci.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/bsp/pci.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/bsp/pci.h>
diff --git a/include/powerpc/mvme3100/bsp/vpd.h b/include/powerpc/mvme3100/bsp/vpd.h
new file mode 100644
index 0000000000..c7d6e169ab
--- /dev/null
+++ b/include/powerpc/mvme3100/bsp/vpd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/bsp/vpd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/bsp/vpd.h>
diff --git a/include/powerpc/mvme3100/coverhd.h b/include/powerpc/mvme3100/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mvme3100/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mvme3100/libcpu/byteorder.h b/include/powerpc/mvme3100/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mvme3100/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mvme3100/libcpu/mmu.h b/include/powerpc/mvme3100/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mvme3100/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mvme3100/rtems/asm.h b/include/powerpc/mvme3100/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mvme3100/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mvme3100/rtems/score/cpu.h b/include/powerpc/mvme3100/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mvme3100/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mvme3100/rtems/score/cpuatomic.h b/include/powerpc/mvme3100/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mvme3100/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mvme3100/rtems/score/types.h b/include/powerpc/mvme3100/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mvme3100/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/mvme3100/tm27.h b/include/powerpc/mvme3100/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/mvme3100/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h b/include/powerpc/mvme5500/bsp.h
index ad2249508c..ad2249508c 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
+++ b/include/powerpc/mvme5500/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/vme/VMEConfig.h b/include/powerpc/mvme5500/bsp/VMEConfig.h
index ecc5789899..ecc5789899 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/vme/VMEConfig.h
+++ b/include/powerpc/mvme5500/bsp/VMEConfig.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/gtpcireg.h b/include/powerpc/mvme5500/bsp/gtpcireg.h
index 74751f6088..74751f6088 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/pci/gtpcireg.h
+++ b/include/powerpc/mvme5500/bsp/gtpcireg.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/gtreg.h b/include/powerpc/mvme5500/bsp/gtreg.h
index e9aaeff844..e9aaeff844 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/gtreg.h
+++ b/include/powerpc/mvme5500/bsp/gtreg.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h b/include/powerpc/mvme5500/bsp/irq.h
index 6704c2f626..6704c2f626 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h
+++ b/include/powerpc/mvme5500/bsp/irq.h
diff --git a/include/powerpc/mvme5500/bsp/pci.h b/include/powerpc/mvme5500/bsp/pci.h
new file mode 100644
index 0000000000..784510ec0c
--- /dev/null
+++ b/include/powerpc/mvme5500/bsp/pci.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/bsp/pci.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/bsp/pci.h>
diff --git a/include/powerpc/mvme5500/coverhd.h b/include/powerpc/mvme5500/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/mvme5500/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/mvme5500/libcpu/byteorder.h b/include/powerpc/mvme5500/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/mvme5500/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/mvme5500/libcpu/mmu.h b/include/powerpc/mvme5500/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/mvme5500/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/mvme5500/rtems/asm.h b/include/powerpc/mvme5500/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/mvme5500/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/mvme5500/rtems/score/cpu.h b/include/powerpc/mvme5500/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/mvme5500/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/mvme5500/rtems/score/cpuatomic.h b/include/powerpc/mvme5500/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/mvme5500/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/mvme5500/rtems/score/types.h b/include/powerpc/mvme5500/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/mvme5500/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/tm27.h b/include/powerpc/mvme5500/tm27.h
index 2a80618cfb..2a80618cfb 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/include/tm27.h
+++ b/include/powerpc/mvme5500/tm27.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h b/include/powerpc/pghplus/bsp.h
index fa404e4f5d..fa404e4f5d 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h
+++ b/include/powerpc/pghplus/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/8xx_immap.h b/include/powerpc/pghplus/bsp/8xx_immap.h
index c1c414e25f..c1c414e25f 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/include/8xx_immap.h
+++ b/include/powerpc/pghplus/bsp/8xx_immap.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/irq.h b/include/powerpc/pghplus/bsp/irq.h
index 2d66829037..2d66829037 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/include/irq.h
+++ b/include/powerpc/pghplus/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/coverhd.h b/include/powerpc/pghplus/coverhd.h
index 9bd1c357c8..9bd1c357c8 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/include/coverhd.h
+++ b/include/powerpc/pghplus/coverhd.h
diff --git a/include/powerpc/pghplus/libcpu/byteorder.h b/include/powerpc/pghplus/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/pghplus/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/pghplus/libcpu/mmu.h b/include/powerpc/pghplus/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/pghplus/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/pghplus/rtems/asm.h b/include/powerpc/pghplus/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/pghplus/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/pghplus/rtems/score/cpu.h b/include/powerpc/pghplus/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/pghplus/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/pghplus/rtems/score/cpuatomic.h b/include/powerpc/pghplus/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/pghplus/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/pghplus/rtems/score/types.h b/include/powerpc/pghplus/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/pghplus/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/pghplus/tm27.h b/include/powerpc/pghplus/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/pghplus/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/phycore_mpc5554/bsp.h b/include/powerpc/phycore_mpc5554/bsp.h
new file mode 100644
index 0000000000..7f5174b912
--- /dev/null
+++ b/include/powerpc/phycore_mpc5554/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp.h>
diff --git a/include/powerpc/phycore_mpc5554/bsp/irq.h b/include/powerpc/phycore_mpc5554/bsp/irq.h
new file mode 100644
index 0000000000..ea615705d9
--- /dev/null
+++ b/include/powerpc/phycore_mpc5554/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/gwlcfm/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/gwlcfm/bsp/irq.h>
diff --git a/include/powerpc/phycore_mpc5554/bsp/linker-symbols.h b/include/powerpc/phycore_mpc5554/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/phycore_mpc5554/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/phycore_mpc5554/bsp/start.h b/include/powerpc/phycore_mpc5554/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/phycore_mpc5554/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/phycore_mpc5554/coverhd.h b/include/powerpc/phycore_mpc5554/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/phycore_mpc5554/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/phycore_mpc5554/libcpu/byteorder.h b/include/powerpc/phycore_mpc5554/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/phycore_mpc5554/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/phycore_mpc5554/libcpu/mmu.h b/include/powerpc/phycore_mpc5554/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/phycore_mpc5554/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/phycore_mpc5554/rtems/asm.h b/include/powerpc/phycore_mpc5554/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/phycore_mpc5554/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/phycore_mpc5554/rtems/score/cpu.h b/include/powerpc/phycore_mpc5554/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/phycore_mpc5554/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/phycore_mpc5554/rtems/score/cpuatomic.h b/include/powerpc/phycore_mpc5554/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/phycore_mpc5554/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/phycore_mpc5554/rtems/score/types.h b/include/powerpc/phycore_mpc5554/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/phycore_mpc5554/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/phycore_mpc5554/tm27.h b/include/powerpc/phycore_mpc5554/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/phycore_mpc5554/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/pm520_cr825/bsp.h b/include/powerpc/pm520_cr825/bsp.h
new file mode 100644
index 0000000000..743a5e4e2a
--- /dev/null
+++ b/include/powerpc/pm520_cr825/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp.h>
diff --git a/include/powerpc/pm520_cr825/bsp/i2c.h b/include/powerpc/pm520_cr825/bsp/i2c.h
new file mode 100644
index 0000000000..64bbd7315f
--- /dev/null
+++ b/include/powerpc/pm520_cr825/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp/i2c.h>
diff --git a/include/powerpc/pm520_cr825/bsp/irq.h b/include/powerpc/pm520_cr825/bsp/irq.h
new file mode 100644
index 0000000000..bb70d84443
--- /dev/null
+++ b/include/powerpc/pm520_cr825/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp/irq.h>
diff --git a/include/powerpc/pm520_cr825/bsp/u-boot-config.h b/include/powerpc/pm520_cr825/bsp/u-boot-config.h
new file mode 100644
index 0000000000..3fefe50889
--- /dev/null
+++ b/include/powerpc/pm520_cr825/bsp/u-boot-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp/u-boot-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp/u-boot-config.h>
diff --git a/include/powerpc/pm520_cr825/coverhd.h b/include/powerpc/pm520_cr825/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/pm520_cr825/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/pm520_cr825/libcpu/byteorder.h b/include/powerpc/pm520_cr825/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/pm520_cr825/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/pm520_cr825/libcpu/mmu.h b/include/powerpc/pm520_cr825/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/pm520_cr825/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/pm520_cr825/rtems/asm.h b/include/powerpc/pm520_cr825/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/pm520_cr825/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/pm520_cr825/rtems/score/cpu.h b/include/powerpc/pm520_cr825/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/pm520_cr825/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/pm520_cr825/rtems/score/cpuatomic.h b/include/powerpc/pm520_cr825/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/pm520_cr825/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/pm520_cr825/rtems/score/types.h b/include/powerpc/pm520_cr825/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/pm520_cr825/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/pm520_cr825/tm27.h b/include/powerpc/pm520_cr825/tm27.h
new file mode 100644
index 0000000000..3d7f96390a
--- /dev/null
+++ b/include/powerpc/pm520_cr825/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/tm27.h>
diff --git a/include/powerpc/pm520_ze30/bsp.h b/include/powerpc/pm520_ze30/bsp.h
new file mode 100644
index 0000000000..743a5e4e2a
--- /dev/null
+++ b/include/powerpc/pm520_ze30/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp.h>
diff --git a/include/powerpc/pm520_ze30/bsp/i2c.h b/include/powerpc/pm520_ze30/bsp/i2c.h
new file mode 100644
index 0000000000..64bbd7315f
--- /dev/null
+++ b/include/powerpc/pm520_ze30/bsp/i2c.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp/i2c.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp/i2c.h>
diff --git a/include/powerpc/pm520_ze30/bsp/irq.h b/include/powerpc/pm520_ze30/bsp/irq.h
new file mode 100644
index 0000000000..bb70d84443
--- /dev/null
+++ b/include/powerpc/pm520_ze30/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp/irq.h>
diff --git a/include/powerpc/pm520_ze30/bsp/u-boot-config.h b/include/powerpc/pm520_ze30/bsp/u-boot-config.h
new file mode 100644
index 0000000000..3fefe50889
--- /dev/null
+++ b/include/powerpc/pm520_ze30/bsp/u-boot-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/bsp/u-boot-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/bsp/u-boot-config.h>
diff --git a/include/powerpc/pm520_ze30/coverhd.h b/include/powerpc/pm520_ze30/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/pm520_ze30/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/pm520_ze30/libcpu/byteorder.h b/include/powerpc/pm520_ze30/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/pm520_ze30/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/pm520_ze30/libcpu/mmu.h b/include/powerpc/pm520_ze30/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/pm520_ze30/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/pm520_ze30/rtems/asm.h b/include/powerpc/pm520_ze30/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/pm520_ze30/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/pm520_ze30/rtems/score/cpu.h b/include/powerpc/pm520_ze30/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/pm520_ze30/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/pm520_ze30/rtems/score/cpuatomic.h b/include/powerpc/pm520_ze30/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/pm520_ze30/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/pm520_ze30/rtems/score/types.h b/include/powerpc/pm520_ze30/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/pm520_ze30/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/pm520_ze30/tm27.h b/include/powerpc/pm520_ze30/tm27.h
new file mode 100644
index 0000000000..3d7f96390a
--- /dev/null
+++ b/include/powerpc/pm520_ze30/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/brs5l/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/brs5l/tm27.h>
diff --git a/c/src/lib/libbsp/powerpc/psim/include/bsp.h b/include/powerpc/psim/bsp.h
index 2164800ef3..2164800ef3 100644
--- a/c/src/lib/libbsp/powerpc/psim/include/bsp.h
+++ b/include/powerpc/psim/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/psim/irq/irq.h b/include/powerpc/psim/bsp/irq.h
index 376c95a627..376c95a627 100644
--- a/c/src/lib/libbsp/powerpc/psim/irq/irq.h
+++ b/include/powerpc/psim/bsp/irq.h
diff --git a/include/powerpc/psim/bsp/linker-symbols.h b/include/powerpc/psim/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/psim/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/powerpc/psim/include/coverhd.h b/include/powerpc/psim/coverhd.h
index 16cfc1f06d..16cfc1f06d 100644
--- a/c/src/lib/libbsp/powerpc/psim/include/coverhd.h
+++ b/include/powerpc/psim/coverhd.h
diff --git a/include/powerpc/psim/libcpu/byteorder.h b/include/powerpc/psim/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/psim/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/psim/libcpu/mmu.h b/include/powerpc/psim/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/psim/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/psim/rtems/asm.h b/include/powerpc/psim/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/psim/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/psim/rtems/score/cpu.h b/include/powerpc/psim/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/psim/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/psim/rtems/score/cpuatomic.h b/include/powerpc/psim/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/psim/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/psim/rtems/score/types.h b/include/powerpc/psim/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/psim/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/powerpc/psim/include/tm27.h b/include/powerpc/psim/tm27.h
index 3a41283a13..3a41283a13 100644
--- a/c/src/lib/libbsp/powerpc/psim/include/tm27.h
+++ b/include/powerpc/psim/tm27.h
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/include/bsp.h b/include/powerpc/qemuppc/bsp.h
index 4a2bda9cfb..4a2bda9cfb 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/include/bsp.h
+++ b/include/powerpc/qemuppc/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/irq/irq.h b/include/powerpc/qemuppc/bsp/irq.h
index 7124dbcaf8..7124dbcaf8 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/irq/irq.h
+++ b/include/powerpc/qemuppc/bsp/irq.h
diff --git a/include/powerpc/qemuppc/coverhd.h b/include/powerpc/qemuppc/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/qemuppc/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/qemuppc/libcpu/byteorder.h b/include/powerpc/qemuppc/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/qemuppc/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/qemuppc/libcpu/mmu.h b/include/powerpc/qemuppc/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/qemuppc/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/qemuppc/rtems/asm.h b/include/powerpc/qemuppc/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/qemuppc/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/qemuppc/rtems/score/cpu.h b/include/powerpc/qemuppc/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/qemuppc/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/qemuppc/rtems/score/cpuatomic.h b/include/powerpc/qemuppc/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/qemuppc/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/qemuppc/rtems/score/types.h b/include/powerpc/qemuppc/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/qemuppc/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/qemuppc/tm27.h b/include/powerpc/qemuppc/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/qemuppc/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/qemuprep-altivec/bsp.h b/include/powerpc/qemuprep-altivec/bsp.h
new file mode 100644
index 0000000000..baca1dd5e0
--- /dev/null
+++ b/include/powerpc/qemuprep-altivec/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/bsp.h>
diff --git a/include/powerpc/qemuprep-altivec/bsp/VMEConfig.h b/include/powerpc/qemuprep-altivec/bsp/VMEConfig.h
new file mode 100644
index 0000000000..adb475852a
--- /dev/null
+++ b/include/powerpc/qemuprep-altivec/bsp/VMEConfig.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/bsp/VMEConfig.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/bsp/VMEConfig.h>
diff --git a/include/powerpc/qemuprep-altivec/bsp/irq.h b/include/powerpc/qemuprep-altivec/bsp/irq.h
new file mode 100644
index 0000000000..511c4b7a96
--- /dev/null
+++ b/include/powerpc/qemuprep-altivec/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/ep1a/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/ep1a/bsp/irq.h>
diff --git a/include/powerpc/qemuprep-altivec/bsp/pci.h b/include/powerpc/qemuprep-altivec/bsp/pci.h
new file mode 100644
index 0000000000..784510ec0c
--- /dev/null
+++ b/include/powerpc/qemuprep-altivec/bsp/pci.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/bsp/pci.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/bsp/pci.h>
diff --git a/include/powerpc/qemuprep-altivec/coverhd.h b/include/powerpc/qemuprep-altivec/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/qemuprep-altivec/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/qemuprep-altivec/libcpu/byteorder.h b/include/powerpc/qemuprep-altivec/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/qemuprep-altivec/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/qemuprep-altivec/libcpu/mmu.h b/include/powerpc/qemuprep-altivec/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/qemuprep-altivec/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/qemuprep-altivec/nvram.h b/include/powerpc/qemuprep-altivec/nvram.h
new file mode 100644
index 0000000000..f46fa9172d
--- /dev/null
+++ b/include/powerpc/qemuprep-altivec/nvram.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/nvram.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/nvram.h>
diff --git a/include/powerpc/qemuprep-altivec/rtems/asm.h b/include/powerpc/qemuprep-altivec/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/qemuprep-altivec/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/qemuprep-altivec/rtems/score/cpu.h b/include/powerpc/qemuprep-altivec/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/qemuprep-altivec/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/qemuprep-altivec/rtems/score/cpuatomic.h b/include/powerpc/qemuprep-altivec/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/qemuprep-altivec/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/qemuprep-altivec/rtems/score/types.h b/include/powerpc/qemuprep-altivec/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/qemuprep-altivec/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/qemuprep-altivec/tm27.h b/include/powerpc/qemuprep-altivec/tm27.h
new file mode 100644
index 0000000000..f6c938a2e2
--- /dev/null
+++ b/include/powerpc/qemuprep-altivec/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/tm27.h>
diff --git a/include/powerpc/qemuprep/bsp.h b/include/powerpc/qemuprep/bsp.h
new file mode 100644
index 0000000000..baca1dd5e0
--- /dev/null
+++ b/include/powerpc/qemuprep/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/bsp.h>
diff --git a/include/powerpc/qemuprep/bsp/VMEConfig.h b/include/powerpc/qemuprep/bsp/VMEConfig.h
new file mode 100644
index 0000000000..adb475852a
--- /dev/null
+++ b/include/powerpc/qemuprep/bsp/VMEConfig.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/bsp/VMEConfig.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/bsp/VMEConfig.h>
diff --git a/include/powerpc/qemuprep/bsp/irq.h b/include/powerpc/qemuprep/bsp/irq.h
new file mode 100644
index 0000000000..511c4b7a96
--- /dev/null
+++ b/include/powerpc/qemuprep/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/ep1a/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/ep1a/bsp/irq.h>
diff --git a/include/powerpc/qemuprep/bsp/pci.h b/include/powerpc/qemuprep/bsp/pci.h
new file mode 100644
index 0000000000..784510ec0c
--- /dev/null
+++ b/include/powerpc/qemuprep/bsp/pci.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/bsp/pci.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/bsp/pci.h>
diff --git a/include/powerpc/qemuprep/coverhd.h b/include/powerpc/qemuprep/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/qemuprep/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/qemuprep/libcpu/byteorder.h b/include/powerpc/qemuprep/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/qemuprep/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/qemuprep/libcpu/mmu.h b/include/powerpc/qemuprep/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/qemuprep/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/qemuprep/nvram.h b/include/powerpc/qemuprep/nvram.h
new file mode 100644
index 0000000000..f46fa9172d
--- /dev/null
+++ b/include/powerpc/qemuprep/nvram.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/nvram.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/nvram.h>
diff --git a/include/powerpc/qemuprep/rtems/asm.h b/include/powerpc/qemuprep/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/qemuprep/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/qemuprep/rtems/score/cpu.h b/include/powerpc/qemuprep/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/qemuprep/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/qemuprep/rtems/score/cpuatomic.h b/include/powerpc/qemuprep/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/qemuprep/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/qemuprep/rtems/score/types.h b/include/powerpc/qemuprep/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/qemuprep/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/qemuprep/tm27.h b/include/powerpc/qemuprep/tm27.h
new file mode 100644
index 0000000000..f6c938a2e2
--- /dev/null
+++ b/include/powerpc/qemuprep/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/mcp750/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/mcp750/tm27.h>
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/bsp.h b/include/powerpc/qoriq_core_0/bsp.h
index 08760607b5..08760607b5 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/bsp.h
+++ b/include/powerpc/qoriq_core_0/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/irq.h b/include/powerpc/qoriq_core_0/bsp/irq.h
index 3464028560..3464028560 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/irq.h
+++ b/include/powerpc/qoriq_core_0/bsp/irq.h
diff --git a/include/powerpc/qoriq_core_0/bsp/linker-symbols.h b/include/powerpc/qoriq_core_0/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/qoriq_core_0/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/mmu.h b/include/powerpc/qoriq_core_0/bsp/mmu.h
index 2962ff268d..2962ff268d 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/mmu.h
+++ b/include/powerpc/qoriq_core_0/bsp/mmu.h
diff --git a/include/powerpc/qoriq_core_0/bsp/start.h b/include/powerpc/qoriq_core_0/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/qoriq_core_0/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/tsec-config.h b/include/powerpc/qoriq_core_0/bsp/tsec-config.h
index b1a70e7486..b1a70e7486 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/tsec-config.h
+++ b/include/powerpc/qoriq_core_0/bsp/tsec-config.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/u-boot-config.h b/include/powerpc/qoriq_core_0/bsp/u-boot-config.h
index 5a34906ecd..5a34906ecd 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/u-boot-config.h
+++ b/include/powerpc/qoriq_core_0/bsp/u-boot-config.h
diff --git a/include/powerpc/qoriq_core_0/coverhd.h b/include/powerpc/qoriq_core_0/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/qoriq_core_0/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/qoriq_core_0/libcpu/byteorder.h b/include/powerpc/qoriq_core_0/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/qoriq_core_0/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/qoriq_core_0/libcpu/mmu.h b/include/powerpc/qoriq_core_0/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/qoriq_core_0/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/qoriq_core_0/rtems/asm.h b/include/powerpc/qoriq_core_0/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/qoriq_core_0/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/qoriq_core_0/rtems/score/cpu.h b/include/powerpc/qoriq_core_0/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/qoriq_core_0/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/qoriq_core_0/rtems/score/cpuatomic.h b/include/powerpc/qoriq_core_0/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/qoriq_core_0/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/qoriq_core_0/rtems/score/types.h b/include/powerpc/qoriq_core_0/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/qoriq_core_0/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/tm27.h b/include/powerpc/qoriq_core_0/tm27.h
index cc35487ca9..cc35487ca9 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/tm27.h
+++ b/include/powerpc/qoriq_core_0/tm27.h
diff --git a/include/powerpc/qoriq_core_1/bsp.h b/include/powerpc/qoriq_core_1/bsp.h
new file mode 100644
index 0000000000..610df75f81
--- /dev/null
+++ b/include/powerpc/qoriq_core_1/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/qoriq_core_0/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/qoriq_core_0/bsp.h>
diff --git a/include/powerpc/qoriq_core_1/bsp/irq.h b/include/powerpc/qoriq_core_1/bsp/irq.h
new file mode 100644
index 0000000000..8e20f8c227
--- /dev/null
+++ b/include/powerpc/qoriq_core_1/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/qoriq_core_0/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/qoriq_core_0/bsp/irq.h>
diff --git a/include/powerpc/qoriq_core_1/bsp/linker-symbols.h b/include/powerpc/qoriq_core_1/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/qoriq_core_1/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/qoriq_core_1/bsp/mmu.h b/include/powerpc/qoriq_core_1/bsp/mmu.h
new file mode 100644
index 0000000000..3ad96a06fb
--- /dev/null
+++ b/include/powerpc/qoriq_core_1/bsp/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/qoriq_core_0/bsp/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/qoriq_core_0/bsp/mmu.h>
diff --git a/include/powerpc/qoriq_core_1/bsp/start.h b/include/powerpc/qoriq_core_1/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/qoriq_core_1/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/qoriq_core_1/bsp/tsec-config.h b/include/powerpc/qoriq_core_1/bsp/tsec-config.h
new file mode 100644
index 0000000000..958158890a
--- /dev/null
+++ b/include/powerpc/qoriq_core_1/bsp/tsec-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/qoriq_core_0/bsp/tsec-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/qoriq_core_0/bsp/tsec-config.h>
diff --git a/include/powerpc/qoriq_core_1/bsp/u-boot-config.h b/include/powerpc/qoriq_core_1/bsp/u-boot-config.h
new file mode 100644
index 0000000000..1c8d96a3c5
--- /dev/null
+++ b/include/powerpc/qoriq_core_1/bsp/u-boot-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/qoriq_core_0/bsp/u-boot-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/qoriq_core_0/bsp/u-boot-config.h>
diff --git a/include/powerpc/qoriq_core_1/coverhd.h b/include/powerpc/qoriq_core_1/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/qoriq_core_1/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/qoriq_core_1/libcpu/byteorder.h b/include/powerpc/qoriq_core_1/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/qoriq_core_1/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/qoriq_core_1/libcpu/mmu.h b/include/powerpc/qoriq_core_1/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/qoriq_core_1/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/qoriq_core_1/rtems/asm.h b/include/powerpc/qoriq_core_1/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/qoriq_core_1/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/qoriq_core_1/rtems/score/cpu.h b/include/powerpc/qoriq_core_1/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/qoriq_core_1/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/qoriq_core_1/rtems/score/cpuatomic.h b/include/powerpc/qoriq_core_1/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/qoriq_core_1/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/qoriq_core_1/rtems/score/types.h b/include/powerpc/qoriq_core_1/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/qoriq_core_1/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/qoriq_core_1/tm27.h b/include/powerpc/qoriq_core_1/tm27.h
new file mode 100644
index 0000000000..a0fe7e8b87
--- /dev/null
+++ b/include/powerpc/qoriq_core_1/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/qoriq_core_0/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/qoriq_core_0/tm27.h>
diff --git a/include/powerpc/qoriq_p1020rdb/bsp.h b/include/powerpc/qoriq_p1020rdb/bsp.h
new file mode 100644
index 0000000000..610df75f81
--- /dev/null
+++ b/include/powerpc/qoriq_p1020rdb/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/qoriq_core_0/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/qoriq_core_0/bsp.h>
diff --git a/include/powerpc/qoriq_p1020rdb/bsp/irq.h b/include/powerpc/qoriq_p1020rdb/bsp/irq.h
new file mode 100644
index 0000000000..8e20f8c227
--- /dev/null
+++ b/include/powerpc/qoriq_p1020rdb/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/qoriq_core_0/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/qoriq_core_0/bsp/irq.h>
diff --git a/include/powerpc/qoriq_p1020rdb/bsp/linker-symbols.h b/include/powerpc/qoriq_p1020rdb/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/qoriq_p1020rdb/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/qoriq_p1020rdb/bsp/mmu.h b/include/powerpc/qoriq_p1020rdb/bsp/mmu.h
new file mode 100644
index 0000000000..3ad96a06fb
--- /dev/null
+++ b/include/powerpc/qoriq_p1020rdb/bsp/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/qoriq_core_0/bsp/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/qoriq_core_0/bsp/mmu.h>
diff --git a/include/powerpc/qoriq_p1020rdb/bsp/start.h b/include/powerpc/qoriq_p1020rdb/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/qoriq_p1020rdb/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/qoriq_p1020rdb/bsp/tsec-config.h b/include/powerpc/qoriq_p1020rdb/bsp/tsec-config.h
new file mode 100644
index 0000000000..958158890a
--- /dev/null
+++ b/include/powerpc/qoriq_p1020rdb/bsp/tsec-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/qoriq_core_0/bsp/tsec-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/qoriq_core_0/bsp/tsec-config.h>
diff --git a/include/powerpc/qoriq_p1020rdb/bsp/u-boot-config.h b/include/powerpc/qoriq_p1020rdb/bsp/u-boot-config.h
new file mode 100644
index 0000000000..1c8d96a3c5
--- /dev/null
+++ b/include/powerpc/qoriq_p1020rdb/bsp/u-boot-config.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/qoriq_core_0/bsp/u-boot-config.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/qoriq_core_0/bsp/u-boot-config.h>
diff --git a/include/powerpc/qoriq_p1020rdb/coverhd.h b/include/powerpc/qoriq_p1020rdb/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/qoriq_p1020rdb/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/qoriq_p1020rdb/libcpu/byteorder.h b/include/powerpc/qoriq_p1020rdb/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/qoriq_p1020rdb/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/qoriq_p1020rdb/libcpu/mmu.h b/include/powerpc/qoriq_p1020rdb/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/qoriq_p1020rdb/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/qoriq_p1020rdb/rtems/asm.h b/include/powerpc/qoriq_p1020rdb/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/qoriq_p1020rdb/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/qoriq_p1020rdb/rtems/score/cpu.h b/include/powerpc/qoriq_p1020rdb/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/qoriq_p1020rdb/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/qoriq_p1020rdb/rtems/score/cpuatomic.h b/include/powerpc/qoriq_p1020rdb/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/qoriq_p1020rdb/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/qoriq_p1020rdb/rtems/score/types.h b/include/powerpc/qoriq_p1020rdb/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/qoriq_p1020rdb/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/qoriq_p1020rdb/tm27.h b/include/powerpc/qoriq_p1020rdb/tm27.h
new file mode 100644
index 0000000000..a0fe7e8b87
--- /dev/null
+++ b/include/powerpc/qoriq_p1020rdb/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/qoriq_core_0/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/qoriq_core_0/tm27.h>
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h b/include/powerpc/score603e/bsp.h
index a98b5fb2c0..a98b5fb2c0 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
+++ b/include/powerpc/score603e/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/score603e/irq/irq.h b/include/powerpc/score603e/bsp/irq.h
index 97977a75e7..97977a75e7 100644
--- a/c/src/lib/libbsp/powerpc/score603e/irq/irq.h
+++ b/include/powerpc/score603e/bsp/irq.h
diff --git a/include/powerpc/score603e/bsp/pci.h b/include/powerpc/score603e/bsp/pci.h
new file mode 100644
index 0000000000..784510ec0c
--- /dev/null
+++ b/include/powerpc/score603e/bsp/pci.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/bsp/pci.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/bsp/pci.h>
diff --git a/include/powerpc/score603e/coverhd.h b/include/powerpc/score603e/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/score603e/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/score603e/libcpu/byteorder.h b/include/powerpc/score603e/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/score603e/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/score603e/libcpu/mmu.h b/include/powerpc/score603e/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/score603e/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/score603e/rtems/asm.h b/include/powerpc/score603e/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/score603e/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/score603e/rtems/score/cpu.h b/include/powerpc/score603e/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/score603e/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/score603e/rtems/score/cpuatomic.h b/include/powerpc/score603e/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/score603e/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/score603e/rtems/score/types.h b/include/powerpc/score603e/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/score603e/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/tm27.h b/include/powerpc/score603e/tm27.h
index 0ee290c705..0ee290c705 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/tm27.h
+++ b/include/powerpc/score603e/tm27.h
diff --git a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h b/include/powerpc/ss555/bsp.h
index ce708b0791..ce708b0791 100644
--- a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h
+++ b/include/powerpc/ss555/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/ss555/irq/irq.h b/include/powerpc/ss555/bsp/irq.h
index 31c4be9a9e..31c4be9a9e 100644
--- a/c/src/lib/libbsp/powerpc/ss555/irq/irq.h
+++ b/include/powerpc/ss555/bsp/irq.h
diff --git a/include/powerpc/ss555/coverhd.h b/include/powerpc/ss555/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/ss555/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/ss555/libcpu/byteorder.h b/include/powerpc/ss555/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/ss555/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/ss555/libcpu/mmu.h b/include/powerpc/ss555/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/ss555/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/ss555/rtems/asm.h b/include/powerpc/ss555/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/ss555/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/ss555/rtems/score/cpu.h b/include/powerpc/ss555/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/ss555/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/ss555/rtems/score/cpuatomic.h b/include/powerpc/ss555/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/ss555/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/ss555/rtems/score/types.h b/include/powerpc/ss555/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/ss555/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/powerpc/ss555/include/tm27.h b/include/powerpc/ss555/tm27.h
index 5106801744..5106801744 100644
--- a/c/src/lib/libbsp/powerpc/ss555/include/tm27.h
+++ b/include/powerpc/ss555/tm27.h
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/include/bsp.h b/include/powerpc/t32mppc/bsp.h
index 4ce387710b..4ce387710b 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/include/bsp.h
+++ b/include/powerpc/t32mppc/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/include/irq.h b/include/powerpc/t32mppc/bsp/irq.h
index 4a01bf4f9f..4a01bf4f9f 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/include/irq.h
+++ b/include/powerpc/t32mppc/bsp/irq.h
diff --git a/include/powerpc/t32mppc/bsp/linker-symbols.h b/include/powerpc/t32mppc/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/t32mppc/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/include/powerpc/t32mppc/bsp/start.h b/include/powerpc/t32mppc/bsp/start.h
new file mode 100644
index 0000000000..1ad13eb865
--- /dev/null
+++ b/include/powerpc/t32mppc/bsp/start.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/start.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/start.h>
diff --git a/include/powerpc/t32mppc/coverhd.h b/include/powerpc/t32mppc/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/powerpc/t32mppc/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/powerpc/t32mppc/libcpu/byteorder.h b/include/powerpc/t32mppc/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/t32mppc/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/t32mppc/libcpu/mmu.h b/include/powerpc/t32mppc/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/t32mppc/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/t32mppc/rtems/asm.h b/include/powerpc/t32mppc/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/t32mppc/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/t32mppc/rtems/score/cpu.h b/include/powerpc/t32mppc/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/t32mppc/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/t32mppc/rtems/score/cpuatomic.h b/include/powerpc/t32mppc/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/t32mppc/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/t32mppc/rtems/score/types.h b/include/powerpc/t32mppc/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/t32mppc/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/t32mppc/tm27.h b/include/powerpc/t32mppc/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/t32mppc/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/powerpc/tqm8xx_stk8xx/bsp.h b/include/powerpc/tqm8xx_stk8xx/bsp.h
new file mode 100644
index 0000000000..5f94690f34
--- /dev/null
+++ b/include/powerpc/tqm8xx_stk8xx/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/pghplus/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/pghplus/bsp.h>
diff --git a/include/powerpc/tqm8xx_stk8xx/bsp/8xx_immap.h b/include/powerpc/tqm8xx_stk8xx/bsp/8xx_immap.h
new file mode 100644
index 0000000000..f25789ea63
--- /dev/null
+++ b/include/powerpc/tqm8xx_stk8xx/bsp/8xx_immap.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/pghplus/bsp/8xx_immap.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/pghplus/bsp/8xx_immap.h>
diff --git a/include/powerpc/tqm8xx_stk8xx/bsp/irq.h b/include/powerpc/tqm8xx_stk8xx/bsp/irq.h
new file mode 100644
index 0000000000..b5af2d5184
--- /dev/null
+++ b/include/powerpc/tqm8xx_stk8xx/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/pghplus/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/pghplus/bsp/irq.h>
diff --git a/include/powerpc/tqm8xx_stk8xx/coverhd.h b/include/powerpc/tqm8xx_stk8xx/coverhd.h
new file mode 100644
index 0000000000..3d197f6fd1
--- /dev/null
+++ b/include/powerpc/tqm8xx_stk8xx/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/pghplus/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/pghplus/coverhd.h>
diff --git a/include/powerpc/tqm8xx_stk8xx/libcpu/byteorder.h b/include/powerpc/tqm8xx_stk8xx/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/tqm8xx_stk8xx/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/tqm8xx_stk8xx/libcpu/mmu.h b/include/powerpc/tqm8xx_stk8xx/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/tqm8xx_stk8xx/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/tqm8xx_stk8xx/rtems/asm.h b/include/powerpc/tqm8xx_stk8xx/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/tqm8xx_stk8xx/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/tqm8xx_stk8xx/rtems/score/cpu.h b/include/powerpc/tqm8xx_stk8xx/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/tqm8xx_stk8xx/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/tqm8xx_stk8xx/rtems/score/cpuatomic.h b/include/powerpc/tqm8xx_stk8xx/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/tqm8xx_stk8xx/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/tqm8xx_stk8xx/rtems/score/types.h b/include/powerpc/tqm8xx_stk8xx/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/tqm8xx_stk8xx/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/tqm8xx_stk8xx/tm27.h b/include/powerpc/tqm8xx_stk8xx/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/tqm8xx_stk8xx/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h b/include/powerpc/virtex/bsp.h
index b4a47dc4b7..b4a47dc4b7 100644
--- a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h
+++ b/include/powerpc/virtex/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/irq/irq.h b/include/powerpc/virtex/bsp/irq.h
index 1ce5b68b98..1ce5b68b98 100644
--- a/c/src/lib/libbsp/powerpc/virtex/irq/irq.h
+++ b/include/powerpc/virtex/bsp/irq.h
diff --git a/include/powerpc/virtex/bsp/linker-symbols.h b/include/powerpc/virtex/bsp/linker-symbols.h
new file mode 100644
index 0000000000..4f07d75da9
--- /dev/null
+++ b/include/powerpc/virtex/bsp/linker-symbols.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/br_uid/bsp/linker-symbols.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/br_uid/bsp/linker-symbols.h>
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/coverhd.h b/include/powerpc/virtex/coverhd.h
index 498e603092..498e603092 100644
--- a/c/src/lib/libbsp/powerpc/virtex/include/coverhd.h
+++ b/include/powerpc/virtex/coverhd.h
diff --git a/include/powerpc/virtex/libcpu/byteorder.h b/include/powerpc/virtex/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/virtex/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/virtex/libcpu/mmu.h b/include/powerpc/virtex/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/virtex/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/virtex/rtems/asm.h b/include/powerpc/virtex/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/virtex/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/virtex/rtems/score/cpu.h b/include/powerpc/virtex/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/virtex/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/virtex/rtems/score/cpuatomic.h b/include/powerpc/virtex/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/virtex/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/virtex/rtems/score/types.h b/include/powerpc/virtex/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/virtex/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/virtex/tm27.h b/include/powerpc/virtex/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/virtex/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h b/include/powerpc/virtex4/bsp.h
index 3090bda349..3090bda349 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h
+++ b/include/powerpc/virtex4/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/irq.h b/include/powerpc/virtex4/bsp/irq.h
index 45ef69adbf..45ef69adbf 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/include/irq.h
+++ b/include/powerpc/virtex4/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/mmu.h b/include/powerpc/virtex4/bsp/mmu.h
index 3e2710b95c..3e2710b95c 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/include/mmu.h
+++ b/include/powerpc/virtex4/bsp/mmu.h
diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/coverhd.h b/include/powerpc/virtex4/coverhd.h
index ce5a92c120..ce5a92c120 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/include/coverhd.h
+++ b/include/powerpc/virtex4/coverhd.h
diff --git a/include/powerpc/virtex4/libcpu/byteorder.h b/include/powerpc/virtex4/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/virtex4/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/virtex4/libcpu/mmu.h b/include/powerpc/virtex4/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/virtex4/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/virtex4/rtems/asm.h b/include/powerpc/virtex4/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/virtex4/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/virtex4/rtems/score/cpu.h b/include/powerpc/virtex4/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/virtex4/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/virtex4/rtems/score/cpuatomic.h b/include/powerpc/virtex4/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/virtex4/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/virtex4/rtems/score/types.h b/include/powerpc/virtex4/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/virtex4/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/virtex4/tm27.h b/include/powerpc/virtex4/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/virtex4/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h b/include/powerpc/virtex5/bsp.h
index f690095a47..f690095a47 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h
+++ b/include/powerpc/virtex5/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/irq.h b/include/powerpc/virtex5/bsp/irq.h
index 066090de7f..066090de7f 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/include/irq.h
+++ b/include/powerpc/virtex5/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/mmu.h b/include/powerpc/virtex5/bsp/mmu.h
index a3fb32b662..a3fb32b662 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/include/mmu.h
+++ b/include/powerpc/virtex5/bsp/mmu.h
diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/coverhd.h b/include/powerpc/virtex5/coverhd.h
index f6a00b1e81..f6a00b1e81 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/include/coverhd.h
+++ b/include/powerpc/virtex5/coverhd.h
diff --git a/include/powerpc/virtex5/libcpu/byteorder.h b/include/powerpc/virtex5/libcpu/byteorder.h
new file mode 100644
index 0000000000..9fd018eda4
--- /dev/null
+++ b/include/powerpc/virtex5/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/byteorder.h>
diff --git a/include/powerpc/virtex5/libcpu/mmu.h b/include/powerpc/virtex5/libcpu/mmu.h
new file mode 100644
index 0000000000..7d335e8940
--- /dev/null
+++ b/include/powerpc/virtex5/libcpu/mmu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/libcpu/mmu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/libcpu/mmu.h>
diff --git a/include/powerpc/virtex5/rtems/asm.h b/include/powerpc/virtex5/rtems/asm.h
new file mode 100644
index 0000000000..e6a1df4d9f
--- /dev/null
+++ b/include/powerpc/virtex5/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/asm.h>
diff --git a/include/powerpc/virtex5/rtems/score/cpu.h b/include/powerpc/virtex5/rtems/score/cpu.h
new file mode 100644
index 0000000000..76776845ac
--- /dev/null
+++ b/include/powerpc/virtex5/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/cpu.h>
diff --git a/include/powerpc/virtex5/rtems/score/cpuatomic.h b/include/powerpc/virtex5/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/powerpc/virtex5/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/powerpc/virtex5/rtems/score/types.h b/include/powerpc/virtex5/rtems/score/types.h
new file mode 100644
index 0000000000..6382f8c184
--- /dev/null
+++ b/include/powerpc/virtex5/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* powerpc/beatnik/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <powerpc/beatnik/rtems/score/types.h>
diff --git a/include/powerpc/virtex5/tm27.h b/include/powerpc/virtex5/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/powerpc/virtex5/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libcpu/powerpc/ppc403/include/ppc405ex.h b/include/ppc4xx/ppc405ex.h
index 98ebbe28a2..98ebbe28a2 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/include/ppc405ex.h
+++ b/include/ppc4xx/ppc405ex.h
diff --git a/c/src/lib/libcpu/powerpc/ppc403/include/ppc405gp.h b/include/ppc4xx/ppc405gp.h
index 9cf46a780a..9cf46a780a 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/include/ppc405gp.h
+++ b/include/ppc4xx/ppc405gp.h
diff --git a/c/src/lib/libbsp/powerpc/psim/include/psim.h b/include/psim.h
index e7b6fa7578..e7b6fa7578 100644
--- a/c/src/lib/libbsp/powerpc/psim/include/psim.h
+++ b/include/psim.h
diff --git a/c/src/lib/libcpu/arm/pxa255/include/pxa255.h b/include/pxa255.h
index d5f2830c53..d5f2830c53 100644
--- a/c/src/lib/libcpu/arm/pxa255/include/pxa255.h
+++ b/include/pxa255.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/rasta.h b/include/rasta.h
index b7eccb4ecb..b7eccb4ecb 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/rasta.h
+++ b/include/rasta.h
diff --git a/cpukit/libnetworking/resolv.h b/include/resolv.h
index 6c87a005e3..6c87a005e3 100644
--- a/cpukit/libnetworking/resolv.h
+++ b/include/resolv.h
diff --git a/cpukit/librpc/include/rpc/auth.h b/include/rpc/auth.h
index 13432bd5d0..13432bd5d0 100644
--- a/cpukit/librpc/include/rpc/auth.h
+++ b/include/rpc/auth.h
diff --git a/cpukit/librpc/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index f822f3dd60..f822f3dd60 100644
--- a/cpukit/librpc/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
diff --git a/cpukit/librpc/include/rpc/clnt.h b/include/rpc/clnt.h
index 3042abe1b6..3042abe1b6 100644
--- a/cpukit/librpc/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
diff --git a/cpukit/librpc/include/rpc/clnt_soc.h b/include/rpc/clnt_soc.h
index 9aa99b88ba..9aa99b88ba 100644
--- a/cpukit/librpc/include/rpc/clnt_soc.h
+++ b/include/rpc/clnt_soc.h
diff --git a/cpukit/librpc/include/rpc/clnt_stat.h b/include/rpc/clnt_stat.h
index 2c68745407..2c68745407 100644
--- a/cpukit/librpc/include/rpc/clnt_stat.h
+++ b/include/rpc/clnt_stat.h
diff --git a/cpukit/librpc/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index 86fff6be4f..86fff6be4f 100644
--- a/cpukit/librpc/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
diff --git a/cpukit/librpc/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index 14720e8cbd..14720e8cbd 100644
--- a/cpukit/librpc/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
diff --git a/cpukit/librpc/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index a5ea404f45..a5ea404f45 100644
--- a/cpukit/librpc/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
diff --git a/cpukit/librpc/include/rpc/rpc.h b/include/rpc/rpc.h
index 20065efd4d..20065efd4d 100644
--- a/cpukit/librpc/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
diff --git a/cpukit/librpc/include/rpc/rpc_com.h b/include/rpc/rpc_com.h
index 9a1ce453ab..9a1ce453ab 100644
--- a/cpukit/librpc/include/rpc/rpc_com.h
+++ b/include/rpc/rpc_com.h
diff --git a/cpukit/librpc/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index 63a1f360a0..63a1f360a0 100644
--- a/cpukit/librpc/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
diff --git a/cpukit/librpc/include/rpc/rpcent.h b/include/rpc/rpcent.h
index 1cf4161b81..1cf4161b81 100644
--- a/cpukit/librpc/include/rpc/rpcent.h
+++ b/include/rpc/rpcent.h
diff --git a/cpukit/librpc/include/rpc/svc.h b/include/rpc/svc.h
index 0ef3b8c28e..0ef3b8c28e 100644
--- a/cpukit/librpc/include/rpc/svc.h
+++ b/include/rpc/svc.h
diff --git a/cpukit/librpc/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index 846752c294..846752c294 100644
--- a/cpukit/librpc/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
diff --git a/cpukit/librpc/include/rpc/svc_soc.h b/include/rpc/svc_soc.h
index 5b36fb46ef..5b36fb46ef 100644
--- a/cpukit/librpc/include/rpc/svc_soc.h
+++ b/include/rpc/svc_soc.h
diff --git a/cpukit/librpc/include/rpc/types.h b/include/rpc/types.h
index 05375d32e9..05375d32e9 100644
--- a/cpukit/librpc/include/rpc/types.h
+++ b/include/rpc/types.h
diff --git a/cpukit/librpc/include/rpc/xdr.h b/include/rpc/xdr.h
index 30f2bccc0c..30f2bccc0c 100644
--- a/cpukit/librpc/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
diff --git a/cpukit/rtems/include/rtems.h b/include/rtems.h
index af05ee6176..af05ee6176 100644
--- a/cpukit/rtems/include/rtems.h
+++ b/include/rtems.h
diff --git a/include/rtems/asm.h b/include/rtems/asm.h
new file mode 100644
index 0000000000..f56961c10a
--- /dev/null
+++ b/include/rtems/asm.h
@@ -0,0 +1,382 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_altcycv_devkit__)
+#  include <arm/altcycv_devkit/rtems/asm.h>
+#elif defined(__rtems_arm_altcycv_devkit_smp__)
+#  include <arm/altcycv_devkit_smp/rtems/asm.h>
+#elif defined(__rtems_arm_arm1136jfs__)
+#  include <arm/arm1136jfs/rtems/asm.h>
+#elif defined(__rtems_arm_arm1136js__)
+#  include <arm/arm1136js/rtems/asm.h>
+#elif defined(__rtems_arm_arm7tdmi__)
+#  include <arm/arm7tdmi/rtems/asm.h>
+#elif defined(__rtems_arm_arm920__)
+#  include <arm/arm920/rtems/asm.h>
+#elif defined(__rtems_arm_armcortexa9__)
+#  include <arm/armcortexa9/rtems/asm.h>
+#elif defined(__rtems_arm_beagleboardorig__)
+#  include <arm/beagleboardorig/rtems/asm.h>
+#elif defined(__rtems_arm_beagleboardxm__)
+#  include <arm/beagleboardxm/rtems/asm.h>
+#elif defined(__rtems_arm_beagleboneblack__)
+#  include <arm/beagleboneblack/rtems/asm.h>
+#elif defined(__rtems_arm_beaglebonewhite__)
+#  include <arm/beaglebonewhite/rtems/asm.h>
+#elif defined(__rtems_arm_csb336__)
+#  include <arm/csb336/rtems/asm.h>
+#elif defined(__rtems_arm_csb337__)
+#  include <arm/csb337/rtems/asm.h>
+#elif defined(__rtems_arm_csb637__)
+#  include <arm/csb637/rtems/asm.h>
+#elif defined(__rtems_arm_edb7312__)
+#  include <arm/edb7312/rtems/asm.h>
+#elif defined(__rtems_arm_gba__)
+#  include <arm/gba/rtems/asm.h>
+#elif defined(__rtems_arm_gp32__)
+#  include <arm/gp32/rtems/asm.h>
+#elif defined(__rtems_arm_gumstix__)
+#  include <arm/gumstix/rtems/asm.h>
+#elif defined(__rtems_arm_kit637_v6__)
+#  include <arm/kit637_v6/rtems/asm.h>
+#elif defined(__rtems_arm_lm3s3749__)
+#  include <arm/lm3s3749/rtems/asm.h>
+#elif defined(__rtems_arm_lm3s6965__)
+#  include <arm/lm3s6965/rtems/asm.h>
+#elif defined(__rtems_arm_lm3s6965_qemu__)
+#  include <arm/lm3s6965_qemu/rtems/asm.h>
+#elif defined(__rtems_arm_lm4f120__)
+#  include <arm/lm4f120/rtems/asm.h>
+#elif defined(__rtems_arm_lpc1768_mbed__)
+#  include <arm/lpc1768_mbed/rtems/asm.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram__)
+#  include <arm/lpc1768_mbed_ahb_ram/rtems/asm.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram_eth__)
+#  include <arm/lpc1768_mbed_ahb_ram_eth/rtems/asm.h>
+#elif defined(__rtems_arm_lpc17xx_ea_ram__)
+#  include <arm/lpc17xx_ea_ram/rtems/asm.h>
+#elif defined(__rtems_arm_lpc17xx_ea_rom_int__)
+#  include <arm/lpc17xx_ea_rom_int/rtems/asm.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_ram__)
+#  include <arm/lpc17xx_plx800_ram/rtems/asm.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_rom_int__)
+#  include <arm/lpc17xx_plx800_rom_int/rtems/asm.h>
+#elif defined(__rtems_arm_lpc2362__)
+#  include <arm/lpc2362/rtems/asm.h>
+#elif defined(__rtems_arm_lpc23xx_tli800__)
+#  include <arm/lpc23xx_tli800/rtems/asm.h>
+#elif defined(__rtems_arm_lpc24xx_ea__)
+#  include <arm/lpc24xx_ea/rtems/asm.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_ram__)
+#  include <arm/lpc24xx_ncs_ram/rtems/asm.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_ext__)
+#  include <arm/lpc24xx_ncs_rom_ext/rtems/asm.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_int__)
+#  include <arm/lpc24xx_ncs_rom_int/rtems/asm.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_ram__)
+#  include <arm/lpc24xx_plx800_ram/rtems/asm.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_rom_int__)
+#  include <arm/lpc24xx_plx800_rom_int/rtems/asm.h>
+#elif defined(__rtems_arm_lpc32xx_mzx__)
+#  include <arm/lpc32xx_mzx/rtems/asm.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_1__)
+#  include <arm/lpc32xx_mzx_stage_1/rtems/asm.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_2__)
+#  include <arm/lpc32xx_mzx_stage_2/rtems/asm.h>
+#elif defined(__rtems_arm_lpc32xx_phycore__)
+#  include <arm/lpc32xx_phycore/rtems/asm.h>
+#elif defined(__rtems_arm_lpc40xx_ea_ram__)
+#  include <arm/lpc40xx_ea_ram/rtems/asm.h>
+#elif defined(__rtems_arm_lpc40xx_ea_rom_int__)
+#  include <arm/lpc40xx_ea_rom_int/rtems/asm.h>
+#elif defined(__rtems_arm_nds__)
+#  include <arm/nds/rtems/asm.h>
+#elif defined(__rtems_arm_raspberrypi__)
+#  include <arm/raspberrypi/rtems/asm.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu__)
+#  include <arm/realview_pbx_a9_qemu/rtems/asm.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu_smp__)
+#  include <arm/realview_pbx_a9_qemu_smp/rtems/asm.h>
+#elif defined(__rtems_arm_rtl22xx__)
+#  include <arm/rtl22xx/rtems/asm.h>
+#elif defined(__rtems_arm_rtl22xx_t__)
+#  include <arm/rtl22xx_t/rtems/asm.h>
+#elif defined(__rtems_arm_smdk2410__)
+#  include <arm/smdk2410/rtems/asm.h>
+#elif defined(__rtems_arm_stm32f105rc__)
+#  include <arm/stm32f105rc/rtems/asm.h>
+#elif defined(__rtems_arm_stm32f4__)
+#  include <arm/stm32f4/rtems/asm.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk__)
+#  include <arm/tms570ls3137_hdk/rtems/asm.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_intram__)
+#  include <arm/tms570ls3137_hdk_intram/rtems/asm.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_sdram__)
+#  include <arm/tms570ls3137_hdk_sdram/rtems/asm.h>
+#elif defined(__rtems_arm_xilinx_zynq_a9_qemu__)
+#  include <arm/xilinx_zynq_a9_qemu/rtems/asm.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc702__)
+#  include <arm/xilinx_zynq_zc702/rtems/asm.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc706__)
+#  include <arm/xilinx_zynq_zc706/rtems/asm.h>
+#elif defined(__rtems_arm_xilinx_zynq_zedboard__)
+#  include <arm/xilinx_zynq_zedboard/rtems/asm.h>
+#elif defined(__rtems_avr_avrtest__)
+#  include <avr/avrtest/rtems/asm.h>
+#elif defined(__rtems_bfin_TLL6527M__)
+#  include <bfin/TLL6527M/rtems/asm.h>
+#elif defined(__rtems_bfin_bf537Stamp__)
+#  include <bfin/bf537Stamp/rtems/asm.h>
+#elif defined(__rtems_bfin_eZKit533__)
+#  include <bfin/eZKit533/rtems/asm.h>
+#elif defined(__rtems_h8300_h8sim__)
+#  include <h8300/h8sim/rtems/asm.h>
+#elif defined(__rtems_h8300_h8sxsim__)
+#  include <h8300/h8sxsim/rtems/asm.h>
+#elif defined(__rtems_i386_pc386__)
+#  include <i386/pc386/rtems/asm.h>
+#elif defined(__rtems_i386_pc486__)
+#  include <i386/pc486/rtems/asm.h>
+#elif defined(__rtems_i386_pc586__)
+#  include <i386/pc586/rtems/asm.h>
+#elif defined(__rtems_i386_pc586_sse__)
+#  include <i386/pc586-sse/rtems/asm.h>
+#elif defined(__rtems_i386_pc686__)
+#  include <i386/pc686/rtems/asm.h>
+#elif defined(__rtems_i386_pcp4__)
+#  include <i386/pcp4/rtems/asm.h>
+#elif defined(__rtems_lm32_lm32_evr__)
+#  include <lm32/lm32_evr/rtems/asm.h>
+#elif defined(__rtems_lm32_milkymist__)
+#  include <lm32/milkymist/rtems/asm.h>
+#elif defined(__rtems_m32c_m32csim__)
+#  include <m32c/m32csim/rtems/asm.h>
+#elif defined(__rtems_m32r_m32rsim__)
+#  include <m32r/m32rsim/rtems/asm.h>
+#elif defined(__rtems_m68k_COBRA5475__)
+#  include <m68k/COBRA5475/rtems/asm.h>
+#elif defined(__rtems_m68k_av5282__)
+#  include <m68k/av5282/rtems/asm.h>
+#elif defined(__rtems_m68k_csb360__)
+#  include <m68k/csb360/rtems/asm.h>
+#elif defined(__rtems_m68k_gen68302__)
+#  include <m68k/gen68302/rtems/asm.h>
+#elif defined(__rtems_m68k_gen68340__)
+#  include <m68k/gen68340/rtems/asm.h>
+#elif defined(__rtems_m68k_gen68360__)
+#  include <m68k/gen68360/rtems/asm.h>
+#elif defined(__rtems_m68k_gen68360_040__)
+#  include <m68k/gen68360_040/rtems/asm.h>
+#elif defined(__rtems_m68k_idp__)
+#  include <m68k/idp/rtems/asm.h>
+#elif defined(__rtems_m68k_m5484FireEngine__)
+#  include <m68k/m5484FireEngine/rtems/asm.h>
+#elif defined(__rtems_m68k_mcf5206elite__)
+#  include <m68k/mcf5206elite/rtems/asm.h>
+#elif defined(__rtems_m68k_mcf52235__)
+#  include <m68k/mcf52235/rtems/asm.h>
+#elif defined(__rtems_m68k_mcf5225x__)
+#  include <m68k/mcf5225x/rtems/asm.h>
+#elif defined(__rtems_m68k_mcf5235__)
+#  include <m68k/mcf5235/rtems/asm.h>
+#elif defined(__rtems_m68k_mcf5329__)
+#  include <m68k/mcf5329/rtems/asm.h>
+#elif defined(__rtems_m68k_mrm332__)
+#  include <m68k/mrm332/rtems/asm.h>
+#elif defined(__rtems_m68k_mvme136__)
+#  include <m68k/mvme136/rtems/asm.h>
+#elif defined(__rtems_m68k_mvme147__)
+#  include <m68k/mvme147/rtems/asm.h>
+#elif defined(__rtems_m68k_mvme147s__)
+#  include <m68k/mvme147s/rtems/asm.h>
+#elif defined(__rtems_m68k_mvme162__)
+#  include <m68k/mvme162/rtems/asm.h>
+#elif defined(__rtems_m68k_mvme162lx__)
+#  include <m68k/mvme162lx/rtems/asm.h>
+#elif defined(__rtems_m68k_mvme167__)
+#  include <m68k/mvme167/rtems/asm.h>
+#elif defined(__rtems_m68k_ods68302__)
+#  include <m68k/ods68302/rtems/asm.h>
+#elif defined(__rtems_m68k_pgh360__)
+#  include <m68k/pgh360/rtems/asm.h>
+#elif defined(__rtems_m68k_sim68000__)
+#  include <m68k/sim68000/rtems/asm.h>
+#elif defined(__rtems_m68k_simcpu32__)
+#  include <m68k/simcpu32/rtems/asm.h>
+#elif defined(__rtems_m68k_uC5282__)
+#  include <m68k/uC5282/rtems/asm.h>
+#elif defined(__rtems_mips_csb350__)
+#  include <mips/csb350/rtems/asm.h>
+#elif defined(__rtems_mips_genmongoosev__)
+#  include <mips/genmongoosev/rtems/asm.h>
+#elif defined(__rtems_mips_hurricane__)
+#  include <mips/hurricane/rtems/asm.h>
+#elif defined(__rtems_mips_jmr3904__)
+#  include <mips/jmr3904/rtems/asm.h>
+#elif defined(__rtems_mips_malta__)
+#  include <mips/malta/rtems/asm.h>
+#elif defined(__rtems_mips_rbtx4925__)
+#  include <mips/rbtx4925/rtems/asm.h>
+#elif defined(__rtems_mips_rbtx4938__)
+#  include <mips/rbtx4938/rtems/asm.h>
+#elif defined(__rtems_moxie_moxiesim__)
+#  include <moxie/moxiesim/rtems/asm.h>
+#elif defined(__rtems_nios2_nios2_iss__)
+#  include <nios2/nios2_iss/rtems/asm.h>
+#elif defined(__rtems_or1k_or1ksim__)
+#  include <or1k/or1ksim/rtems/asm.h>
+#elif defined(__rtems_powerpc_beatnik__)
+#  include <powerpc/beatnik/rtems/asm.h>
+#elif defined(__rtems_powerpc_br_uid__)
+#  include <powerpc/br_uid/rtems/asm.h>
+#elif defined(__rtems_powerpc_brs5l__)
+#  include <powerpc/brs5l/rtems/asm.h>
+#elif defined(__rtems_powerpc_brs6l__)
+#  include <powerpc/brs6l/rtems/asm.h>
+#elif defined(__rtems_powerpc_dp2__)
+#  include <powerpc/dp2/rtems/asm.h>
+#elif defined(__rtems_powerpc_ep1a__)
+#  include <powerpc/ep1a/rtems/asm.h>
+#elif defined(__rtems_powerpc_gwlcfm__)
+#  include <powerpc/gwlcfm/rtems/asm.h>
+#elif defined(__rtems_powerpc_haleakala__)
+#  include <powerpc/haleakala/rtems/asm.h>
+#elif defined(__rtems_powerpc_hsc_cm01__)
+#  include <powerpc/hsc_cm01/rtems/asm.h>
+#elif defined(__rtems_powerpc_icecube__)
+#  include <powerpc/icecube/rtems/asm.h>
+#elif defined(__rtems_powerpc_mbx821_001__)
+#  include <powerpc/mbx821_001/rtems/asm.h>
+#elif defined(__rtems_powerpc_mbx821_002__)
+#  include <powerpc/mbx821_002/rtems/asm.h>
+#elif defined(__rtems_powerpc_mbx821_002b__)
+#  include <powerpc/mbx821_002b/rtems/asm.h>
+#elif defined(__rtems_powerpc_mbx860_001b__)
+#  include <powerpc/mbx860_001b/rtems/asm.h>
+#elif defined(__rtems_powerpc_mbx860_002__)
+#  include <powerpc/mbx860_002/rtems/asm.h>
+#elif defined(__rtems_powerpc_mbx860_005b__)
+#  include <powerpc/mbx860_005b/rtems/asm.h>
+#elif defined(__rtems_powerpc_mbx860_1b__)
+#  include <powerpc/mbx860_1b/rtems/asm.h>
+#elif defined(__rtems_powerpc_mcp750__)
+#  include <powerpc/mcp750/rtems/asm.h>
+#elif defined(__rtems_powerpc_mpc5566evb__)
+#  include <powerpc/mpc5566evb/rtems/asm.h>
+#elif defined(__rtems_powerpc_mpc5566evb_spe__)
+#  include <powerpc/mpc5566evb_spe/rtems/asm.h>
+#elif defined(__rtems_powerpc_mpc5643l_dpu__)
+#  include <powerpc/mpc5643l_dpu/rtems/asm.h>
+#elif defined(__rtems_powerpc_mpc5643l_evb__)
+#  include <powerpc/mpc5643l_evb/rtems/asm.h>
+#elif defined(__rtems_powerpc_mpc5668g__)
+#  include <powerpc/mpc5668g/rtems/asm.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_app__)
+#  include <powerpc/mpc5674f_ecu508_app/rtems/asm.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_boot__)
+#  include <powerpc/mpc5674f_ecu508_boot/rtems/asm.h>
+#elif defined(__rtems_powerpc_mpc5674f_rsm6__)
+#  include <powerpc/mpc5674f_rsm6/rtems/asm.h>
+#elif defined(__rtems_powerpc_mpc5674fevb__)
+#  include <powerpc/mpc5674fevb/rtems/asm.h>
+#elif defined(__rtems_powerpc_mpc5674fevb_spe__)
+#  include <powerpc/mpc5674fevb_spe/rtems/asm.h>
+#elif defined(__rtems_powerpc_mpc8260ads__)
+#  include <powerpc/mpc8260ads/rtems/asm.h>
+#elif defined(__rtems_powerpc_mpc8309som__)
+#  include <powerpc/mpc8309som/rtems/asm.h>
+#elif defined(__rtems_powerpc_mpc8313erdb__)
+#  include <powerpc/mpc8313erdb/rtems/asm.h>
+#elif defined(__rtems_powerpc_mpc8349eamds__)
+#  include <powerpc/mpc8349eamds/rtems/asm.h>
+#elif defined(__rtems_powerpc_mtx603e__)
+#  include <powerpc/mtx603e/rtems/asm.h>
+#elif defined(__rtems_powerpc_mvme2100__)
+#  include <powerpc/mvme2100/rtems/asm.h>
+#elif defined(__rtems_powerpc_mvme2307__)
+#  include <powerpc/mvme2307/rtems/asm.h>
+#elif defined(__rtems_powerpc_mvme3100__)
+#  include <powerpc/mvme3100/rtems/asm.h>
+#elif defined(__rtems_powerpc_mvme5500__)
+#  include <powerpc/mvme5500/rtems/asm.h>
+#elif defined(__rtems_powerpc_pghplus__)
+#  include <powerpc/pghplus/rtems/asm.h>
+#elif defined(__rtems_powerpc_phycore_mpc5554__)
+#  include <powerpc/phycore_mpc5554/rtems/asm.h>
+#elif defined(__rtems_powerpc_pm520_cr825__)
+#  include <powerpc/pm520_cr825/rtems/asm.h>
+#elif defined(__rtems_powerpc_pm520_ze30__)
+#  include <powerpc/pm520_ze30/rtems/asm.h>
+#elif defined(__rtems_powerpc_psim__)
+#  include <powerpc/psim/rtems/asm.h>
+#elif defined(__rtems_powerpc_qemuppc__)
+#  include <powerpc/qemuppc/rtems/asm.h>
+#elif defined(__rtems_powerpc_qemuprep__)
+#  include <powerpc/qemuprep/rtems/asm.h>
+#elif defined(__rtems_powerpc_qemuprep_altivec__)
+#  include <powerpc/qemuprep-altivec/rtems/asm.h>
+#elif defined(__rtems_powerpc_qoriq_core_0__)
+#  include <powerpc/qoriq_core_0/rtems/asm.h>
+#elif defined(__rtems_powerpc_qoriq_core_1__)
+#  include <powerpc/qoriq_core_1/rtems/asm.h>
+#elif defined(__rtems_powerpc_qoriq_p1020rdb__)
+#  include <powerpc/qoriq_p1020rdb/rtems/asm.h>
+#elif defined(__rtems_powerpc_score603e__)
+#  include <powerpc/score603e/rtems/asm.h>
+#elif defined(__rtems_powerpc_ss555__)
+#  include <powerpc/ss555/rtems/asm.h>
+#elif defined(__rtems_powerpc_t32mppc__)
+#  include <powerpc/t32mppc/rtems/asm.h>
+#elif defined(__rtems_powerpc_tqm8xx_stk8xx__)
+#  include <powerpc/tqm8xx_stk8xx/rtems/asm.h>
+#elif defined(__rtems_powerpc_virtex__)
+#  include <powerpc/virtex/rtems/asm.h>
+#elif defined(__rtems_powerpc_virtex4__)
+#  include <powerpc/virtex4/rtems/asm.h>
+#elif defined(__rtems_powerpc_virtex5__)
+#  include <powerpc/virtex5/rtems/asm.h>
+#elif defined(__rtems_sh_gensh1__)
+#  include <sh/gensh1/rtems/asm.h>
+#elif defined(__rtems_sh_gensh2__)
+#  include <sh/gensh2/rtems/asm.h>
+#elif defined(__rtems_sh_gensh4__)
+#  include <sh/gensh4/rtems/asm.h>
+#elif defined(__rtems_sh_simsh1__)
+#  include <sh/simsh1/rtems/asm.h>
+#elif defined(__rtems_sh_simsh2__)
+#  include <sh/simsh2/rtems/asm.h>
+#elif defined(__rtems_sh_simsh2e__)
+#  include <sh/simsh2e/rtems/asm.h>
+#elif defined(__rtems_sh_simsh4__)
+#  include <sh/simsh4/rtems/asm.h>
+#elif defined(__rtems_sparc_erc32__)
+#  include <sparc/erc32/rtems/asm.h>
+#elif defined(__rtems_sparc_leon2__)
+#  include <sparc/leon2/rtems/asm.h>
+#elif defined(__rtems_sparc_leon3__)
+#  include <sparc/leon3/rtems/asm.h>
+#elif defined(__rtems_sparc_ngmp__)
+#  include <sparc/ngmp/rtems/asm.h>
+#elif defined(__rtems_sparc_sis__)
+#  include <sparc/sis/rtems/asm.h>
+#elif defined(__rtems_sparc64_niagara__)
+#  include <sparc64/niagara/rtems/asm.h>
+#elif defined(__rtems_sparc64_usiii__)
+#  include <sparc64/usiii/rtems/asm.h>
+#elif defined(__rtems_v850_v850e1sim__)
+#  include <v850/v850e1sim/rtems/asm.h>
+#elif defined(__rtems_v850_v850e2sim__)
+#  include <v850/v850e2sim/rtems/asm.h>
+#elif defined(__rtems_v850_v850e2v3sim__)
+#  include <v850/v850e2v3sim/rtems/asm.h>
+#elif defined(__rtems_v850_v850esim__)
+#  include <v850/v850esim/rtems/asm.h>
+#elif defined(__rtems_v850_v850essim__)
+#  include <v850/v850essim/rtems/asm.h>
+#elif defined(__rtems_v850_v850sim__)
+#  include <v850/v850sim/rtems/asm.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/cpukit/libcsupport/include/rtems/assoc.h b/include/rtems/assoc.h
index c4933159e0..c4933159e0 100644
--- a/cpukit/libcsupport/include/rtems/assoc.h
+++ b/include/rtems/assoc.h
diff --git a/cpukit/libblock/include/rtems/bdbuf.h b/include/rtems/bdbuf.h
index edec05e099..edec05e099 100644
--- a/cpukit/libblock/include/rtems/bdbuf.h
+++ b/include/rtems/bdbuf.h
diff --git a/cpukit/libblock/include/rtems/bdpart.h b/include/rtems/bdpart.h
index 8886c3614d..8886c3614d 100644
--- a/cpukit/libblock/include/rtems/bdpart.h
+++ b/include/rtems/bdpart.h
diff --git a/cpukit/score/cpu/bfin/rtems/bfin/bf52x.h b/include/rtems/bfin/bf52x.h
index 86142a6c62..86142a6c62 100644
--- a/cpukit/score/cpu/bfin/rtems/bfin/bf52x.h
+++ b/include/rtems/bfin/bf52x.h
diff --git a/cpukit/score/cpu/bfin/rtems/bfin/bf533.h b/include/rtems/bfin/bf533.h
index 682aad4bbb..682aad4bbb 100644
--- a/cpukit/score/cpu/bfin/rtems/bfin/bf533.h
+++ b/include/rtems/bfin/bf533.h
diff --git a/cpukit/score/cpu/bfin/rtems/bfin/bfin.h b/include/rtems/bfin/bfin.h
index 4ba0b2b295..4ba0b2b295 100644
--- a/cpukit/score/cpu/bfin/rtems/bfin/bfin.h
+++ b/include/rtems/bfin/bfin.h
diff --git a/cpukit/libblock/include/rtems/blkdev.h b/include/rtems/blkdev.h
index d17cadc796..d17cadc796 100644
--- a/cpukit/libblock/include/rtems/blkdev.h
+++ b/include/rtems/blkdev.h
diff --git a/cpukit/libnetworking/rtems/bsdnet/_types.h b/include/rtems/bsdnet/_types.h
index d557e31c1f..d557e31c1f 100644
--- a/cpukit/libnetworking/rtems/bsdnet/_types.h
+++ b/include/rtems/bsdnet/_types.h
diff --git a/cpukit/libnetworking/rtems/bsdnet/servers.h b/include/rtems/bsdnet/servers.h
index 8886d05405..8886d05405 100644
--- a/cpukit/libnetworking/rtems/bsdnet/servers.h
+++ b/include/rtems/bsdnet/servers.h
diff --git a/cpukit/include/rtems/bspIo.h b/include/rtems/bspIo.h
index df068a1671..df068a1671 100644
--- a/cpukit/include/rtems/bspIo.h
+++ b/include/rtems/bspIo.h
diff --git a/cpukit/libmisc/bspcmdline/bspcmdline.h b/include/rtems/bspcmdline.h
index 51916ff26a..51916ff26a 100644
--- a/cpukit/libmisc/bspcmdline/bspcmdline.h
+++ b/include/rtems/bspcmdline.h
diff --git a/cpukit/include/rtems/btimer.h b/include/rtems/btimer.h
index c424e7e9ed..c424e7e9ed 100644
--- a/cpukit/include/rtems/btimer.h
+++ b/include/rtems/btimer.h
diff --git a/cpukit/libmisc/capture/capture-cli.h b/include/rtems/capture-cli.h
index 7f0776655b..7f0776655b 100644
--- a/cpukit/libmisc/capture/capture-cli.h
+++ b/include/rtems/capture-cli.h
diff --git a/cpukit/libmisc/capture/capture.h b/include/rtems/capture.h
index 63d1343ccd..63d1343ccd 100644
--- a/cpukit/libmisc/capture/capture.h
+++ b/include/rtems/capture.h
diff --git a/cpukit/libmisc/capture/captureimpl.h b/include/rtems/captureimpl.h
index 77a6f078e9..77a6f078e9 100644
--- a/cpukit/libmisc/capture/captureimpl.h
+++ b/include/rtems/captureimpl.h
diff --git a/cpukit/sapi/include/rtems/cbs.h b/include/rtems/cbs.h
index a42061ddc0..a42061ddc0 100644
--- a/cpukit/sapi/include/rtems/cbs.h
+++ b/include/rtems/cbs.h
diff --git a/cpukit/sapi/include/rtems/chain.h b/include/rtems/chain.h
index 8da355da0c..8da355da0c 100644
--- a/cpukit/sapi/include/rtems/chain.h
+++ b/include/rtems/chain.h
diff --git a/cpukit/libcsupport/include/clockdrv.h b/include/rtems/clockdrv.h
index 5d7a92c515..5d7a92c515 100644
--- a/cpukit/libcsupport/include/clockdrv.h
+++ b/include/rtems/clockdrv.h
diff --git a/cpukit/include/rtems/concat.h b/include/rtems/concat.h
index 022f1bfd39..022f1bfd39 100644
--- a/cpukit/include/rtems/concat.h
+++ b/include/rtems/concat.h
diff --git a/cpukit/sapi/include/confdefs.h b/include/rtems/confdefs.h
index 595dac5807..595dac5807 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/include/rtems/confdefs.h
diff --git a/cpukit/sapi/include/rtems/config.h b/include/rtems/config.h
index 9a9d0a3694..9a9d0a3694 100644
--- a/cpukit/sapi/include/rtems/config.h
+++ b/include/rtems/config.h
diff --git a/cpukit/libcsupport/include/console.h b/include/rtems/console.h
index dbd749c60a..dbd749c60a 100644
--- a/cpukit/libcsupport/include/console.h
+++ b/include/rtems/console.h
diff --git a/cpukit/sapi/include/rtems/counter.h b/include/rtems/counter.h
index bc46925fea..bc46925fea 100644
--- a/cpukit/sapi/include/rtems/counter.h
+++ b/include/rtems/counter.h
diff --git a/cpukit/libmisc/cpuuse/cpuuse.h b/include/rtems/cpuuse.h
index 662d905eb0..662d905eb0 100644
--- a/cpukit/libmisc/cpuuse/cpuuse.h
+++ b/include/rtems/cpuuse.h
diff --git a/cpukit/score/include/rtems/debug.h b/include/rtems/debug.h
index 067de4e0ed..067de4e0ed 100644
--- a/cpukit/score/include/rtems/debug.h
+++ b/include/rtems/debug.h
diff --git a/cpukit/libfs/src/devfs/devfs.h b/include/rtems/devfs.h
index 0213e072f9..0213e072f9 100644
--- a/cpukit/libfs/src/devfs/devfs.h
+++ b/include/rtems/devfs.h
diff --git a/cpukit/libcsupport/include/rtems/deviceio.h b/include/rtems/deviceio.h
index a448fc7bb4..a448fc7bb4 100644
--- a/cpukit/libcsupport/include/rtems/deviceio.h
+++ b/include/rtems/deviceio.h
diff --git a/cpukit/libmisc/devnull/devnull.h b/include/rtems/devnull.h
index 39081f478b..39081f478b 100644
--- a/cpukit/libmisc/devnull/devnull.h
+++ b/include/rtems/devnull.h
diff --git a/cpukit/libmisc/devnull/devzero.h b/include/rtems/devzero.h
index bc47d3ea09..bc47d3ea09 100644
--- a/cpukit/libmisc/devnull/devzero.h
+++ b/include/rtems/devzero.h
diff --git a/cpukit/libnetworking/rtems/dhcp.h b/include/rtems/dhcp.h
index eb7f42d2fd..eb7f42d2fd 100644
--- a/cpukit/libnetworking/rtems/dhcp.h
+++ b/include/rtems/dhcp.h
diff --git a/cpukit/libblock/include/rtems/diskdevs.h b/include/rtems/diskdevs.h
index 3940c5710d..3940c5710d 100644
--- a/cpukit/libblock/include/rtems/diskdevs.h
+++ b/include/rtems/diskdevs.h
diff --git a/cpukit/libfs/src/dosfs/dosfs.h b/include/rtems/dosfs.h
index 481279e47b..481279e47b 100644
--- a/cpukit/libfs/src/dosfs/dosfs.h
+++ b/include/rtems/dosfs.h
diff --git a/cpukit/libmisc/dumpbuf/dumpbuf.h b/include/rtems/dumpbuf.h
index d714879ab4..d714879ab4 100644
--- a/cpukit/libmisc/dumpbuf/dumpbuf.h
+++ b/include/rtems/dumpbuf.h
diff --git a/cpukit/include/rtems/endian.h b/include/rtems/endian.h
index 74ef1c4172..74ef1c4172 100644
--- a/cpukit/include/rtems/endian.h
+++ b/include/rtems/endian.h
diff --git a/cpukit/libcsupport/include/rtems/error.h b/include/rtems/error.h
index cbcfa98614..cbcfa98614 100644
--- a/cpukit/libcsupport/include/rtems/error.h
+++ b/include/rtems/error.h
diff --git a/cpukit/sapi/include/rtems/extension.h b/include/rtems/extension.h
index 950af8e097..950af8e097 100644
--- a/cpukit/sapi/include/rtems/extension.h
+++ b/include/rtems/extension.h
diff --git a/cpukit/sapi/include/rtems/extensionimpl.h b/include/rtems/extensionimpl.h
index 487bdb4024..487bdb4024 100644
--- a/cpukit/sapi/include/rtems/extensionimpl.h
+++ b/include/rtems/extensionimpl.h
diff --git a/cpukit/sapi/include/rtems/fatal.h b/include/rtems/fatal.h
index 6e5986aeb6..6e5986aeb6 100644
--- a/cpukit/sapi/include/rtems/fatal.h
+++ b/include/rtems/fatal.h
diff --git a/cpukit/libmisc/fb/fb.h b/include/rtems/fb.h
index e268418a3a..e268418a3a 100644
--- a/cpukit/libmisc/fb/fb.h
+++ b/include/rtems/fb.h
diff --git a/cpukit/libblock/include/rtems/flashdisk.h b/include/rtems/flashdisk.h
index ec353096ad..ec353096ad 100644
--- a/cpukit/libblock/include/rtems/flashdisk.h
+++ b/include/rtems/flashdisk.h
diff --git a/cpukit/libcsupport/include/rtems/framebuffer.h b/include/rtems/framebuffer.h
index ab1e5c73bd..ab1e5c73bd 100644
--- a/cpukit/libcsupport/include/rtems/framebuffer.h
+++ b/include/rtems/framebuffer.h
diff --git a/cpukit/include/rtems/fs.h b/include/rtems/fs.h
index 4801007c1a..4801007c1a 100644
--- a/cpukit/include/rtems/fs.h
+++ b/include/rtems/fs.h
diff --git a/cpukit/libmisc/fsmount/fsmount.h b/include/rtems/fsmount.h
index 82161f1adc..82161f1adc 100644
--- a/cpukit/libmisc/fsmount/fsmount.h
+++ b/include/rtems/fsmount.h
diff --git a/cpukit/ftpd/ftpd.h b/include/rtems/ftpd.h
index f33ca59d3a..f33ca59d3a 100644
--- a/cpukit/ftpd/ftpd.h
+++ b/include/rtems/ftpd.h
diff --git a/cpukit/libnetworking/rtems/ftpfs.h b/include/rtems/ftpfs.h
index c1f615b85b..c1f615b85b 100644
--- a/cpukit/libnetworking/rtems/ftpfs.h
+++ b/include/rtems/ftpfs.h
diff --git a/cpukit/libcsupport/include/rtems/gxx_wrappers.h b/include/rtems/gxx_wrappers.h
index 94502b937f..94502b937f 100644
--- a/cpukit/libcsupport/include/rtems/gxx_wrappers.h
+++ b/include/rtems/gxx_wrappers.h
diff --git a/cpukit/libblock/include/rtems/ide_part_table.h b/include/rtems/ide_part_table.h
index 261135cccd..261135cccd 100644
--- a/cpukit/libblock/include/rtems/ide_part_table.h
+++ b/include/rtems/ide_part_table.h
diff --git a/cpukit/libfs/src/imfs/imfs.h b/include/rtems/imfs.h
index 7dca51f97a..7dca51f97a 100644
--- a/cpukit/libfs/src/imfs/imfs.h
+++ b/include/rtems/imfs.h
diff --git a/cpukit/sapi/include/rtems/init.h b/include/rtems/init.h
index 8ddad2600a..8ddad2600a 100644
--- a/cpukit/sapi/include/rtems/init.h
+++ b/include/rtems/init.h
diff --git a/cpukit/sapi/include/rtems/io.h b/include/rtems/io.h
index ce750b0f69..ce750b0f69 100644
--- a/cpukit/sapi/include/rtems/io.h
+++ b/include/rtems/io.h
diff --git a/cpukit/libcsupport/include/iosupp.h b/include/rtems/iosupp.h
index 9fe8a6ab1d..9fe8a6ab1d 100644
--- a/cpukit/libcsupport/include/iosupp.h
+++ b/include/rtems/iosupp.h
diff --git a/cpukit/include/rtems/irq-extension.h b/include/rtems/irq-extension.h
index 01e61c9862..01e61c9862 100644
--- a/cpukit/include/rtems/irq-extension.h
+++ b/include/rtems/irq-extension.h
diff --git a/cpukit/include/rtems/irq.h b/include/rtems/irq.h
index e92d0dd5f5..e92d0dd5f5 100644
--- a/cpukit/include/rtems/irq.h
+++ b/include/rtems/irq.h
diff --git a/cpukit/libfs/src/jffs2/include/rtems/jffs2.h b/include/rtems/jffs2.h
index 7b2f4d5de2..7b2f4d5de2 100644
--- a/cpukit/libfs/src/jffs2/include/rtems/jffs2.h
+++ b/include/rtems/jffs2.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/kd.h b/include/rtems/kd.h
index c97e4f7bdd..c97e4f7bdd 100644
--- a/c/src/lib/libbsp/i386/pc386/console/kd.h
+++ b/include/rtems/kd.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/keyboard.h b/include/rtems/keyboard.h
index ffc8aabfbd..ffc8aabfbd 100644
--- a/c/src/lib/libbsp/i386/pc386/console/keyboard.h
+++ b/include/rtems/keyboard.h
diff --git a/cpukit/libcsupport/include/rtems/libcsupport.h b/include/rtems/libcsupport.h
index e4ae0aea63..e4ae0aea63 100644
--- a/cpukit/libcsupport/include/rtems/libcsupport.h
+++ b/include/rtems/libcsupport.h
diff --git a/cpukit/libi2c/libi2c.h b/include/rtems/libi2c.h
index 27bf94cb97..27bf94cb97 100644
--- a/cpukit/libi2c/libi2c.h
+++ b/include/rtems/libi2c.h
diff --git a/cpukit/libcsupport/include/rtems/libio.h b/include/rtems/libio.h
index dabee60910..dabee60910 100644
--- a/cpukit/libcsupport/include/rtems/libio.h
+++ b/include/rtems/libio.h
diff --git a/cpukit/libcsupport/include/rtems/libio_.h b/include/rtems/libio_.h
index 458201ea3f..458201ea3f 100644
--- a/cpukit/libcsupport/include/rtems/libio_.h
+++ b/include/rtems/libio_.h
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/m68302.h b/include/rtems/m68k/m68302.h
index acf55f50c5..acf55f50c5 100644
--- a/cpukit/score/cpu/m68k/rtems/m68k/m68302.h
+++ b/include/rtems/m68k/m68302.h
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/m68360.h b/include/rtems/m68k/m68360.h
index dc181d0cdf..dc181d0cdf 100644
--- a/cpukit/score/cpu/m68k/rtems/m68k/m68360.h
+++ b/include/rtems/m68k/m68360.h
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/qsm.h b/include/rtems/m68k/qsm.h
index 32dbc1d5f9..32dbc1d5f9 100644
--- a/cpukit/score/cpu/m68k/rtems/m68k/qsm.h
+++ b/include/rtems/m68k/qsm.h
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/sim.h b/include/rtems/m68k/sim.h
index cec6b84cc1..cec6b84cc1 100644
--- a/cpukit/score/cpu/m68k/rtems/m68k/sim.h
+++ b/include/rtems/m68k/sim.h
diff --git a/cpukit/libcsupport/include/rtems/malloc.h b/include/rtems/malloc.h
index 7c00f21e77..7c00f21e77 100644
--- a/cpukit/libcsupport/include/rtems/malloc.h
+++ b/include/rtems/malloc.h
diff --git a/cpukit/libblock/include/rtems/media.h b/include/rtems/media.h
index 77a1aa8348..77a1aa8348 100644
--- a/cpukit/libblock/include/rtems/media.h
+++ b/include/rtems/media.h
diff --git a/cpukit/score/cpu/mips/rtems/mips/idtcpu.h b/include/rtems/mips/idtcpu.h
index 927bbec133..927bbec133 100644
--- a/cpukit/score/cpu/mips/rtems/mips/idtcpu.h
+++ b/include/rtems/mips/idtcpu.h
diff --git a/cpukit/score/cpu/mips/rtems/mips/iregdef.h b/include/rtems/mips/iregdef.h
index 5d41074184..5d41074184 100644
--- a/cpukit/score/cpu/mips/rtems/mips/iregdef.h
+++ b/include/rtems/mips/iregdef.h
diff --git a/cpukit/libnetworking/rtems/mkrootfs.h b/include/rtems/mkrootfs.h
index 648b71197b..648b71197b 100644
--- a/cpukit/libnetworking/rtems/mkrootfs.h
+++ b/include/rtems/mkrootfs.h
diff --git a/cpukit/libmisc/monitor/monitor.h b/include/rtems/monitor.h
index 6a85d602eb..6a85d602eb 100644
--- a/cpukit/libmisc/monitor/monitor.h
+++ b/include/rtems/monitor.h
diff --git a/cpukit/libcsupport/include/motorola/mc68230.h b/include/rtems/motorola/mc68230.h
index 2f94e0011c..2f94e0011c 100644
--- a/cpukit/libcsupport/include/motorola/mc68230.h
+++ b/include/rtems/motorola/mc68230.h
diff --git a/cpukit/libcsupport/include/motorola/mc68681.h b/include/rtems/motorola/mc68681.h
index 83a7d1f461..83a7d1f461 100644
--- a/cpukit/libcsupport/include/motorola/mc68681.h
+++ b/include/rtems/motorola/mc68681.h
diff --git a/cpukit/libmisc/mouse/mouse_parser.h b/include/rtems/mouse_parser.h
index 27bea1bbbc..27bea1bbbc 100644
--- a/cpukit/libmisc/mouse/mouse_parser.h
+++ b/include/rtems/mouse_parser.h
diff --git a/cpukit/sapi/include/rtems/mptables.h b/include/rtems/mptables.h
index 01e5b653b4..01e5b653b4 100644
--- a/cpukit/sapi/include/rtems/mptables.h
+++ b/include/rtems/mptables.h
diff --git a/cpukit/libmisc/fb/mw_uid.h b/include/rtems/mw_uid.h
index 8a10a8f38c..8a10a8f38c 100644
--- a/cpukit/libmisc/fb/mw_uid.h
+++ b/include/rtems/mw_uid.h
diff --git a/cpukit/libblock/include/rtems/nvdisk-sram.h b/include/rtems/nvdisk-sram.h
index 3acaf600b6..3acaf600b6 100644
--- a/cpukit/libblock/include/rtems/nvdisk-sram.h
+++ b/include/rtems/nvdisk-sram.h
diff --git a/cpukit/libblock/include/rtems/nvdisk.h b/include/rtems/nvdisk.h
index 5570fb8c6b..5570fb8c6b 100644
--- a/cpukit/libblock/include/rtems/nvdisk.h
+++ b/include/rtems/nvdisk.h
diff --git a/cpukit/telnetd/passwd.h b/include/rtems/passwd.h
index 8d5c299a5e..8d5c299a5e 100644
--- a/cpukit/telnetd/passwd.h
+++ b/include/rtems/passwd.h
diff --git a/cpukit/include/rtems/pci.h b/include/rtems/pci.h
index 86ab4af241..86ab4af241 100644
--- a/cpukit/include/rtems/pci.h
+++ b/include/rtems/pci.h
diff --git a/cpukit/libfs/src/pipe/pipe.h b/include/rtems/pipe.h
index 7c6566ad50..7c6566ad50 100644
--- a/cpukit/libfs/src/pipe/pipe.h
+++ b/include/rtems/pipe.h
diff --git a/cpukit/posix/include/rtems/posix/aio_misc.h b/include/rtems/posix/aio_misc.h
index aeccbad98f..aeccbad98f 100644
--- a/cpukit/posix/include/rtems/posix/aio_misc.h
+++ b/include/rtems/posix/aio_misc.h
diff --git a/cpukit/posix/include/rtems/posix/barrier.h b/include/rtems/posix/barrier.h
index e445586511..e445586511 100644
--- a/cpukit/posix/include/rtems/posix/barrier.h
+++ b/include/rtems/posix/barrier.h
diff --git a/cpukit/posix/include/rtems/posix/barrierimpl.h b/include/rtems/posix/barrierimpl.h
index 240abad45d..240abad45d 100644
--- a/cpukit/posix/include/rtems/posix/barrierimpl.h
+++ b/include/rtems/posix/barrierimpl.h
diff --git a/cpukit/posix/include/rtems/posix/cancel.h b/include/rtems/posix/cancel.h
index fd066e9175..fd066e9175 100644
--- a/cpukit/posix/include/rtems/posix/cancel.h
+++ b/include/rtems/posix/cancel.h
diff --git a/cpukit/posix/include/rtems/posix/cond.h b/include/rtems/posix/cond.h
index 00a0fdb9a4..00a0fdb9a4 100644
--- a/cpukit/posix/include/rtems/posix/cond.h
+++ b/include/rtems/posix/cond.h
diff --git a/cpukit/posix/include/rtems/posix/condimpl.h b/include/rtems/posix/condimpl.h
index 435127ee3c..435127ee3c 100644
--- a/cpukit/posix/include/rtems/posix/condimpl.h
+++ b/include/rtems/posix/condimpl.h
diff --git a/cpukit/posix/include/rtems/posix/config.h b/include/rtems/posix/config.h
index 08d764b46a..08d764b46a 100644
--- a/cpukit/posix/include/rtems/posix/config.h
+++ b/include/rtems/posix/config.h
diff --git a/cpukit/posix/include/rtems/posix/key.h b/include/rtems/posix/key.h
index 6e52544686..6e52544686 100644
--- a/cpukit/posix/include/rtems/posix/key.h
+++ b/include/rtems/posix/key.h
diff --git a/cpukit/posix/include/rtems/posix/keyimpl.h b/include/rtems/posix/keyimpl.h
index a5c80d625b..a5c80d625b 100644
--- a/cpukit/posix/include/rtems/posix/keyimpl.h
+++ b/include/rtems/posix/keyimpl.h
diff --git a/cpukit/posix/include/rtems/posix/mqueue.h b/include/rtems/posix/mqueue.h
index 473183d4bc..473183d4bc 100644
--- a/cpukit/posix/include/rtems/posix/mqueue.h
+++ b/include/rtems/posix/mqueue.h
diff --git a/cpukit/posix/include/rtems/posix/mqueueimpl.h b/include/rtems/posix/mqueueimpl.h
index bfc850d990..bfc850d990 100644
--- a/cpukit/posix/include/rtems/posix/mqueueimpl.h
+++ b/include/rtems/posix/mqueueimpl.h
diff --git a/cpukit/posix/include/rtems/posix/mutex.h b/include/rtems/posix/mutex.h
index 5243d4cbbb..5243d4cbbb 100644
--- a/cpukit/posix/include/rtems/posix/mutex.h
+++ b/include/rtems/posix/mutex.h
diff --git a/cpukit/posix/include/rtems/posix/muteximpl.h b/include/rtems/posix/muteximpl.h
index e5955a6fdd..e5955a6fdd 100644
--- a/cpukit/posix/include/rtems/posix/muteximpl.h
+++ b/include/rtems/posix/muteximpl.h
diff --git a/cpukit/posix/include/rtems/posix/posixapi.h b/include/rtems/posix/posixapi.h
index ec8b8453ff..ec8b8453ff 100644
--- a/cpukit/posix/include/rtems/posix/posixapi.h
+++ b/include/rtems/posix/posixapi.h
diff --git a/cpukit/posix/include/rtems/posix/priorityimpl.h b/include/rtems/posix/priorityimpl.h
index 169254d22f..169254d22f 100644
--- a/cpukit/posix/include/rtems/posix/priorityimpl.h
+++ b/include/rtems/posix/priorityimpl.h
diff --git a/cpukit/posix/include/rtems/posix/psignal.h b/include/rtems/posix/psignal.h
index ed98442e32..ed98442e32 100644
--- a/cpukit/posix/include/rtems/posix/psignal.h
+++ b/include/rtems/posix/psignal.h
diff --git a/cpukit/posix/include/rtems/posix/psignalimpl.h b/include/rtems/posix/psignalimpl.h
index 81561e2539..81561e2539 100644
--- a/cpukit/posix/include/rtems/posix/psignalimpl.h
+++ b/include/rtems/posix/psignalimpl.h
diff --git a/cpukit/posix/include/rtems/posix/pthread.h b/include/rtems/posix/pthread.h
index 05783ff4ad..05783ff4ad 100644
--- a/cpukit/posix/include/rtems/posix/pthread.h
+++ b/include/rtems/posix/pthread.h
diff --git a/cpukit/posix/include/rtems/posix/pthreadimpl.h b/include/rtems/posix/pthreadimpl.h
index d0dc330643..d0dc330643 100644
--- a/cpukit/posix/include/rtems/posix/pthreadimpl.h
+++ b/include/rtems/posix/pthreadimpl.h
diff --git a/cpukit/posix/include/rtems/posix/ptimer.h b/include/rtems/posix/ptimer.h
index 7cc0516154..7cc0516154 100644
--- a/cpukit/posix/include/rtems/posix/ptimer.h
+++ b/include/rtems/posix/ptimer.h
diff --git a/cpukit/posix/include/rtems/posix/rwlock.h b/include/rtems/posix/rwlock.h
index 3d33d40915..3d33d40915 100644
--- a/cpukit/posix/include/rtems/posix/rwlock.h
+++ b/include/rtems/posix/rwlock.h
diff --git a/cpukit/posix/include/rtems/posix/rwlockimpl.h b/include/rtems/posix/rwlockimpl.h
index 48e0a17366..48e0a17366 100644
--- a/cpukit/posix/include/rtems/posix/rwlockimpl.h
+++ b/include/rtems/posix/rwlockimpl.h
diff --git a/cpukit/posix/include/rtems/posix/semaphore.h b/include/rtems/posix/semaphore.h
index 5aef39b7ec..5aef39b7ec 100644
--- a/cpukit/posix/include/rtems/posix/semaphore.h
+++ b/include/rtems/posix/semaphore.h
diff --git a/cpukit/posix/include/rtems/posix/semaphoreimpl.h b/include/rtems/posix/semaphoreimpl.h
index df5e5238de..df5e5238de 100644
--- a/cpukit/posix/include/rtems/posix/semaphoreimpl.h
+++ b/include/rtems/posix/semaphoreimpl.h
diff --git a/cpukit/posix/include/rtems/posix/sigset.h b/include/rtems/posix/sigset.h
index 96bcc086ba..96bcc086ba 100644
--- a/cpukit/posix/include/rtems/posix/sigset.h
+++ b/include/rtems/posix/sigset.h
diff --git a/cpukit/posix/include/rtems/posix/spinlock.h b/include/rtems/posix/spinlock.h
index 8da451ce22..8da451ce22 100644
--- a/cpukit/posix/include/rtems/posix/spinlock.h
+++ b/include/rtems/posix/spinlock.h
diff --git a/cpukit/posix/include/rtems/posix/spinlockimpl.h b/include/rtems/posix/spinlockimpl.h
index 8a2f58360d..8a2f58360d 100644
--- a/cpukit/posix/include/rtems/posix/spinlockimpl.h
+++ b/include/rtems/posix/spinlockimpl.h
diff --git a/include/rtems/posix/threadsup.h b/include/rtems/posix/threadsup.h
new file mode 100644
index 0000000000..48f0727b30
--- /dev/null
+++ b/include/rtems/posix/threadsup.h
@@ -0,0 +1,127 @@
+/**
+ * @file
+ * 
+ * @brief POSIX Thread API Support
+ *
+ * This defines the POSIX thread API extension.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2014.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.org/license/LICENSE.
+ */
+
+#ifndef _RTEMS_POSIX_THREADSUP_H
+#define _RTEMS_POSIX_THREADSUP_H
+
+#include <rtems/score/coresem.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/threadq.h>
+#include <rtems/score/watchdog.h>
+
+#include <rtems/posix/pthread.h>
+#include <signal.h>
+
+/**
+ *  @defgroup POSIX_THREAD POSIX Thread API Extension
+ *
+ *  @ingroup POSIXAPI
+ * 
+ */
+/**@{**/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * This defines the POSIX API support structure associated with
+ * each thread in a system with POSIX configured.
+ */
+typedef struct {
+  /** This is the POSIX threads attribute set. */
+  pthread_attr_t          Attributes;
+  /** This indicates whether the thread is attached or detached. */
+  int                     detachstate;
+  /** This is the set of threads waiting for the thread to exit. */
+  Thread_queue_Control    Join_List;
+  /** This is the thread's current scheduling policy. */
+  int                     schedpolicy;
+  /** This is the thread's current set of scheduling parameters. */
+  struct sched_param      schedparam;
+  /**
+   * This is the high priority to execute at when using the sporadic
+   * scheduler.
+   */
+  int                     ss_high_priority;
+  /**
+   * This is the timer which controls when the thread executes at
+   * high and low priority when using the sporadic scheduler.
+   */
+  Watchdog_Control        Sporadic_timer;
+
+  /** This is the set of signals which are currently blocked. */
+  sigset_t                signals_blocked;
+  /** This is the set of signals which are currently pending. */
+  sigset_t                signals_pending;
+
+  /**
+   * @brief Signal post-switch action in case signals are pending.
+   */
+  Thread_Action           Signal_action;
+
+  /*******************************************************************/
+  /*******************************************************************/
+  /***************         POSIX Cancelability         ***************/
+  /*******************************************************************/
+  /*******************************************************************/
+
+  /** This is the cancelability state. */
+  int                     cancelability_state;
+  /** This is the cancelability type. */
+  int                     cancelability_type;
+  /** This indicates if a cancelation has been requested. */
+  int                     cancelation_requested;
+#ifndef HAVE_STRUCT__PTHREAD_CLEANUP_CONTEXT
+  /** This is the set of cancelation handlers. */
+  Chain_Control           Cancellation_Handlers;
+#else /* HAVE_STRUCT__PTHREAD_CLEANUP_CONTEXT */
+  /**
+   * @brief LIFO list of cleanup contexts.
+   */
+  struct _pthread_cleanup_context *last_cleanup_context;
+#endif /* HAVE_STRUCT__PTHREAD_CLEANUP_CONTEXT */
+
+} POSIX_API_Control;
+
+/**
+ * @brief POSIX thread exit shared helper.
+ *
+ * 16.1.5.1 Thread Termination, p1003.1c/Draft 10, p. 150
+ *
+ * This method is a helper routine which ensures that all
+ * POSIX thread calls which result in a thread exiting will
+ * do so in the same manner.
+ *
+ * @param[in] the_thread is a pointer to the thread exiting or being canceled
+ * @param[in] value_ptr is a pointer the value to be returned by the thread
+ *
+ * NOTE: Key destructors are executed in the POSIX api delete extension.
+ *
+ */
+void _POSIX_Thread_Exit(
+  Thread_Control *the_thread,
+  void           *value_ptr
+);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* end of include file */
diff --git a/cpukit/posix/include/rtems/posix/time.h b/include/rtems/posix/time.h
index 4eea228a6d..4eea228a6d 100644
--- a/cpukit/posix/include/rtems/posix/time.h
+++ b/include/rtems/posix/time.h
diff --git a/cpukit/posix/include/rtems/posix/timer.h b/include/rtems/posix/timer.h
index 79fe093219..79fe093219 100644
--- a/cpukit/posix/include/rtems/posix/timer.h
+++ b/include/rtems/posix/timer.h
diff --git a/cpukit/posix/include/rtems/posix/timerimpl.h b/include/rtems/posix/timerimpl.h
index b297d3205a..b297d3205a 100644
--- a/cpukit/posix/include/rtems/posix/timerimpl.h
+++ b/include/rtems/posix/timerimpl.h
diff --git a/c/src/lib/libcpu/powerpc/rtems/powerpc/cache.h b/include/rtems/powerpc/cache.h
index 1fdc75ae8b..1fdc75ae8b 100644
--- a/c/src/lib/libcpu/powerpc/rtems/powerpc/cache.h
+++ b/include/rtems/powerpc/cache.h
diff --git a/c/src/lib/libcpu/powerpc/rtems/powerpc/debugmod.h b/include/rtems/powerpc/debugmod.h
index 61b650695c..61b650695c 100644
--- a/c/src/lib/libcpu/powerpc/rtems/powerpc/debugmod.h
+++ b/include/rtems/powerpc/debugmod.h
diff --git a/c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h b/include/rtems/powerpc/powerpc.h
index 9b9f738c6c..9b9f738c6c 100644
--- a/c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h
+++ b/include/rtems/powerpc/powerpc.h
diff --git a/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h b/include/rtems/powerpc/registers.h
index 555641077f..555641077f 100644
--- a/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h
+++ b/include/rtems/powerpc/registers.h
diff --git a/cpukit/sapi/include/rtems/profiling.h b/include/rtems/profiling.h
index 836e6d890e..836e6d890e 100644
--- a/cpukit/sapi/include/rtems/profiling.h
+++ b/include/rtems/profiling.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/ps2_drv.h b/include/rtems/ps2_drv.h
index 536b56a6ed..536b56a6ed 100644
--- a/c/src/lib/libbsp/i386/pc386/console/ps2_drv.h
+++ b/include/rtems/ps2_drv.h
diff --git a/cpukit/telnetd/pty.h b/include/rtems/pty.h
index 1d86294c44..1d86294c44 100644
--- a/cpukit/telnetd/pty.h
+++ b/include/rtems/pty.h
diff --git a/cpukit/libqos/qreslib.h b/include/rtems/qreslib.h
index 3de8668fdb..3de8668fdb 100644
--- a/cpukit/libqos/qreslib.h
+++ b/include/rtems/qreslib.h
diff --git a/cpukit/libblock/include/rtems/ramdisk.h b/include/rtems/ramdisk.h
index 727efddbe8..727efddbe8 100644
--- a/cpukit/libblock/include/rtems/ramdisk.h
+++ b/include/rtems/ramdisk.h
diff --git a/cpukit/sapi/include/rtems/rbheap.h b/include/rtems/rbheap.h
index c008721b23..c008721b23 100644
--- a/cpukit/sapi/include/rtems/rbheap.h
+++ b/include/rtems/rbheap.h
diff --git a/cpukit/sapi/include/rtems/rbtree.h b/include/rtems/rbtree.h
index 900506fdc7..900506fdc7 100644
--- a/cpukit/sapi/include/rtems/rbtree.h
+++ b/include/rtems/rbtree.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h b/include/rtems/rfs/rtems-rfs-bitmaps.h
index 5574339421..5574339421 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h
+++ b/include/rtems/rfs/rtems-rfs-bitmaps.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-block-pos.h b/include/rtems/rfs/rtems-rfs-block-pos.h
index 7d0f0693be..7d0f0693be 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-block-pos.h
+++ b/include/rtems/rfs/rtems-rfs-block-pos.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-block.h b/include/rtems/rfs/rtems-rfs-block.h
index 394853b7ad..394853b7ad 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-block.h
+++ b/include/rtems/rfs/rtems-rfs-block.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-buffer.h b/include/rtems/rfs/rtems-rfs-buffer.h
index f5fe9d48e2..f5fe9d48e2 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-buffer.h
+++ b/include/rtems/rfs/rtems-rfs-buffer.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-data.h b/include/rtems/rfs/rtems-rfs-data.h
index 6217e74587..6217e74587 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-data.h
+++ b/include/rtems/rfs/rtems-rfs-data.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-dir-hash.h b/include/rtems/rfs/rtems-rfs-dir-hash.h
index d9a8a2004f..d9a8a2004f 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-dir-hash.h
+++ b/include/rtems/rfs/rtems-rfs-dir-hash.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-dir.h b/include/rtems/rfs/rtems-rfs-dir.h
index ae3647d03c..ae3647d03c 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-dir.h
+++ b/include/rtems/rfs/rtems-rfs-dir.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file-system-fwd.h b/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/include/rtems/rfs/rtems-rfs-file-system-fwd.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file-system.h b/include/rtems/rfs/rtems-rfs-file-system.h
index e00b142532..e00b142532 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-file-system.h
+++ b/include/rtems/rfs/rtems-rfs-file-system.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file.h b/include/rtems/rfs/rtems-rfs-file.h
index 772e846143..772e846143 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-file.h
+++ b/include/rtems/rfs/rtems-rfs-file.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-group.h b/include/rtems/rfs/rtems-rfs-group.h
index 23e6434b2c..23e6434b2c 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-group.h
+++ b/include/rtems/rfs/rtems-rfs-group.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-inode.h b/include/rtems/rfs/rtems-rfs-inode.h
index 95861ea8a7..95861ea8a7 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-inode.h
+++ b/include/rtems/rfs/rtems-rfs-inode.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-link.h b/include/rtems/rfs/rtems-rfs-link.h
index d30814aaff..d30814aaff 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-link.h
+++ b/include/rtems/rfs/rtems-rfs-link.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-mutex.h b/include/rtems/rfs/rtems-rfs-mutex.h
index 606fd53233..606fd53233 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-mutex.h
+++ b/include/rtems/rfs/rtems-rfs-mutex.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-trace.h b/include/rtems/rfs/rtems-rfs-trace.h
index 4d6d0c9ddb..4d6d0c9ddb 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-trace.h
+++ b/include/rtems/rfs/rtems-rfs-trace.h
diff --git a/cpukit/libcsupport/include/ringbuf.h b/include/rtems/ringbuf.h
index c16a79d1ae..c16a79d1ae 100644
--- a/cpukit/libcsupport/include/ringbuf.h
+++ b/include/rtems/ringbuf.h
diff --git a/cpukit/libcsupport/include/rtc.h b/include/rtems/rtc.h
index 27b9e453c5..27b9e453c5 100644
--- a/cpukit/libcsupport/include/rtc.h
+++ b/include/rtems/rtc.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-format.h b/include/rtems/rtems-rfs-format.h
index f65cce1789..f65cce1789 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-format.h
+++ b/include/rtems/rtems-rfs-format.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-shell.h b/include/rtems/rtems-rfs-shell.h
index c2e1108a47..c2e1108a47 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-shell.h
+++ b/include/rtems/rtems-rfs-shell.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs.h b/include/rtems/rtems-rfs.h
index 958f9a636b..958f9a636b 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs.h
+++ b/include/rtems/rtems-rfs.h
diff --git a/cpukit/rtems/include/rtems/rtems/asr.h b/include/rtems/rtems/asr.h
index 0110a404c2..0110a404c2 100644
--- a/cpukit/rtems/include/rtems/rtems/asr.h
+++ b/include/rtems/rtems/asr.h
diff --git a/cpukit/rtems/include/rtems/rtems/asrimpl.h b/include/rtems/rtems/asrimpl.h
index 38ee35d83a..38ee35d83a 100644
--- a/cpukit/rtems/include/rtems/rtems/asrimpl.h
+++ b/include/rtems/rtems/asrimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/attr.h b/include/rtems/rtems/attr.h
index 7e8fa4818a..7e8fa4818a 100644
--- a/cpukit/rtems/include/rtems/rtems/attr.h
+++ b/include/rtems/rtems/attr.h
diff --git a/cpukit/rtems/include/rtems/rtems/attrimpl.h b/include/rtems/rtems/attrimpl.h
index a32c37096d..a32c37096d 100644
--- a/cpukit/rtems/include/rtems/rtems/attrimpl.h
+++ b/include/rtems/rtems/attrimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/barrier.h b/include/rtems/rtems/barrier.h
index 8c3b9d3022..8c3b9d3022 100644
--- a/cpukit/rtems/include/rtems/rtems/barrier.h
+++ b/include/rtems/rtems/barrier.h
diff --git a/cpukit/rtems/include/rtems/rtems/barrierimpl.h b/include/rtems/rtems/barrierimpl.h
index 963ebd93da..963ebd93da 100644
--- a/cpukit/rtems/include/rtems/rtems/barrierimpl.h
+++ b/include/rtems/rtems/barrierimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/barriermp.h b/include/rtems/rtems/barriermp.h
index c4c2e9814b..c4c2e9814b 100644
--- a/cpukit/rtems/include/rtems/rtems/barriermp.h
+++ b/include/rtems/rtems/barriermp.h
diff --git a/cpukit/rtems/include/rtems/rtems/cache.h b/include/rtems/rtems/cache.h
index a7dcaa60fd..a7dcaa60fd 100644
--- a/cpukit/rtems/include/rtems/rtems/cache.h
+++ b/include/rtems/rtems/cache.h
diff --git a/cpukit/rtems/include/rtems/rtems/clock.h b/include/rtems/rtems/clock.h
index 7595f5e8c4..7595f5e8c4 100644
--- a/cpukit/rtems/include/rtems/rtems/clock.h
+++ b/include/rtems/rtems/clock.h
diff --git a/cpukit/rtems/include/rtems/rtems/config.h b/include/rtems/rtems/config.h
index 4b2c54eb5c..4b2c54eb5c 100644
--- a/cpukit/rtems/include/rtems/rtems/config.h
+++ b/include/rtems/rtems/config.h
diff --git a/cpukit/rtems/include/rtems/rtems/dpmem.h b/include/rtems/rtems/dpmem.h
index e582d2d359..e582d2d359 100644
--- a/cpukit/rtems/include/rtems/rtems/dpmem.h
+++ b/include/rtems/rtems/dpmem.h
diff --git a/cpukit/rtems/include/rtems/rtems/dpmemimpl.h b/include/rtems/rtems/dpmemimpl.h
index 9fd2e6c1ed..9fd2e6c1ed 100644
--- a/cpukit/rtems/include/rtems/rtems/dpmemimpl.h
+++ b/include/rtems/rtems/dpmemimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/event.h b/include/rtems/rtems/event.h
index ca48ef27da..ca48ef27da 100644
--- a/cpukit/rtems/include/rtems/rtems/event.h
+++ b/include/rtems/rtems/event.h
diff --git a/cpukit/rtems/include/rtems/rtems/eventimpl.h b/include/rtems/rtems/eventimpl.h
index 60b6b51c62..60b6b51c62 100644
--- a/cpukit/rtems/include/rtems/rtems/eventimpl.h
+++ b/include/rtems/rtems/eventimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/eventmp.h b/include/rtems/rtems/eventmp.h
index b65584db51..b65584db51 100644
--- a/cpukit/rtems/include/rtems/rtems/eventmp.h
+++ b/include/rtems/rtems/eventmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/intr.h b/include/rtems/rtems/intr.h
index 57e8a96089..57e8a96089 100644
--- a/cpukit/rtems/include/rtems/rtems/intr.h
+++ b/include/rtems/rtems/intr.h
diff --git a/cpukit/rtems/mainpage.h b/include/rtems/rtems/mainpage.h
index 720698140e..720698140e 100644
--- a/cpukit/rtems/mainpage.h
+++ b/include/rtems/rtems/mainpage.h
diff --git a/cpukit/rtems/include/rtems/rtems/message.h b/include/rtems/rtems/message.h
index 0fad595277..0fad595277 100644
--- a/cpukit/rtems/include/rtems/rtems/message.h
+++ b/include/rtems/rtems/message.h
diff --git a/cpukit/rtems/include/rtems/rtems/messageimpl.h b/include/rtems/rtems/messageimpl.h
index e2bc88d0db..e2bc88d0db 100644
--- a/cpukit/rtems/include/rtems/rtems/messageimpl.h
+++ b/include/rtems/rtems/messageimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/modes.h b/include/rtems/rtems/modes.h
index 547ae13e05..547ae13e05 100644
--- a/cpukit/rtems/include/rtems/rtems/modes.h
+++ b/include/rtems/rtems/modes.h
diff --git a/cpukit/rtems/include/rtems/rtems/modesimpl.h b/include/rtems/rtems/modesimpl.h
index 8c1acc7cb9..8c1acc7cb9 100644
--- a/cpukit/rtems/include/rtems/rtems/modesimpl.h
+++ b/include/rtems/rtems/modesimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/mp.h b/include/rtems/rtems/mp.h
index da8c11446c..da8c11446c 100644
--- a/cpukit/rtems/include/rtems/rtems/mp.h
+++ b/include/rtems/rtems/mp.h
diff --git a/cpukit/rtems/include/rtems/rtems/msgmp.h b/include/rtems/rtems/msgmp.h
index 3c2b450f34..3c2b450f34 100644
--- a/cpukit/rtems/include/rtems/rtems/msgmp.h
+++ b/include/rtems/rtems/msgmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/object.h b/include/rtems/rtems/object.h
index 2652915462..2652915462 100644
--- a/cpukit/rtems/include/rtems/rtems/object.h
+++ b/include/rtems/rtems/object.h
diff --git a/cpukit/rtems/include/rtems/rtems/options.h b/include/rtems/rtems/options.h
index 752aefda2e..752aefda2e 100644
--- a/cpukit/rtems/include/rtems/rtems/options.h
+++ b/include/rtems/rtems/options.h
diff --git a/cpukit/rtems/include/rtems/rtems/optionsimpl.h b/include/rtems/rtems/optionsimpl.h
index 0263fcf78d..0263fcf78d 100644
--- a/cpukit/rtems/include/rtems/rtems/optionsimpl.h
+++ b/include/rtems/rtems/optionsimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/part.h b/include/rtems/rtems/part.h
index 7dd90a9eaf..7dd90a9eaf 100644
--- a/cpukit/rtems/include/rtems/rtems/part.h
+++ b/include/rtems/rtems/part.h
diff --git a/cpukit/rtems/include/rtems/rtems/partimpl.h b/include/rtems/rtems/partimpl.h
index 0f704d2be6..0f704d2be6 100644
--- a/cpukit/rtems/include/rtems/rtems/partimpl.h
+++ b/include/rtems/rtems/partimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/partmp.h b/include/rtems/rtems/partmp.h
index 0658a78b65..0658a78b65 100644
--- a/cpukit/rtems/include/rtems/rtems/partmp.h
+++ b/include/rtems/rtems/partmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/ratemon.h b/include/rtems/rtems/ratemon.h
index 8701639e12..8701639e12 100644
--- a/cpukit/rtems/include/rtems/rtems/ratemon.h
+++ b/include/rtems/rtems/ratemon.h
diff --git a/cpukit/rtems/include/rtems/rtems/ratemonimpl.h b/include/rtems/rtems/ratemonimpl.h
index 1489e57e06..1489e57e06 100644
--- a/cpukit/rtems/include/rtems/rtems/ratemonimpl.h
+++ b/include/rtems/rtems/ratemonimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/region.h b/include/rtems/rtems/region.h
index a46e1b2440..a46e1b2440 100644
--- a/cpukit/rtems/include/rtems/rtems/region.h
+++ b/include/rtems/rtems/region.h
diff --git a/cpukit/rtems/include/rtems/rtems/regionimpl.h b/include/rtems/rtems/regionimpl.h
index 9ff7b966ca..9ff7b966ca 100644
--- a/cpukit/rtems/include/rtems/rtems/regionimpl.h
+++ b/include/rtems/rtems/regionimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/regionmp.h b/include/rtems/rtems/regionmp.h
index 2b265f2a5f..2b265f2a5f 100644
--- a/cpukit/rtems/include/rtems/rtems/regionmp.h
+++ b/include/rtems/rtems/regionmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/rtemsapi.h b/include/rtems/rtems/rtemsapi.h
index be60241d32..be60241d32 100644
--- a/cpukit/rtems/include/rtems/rtems/rtemsapi.h
+++ b/include/rtems/rtems/rtemsapi.h
diff --git a/cpukit/rtems/include/rtems/rtems/sem.h b/include/rtems/rtems/sem.h
index 2442010113..2442010113 100644
--- a/cpukit/rtems/include/rtems/rtems/sem.h
+++ b/include/rtems/rtems/sem.h
diff --git a/cpukit/rtems/include/rtems/rtems/semimpl.h b/include/rtems/rtems/semimpl.h
index e0a35a2e33..e0a35a2e33 100644
--- a/cpukit/rtems/include/rtems/rtems/semimpl.h
+++ b/include/rtems/rtems/semimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/semmp.h b/include/rtems/rtems/semmp.h
index 9fd6c74a5a..9fd6c74a5a 100644
--- a/cpukit/rtems/include/rtems/rtems/semmp.h
+++ b/include/rtems/rtems/semmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/signal.h b/include/rtems/rtems/signal.h
index f7b7000d9a..f7b7000d9a 100644
--- a/cpukit/rtems/include/rtems/rtems/signal.h
+++ b/include/rtems/rtems/signal.h
diff --git a/cpukit/rtems/include/rtems/rtems/signalimpl.h b/include/rtems/rtems/signalimpl.h
index ddbe00ba5e..ddbe00ba5e 100644
--- a/cpukit/rtems/include/rtems/rtems/signalimpl.h
+++ b/include/rtems/rtems/signalimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/signalmp.h b/include/rtems/rtems/signalmp.h
index c6b9a3d045..c6b9a3d045 100644
--- a/cpukit/rtems/include/rtems/rtems/signalmp.h
+++ b/include/rtems/rtems/signalmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/smp.h b/include/rtems/rtems/smp.h
index aeb0df6f46..aeb0df6f46 100644
--- a/cpukit/rtems/include/rtems/rtems/smp.h
+++ b/include/rtems/rtems/smp.h
diff --git a/cpukit/rtems/include/rtems/rtems/status.h b/include/rtems/rtems/status.h
index c54404ba14..c54404ba14 100644
--- a/cpukit/rtems/include/rtems/rtems/status.h
+++ b/include/rtems/rtems/status.h
diff --git a/cpukit/rtems/include/rtems/rtems/statusimpl.h b/include/rtems/rtems/statusimpl.h
index 8aff36a96a..8aff36a96a 100644
--- a/cpukit/rtems/include/rtems/rtems/statusimpl.h
+++ b/include/rtems/rtems/statusimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/support.h b/include/rtems/rtems/support.h
index 49dc9d88d0..49dc9d88d0 100644
--- a/cpukit/rtems/include/rtems/rtems/support.h
+++ b/include/rtems/rtems/support.h
diff --git a/cpukit/rtems/include/rtems/rtems/taskmp.h b/include/rtems/rtems/taskmp.h
index 30a9a6a066..30a9a6a066 100644
--- a/cpukit/rtems/include/rtems/rtems/taskmp.h
+++ b/include/rtems/rtems/taskmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/tasks.h b/include/rtems/rtems/tasks.h
index e0fa27e16f..e0fa27e16f 100644
--- a/cpukit/rtems/include/rtems/rtems/tasks.h
+++ b/include/rtems/rtems/tasks.h
diff --git a/cpukit/rtems/include/rtems/rtems/tasksimpl.h b/include/rtems/rtems/tasksimpl.h
index 280be2fac8..280be2fac8 100644
--- a/cpukit/rtems/include/rtems/rtems/tasksimpl.h
+++ b/include/rtems/rtems/tasksimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/timer.h b/include/rtems/rtems/timer.h
index 7cc90511ca..7cc90511ca 100644
--- a/cpukit/rtems/include/rtems/rtems/timer.h
+++ b/include/rtems/rtems/timer.h
diff --git a/cpukit/rtems/include/rtems/rtems/timerimpl.h b/include/rtems/rtems/timerimpl.h
index 667a86a686..667a86a686 100644
--- a/cpukit/rtems/include/rtems/rtems/timerimpl.h
+++ b/include/rtems/rtems/timerimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/types.h b/include/rtems/rtems/types.h
index fb88116769..fb88116769 100644
--- a/cpukit/rtems/include/rtems/rtems/types.h
+++ b/include/rtems/rtems/types.h
diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet.h b/include/rtems/rtems_bsdnet.h
index 5a95b3a2d2..5a95b3a2d2 100644
--- a/cpukit/libnetworking/rtems/rtems_bsdnet.h
+++ b/include/rtems/rtems_bsdnet.h
diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h b/include/rtems/rtems_bsdnet_internal.h
index 5be781b4c8..5be781b4c8 100644
--- a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
+++ b/include/rtems/rtems_bsdnet_internal.h
diff --git a/cpukit/libnetworking/rtems/rtems_dhcp_failsafe.h b/include/rtems/rtems_dhcp_failsafe.h
index 3c5a59fcb0..3c5a59fcb0 100644
--- a/cpukit/libnetworking/rtems/rtems_dhcp_failsafe.h
+++ b/include/rtems/rtems_dhcp_failsafe.h
diff --git a/cpukit/libnetworking/rtems/rtems_mii_ioctl.h b/include/rtems/rtems_mii_ioctl.h
index dfeebf169b..dfeebf169b 100644
--- a/cpukit/libnetworking/rtems/rtems_mii_ioctl.h
+++ b/include/rtems/rtems_mii_ioctl.h
diff --git a/cpukit/pppd/rtemsdialer.h b/include/rtems/rtemsdialer.h
index 611986b802..611986b802 100644
--- a/cpukit/pppd/rtemsdialer.h
+++ b/include/rtems/rtemsdialer.h
diff --git a/cpukit/pppd/rtemspppd.h b/include/rtems/rtemspppd.h
index a6c8d0b398..a6c8d0b398 100644
--- a/cpukit/pppd/rtemspppd.h
+++ b/include/rtems/rtemspppd.h
diff --git a/cpukit/libdl/dlfcn-shell.h b/include/rtems/rtl/dlfcn-shell.h
index 0406b6c784..0406b6c784 100644
--- a/cpukit/libdl/dlfcn-shell.h
+++ b/include/rtems/rtl/dlfcn-shell.h
diff --git a/cpukit/libdl/rap-shell.h b/include/rtems/rtl/rap-shell.h
index c32529d6da..c32529d6da 100644
--- a/cpukit/libdl/rap-shell.h
+++ b/include/rtems/rtl/rap-shell.h
diff --git a/cpukit/libdl/rap.h b/include/rtems/rtl/rap.h
index e53699f93f..e53699f93f 100644
--- a/cpukit/libdl/rap.h
+++ b/include/rtems/rtl/rap.h
diff --git a/cpukit/libdl/rtl-allocator.h b/include/rtems/rtl/rtl-allocator.h
index 8e90b7b81c..8e90b7b81c 100644
--- a/cpukit/libdl/rtl-allocator.h
+++ b/include/rtems/rtl/rtl-allocator.h
diff --git a/cpukit/libdl/rtl-fwd.h b/include/rtems/rtl/rtl-fwd.h
index 115ba8c3bc..115ba8c3bc 100644
--- a/cpukit/libdl/rtl-fwd.h
+++ b/include/rtems/rtl/rtl-fwd.h
diff --git a/cpukit/libdl/rtl-indirect-ptr.h b/include/rtems/rtl/rtl-indirect-ptr.h
index 5a5b43b9c0..5a5b43b9c0 100644
--- a/cpukit/libdl/rtl-indirect-ptr.h
+++ b/include/rtems/rtl/rtl-indirect-ptr.h
diff --git a/cpukit/libdl/rtl-obj-cache.h b/include/rtems/rtl/rtl-obj-cache.h
index 8abb7f3187..8abb7f3187 100644
--- a/cpukit/libdl/rtl-obj-cache.h
+++ b/include/rtems/rtl/rtl-obj-cache.h
diff --git a/cpukit/libdl/rtl-obj-comp.h b/include/rtems/rtl/rtl-obj-comp.h
index df7a4299f7..df7a4299f7 100644
--- a/cpukit/libdl/rtl-obj-comp.h
+++ b/include/rtems/rtl/rtl-obj-comp.h
diff --git a/cpukit/libdl/rtl-obj-fwd.h b/include/rtems/rtl/rtl-obj-fwd.h
index c4186d9a08..c4186d9a08 100644
--- a/cpukit/libdl/rtl-obj-fwd.h
+++ b/include/rtems/rtl/rtl-obj-fwd.h
diff --git a/cpukit/libdl/rtl-obj.h b/include/rtems/rtl/rtl-obj.h
index 96c76808ab..96c76808ab 100644
--- a/cpukit/libdl/rtl-obj.h
+++ b/include/rtems/rtl/rtl-obj.h
diff --git a/cpukit/libdl/rtl-sym.h b/include/rtems/rtl/rtl-sym.h
index 9bd40ec241..9bd40ec241 100644
--- a/cpukit/libdl/rtl-sym.h
+++ b/include/rtems/rtl/rtl-sym.h
diff --git a/cpukit/libdl/rtl-unresolved.h b/include/rtems/rtl/rtl-unresolved.h
index 5cc51620df..5cc51620df 100644
--- a/cpukit/libdl/rtl-unresolved.h
+++ b/include/rtems/rtl/rtl-unresolved.h
diff --git a/cpukit/libdl/rtl.h b/include/rtems/rtl/rtl.h
index d0a0d0085c..d0a0d0085c 100644
--- a/cpukit/libdl/rtl.h
+++ b/include/rtems/rtl/rtl.h
diff --git a/cpukit/sapi/include/rtems/scheduler.h b/include/rtems/scheduler.h
index a1afa668a9..a1afa668a9 100644
--- a/cpukit/sapi/include/rtems/scheduler.h
+++ b/include/rtems/scheduler.h
diff --git a/cpukit/score/include/rtems/score/address.h b/include/rtems/score/address.h
index 8f38f7c2dc..8f38f7c2dc 100644
--- a/cpukit/score/include/rtems/score/address.h
+++ b/include/rtems/score/address.h
diff --git a/cpukit/score/include/rtems/score/apiext.h b/include/rtems/score/apiext.h
index 838267335d..838267335d 100644
--- a/cpukit/score/include/rtems/score/apiext.h
+++ b/include/rtems/score/apiext.h
diff --git a/cpukit/score/include/rtems/score/apimutex.h b/include/rtems/score/apimutex.h
index 5f02e0a1cf..5f02e0a1cf 100644
--- a/cpukit/score/include/rtems/score/apimutex.h
+++ b/include/rtems/score/apimutex.h
diff --git a/cpukit/score/cpu/arm/rtems/score/arm.h b/include/rtems/score/arm.h
index 586a8cb2e9..586a8cb2e9 100644
--- a/cpukit/score/cpu/arm/rtems/score/arm.h
+++ b/include/rtems/score/arm.h
diff --git a/cpukit/score/cpu/arm/rtems/score/armv4.h b/include/rtems/score/armv4.h
index caeaa3e553..caeaa3e553 100644
--- a/cpukit/score/cpu/arm/rtems/score/armv4.h
+++ b/include/rtems/score/armv4.h
diff --git a/cpukit/score/cpu/arm/rtems/score/armv7m.h b/include/rtems/score/armv7m.h
index c5e473ec0a..c5e473ec0a 100644
--- a/cpukit/score/cpu/arm/rtems/score/armv7m.h
+++ b/include/rtems/score/armv7m.h
diff --git a/cpukit/score/include/rtems/score/assert.h b/include/rtems/score/assert.h
index 43ec2d0e38..43ec2d0e38 100644
--- a/cpukit/score/include/rtems/score/assert.h
+++ b/include/rtems/score/assert.h
diff --git a/cpukit/score/cpu/avr/rtems/score/avr.h b/include/rtems/score/avr.h
index 064a2c8762..064a2c8762 100644
--- a/cpukit/score/cpu/avr/rtems/score/avr.h
+++ b/include/rtems/score/avr.h
diff --git a/cpukit/score/include/rtems/score/basedefs.h b/include/rtems/score/basedefs.h
index 695ab8fa4f..695ab8fa4f 100644
--- a/cpukit/score/include/rtems/score/basedefs.h
+++ b/include/rtems/score/basedefs.h
diff --git a/cpukit/score/cpu/bfin/rtems/score/bfin.h b/include/rtems/score/bfin.h
index caa3a51830..caa3a51830 100644
--- a/cpukit/score/cpu/bfin/rtems/score/bfin.h
+++ b/include/rtems/score/bfin.h
diff --git a/cpukit/score/include/rtems/score/chain.h b/include/rtems/score/chain.h
index e358262e6e..e358262e6e 100644
--- a/cpukit/score/include/rtems/score/chain.h
+++ b/include/rtems/score/chain.h
diff --git a/cpukit/score/include/rtems/score/chainimpl.h b/include/rtems/score/chainimpl.h
index 08cbab6bce..08cbab6bce 100644
--- a/cpukit/score/include/rtems/score/chainimpl.h
+++ b/include/rtems/score/chainimpl.h
diff --git a/cpukit/score/include/rtems/score/context.h b/include/rtems/score/context.h
index 4619985c89..4619985c89 100644
--- a/cpukit/score/include/rtems/score/context.h
+++ b/include/rtems/score/context.h
diff --git a/cpukit/score/include/rtems/score/copyrt.h b/include/rtems/score/copyrt.h
index c3757bfae4..c3757bfae4 100644
--- a/cpukit/score/include/rtems/score/copyrt.h
+++ b/include/rtems/score/copyrt.h
diff --git a/cpukit/score/include/rtems/score/corebarrier.h b/include/rtems/score/corebarrier.h
index ba706be3e3..ba706be3e3 100644
--- a/cpukit/score/include/rtems/score/corebarrier.h
+++ b/include/rtems/score/corebarrier.h
diff --git a/cpukit/score/include/rtems/score/corebarrierimpl.h b/include/rtems/score/corebarrierimpl.h
index 124ecabf05..124ecabf05 100644
--- a/cpukit/score/include/rtems/score/corebarrierimpl.h
+++ b/include/rtems/score/corebarrierimpl.h
diff --git a/cpukit/score/include/rtems/score/coremsg.h b/include/rtems/score/coremsg.h
index 84a3a97f0e..84a3a97f0e 100644
--- a/cpukit/score/include/rtems/score/coremsg.h
+++ b/include/rtems/score/coremsg.h
diff --git a/cpukit/score/include/rtems/score/coremsgimpl.h b/include/rtems/score/coremsgimpl.h
index 6c1f901eed..6c1f901eed 100644
--- a/cpukit/score/include/rtems/score/coremsgimpl.h
+++ b/include/rtems/score/coremsgimpl.h
diff --git a/cpukit/score/include/rtems/score/coremutex.h b/include/rtems/score/coremutex.h
index ccf6066740..ccf6066740 100644
--- a/cpukit/score/include/rtems/score/coremutex.h
+++ b/include/rtems/score/coremutex.h
diff --git a/cpukit/score/include/rtems/score/coremuteximpl.h b/include/rtems/score/coremuteximpl.h
index cf327e81c3..cf327e81c3 100644
--- a/cpukit/score/include/rtems/score/coremuteximpl.h
+++ b/include/rtems/score/coremuteximpl.h
diff --git a/cpukit/score/include/rtems/score/corerwlock.h b/include/rtems/score/corerwlock.h
index f211339548..f211339548 100644
--- a/cpukit/score/include/rtems/score/corerwlock.h
+++ b/include/rtems/score/corerwlock.h
diff --git a/cpukit/score/include/rtems/score/corerwlockimpl.h b/include/rtems/score/corerwlockimpl.h
index 66c3b1a112..66c3b1a112 100644
--- a/cpukit/score/include/rtems/score/corerwlockimpl.h
+++ b/include/rtems/score/corerwlockimpl.h
diff --git a/cpukit/score/include/rtems/score/coresem.h b/include/rtems/score/coresem.h
index 5f871f063e..5f871f063e 100644
--- a/cpukit/score/include/rtems/score/coresem.h
+++ b/include/rtems/score/coresem.h
diff --git a/cpukit/score/include/rtems/score/coresemimpl.h b/include/rtems/score/coresemimpl.h
index a29ee281b2..a29ee281b2 100644
--- a/cpukit/score/include/rtems/score/coresemimpl.h
+++ b/include/rtems/score/coresemimpl.h
diff --git a/cpukit/score/include/rtems/score/corespinlock.h b/include/rtems/score/corespinlock.h
index ca50eed5e2..ca50eed5e2 100644
--- a/cpukit/score/include/rtems/score/corespinlock.h
+++ b/include/rtems/score/corespinlock.h
diff --git a/cpukit/score/include/rtems/score/corespinlockimpl.h b/include/rtems/score/corespinlockimpl.h
index fe6f9b67f5..fe6f9b67f5 100644
--- a/cpukit/score/include/rtems/score/corespinlockimpl.h
+++ b/include/rtems/score/corespinlockimpl.h
diff --git a/include/rtems/score/cpu.h b/include/rtems/score/cpu.h
new file mode 100644
index 0000000000..a4d89deb03
--- /dev/null
+++ b/include/rtems/score/cpu.h
@@ -0,0 +1,382 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_altcycv_devkit__)
+#  include <arm/altcycv_devkit/rtems/score/cpu.h>
+#elif defined(__rtems_arm_altcycv_devkit_smp__)
+#  include <arm/altcycv_devkit_smp/rtems/score/cpu.h>
+#elif defined(__rtems_arm_arm1136jfs__)
+#  include <arm/arm1136jfs/rtems/score/cpu.h>
+#elif defined(__rtems_arm_arm1136js__)
+#  include <arm/arm1136js/rtems/score/cpu.h>
+#elif defined(__rtems_arm_arm7tdmi__)
+#  include <arm/arm7tdmi/rtems/score/cpu.h>
+#elif defined(__rtems_arm_arm920__)
+#  include <arm/arm920/rtems/score/cpu.h>
+#elif defined(__rtems_arm_armcortexa9__)
+#  include <arm/armcortexa9/rtems/score/cpu.h>
+#elif defined(__rtems_arm_beagleboardorig__)
+#  include <arm/beagleboardorig/rtems/score/cpu.h>
+#elif defined(__rtems_arm_beagleboardxm__)
+#  include <arm/beagleboardxm/rtems/score/cpu.h>
+#elif defined(__rtems_arm_beagleboneblack__)
+#  include <arm/beagleboneblack/rtems/score/cpu.h>
+#elif defined(__rtems_arm_beaglebonewhite__)
+#  include <arm/beaglebonewhite/rtems/score/cpu.h>
+#elif defined(__rtems_arm_csb336__)
+#  include <arm/csb336/rtems/score/cpu.h>
+#elif defined(__rtems_arm_csb337__)
+#  include <arm/csb337/rtems/score/cpu.h>
+#elif defined(__rtems_arm_csb637__)
+#  include <arm/csb637/rtems/score/cpu.h>
+#elif defined(__rtems_arm_edb7312__)
+#  include <arm/edb7312/rtems/score/cpu.h>
+#elif defined(__rtems_arm_gba__)
+#  include <arm/gba/rtems/score/cpu.h>
+#elif defined(__rtems_arm_gp32__)
+#  include <arm/gp32/rtems/score/cpu.h>
+#elif defined(__rtems_arm_gumstix__)
+#  include <arm/gumstix/rtems/score/cpu.h>
+#elif defined(__rtems_arm_kit637_v6__)
+#  include <arm/kit637_v6/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lm3s3749__)
+#  include <arm/lm3s3749/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lm3s6965__)
+#  include <arm/lm3s6965/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lm3s6965_qemu__)
+#  include <arm/lm3s6965_qemu/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lm4f120__)
+#  include <arm/lm4f120/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc1768_mbed__)
+#  include <arm/lpc1768_mbed/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram__)
+#  include <arm/lpc1768_mbed_ahb_ram/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram_eth__)
+#  include <arm/lpc1768_mbed_ahb_ram_eth/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc17xx_ea_ram__)
+#  include <arm/lpc17xx_ea_ram/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc17xx_ea_rom_int__)
+#  include <arm/lpc17xx_ea_rom_int/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_ram__)
+#  include <arm/lpc17xx_plx800_ram/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_rom_int__)
+#  include <arm/lpc17xx_plx800_rom_int/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc2362__)
+#  include <arm/lpc2362/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc23xx_tli800__)
+#  include <arm/lpc23xx_tli800/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc24xx_ea__)
+#  include <arm/lpc24xx_ea/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_ram__)
+#  include <arm/lpc24xx_ncs_ram/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_ext__)
+#  include <arm/lpc24xx_ncs_rom_ext/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_int__)
+#  include <arm/lpc24xx_ncs_rom_int/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_ram__)
+#  include <arm/lpc24xx_plx800_ram/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_rom_int__)
+#  include <arm/lpc24xx_plx800_rom_int/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc32xx_mzx__)
+#  include <arm/lpc32xx_mzx/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_1__)
+#  include <arm/lpc32xx_mzx_stage_1/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_2__)
+#  include <arm/lpc32xx_mzx_stage_2/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc32xx_phycore__)
+#  include <arm/lpc32xx_phycore/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc40xx_ea_ram__)
+#  include <arm/lpc40xx_ea_ram/rtems/score/cpu.h>
+#elif defined(__rtems_arm_lpc40xx_ea_rom_int__)
+#  include <arm/lpc40xx_ea_rom_int/rtems/score/cpu.h>
+#elif defined(__rtems_arm_nds__)
+#  include <arm/nds/rtems/score/cpu.h>
+#elif defined(__rtems_arm_raspberrypi__)
+#  include <arm/raspberrypi/rtems/score/cpu.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu__)
+#  include <arm/realview_pbx_a9_qemu/rtems/score/cpu.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu_smp__)
+#  include <arm/realview_pbx_a9_qemu_smp/rtems/score/cpu.h>
+#elif defined(__rtems_arm_rtl22xx__)
+#  include <arm/rtl22xx/rtems/score/cpu.h>
+#elif defined(__rtems_arm_rtl22xx_t__)
+#  include <arm/rtl22xx_t/rtems/score/cpu.h>
+#elif defined(__rtems_arm_smdk2410__)
+#  include <arm/smdk2410/rtems/score/cpu.h>
+#elif defined(__rtems_arm_stm32f105rc__)
+#  include <arm/stm32f105rc/rtems/score/cpu.h>
+#elif defined(__rtems_arm_stm32f4__)
+#  include <arm/stm32f4/rtems/score/cpu.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk__)
+#  include <arm/tms570ls3137_hdk/rtems/score/cpu.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_intram__)
+#  include <arm/tms570ls3137_hdk_intram/rtems/score/cpu.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_sdram__)
+#  include <arm/tms570ls3137_hdk_sdram/rtems/score/cpu.h>
+#elif defined(__rtems_arm_xilinx_zynq_a9_qemu__)
+#  include <arm/xilinx_zynq_a9_qemu/rtems/score/cpu.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc702__)
+#  include <arm/xilinx_zynq_zc702/rtems/score/cpu.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc706__)
+#  include <arm/xilinx_zynq_zc706/rtems/score/cpu.h>
+#elif defined(__rtems_arm_xilinx_zynq_zedboard__)
+#  include <arm/xilinx_zynq_zedboard/rtems/score/cpu.h>
+#elif defined(__rtems_avr_avrtest__)
+#  include <avr/avrtest/rtems/score/cpu.h>
+#elif defined(__rtems_bfin_TLL6527M__)
+#  include <bfin/TLL6527M/rtems/score/cpu.h>
+#elif defined(__rtems_bfin_bf537Stamp__)
+#  include <bfin/bf537Stamp/rtems/score/cpu.h>
+#elif defined(__rtems_bfin_eZKit533__)
+#  include <bfin/eZKit533/rtems/score/cpu.h>
+#elif defined(__rtems_h8300_h8sim__)
+#  include <h8300/h8sim/rtems/score/cpu.h>
+#elif defined(__rtems_h8300_h8sxsim__)
+#  include <h8300/h8sxsim/rtems/score/cpu.h>
+#elif defined(__rtems_i386_pc386__)
+#  include <i386/pc386/rtems/score/cpu.h>
+#elif defined(__rtems_i386_pc486__)
+#  include <i386/pc486/rtems/score/cpu.h>
+#elif defined(__rtems_i386_pc586__)
+#  include <i386/pc586/rtems/score/cpu.h>
+#elif defined(__rtems_i386_pc586_sse__)
+#  include <i386/pc586-sse/rtems/score/cpu.h>
+#elif defined(__rtems_i386_pc686__)
+#  include <i386/pc686/rtems/score/cpu.h>
+#elif defined(__rtems_i386_pcp4__)
+#  include <i386/pcp4/rtems/score/cpu.h>
+#elif defined(__rtems_lm32_lm32_evr__)
+#  include <lm32/lm32_evr/rtems/score/cpu.h>
+#elif defined(__rtems_lm32_milkymist__)
+#  include <lm32/milkymist/rtems/score/cpu.h>
+#elif defined(__rtems_m32c_m32csim__)
+#  include <m32c/m32csim/rtems/score/cpu.h>
+#elif defined(__rtems_m32r_m32rsim__)
+#  include <m32r/m32rsim/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_COBRA5475__)
+#  include <m68k/COBRA5475/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_av5282__)
+#  include <m68k/av5282/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_csb360__)
+#  include <m68k/csb360/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_gen68302__)
+#  include <m68k/gen68302/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_gen68340__)
+#  include <m68k/gen68340/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_gen68360__)
+#  include <m68k/gen68360/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_gen68360_040__)
+#  include <m68k/gen68360_040/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_idp__)
+#  include <m68k/idp/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_m5484FireEngine__)
+#  include <m68k/m5484FireEngine/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_mcf5206elite__)
+#  include <m68k/mcf5206elite/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_mcf52235__)
+#  include <m68k/mcf52235/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_mcf5225x__)
+#  include <m68k/mcf5225x/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_mcf5235__)
+#  include <m68k/mcf5235/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_mcf5329__)
+#  include <m68k/mcf5329/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_mrm332__)
+#  include <m68k/mrm332/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_mvme136__)
+#  include <m68k/mvme136/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_mvme147__)
+#  include <m68k/mvme147/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_mvme147s__)
+#  include <m68k/mvme147s/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_mvme162__)
+#  include <m68k/mvme162/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_mvme162lx__)
+#  include <m68k/mvme162lx/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_mvme167__)
+#  include <m68k/mvme167/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_ods68302__)
+#  include <m68k/ods68302/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_pgh360__)
+#  include <m68k/pgh360/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_sim68000__)
+#  include <m68k/sim68000/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_simcpu32__)
+#  include <m68k/simcpu32/rtems/score/cpu.h>
+#elif defined(__rtems_m68k_uC5282__)
+#  include <m68k/uC5282/rtems/score/cpu.h>
+#elif defined(__rtems_mips_csb350__)
+#  include <mips/csb350/rtems/score/cpu.h>
+#elif defined(__rtems_mips_genmongoosev__)
+#  include <mips/genmongoosev/rtems/score/cpu.h>
+#elif defined(__rtems_mips_hurricane__)
+#  include <mips/hurricane/rtems/score/cpu.h>
+#elif defined(__rtems_mips_jmr3904__)
+#  include <mips/jmr3904/rtems/score/cpu.h>
+#elif defined(__rtems_mips_malta__)
+#  include <mips/malta/rtems/score/cpu.h>
+#elif defined(__rtems_mips_rbtx4925__)
+#  include <mips/rbtx4925/rtems/score/cpu.h>
+#elif defined(__rtems_mips_rbtx4938__)
+#  include <mips/rbtx4938/rtems/score/cpu.h>
+#elif defined(__rtems_moxie_moxiesim__)
+#  include <moxie/moxiesim/rtems/score/cpu.h>
+#elif defined(__rtems_nios2_nios2_iss__)
+#  include <nios2/nios2_iss/rtems/score/cpu.h>
+#elif defined(__rtems_or1k_or1ksim__)
+#  include <or1k/or1ksim/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_beatnik__)
+#  include <powerpc/beatnik/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_br_uid__)
+#  include <powerpc/br_uid/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_brs5l__)
+#  include <powerpc/brs5l/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_brs6l__)
+#  include <powerpc/brs6l/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_dp2__)
+#  include <powerpc/dp2/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_ep1a__)
+#  include <powerpc/ep1a/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_gwlcfm__)
+#  include <powerpc/gwlcfm/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_haleakala__)
+#  include <powerpc/haleakala/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_hsc_cm01__)
+#  include <powerpc/hsc_cm01/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_icecube__)
+#  include <powerpc/icecube/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mbx821_001__)
+#  include <powerpc/mbx821_001/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mbx821_002__)
+#  include <powerpc/mbx821_002/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mbx821_002b__)
+#  include <powerpc/mbx821_002b/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mbx860_001b__)
+#  include <powerpc/mbx860_001b/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mbx860_002__)
+#  include <powerpc/mbx860_002/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mbx860_005b__)
+#  include <powerpc/mbx860_005b/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mbx860_1b__)
+#  include <powerpc/mbx860_1b/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mcp750__)
+#  include <powerpc/mcp750/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mpc5566evb__)
+#  include <powerpc/mpc5566evb/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mpc5566evb_spe__)
+#  include <powerpc/mpc5566evb_spe/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mpc5643l_dpu__)
+#  include <powerpc/mpc5643l_dpu/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mpc5643l_evb__)
+#  include <powerpc/mpc5643l_evb/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mpc5668g__)
+#  include <powerpc/mpc5668g/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_app__)
+#  include <powerpc/mpc5674f_ecu508_app/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_boot__)
+#  include <powerpc/mpc5674f_ecu508_boot/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mpc5674f_rsm6__)
+#  include <powerpc/mpc5674f_rsm6/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mpc5674fevb__)
+#  include <powerpc/mpc5674fevb/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mpc5674fevb_spe__)
+#  include <powerpc/mpc5674fevb_spe/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mpc8260ads__)
+#  include <powerpc/mpc8260ads/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mpc8309som__)
+#  include <powerpc/mpc8309som/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mpc8313erdb__)
+#  include <powerpc/mpc8313erdb/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mpc8349eamds__)
+#  include <powerpc/mpc8349eamds/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mtx603e__)
+#  include <powerpc/mtx603e/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mvme2100__)
+#  include <powerpc/mvme2100/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mvme2307__)
+#  include <powerpc/mvme2307/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mvme3100__)
+#  include <powerpc/mvme3100/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_mvme5500__)
+#  include <powerpc/mvme5500/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_pghplus__)
+#  include <powerpc/pghplus/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_phycore_mpc5554__)
+#  include <powerpc/phycore_mpc5554/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_pm520_cr825__)
+#  include <powerpc/pm520_cr825/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_pm520_ze30__)
+#  include <powerpc/pm520_ze30/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_psim__)
+#  include <powerpc/psim/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_qemuppc__)
+#  include <powerpc/qemuppc/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_qemuprep__)
+#  include <powerpc/qemuprep/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_qemuprep_altivec__)
+#  include <powerpc/qemuprep-altivec/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_qoriq_core_0__)
+#  include <powerpc/qoriq_core_0/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_qoriq_core_1__)
+#  include <powerpc/qoriq_core_1/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_qoriq_p1020rdb__)
+#  include <powerpc/qoriq_p1020rdb/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_score603e__)
+#  include <powerpc/score603e/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_ss555__)
+#  include <powerpc/ss555/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_t32mppc__)
+#  include <powerpc/t32mppc/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_tqm8xx_stk8xx__)
+#  include <powerpc/tqm8xx_stk8xx/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_virtex__)
+#  include <powerpc/virtex/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_virtex4__)
+#  include <powerpc/virtex4/rtems/score/cpu.h>
+#elif defined(__rtems_powerpc_virtex5__)
+#  include <powerpc/virtex5/rtems/score/cpu.h>
+#elif defined(__rtems_sh_gensh1__)
+#  include <sh/gensh1/rtems/score/cpu.h>
+#elif defined(__rtems_sh_gensh2__)
+#  include <sh/gensh2/rtems/score/cpu.h>
+#elif defined(__rtems_sh_gensh4__)
+#  include <sh/gensh4/rtems/score/cpu.h>
+#elif defined(__rtems_sh_simsh1__)
+#  include <sh/simsh1/rtems/score/cpu.h>
+#elif defined(__rtems_sh_simsh2__)
+#  include <sh/simsh2/rtems/score/cpu.h>
+#elif defined(__rtems_sh_simsh2e__)
+#  include <sh/simsh2e/rtems/score/cpu.h>
+#elif defined(__rtems_sh_simsh4__)
+#  include <sh/simsh4/rtems/score/cpu.h>
+#elif defined(__rtems_sparc_erc32__)
+#  include <sparc/erc32/rtems/score/cpu.h>
+#elif defined(__rtems_sparc_leon2__)
+#  include <sparc/leon2/rtems/score/cpu.h>
+#elif defined(__rtems_sparc_leon3__)
+#  include <sparc/leon3/rtems/score/cpu.h>
+#elif defined(__rtems_sparc_ngmp__)
+#  include <sparc/ngmp/rtems/score/cpu.h>
+#elif defined(__rtems_sparc_sis__)
+#  include <sparc/sis/rtems/score/cpu.h>
+#elif defined(__rtems_sparc64_niagara__)
+#  include <sparc64/niagara/rtems/score/cpu.h>
+#elif defined(__rtems_sparc64_usiii__)
+#  include <sparc64/usiii/rtems/score/cpu.h>
+#elif defined(__rtems_v850_v850e1sim__)
+#  include <v850/v850e1sim/rtems/score/cpu.h>
+#elif defined(__rtems_v850_v850e2sim__)
+#  include <v850/v850e2sim/rtems/score/cpu.h>
+#elif defined(__rtems_v850_v850e2v3sim__)
+#  include <v850/v850e2v3sim/rtems/score/cpu.h>
+#elif defined(__rtems_v850_v850esim__)
+#  include <v850/v850esim/rtems/score/cpu.h>
+#elif defined(__rtems_v850_v850essim__)
+#  include <v850/v850essim/rtems/score/cpu.h>
+#elif defined(__rtems_v850_v850sim__)
+#  include <v850/v850sim/rtems/score/cpu.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/include/rtems/score/cpu_asm.h b/include/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..b7408eb8ba
--- /dev/null
+++ b/include/rtems/score/cpu_asm.h
@@ -0,0 +1,160 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_altcycv_devkit__)
+#  include <arm/altcycv_devkit/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_altcycv_devkit_smp__)
+#  include <arm/altcycv_devkit_smp/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_arm1136jfs__)
+#  include <arm/arm1136jfs/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_arm1136js__)
+#  include <arm/arm1136js/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_arm7tdmi__)
+#  include <arm/arm7tdmi/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_arm920__)
+#  include <arm/arm920/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_armcortexa9__)
+#  include <arm/armcortexa9/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_beagleboardorig__)
+#  include <arm/beagleboardorig/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_beagleboardxm__)
+#  include <arm/beagleboardxm/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_beagleboneblack__)
+#  include <arm/beagleboneblack/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_beaglebonewhite__)
+#  include <arm/beaglebonewhite/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_csb336__)
+#  include <arm/csb336/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_csb337__)
+#  include <arm/csb337/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_csb637__)
+#  include <arm/csb637/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_edb7312__)
+#  include <arm/edb7312/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_gba__)
+#  include <arm/gba/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_gp32__)
+#  include <arm/gp32/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_gumstix__)
+#  include <arm/gumstix/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_kit637_v6__)
+#  include <arm/kit637_v6/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lm3s3749__)
+#  include <arm/lm3s3749/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lm3s6965__)
+#  include <arm/lm3s6965/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lm3s6965_qemu__)
+#  include <arm/lm3s6965_qemu/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lm4f120__)
+#  include <arm/lm4f120/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc1768_mbed__)
+#  include <arm/lpc1768_mbed/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram__)
+#  include <arm/lpc1768_mbed_ahb_ram/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram_eth__)
+#  include <arm/lpc1768_mbed_ahb_ram_eth/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc17xx_ea_ram__)
+#  include <arm/lpc17xx_ea_ram/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc17xx_ea_rom_int__)
+#  include <arm/lpc17xx_ea_rom_int/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_ram__)
+#  include <arm/lpc17xx_plx800_ram/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_rom_int__)
+#  include <arm/lpc17xx_plx800_rom_int/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc2362__)
+#  include <arm/lpc2362/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc23xx_tli800__)
+#  include <arm/lpc23xx_tli800/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc24xx_ea__)
+#  include <arm/lpc24xx_ea/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_ram__)
+#  include <arm/lpc24xx_ncs_ram/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_ext__)
+#  include <arm/lpc24xx_ncs_rom_ext/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_int__)
+#  include <arm/lpc24xx_ncs_rom_int/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_ram__)
+#  include <arm/lpc24xx_plx800_ram/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_rom_int__)
+#  include <arm/lpc24xx_plx800_rom_int/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc32xx_mzx__)
+#  include <arm/lpc32xx_mzx/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_1__)
+#  include <arm/lpc32xx_mzx_stage_1/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_2__)
+#  include <arm/lpc32xx_mzx_stage_2/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc32xx_phycore__)
+#  include <arm/lpc32xx_phycore/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc40xx_ea_ram__)
+#  include <arm/lpc40xx_ea_ram/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_lpc40xx_ea_rom_int__)
+#  include <arm/lpc40xx_ea_rom_int/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_nds__)
+#  include <arm/nds/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_raspberrypi__)
+#  include <arm/raspberrypi/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu__)
+#  include <arm/realview_pbx_a9_qemu/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu_smp__)
+#  include <arm/realview_pbx_a9_qemu_smp/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_rtl22xx__)
+#  include <arm/rtl22xx/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_rtl22xx_t__)
+#  include <arm/rtl22xx_t/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_smdk2410__)
+#  include <arm/smdk2410/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_stm32f105rc__)
+#  include <arm/stm32f105rc/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_stm32f4__)
+#  include <arm/stm32f4/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk__)
+#  include <arm/tms570ls3137_hdk/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_intram__)
+#  include <arm/tms570ls3137_hdk_intram/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_sdram__)
+#  include <arm/tms570ls3137_hdk_sdram/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_xilinx_zynq_a9_qemu__)
+#  include <arm/xilinx_zynq_a9_qemu/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc702__)
+#  include <arm/xilinx_zynq_zc702/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc706__)
+#  include <arm/xilinx_zynq_zc706/rtems/score/cpu_asm.h>
+#elif defined(__rtems_arm_xilinx_zynq_zedboard__)
+#  include <arm/xilinx_zynq_zedboard/rtems/score/cpu_asm.h>
+#elif defined(__rtems_avr_avrtest__)
+#  include <avr/avrtest/rtems/score/cpu_asm.h>
+#elif defined(__rtems_bfin_TLL6527M__)
+#  include <bfin/TLL6527M/rtems/score/cpu_asm.h>
+#elif defined(__rtems_bfin_bf537Stamp__)
+#  include <bfin/bf537Stamp/rtems/score/cpu_asm.h>
+#elif defined(__rtems_bfin_eZKit533__)
+#  include <bfin/eZKit533/rtems/score/cpu_asm.h>
+#elif defined(__rtems_lm32_lm32_evr__)
+#  include <lm32/lm32_evr/rtems/score/cpu_asm.h>
+#elif defined(__rtems_lm32_milkymist__)
+#  include <lm32/milkymist/rtems/score/cpu_asm.h>
+#elif defined(__rtems_m32c_m32csim__)
+#  include <m32c/m32csim/rtems/score/cpu_asm.h>
+#elif defined(__rtems_m32r_m32rsim__)
+#  include <m32r/m32rsim/rtems/score/cpu_asm.h>
+#elif defined(__rtems_nios2_nios2_iss__)
+#  include <nios2/nios2_iss/rtems/score/cpu_asm.h>
+#elif defined(__rtems_or1k_or1ksim__)
+#  include <or1k/or1ksim/rtems/score/cpu_asm.h>
+#elif defined(__rtems_v850_v850e1sim__)
+#  include <v850/v850e1sim/rtems/score/cpu_asm.h>
+#elif defined(__rtems_v850_v850e2sim__)
+#  include <v850/v850e2sim/rtems/score/cpu_asm.h>
+#elif defined(__rtems_v850_v850e2v3sim__)
+#  include <v850/v850e2v3sim/rtems/score/cpu_asm.h>
+#elif defined(__rtems_v850_v850esim__)
+#  include <v850/v850esim/rtems/score/cpu_asm.h>
+#elif defined(__rtems_v850_v850essim__)
+#  include <v850/v850essim/rtems/score/cpu_asm.h>
+#elif defined(__rtems_v850_v850sim__)
+#  include <v850/v850sim/rtems/score/cpu_asm.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/include/rtems/score/cpuatomic.h b/include/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..9213815ad3
--- /dev/null
+++ b/include/rtems/score/cpuatomic.h
@@ -0,0 +1,380 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_altcycv_devkit__)
+#  include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_altcycv_devkit_smp__)
+#  include <arm/altcycv_devkit_smp/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_arm1136jfs__)
+#  include <arm/arm1136jfs/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_arm1136js__)
+#  include <arm/arm1136js/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_arm7tdmi__)
+#  include <arm/arm7tdmi/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_arm920__)
+#  include <arm/arm920/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_armcortexa9__)
+#  include <arm/armcortexa9/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_beagleboardorig__)
+#  include <arm/beagleboardorig/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_beagleboardxm__)
+#  include <arm/beagleboardxm/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_beagleboneblack__)
+#  include <arm/beagleboneblack/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_beaglebonewhite__)
+#  include <arm/beaglebonewhite/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_csb336__)
+#  include <arm/csb336/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_csb337__)
+#  include <arm/csb337/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_csb637__)
+#  include <arm/csb637/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_edb7312__)
+#  include <arm/edb7312/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_gba__)
+#  include <arm/gba/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_gp32__)
+#  include <arm/gp32/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_gumstix__)
+#  include <arm/gumstix/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_kit637_v6__)
+#  include <arm/kit637_v6/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lm3s3749__)
+#  include <arm/lm3s3749/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lm3s6965__)
+#  include <arm/lm3s6965/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lm3s6965_qemu__)
+#  include <arm/lm3s6965_qemu/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lm4f120__)
+#  include <arm/lm4f120/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc1768_mbed__)
+#  include <arm/lpc1768_mbed/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram__)
+#  include <arm/lpc1768_mbed_ahb_ram/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram_eth__)
+#  include <arm/lpc1768_mbed_ahb_ram_eth/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc17xx_ea_ram__)
+#  include <arm/lpc17xx_ea_ram/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc17xx_ea_rom_int__)
+#  include <arm/lpc17xx_ea_rom_int/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_ram__)
+#  include <arm/lpc17xx_plx800_ram/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_rom_int__)
+#  include <arm/lpc17xx_plx800_rom_int/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc2362__)
+#  include <arm/lpc2362/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc23xx_tli800__)
+#  include <arm/lpc23xx_tli800/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc24xx_ea__)
+#  include <arm/lpc24xx_ea/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_ram__)
+#  include <arm/lpc24xx_ncs_ram/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_ext__)
+#  include <arm/lpc24xx_ncs_rom_ext/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_int__)
+#  include <arm/lpc24xx_ncs_rom_int/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_ram__)
+#  include <arm/lpc24xx_plx800_ram/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_rom_int__)
+#  include <arm/lpc24xx_plx800_rom_int/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc32xx_mzx__)
+#  include <arm/lpc32xx_mzx/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_1__)
+#  include <arm/lpc32xx_mzx_stage_1/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_2__)
+#  include <arm/lpc32xx_mzx_stage_2/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc32xx_phycore__)
+#  include <arm/lpc32xx_phycore/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc40xx_ea_ram__)
+#  include <arm/lpc40xx_ea_ram/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_lpc40xx_ea_rom_int__)
+#  include <arm/lpc40xx_ea_rom_int/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_nds__)
+#  include <arm/nds/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_raspberrypi__)
+#  include <arm/raspberrypi/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu__)
+#  include <arm/realview_pbx_a9_qemu/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu_smp__)
+#  include <arm/realview_pbx_a9_qemu_smp/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_rtl22xx__)
+#  include <arm/rtl22xx/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_rtl22xx_t__)
+#  include <arm/rtl22xx_t/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_smdk2410__)
+#  include <arm/smdk2410/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_stm32f105rc__)
+#  include <arm/stm32f105rc/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_stm32f4__)
+#  include <arm/stm32f4/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk__)
+#  include <arm/tms570ls3137_hdk/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_intram__)
+#  include <arm/tms570ls3137_hdk_intram/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_sdram__)
+#  include <arm/tms570ls3137_hdk_sdram/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_xilinx_zynq_a9_qemu__)
+#  include <arm/xilinx_zynq_a9_qemu/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc702__)
+#  include <arm/xilinx_zynq_zc702/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc706__)
+#  include <arm/xilinx_zynq_zc706/rtems/score/cpuatomic.h>
+#elif defined(__rtems_arm_xilinx_zynq_zedboard__)
+#  include <arm/xilinx_zynq_zedboard/rtems/score/cpuatomic.h>
+#elif defined(__rtems_avr_avrtest__)
+#  include <avr/avrtest/rtems/score/cpuatomic.h>
+#elif defined(__rtems_bfin_TLL6527M__)
+#  include <bfin/TLL6527M/rtems/score/cpuatomic.h>
+#elif defined(__rtems_bfin_bf537Stamp__)
+#  include <bfin/bf537Stamp/rtems/score/cpuatomic.h>
+#elif defined(__rtems_bfin_eZKit533__)
+#  include <bfin/eZKit533/rtems/score/cpuatomic.h>
+#elif defined(__rtems_h8300_h8sim__)
+#  include <h8300/h8sim/rtems/score/cpuatomic.h>
+#elif defined(__rtems_h8300_h8sxsim__)
+#  include <h8300/h8sxsim/rtems/score/cpuatomic.h>
+#elif defined(__rtems_i386_pc386__)
+#  include <i386/pc386/rtems/score/cpuatomic.h>
+#elif defined(__rtems_i386_pc486__)
+#  include <i386/pc486/rtems/score/cpuatomic.h>
+#elif defined(__rtems_i386_pc586__)
+#  include <i386/pc586/rtems/score/cpuatomic.h>
+#elif defined(__rtems_i386_pc586_sse__)
+#  include <i386/pc586-sse/rtems/score/cpuatomic.h>
+#elif defined(__rtems_i386_pc686__)
+#  include <i386/pc686/rtems/score/cpuatomic.h>
+#elif defined(__rtems_i386_pcp4__)
+#  include <i386/pcp4/rtems/score/cpuatomic.h>
+#elif defined(__rtems_lm32_lm32_evr__)
+#  include <lm32/lm32_evr/rtems/score/cpuatomic.h>
+#elif defined(__rtems_lm32_milkymist__)
+#  include <lm32/milkymist/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m32c_m32csim__)
+#  include <m32c/m32csim/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m32r_m32rsim__)
+#  include <m32r/m32rsim/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_COBRA5475__)
+#  include <m68k/COBRA5475/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_av5282__)
+#  include <m68k/av5282/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_csb360__)
+#  include <m68k/csb360/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_gen68302__)
+#  include <m68k/gen68302/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_gen68340__)
+#  include <m68k/gen68340/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_gen68360__)
+#  include <m68k/gen68360/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_gen68360_040__)
+#  include <m68k/gen68360_040/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_idp__)
+#  include <m68k/idp/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_m5484FireEngine__)
+#  include <m68k/m5484FireEngine/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_mcf5206elite__)
+#  include <m68k/mcf5206elite/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_mcf52235__)
+#  include <m68k/mcf52235/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_mcf5225x__)
+#  include <m68k/mcf5225x/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_mcf5235__)
+#  include <m68k/mcf5235/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_mcf5329__)
+#  include <m68k/mcf5329/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_mrm332__)
+#  include <m68k/mrm332/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_mvme136__)
+#  include <m68k/mvme136/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_mvme147__)
+#  include <m68k/mvme147/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_mvme147s__)
+#  include <m68k/mvme147s/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_mvme162__)
+#  include <m68k/mvme162/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_mvme162lx__)
+#  include <m68k/mvme162lx/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_mvme167__)
+#  include <m68k/mvme167/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_ods68302__)
+#  include <m68k/ods68302/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_pgh360__)
+#  include <m68k/pgh360/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_sim68000__)
+#  include <m68k/sim68000/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_simcpu32__)
+#  include <m68k/simcpu32/rtems/score/cpuatomic.h>
+#elif defined(__rtems_m68k_uC5282__)
+#  include <m68k/uC5282/rtems/score/cpuatomic.h>
+#elif defined(__rtems_mips_csb350__)
+#  include <mips/csb350/rtems/score/cpuatomic.h>
+#elif defined(__rtems_mips_genmongoosev__)
+#  include <mips/genmongoosev/rtems/score/cpuatomic.h>
+#elif defined(__rtems_mips_hurricane__)
+#  include <mips/hurricane/rtems/score/cpuatomic.h>
+#elif defined(__rtems_mips_jmr3904__)
+#  include <mips/jmr3904/rtems/score/cpuatomic.h>
+#elif defined(__rtems_mips_malta__)
+#  include <mips/malta/rtems/score/cpuatomic.h>
+#elif defined(__rtems_mips_rbtx4925__)
+#  include <mips/rbtx4925/rtems/score/cpuatomic.h>
+#elif defined(__rtems_mips_rbtx4938__)
+#  include <mips/rbtx4938/rtems/score/cpuatomic.h>
+#elif defined(__rtems_moxie_moxiesim__)
+#  include <moxie/moxiesim/rtems/score/cpuatomic.h>
+#elif defined(__rtems_nios2_nios2_iss__)
+#  include <nios2/nios2_iss/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_beatnik__)
+#  include <powerpc/beatnik/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_br_uid__)
+#  include <powerpc/br_uid/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_brs5l__)
+#  include <powerpc/brs5l/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_brs6l__)
+#  include <powerpc/brs6l/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_dp2__)
+#  include <powerpc/dp2/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_ep1a__)
+#  include <powerpc/ep1a/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_gwlcfm__)
+#  include <powerpc/gwlcfm/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_haleakala__)
+#  include <powerpc/haleakala/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_hsc_cm01__)
+#  include <powerpc/hsc_cm01/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_icecube__)
+#  include <powerpc/icecube/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mbx821_001__)
+#  include <powerpc/mbx821_001/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mbx821_002__)
+#  include <powerpc/mbx821_002/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mbx821_002b__)
+#  include <powerpc/mbx821_002b/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mbx860_001b__)
+#  include <powerpc/mbx860_001b/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mbx860_002__)
+#  include <powerpc/mbx860_002/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mbx860_005b__)
+#  include <powerpc/mbx860_005b/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mbx860_1b__)
+#  include <powerpc/mbx860_1b/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mcp750__)
+#  include <powerpc/mcp750/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mpc5566evb__)
+#  include <powerpc/mpc5566evb/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mpc5566evb_spe__)
+#  include <powerpc/mpc5566evb_spe/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mpc5643l_dpu__)
+#  include <powerpc/mpc5643l_dpu/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mpc5643l_evb__)
+#  include <powerpc/mpc5643l_evb/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mpc5668g__)
+#  include <powerpc/mpc5668g/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_app__)
+#  include <powerpc/mpc5674f_ecu508_app/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_boot__)
+#  include <powerpc/mpc5674f_ecu508_boot/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mpc5674f_rsm6__)
+#  include <powerpc/mpc5674f_rsm6/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mpc5674fevb__)
+#  include <powerpc/mpc5674fevb/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mpc5674fevb_spe__)
+#  include <powerpc/mpc5674fevb_spe/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mpc8260ads__)
+#  include <powerpc/mpc8260ads/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mpc8309som__)
+#  include <powerpc/mpc8309som/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mpc8313erdb__)
+#  include <powerpc/mpc8313erdb/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mpc8349eamds__)
+#  include <powerpc/mpc8349eamds/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mtx603e__)
+#  include <powerpc/mtx603e/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mvme2100__)
+#  include <powerpc/mvme2100/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mvme2307__)
+#  include <powerpc/mvme2307/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mvme3100__)
+#  include <powerpc/mvme3100/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_mvme5500__)
+#  include <powerpc/mvme5500/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_pghplus__)
+#  include <powerpc/pghplus/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_phycore_mpc5554__)
+#  include <powerpc/phycore_mpc5554/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_pm520_cr825__)
+#  include <powerpc/pm520_cr825/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_pm520_ze30__)
+#  include <powerpc/pm520_ze30/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_psim__)
+#  include <powerpc/psim/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_qemuppc__)
+#  include <powerpc/qemuppc/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_qemuprep__)
+#  include <powerpc/qemuprep/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_qemuprep_altivec__)
+#  include <powerpc/qemuprep-altivec/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_qoriq_core_0__)
+#  include <powerpc/qoriq_core_0/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_qoriq_core_1__)
+#  include <powerpc/qoriq_core_1/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_qoriq_p1020rdb__)
+#  include <powerpc/qoriq_p1020rdb/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_score603e__)
+#  include <powerpc/score603e/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_ss555__)
+#  include <powerpc/ss555/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_t32mppc__)
+#  include <powerpc/t32mppc/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_tqm8xx_stk8xx__)
+#  include <powerpc/tqm8xx_stk8xx/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_virtex__)
+#  include <powerpc/virtex/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_virtex4__)
+#  include <powerpc/virtex4/rtems/score/cpuatomic.h>
+#elif defined(__rtems_powerpc_virtex5__)
+#  include <powerpc/virtex5/rtems/score/cpuatomic.h>
+#elif defined(__rtems_sh_gensh1__)
+#  include <sh/gensh1/rtems/score/cpuatomic.h>
+#elif defined(__rtems_sh_gensh2__)
+#  include <sh/gensh2/rtems/score/cpuatomic.h>
+#elif defined(__rtems_sh_gensh4__)
+#  include <sh/gensh4/rtems/score/cpuatomic.h>
+#elif defined(__rtems_sh_simsh1__)
+#  include <sh/simsh1/rtems/score/cpuatomic.h>
+#elif defined(__rtems_sh_simsh2__)
+#  include <sh/simsh2/rtems/score/cpuatomic.h>
+#elif defined(__rtems_sh_simsh2e__)
+#  include <sh/simsh2e/rtems/score/cpuatomic.h>
+#elif defined(__rtems_sh_simsh4__)
+#  include <sh/simsh4/rtems/score/cpuatomic.h>
+#elif defined(__rtems_sparc_erc32__)
+#  include <sparc/erc32/rtems/score/cpuatomic.h>
+#elif defined(__rtems_sparc_leon2__)
+#  include <sparc/leon2/rtems/score/cpuatomic.h>
+#elif defined(__rtems_sparc_leon3__)
+#  include <sparc/leon3/rtems/score/cpuatomic.h>
+#elif defined(__rtems_sparc_ngmp__)
+#  include <sparc/ngmp/rtems/score/cpuatomic.h>
+#elif defined(__rtems_sparc_sis__)
+#  include <sparc/sis/rtems/score/cpuatomic.h>
+#elif defined(__rtems_sparc64_niagara__)
+#  include <sparc64/niagara/rtems/score/cpuatomic.h>
+#elif defined(__rtems_sparc64_usiii__)
+#  include <sparc64/usiii/rtems/score/cpuatomic.h>
+#elif defined(__rtems_v850_v850e1sim__)
+#  include <v850/v850e1sim/rtems/score/cpuatomic.h>
+#elif defined(__rtems_v850_v850e2sim__)
+#  include <v850/v850e2sim/rtems/score/cpuatomic.h>
+#elif defined(__rtems_v850_v850e2v3sim__)
+#  include <v850/v850e2v3sim/rtems/score/cpuatomic.h>
+#elif defined(__rtems_v850_v850esim__)
+#  include <v850/v850esim/rtems/score/cpuatomic.h>
+#elif defined(__rtems_v850_v850essim__)
+#  include <v850/v850essim/rtems/score/cpuatomic.h>
+#elif defined(__rtems_v850_v850sim__)
+#  include <v850/v850sim/rtems/score/cpuatomic.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/cpukit/score/include/rtems/score/cpuset.h b/include/rtems/score/cpuset.h
index 0f781d91fd..0f781d91fd 100644
--- a/cpukit/score/include/rtems/score/cpuset.h
+++ b/include/rtems/score/cpuset.h
diff --git a/cpukit/score/include/rtems/score/cpusetimpl.h b/include/rtems/score/cpusetimpl.h
index a898d64cd8..a898d64cd8 100644
--- a/cpukit/score/include/rtems/score/cpusetimpl.h
+++ b/include/rtems/score/cpusetimpl.h
diff --git a/cpukit/score/include/rtems/score/freechain.h b/include/rtems/score/freechain.h
index d68a1f7c8c..d68a1f7c8c 100644
--- a/cpukit/score/include/rtems/score/freechain.h
+++ b/include/rtems/score/freechain.h
diff --git a/cpukit/score/cpu/h8300/rtems/score/h8300.h b/include/rtems/score/h8300.h
index e30343cb84..e30343cb84 100644
--- a/cpukit/score/cpu/h8300/rtems/score/h8300.h
+++ b/include/rtems/score/h8300.h
diff --git a/cpukit/score/include/rtems/score/heap.h b/include/rtems/score/heap.h
index f20b4e6651..f20b4e6651 100644
--- a/cpukit/score/include/rtems/score/heap.h
+++ b/include/rtems/score/heap.h
diff --git a/cpukit/score/include/rtems/score/heapimpl.h b/include/rtems/score/heapimpl.h
index a8948edd6f..a8948edd6f 100644
--- a/cpukit/score/include/rtems/score/heapimpl.h
+++ b/include/rtems/score/heapimpl.h
diff --git a/cpukit/score/cpu/i386/rtems/score/i386.h b/include/rtems/score/i386.h
index 875526ad62..875526ad62 100644
--- a/cpukit/score/cpu/i386/rtems/score/i386.h
+++ b/include/rtems/score/i386.h
diff --git a/cpukit/score/cpu/i386/rtems/score/idtr.h b/include/rtems/score/idtr.h
index a79af40792..a79af40792 100644
--- a/cpukit/score/cpu/i386/rtems/score/idtr.h
+++ b/include/rtems/score/idtr.h
diff --git a/cpukit/score/include/rtems/score/interr.h b/include/rtems/score/interr.h
index 2100c13e07..2100c13e07 100644
--- a/cpukit/score/include/rtems/score/interr.h
+++ b/include/rtems/score/interr.h
diff --git a/cpukit/score/cpu/i386/rtems/score/interrupts.h b/include/rtems/score/interrupts.h
index 5ae172a4f2..5ae172a4f2 100644
--- a/cpukit/score/cpu/i386/rtems/score/interrupts.h
+++ b/include/rtems/score/interrupts.h
diff --git a/c/src/lib/libcpu/sh/sh7032/include/iosh7032.h b/include/rtems/score/iosh7032.h
index 3750024a64..3750024a64 100644
--- a/c/src/lib/libcpu/sh/sh7032/include/iosh7032.h
+++ b/include/rtems/score/iosh7032.h
diff --git a/c/src/lib/libcpu/sh/sh7045/include/iosh7045.h b/include/rtems/score/iosh7045.h
index db3252b72d..db3252b72d 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/iosh7045.h
+++ b/include/rtems/score/iosh7045.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/iosh7750.h b/include/rtems/score/iosh7750.h
index c5c532dbc2..c5c532dbc2 100644
--- a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/iosh7750.h
+++ b/include/rtems/score/iosh7750.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ipl.h b/include/rtems/score/ipl.h
index 9ce2d87e0e..9ce2d87e0e 100644
--- a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ipl.h
+++ b/include/rtems/score/ipl.h
diff --git a/c/src/lib/libcpu/sh/sh7032/include/ispsh7032.h b/include/rtems/score/ispsh7032.h
index 9c7cee8bd6..9c7cee8bd6 100644
--- a/c/src/lib/libcpu/sh/sh7032/include/ispsh7032.h
+++ b/include/rtems/score/ispsh7032.h
diff --git a/c/src/lib/libcpu/sh/sh7045/include/ispsh7045.h b/include/rtems/score/ispsh7045.h
index fb9f5297ae..fb9f5297ae 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/ispsh7045.h
+++ b/include/rtems/score/ispsh7045.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ispsh7750.h b/include/rtems/score/ispsh7750.h
index 396644a241..396644a241 100644
--- a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ispsh7750.h
+++ b/include/rtems/score/ispsh7750.h
diff --git a/cpukit/score/include/rtems/score/isr.h b/include/rtems/score/isr.h
index dcb25e1dff..dcb25e1dff 100644
--- a/cpukit/score/include/rtems/score/isr.h
+++ b/include/rtems/score/isr.h
diff --git a/cpukit/score/include/rtems/score/isrlevel.h b/include/rtems/score/isrlevel.h
index 2823df7d27..2823df7d27 100644
--- a/cpukit/score/include/rtems/score/isrlevel.h
+++ b/include/rtems/score/isrlevel.h
diff --git a/cpukit/score/include/rtems/score/isrlock.h b/include/rtems/score/isrlock.h
index 80a8a0b38a..80a8a0b38a 100644
--- a/cpukit/score/include/rtems/score/isrlock.h
+++ b/include/rtems/score/isrlock.h
diff --git a/cpukit/score/cpu/lm32/rtems/score/lm32.h b/include/rtems/score/lm32.h
index e8fecdf2f6..e8fecdf2f6 100644
--- a/cpukit/score/cpu/lm32/rtems/score/lm32.h
+++ b/include/rtems/score/lm32.h
diff --git a/cpukit/score/cpu/m32c/rtems/score/m32c.h b/include/rtems/score/m32c.h
index e1936fdcfb..e1936fdcfb 100644
--- a/cpukit/score/cpu/m32c/rtems/score/m32c.h
+++ b/include/rtems/score/m32c.h
diff --git a/cpukit/score/cpu/m32r/rtems/score/m32r.h b/include/rtems/score/m32r.h
index cd9113460c..cd9113460c 100644
--- a/cpukit/score/cpu/m32r/rtems/score/m32r.h
+++ b/include/rtems/score/m32r.h
diff --git a/cpukit/score/cpu/m68k/rtems/score/m68k.h b/include/rtems/score/m68k.h
index 3a5a009e44..3a5a009e44 100644
--- a/cpukit/score/cpu/m68k/rtems/score/m68k.h
+++ b/include/rtems/score/m68k.h
diff --git a/cpukit/score/cpu/mips/rtems/score/mips.h b/include/rtems/score/mips.h
index 4c2c53fa6d..4c2c53fa6d 100644
--- a/cpukit/score/cpu/mips/rtems/score/mips.h
+++ b/include/rtems/score/mips.h
diff --git a/cpukit/score/cpu/moxie/rtems/score/moxie.h b/include/rtems/score/moxie.h
index 66f771aadf..66f771aadf 100644
--- a/cpukit/score/cpu/moxie/rtems/score/moxie.h
+++ b/include/rtems/score/moxie.h
diff --git a/cpukit/score/include/rtems/score/mpci.h b/include/rtems/score/mpci.h
index c20b45c3e1..c20b45c3e1 100644
--- a/cpukit/score/include/rtems/score/mpci.h
+++ b/include/rtems/score/mpci.h
diff --git a/cpukit/score/include/rtems/score/mppkt.h b/include/rtems/score/mppkt.h
index cd1d9b9cb2..cd1d9b9cb2 100644
--- a/cpukit/score/include/rtems/score/mppkt.h
+++ b/include/rtems/score/mppkt.h
diff --git a/cpukit/score/include/rtems/score/mrsp.h b/include/rtems/score/mrsp.h
index 9eb2887766..9eb2887766 100644
--- a/cpukit/score/include/rtems/score/mrsp.h
+++ b/include/rtems/score/mrsp.h
diff --git a/cpukit/score/include/rtems/score/mrspimpl.h b/include/rtems/score/mrspimpl.h
index dc89b69b39..dc89b69b39 100644
--- a/cpukit/score/include/rtems/score/mrspimpl.h
+++ b/include/rtems/score/mrspimpl.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/nios2-count-zeros.h b/include/rtems/score/nios2-count-zeros.h
index 0ec259aa0c..0ec259aa0c 100644
--- a/cpukit/score/cpu/nios2/rtems/score/nios2-count-zeros.h
+++ b/include/rtems/score/nios2-count-zeros.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h b/include/rtems/score/nios2-utility.h
index d5eb4b3597..d5eb4b3597 100644
--- a/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h
+++ b/include/rtems/score/nios2-utility.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/nios2.h b/include/rtems/score/nios2.h
index 26d76bcbfa..26d76bcbfa 100644
--- a/cpukit/score/cpu/nios2/rtems/score/nios2.h
+++ b/include/rtems/score/nios2.h
diff --git a/cpukit/score/include/rtems/score/object.h b/include/rtems/score/object.h
index 70e5fe630c..70e5fe630c 100644
--- a/cpukit/score/include/rtems/score/object.h
+++ b/include/rtems/score/object.h
diff --git a/cpukit/score/include/rtems/score/objectimpl.h b/include/rtems/score/objectimpl.h
index 2928effb57..2928effb57 100644
--- a/cpukit/score/include/rtems/score/objectimpl.h
+++ b/include/rtems/score/objectimpl.h
diff --git a/cpukit/score/include/rtems/score/objectmp.h b/include/rtems/score/objectmp.h
index 934b3981ef..934b3981ef 100644
--- a/cpukit/score/include/rtems/score/objectmp.h
+++ b/include/rtems/score/objectmp.h
diff --git a/cpukit/score/include/rtems/score/onceimpl.h b/include/rtems/score/onceimpl.h
index d81f1d0b31..d81f1d0b31 100644
--- a/cpukit/score/include/rtems/score/onceimpl.h
+++ b/include/rtems/score/onceimpl.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/or1k-utility.h b/include/rtems/score/or1k-utility.h
index 6b238b1641..6b238b1641 100644
--- a/cpukit/score/cpu/or1k/rtems/score/or1k-utility.h
+++ b/include/rtems/score/or1k-utility.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/or1k.h b/include/rtems/score/or1k.h
index e1a3ddce42..e1a3ddce42 100644
--- a/cpukit/score/cpu/or1k/rtems/score/or1k.h
+++ b/include/rtems/score/or1k.h
diff --git a/cpukit/score/include/rtems/score/percpu.h b/include/rtems/score/percpu.h
index 4be4de6974..4be4de6974 100644
--- a/cpukit/score/include/rtems/score/percpu.h
+++ b/include/rtems/score/percpu.h
diff --git a/cpukit/score/cpu/powerpc/rtems/score/powerpc.h b/include/rtems/score/powerpc.h
index 4a7b3aa6af..4a7b3aa6af 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/powerpc.h
+++ b/include/rtems/score/powerpc.h
diff --git a/cpukit/score/include/rtems/score/priority.h b/include/rtems/score/priority.h
index f10f73130d..f10f73130d 100644
--- a/cpukit/score/include/rtems/score/priority.h
+++ b/include/rtems/score/priority.h
diff --git a/cpukit/score/include/rtems/score/prioritybitmap.h b/include/rtems/score/prioritybitmap.h
index f363fe4257..f363fe4257 100644
--- a/cpukit/score/include/rtems/score/prioritybitmap.h
+++ b/include/rtems/score/prioritybitmap.h
diff --git a/cpukit/score/include/rtems/score/prioritybitmapimpl.h b/include/rtems/score/prioritybitmapimpl.h
index de90ef77ae..de90ef77ae 100644
--- a/cpukit/score/include/rtems/score/prioritybitmapimpl.h
+++ b/include/rtems/score/prioritybitmapimpl.h
diff --git a/cpukit/score/include/rtems/score/profiling.h b/include/rtems/score/profiling.h
index f5fa6cc241..f5fa6cc241 100644
--- a/cpukit/score/include/rtems/score/profiling.h
+++ b/include/rtems/score/profiling.h
diff --git a/cpukit/score/include/rtems/score/protectedheap.h b/include/rtems/score/protectedheap.h
index a08fa36cf3..a08fa36cf3 100644
--- a/cpukit/score/include/rtems/score/protectedheap.h
+++ b/include/rtems/score/protectedheap.h
diff --git a/cpukit/score/include/rtems/score/rbtree.h b/include/rtems/score/rbtree.h
index 299b75ad2c..299b75ad2c 100644
--- a/cpukit/score/include/rtems/score/rbtree.h
+++ b/include/rtems/score/rbtree.h
diff --git a/cpukit/score/include/rtems/score/rbtreeimpl.h b/include/rtems/score/rbtreeimpl.h
index ed4cbd558a..ed4cbd558a 100644
--- a/cpukit/score/include/rtems/score/rbtreeimpl.h
+++ b/include/rtems/score/rbtreeimpl.h
diff --git a/cpukit/score/cpu/i386/rtems/score/registers.h b/include/rtems/score/registers.h
index 254fef701b..254fef701b 100644
--- a/cpukit/score/cpu/i386/rtems/score/registers.h
+++ b/include/rtems/score/registers.h
diff --git a/cpukit/score/include/rtems/score/resource.h b/include/rtems/score/resource.h
index ecf84a7275..ecf84a7275 100644
--- a/cpukit/score/include/rtems/score/resource.h
+++ b/include/rtems/score/resource.h
diff --git a/cpukit/score/include/rtems/score/resourceimpl.h b/include/rtems/score/resourceimpl.h
index 69e9a3c5f8..69e9a3c5f8 100644
--- a/cpukit/score/include/rtems/score/resourceimpl.h
+++ b/include/rtems/score/resourceimpl.h
diff --git a/cpukit/score/include/rtems/score/scheduler.h b/include/rtems/score/scheduler.h
index 8bace85f2a..8bace85f2a 100644
--- a/cpukit/score/include/rtems/score/scheduler.h
+++ b/include/rtems/score/scheduler.h
diff --git a/cpukit/score/include/rtems/score/schedulercbs.h b/include/rtems/score/schedulercbs.h
index b3381e0e43..b3381e0e43 100644
--- a/cpukit/score/include/rtems/score/schedulercbs.h
+++ b/include/rtems/score/schedulercbs.h
diff --git a/cpukit/score/include/rtems/score/schedulercbsimpl.h b/include/rtems/score/schedulercbsimpl.h
index ddc79fe6da..ddc79fe6da 100644
--- a/cpukit/score/include/rtems/score/schedulercbsimpl.h
+++ b/include/rtems/score/schedulercbsimpl.h
diff --git a/cpukit/score/include/rtems/score/scheduleredf.h b/include/rtems/score/scheduleredf.h
index e69569156d..e69569156d 100644
--- a/cpukit/score/include/rtems/score/scheduleredf.h
+++ b/include/rtems/score/scheduleredf.h
diff --git a/cpukit/score/include/rtems/score/scheduleredfimpl.h b/include/rtems/score/scheduleredfimpl.h
index a98fb0f9c8..a98fb0f9c8 100644
--- a/cpukit/score/include/rtems/score/scheduleredfimpl.h
+++ b/include/rtems/score/scheduleredfimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulerimpl.h b/include/rtems/score/schedulerimpl.h
index 31ae6d184d..31ae6d184d 100644
--- a/cpukit/score/include/rtems/score/schedulerimpl.h
+++ b/include/rtems/score/schedulerimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulerpriority.h b/include/rtems/score/schedulerpriority.h
index de051a8114..de051a8114 100644
--- a/cpukit/score/include/rtems/score/schedulerpriority.h
+++ b/include/rtems/score/schedulerpriority.h
diff --git a/cpukit/score/include/rtems/score/schedulerpriorityimpl.h b/include/rtems/score/schedulerpriorityimpl.h
index ab5abdc65f..ab5abdc65f 100644
--- a/cpukit/score/include/rtems/score/schedulerpriorityimpl.h
+++ b/include/rtems/score/schedulerpriorityimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulerprioritysmp.h b/include/rtems/score/schedulerprioritysmp.h
index d8ce7dc1dd..d8ce7dc1dd 100644
--- a/cpukit/score/include/rtems/score/schedulerprioritysmp.h
+++ b/include/rtems/score/schedulerprioritysmp.h
diff --git a/cpukit/score/include/rtems/score/schedulersimple.h b/include/rtems/score/schedulersimple.h
index 82b8c3d7b9..82b8c3d7b9 100644
--- a/cpukit/score/include/rtems/score/schedulersimple.h
+++ b/include/rtems/score/schedulersimple.h
diff --git a/cpukit/score/include/rtems/score/schedulersimpleimpl.h b/include/rtems/score/schedulersimpleimpl.h
index b73a1b2c78..b73a1b2c78 100644
--- a/cpukit/score/include/rtems/score/schedulersimpleimpl.h
+++ b/include/rtems/score/schedulersimpleimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulersmp.h b/include/rtems/score/schedulersmp.h
index 9e11488584..9e11488584 100644
--- a/cpukit/score/include/rtems/score/schedulersmp.h
+++ b/include/rtems/score/schedulersmp.h
diff --git a/cpukit/score/include/rtems/score/schedulersmpimpl.h b/include/rtems/score/schedulersmpimpl.h
index e41c7372c0..e41c7372c0 100644
--- a/cpukit/score/include/rtems/score/schedulersmpimpl.h
+++ b/include/rtems/score/schedulersmpimpl.h
diff --git a/cpukit/score/cpu/sh/rtems/score/sh.h b/include/rtems/score/sh.h
index 4e26478b8b..4e26478b8b 100644
--- a/cpukit/score/cpu/sh/rtems/score/sh.h
+++ b/include/rtems/score/sh.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/sh4_regs.h b/include/rtems/score/sh4_regs.h
index 074dc6d7a1..074dc6d7a1 100644
--- a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/sh4_regs.h
+++ b/include/rtems/score/sh4_regs.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/sh7750_regs.h b/include/rtems/score/sh7750_regs.h
index b65f9b6e51..b65f9b6e51 100644
--- a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/sh7750_regs.h
+++ b/include/rtems/score/sh7750_regs.h
diff --git a/cpukit/score/cpu/sh/rtems/score/sh_io.h b/include/rtems/score/sh_io.h
index 8d81965f78..8d81965f78 100644
--- a/cpukit/score/cpu/sh/rtems/score/sh_io.h
+++ b/include/rtems/score/sh_io.h
diff --git a/cpukit/score/include/rtems/score/smp.h b/include/rtems/score/smp.h
index 8886a57dc6..8886a57dc6 100644
--- a/cpukit/score/include/rtems/score/smp.h
+++ b/include/rtems/score/smp.h
diff --git a/cpukit/score/include/rtems/score/smpbarrier.h b/include/rtems/score/smpbarrier.h
index 1c93916b0a..1c93916b0a 100644
--- a/cpukit/score/include/rtems/score/smpbarrier.h
+++ b/include/rtems/score/smpbarrier.h
diff --git a/cpukit/score/include/rtems/score/smpimpl.h b/include/rtems/score/smpimpl.h
index dca8a6bec8..dca8a6bec8 100644
--- a/cpukit/score/include/rtems/score/smpimpl.h
+++ b/include/rtems/score/smpimpl.h
diff --git a/cpukit/score/include/rtems/score/smplock.h b/include/rtems/score/smplock.h
index cc54c694df..cc54c694df 100644
--- a/cpukit/score/include/rtems/score/smplock.h
+++ b/include/rtems/score/smplock.h
diff --git a/cpukit/score/cpu/sparc/rtems/score/sparc.h b/include/rtems/score/sparc.h
index ac8c510e46..ac8c510e46 100644
--- a/cpukit/score/cpu/sparc/rtems/score/sparc.h
+++ b/include/rtems/score/sparc.h
diff --git a/cpukit/score/cpu/sparc64/rtems/score/sparc64.h b/include/rtems/score/sparc64.h
index d20c2ff509..d20c2ff509 100644
--- a/cpukit/score/cpu/sparc64/rtems/score/sparc64.h
+++ b/include/rtems/score/sparc64.h
diff --git a/cpukit/score/include/rtems/score/stack.h b/include/rtems/score/stack.h
index 9622495092..9622495092 100644
--- a/cpukit/score/include/rtems/score/stack.h
+++ b/include/rtems/score/stack.h
diff --git a/cpukit/score/include/rtems/score/stackimpl.h b/include/rtems/score/stackimpl.h
index 4c622345ff..4c622345ff 100644
--- a/cpukit/score/include/rtems/score/stackimpl.h
+++ b/include/rtems/score/stackimpl.h
diff --git a/cpukit/score/include/rtems/score/states.h b/include/rtems/score/states.h
index ba59af6907..ba59af6907 100644
--- a/cpukit/score/include/rtems/score/states.h
+++ b/include/rtems/score/states.h
diff --git a/cpukit/score/include/rtems/score/statesimpl.h b/include/rtems/score/statesimpl.h
index 4251b3c84d..4251b3c84d 100644
--- a/cpukit/score/include/rtems/score/statesimpl.h
+++ b/include/rtems/score/statesimpl.h
diff --git a/cpukit/score/include/rtems/score/sysstate.h b/include/rtems/score/sysstate.h
index 7548c1f80b..7548c1f80b 100644
--- a/cpukit/score/include/rtems/score/sysstate.h
+++ b/include/rtems/score/sysstate.h
diff --git a/cpukit/score/include/rtems/score/thread.h b/include/rtems/score/thread.h
index 299bac6df5..299bac6df5 100644
--- a/cpukit/score/include/rtems/score/thread.h
+++ b/include/rtems/score/thread.h
diff --git a/cpukit/score/include/rtems/score/threaddispatch.h b/include/rtems/score/threaddispatch.h
index f814072529..f814072529 100644
--- a/cpukit/score/include/rtems/score/threaddispatch.h
+++ b/include/rtems/score/threaddispatch.h
diff --git a/cpukit/score/include/rtems/score/threadimpl.h b/include/rtems/score/threadimpl.h
index bfaf1fdf67..bfaf1fdf67 100644
--- a/cpukit/score/include/rtems/score/threadimpl.h
+++ b/include/rtems/score/threadimpl.h
diff --git a/cpukit/score/include/rtems/score/threadmp.h b/include/rtems/score/threadmp.h
index 27b6989893..27b6989893 100644
--- a/cpukit/score/include/rtems/score/threadmp.h
+++ b/include/rtems/score/threadmp.h
diff --git a/cpukit/score/include/rtems/score/threadq.h b/include/rtems/score/threadq.h
index 6dcdf41aaa..6dcdf41aaa 100644
--- a/cpukit/score/include/rtems/score/threadq.h
+++ b/include/rtems/score/threadq.h
diff --git a/cpukit/score/include/rtems/score/threadqimpl.h b/include/rtems/score/threadqimpl.h
index 5931d2252b..5931d2252b 100644
--- a/cpukit/score/include/rtems/score/threadqimpl.h
+++ b/include/rtems/score/threadqimpl.h
diff --git a/cpukit/score/include/rtems/score/threadsync.h b/include/rtems/score/threadsync.h
index fa7aeeb003..fa7aeeb003 100644
--- a/cpukit/score/include/rtems/score/threadsync.h
+++ b/include/rtems/score/threadsync.h
diff --git a/cpukit/score/include/rtems/score/timespec.h b/include/rtems/score/timespec.h
index 9200880222..9200880222 100644
--- a/cpukit/score/include/rtems/score/timespec.h
+++ b/include/rtems/score/timespec.h
diff --git a/cpukit/score/include/rtems/score/timestamp.h b/include/rtems/score/timestamp.h
index 895afcca43..895afcca43 100644
--- a/cpukit/score/include/rtems/score/timestamp.h
+++ b/include/rtems/score/timestamp.h
diff --git a/cpukit/score/include/rtems/score/timestamp64.h b/include/rtems/score/timestamp64.h
index 55b7d07643..55b7d07643 100644
--- a/cpukit/score/include/rtems/score/timestamp64.h
+++ b/include/rtems/score/timestamp64.h
diff --git a/cpukit/score/include/rtems/score/tls.h b/include/rtems/score/tls.h
index 139db7856c..139db7856c 100644
--- a/cpukit/score/include/rtems/score/tls.h
+++ b/include/rtems/score/tls.h
diff --git a/cpukit/score/include/rtems/score/tod.h b/include/rtems/score/tod.h
index 1972b0fa72..1972b0fa72 100644
--- a/cpukit/score/include/rtems/score/tod.h
+++ b/include/rtems/score/tod.h
diff --git a/cpukit/score/include/rtems/score/todimpl.h b/include/rtems/score/todimpl.h
index ad5ed39dab..ad5ed39dab 100644
--- a/cpukit/score/include/rtems/score/todimpl.h
+++ b/include/rtems/score/todimpl.h
diff --git a/include/rtems/score/types.h b/include/rtems/score/types.h
new file mode 100644
index 0000000000..a071f11a82
--- /dev/null
+++ b/include/rtems/score/types.h
@@ -0,0 +1,382 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_altcycv_devkit__)
+#  include <arm/altcycv_devkit/rtems/score/types.h>
+#elif defined(__rtems_arm_altcycv_devkit_smp__)
+#  include <arm/altcycv_devkit_smp/rtems/score/types.h>
+#elif defined(__rtems_arm_arm1136jfs__)
+#  include <arm/arm1136jfs/rtems/score/types.h>
+#elif defined(__rtems_arm_arm1136js__)
+#  include <arm/arm1136js/rtems/score/types.h>
+#elif defined(__rtems_arm_arm7tdmi__)
+#  include <arm/arm7tdmi/rtems/score/types.h>
+#elif defined(__rtems_arm_arm920__)
+#  include <arm/arm920/rtems/score/types.h>
+#elif defined(__rtems_arm_armcortexa9__)
+#  include <arm/armcortexa9/rtems/score/types.h>
+#elif defined(__rtems_arm_beagleboardorig__)
+#  include <arm/beagleboardorig/rtems/score/types.h>
+#elif defined(__rtems_arm_beagleboardxm__)
+#  include <arm/beagleboardxm/rtems/score/types.h>
+#elif defined(__rtems_arm_beagleboneblack__)
+#  include <arm/beagleboneblack/rtems/score/types.h>
+#elif defined(__rtems_arm_beaglebonewhite__)
+#  include <arm/beaglebonewhite/rtems/score/types.h>
+#elif defined(__rtems_arm_csb336__)
+#  include <arm/csb336/rtems/score/types.h>
+#elif defined(__rtems_arm_csb337__)
+#  include <arm/csb337/rtems/score/types.h>
+#elif defined(__rtems_arm_csb637__)
+#  include <arm/csb637/rtems/score/types.h>
+#elif defined(__rtems_arm_edb7312__)
+#  include <arm/edb7312/rtems/score/types.h>
+#elif defined(__rtems_arm_gba__)
+#  include <arm/gba/rtems/score/types.h>
+#elif defined(__rtems_arm_gp32__)
+#  include <arm/gp32/rtems/score/types.h>
+#elif defined(__rtems_arm_gumstix__)
+#  include <arm/gumstix/rtems/score/types.h>
+#elif defined(__rtems_arm_kit637_v6__)
+#  include <arm/kit637_v6/rtems/score/types.h>
+#elif defined(__rtems_arm_lm3s3749__)
+#  include <arm/lm3s3749/rtems/score/types.h>
+#elif defined(__rtems_arm_lm3s6965__)
+#  include <arm/lm3s6965/rtems/score/types.h>
+#elif defined(__rtems_arm_lm3s6965_qemu__)
+#  include <arm/lm3s6965_qemu/rtems/score/types.h>
+#elif defined(__rtems_arm_lm4f120__)
+#  include <arm/lm4f120/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc1768_mbed__)
+#  include <arm/lpc1768_mbed/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram__)
+#  include <arm/lpc1768_mbed_ahb_ram/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram_eth__)
+#  include <arm/lpc1768_mbed_ahb_ram_eth/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc17xx_ea_ram__)
+#  include <arm/lpc17xx_ea_ram/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc17xx_ea_rom_int__)
+#  include <arm/lpc17xx_ea_rom_int/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_ram__)
+#  include <arm/lpc17xx_plx800_ram/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_rom_int__)
+#  include <arm/lpc17xx_plx800_rom_int/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc2362__)
+#  include <arm/lpc2362/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc23xx_tli800__)
+#  include <arm/lpc23xx_tli800/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc24xx_ea__)
+#  include <arm/lpc24xx_ea/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_ram__)
+#  include <arm/lpc24xx_ncs_ram/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_ext__)
+#  include <arm/lpc24xx_ncs_rom_ext/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_int__)
+#  include <arm/lpc24xx_ncs_rom_int/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_ram__)
+#  include <arm/lpc24xx_plx800_ram/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_rom_int__)
+#  include <arm/lpc24xx_plx800_rom_int/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc32xx_mzx__)
+#  include <arm/lpc32xx_mzx/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_1__)
+#  include <arm/lpc32xx_mzx_stage_1/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_2__)
+#  include <arm/lpc32xx_mzx_stage_2/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc32xx_phycore__)
+#  include <arm/lpc32xx_phycore/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc40xx_ea_ram__)
+#  include <arm/lpc40xx_ea_ram/rtems/score/types.h>
+#elif defined(__rtems_arm_lpc40xx_ea_rom_int__)
+#  include <arm/lpc40xx_ea_rom_int/rtems/score/types.h>
+#elif defined(__rtems_arm_nds__)
+#  include <arm/nds/rtems/score/types.h>
+#elif defined(__rtems_arm_raspberrypi__)
+#  include <arm/raspberrypi/rtems/score/types.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu__)
+#  include <arm/realview_pbx_a9_qemu/rtems/score/types.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu_smp__)
+#  include <arm/realview_pbx_a9_qemu_smp/rtems/score/types.h>
+#elif defined(__rtems_arm_rtl22xx__)
+#  include <arm/rtl22xx/rtems/score/types.h>
+#elif defined(__rtems_arm_rtl22xx_t__)
+#  include <arm/rtl22xx_t/rtems/score/types.h>
+#elif defined(__rtems_arm_smdk2410__)
+#  include <arm/smdk2410/rtems/score/types.h>
+#elif defined(__rtems_arm_stm32f105rc__)
+#  include <arm/stm32f105rc/rtems/score/types.h>
+#elif defined(__rtems_arm_stm32f4__)
+#  include <arm/stm32f4/rtems/score/types.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk__)
+#  include <arm/tms570ls3137_hdk/rtems/score/types.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_intram__)
+#  include <arm/tms570ls3137_hdk_intram/rtems/score/types.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_sdram__)
+#  include <arm/tms570ls3137_hdk_sdram/rtems/score/types.h>
+#elif defined(__rtems_arm_xilinx_zynq_a9_qemu__)
+#  include <arm/xilinx_zynq_a9_qemu/rtems/score/types.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc702__)
+#  include <arm/xilinx_zynq_zc702/rtems/score/types.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc706__)
+#  include <arm/xilinx_zynq_zc706/rtems/score/types.h>
+#elif defined(__rtems_arm_xilinx_zynq_zedboard__)
+#  include <arm/xilinx_zynq_zedboard/rtems/score/types.h>
+#elif defined(__rtems_avr_avrtest__)
+#  include <avr/avrtest/rtems/score/types.h>
+#elif defined(__rtems_bfin_TLL6527M__)
+#  include <bfin/TLL6527M/rtems/score/types.h>
+#elif defined(__rtems_bfin_bf537Stamp__)
+#  include <bfin/bf537Stamp/rtems/score/types.h>
+#elif defined(__rtems_bfin_eZKit533__)
+#  include <bfin/eZKit533/rtems/score/types.h>
+#elif defined(__rtems_h8300_h8sim__)
+#  include <h8300/h8sim/rtems/score/types.h>
+#elif defined(__rtems_h8300_h8sxsim__)
+#  include <h8300/h8sxsim/rtems/score/types.h>
+#elif defined(__rtems_i386_pc386__)
+#  include <i386/pc386/rtems/score/types.h>
+#elif defined(__rtems_i386_pc486__)
+#  include <i386/pc486/rtems/score/types.h>
+#elif defined(__rtems_i386_pc586__)
+#  include <i386/pc586/rtems/score/types.h>
+#elif defined(__rtems_i386_pc586_sse__)
+#  include <i386/pc586-sse/rtems/score/types.h>
+#elif defined(__rtems_i386_pc686__)
+#  include <i386/pc686/rtems/score/types.h>
+#elif defined(__rtems_i386_pcp4__)
+#  include <i386/pcp4/rtems/score/types.h>
+#elif defined(__rtems_lm32_lm32_evr__)
+#  include <lm32/lm32_evr/rtems/score/types.h>
+#elif defined(__rtems_lm32_milkymist__)
+#  include <lm32/milkymist/rtems/score/types.h>
+#elif defined(__rtems_m32c_m32csim__)
+#  include <m32c/m32csim/rtems/score/types.h>
+#elif defined(__rtems_m32r_m32rsim__)
+#  include <m32r/m32rsim/rtems/score/types.h>
+#elif defined(__rtems_m68k_COBRA5475__)
+#  include <m68k/COBRA5475/rtems/score/types.h>
+#elif defined(__rtems_m68k_av5282__)
+#  include <m68k/av5282/rtems/score/types.h>
+#elif defined(__rtems_m68k_csb360__)
+#  include <m68k/csb360/rtems/score/types.h>
+#elif defined(__rtems_m68k_gen68302__)
+#  include <m68k/gen68302/rtems/score/types.h>
+#elif defined(__rtems_m68k_gen68340__)
+#  include <m68k/gen68340/rtems/score/types.h>
+#elif defined(__rtems_m68k_gen68360__)
+#  include <m68k/gen68360/rtems/score/types.h>
+#elif defined(__rtems_m68k_gen68360_040__)
+#  include <m68k/gen68360_040/rtems/score/types.h>
+#elif defined(__rtems_m68k_idp__)
+#  include <m68k/idp/rtems/score/types.h>
+#elif defined(__rtems_m68k_m5484FireEngine__)
+#  include <m68k/m5484FireEngine/rtems/score/types.h>
+#elif defined(__rtems_m68k_mcf5206elite__)
+#  include <m68k/mcf5206elite/rtems/score/types.h>
+#elif defined(__rtems_m68k_mcf52235__)
+#  include <m68k/mcf52235/rtems/score/types.h>
+#elif defined(__rtems_m68k_mcf5225x__)
+#  include <m68k/mcf5225x/rtems/score/types.h>
+#elif defined(__rtems_m68k_mcf5235__)
+#  include <m68k/mcf5235/rtems/score/types.h>
+#elif defined(__rtems_m68k_mcf5329__)
+#  include <m68k/mcf5329/rtems/score/types.h>
+#elif defined(__rtems_m68k_mrm332__)
+#  include <m68k/mrm332/rtems/score/types.h>
+#elif defined(__rtems_m68k_mvme136__)
+#  include <m68k/mvme136/rtems/score/types.h>
+#elif defined(__rtems_m68k_mvme147__)
+#  include <m68k/mvme147/rtems/score/types.h>
+#elif defined(__rtems_m68k_mvme147s__)
+#  include <m68k/mvme147s/rtems/score/types.h>
+#elif defined(__rtems_m68k_mvme162__)
+#  include <m68k/mvme162/rtems/score/types.h>
+#elif defined(__rtems_m68k_mvme162lx__)
+#  include <m68k/mvme162lx/rtems/score/types.h>
+#elif defined(__rtems_m68k_mvme167__)
+#  include <m68k/mvme167/rtems/score/types.h>
+#elif defined(__rtems_m68k_ods68302__)
+#  include <m68k/ods68302/rtems/score/types.h>
+#elif defined(__rtems_m68k_pgh360__)
+#  include <m68k/pgh360/rtems/score/types.h>
+#elif defined(__rtems_m68k_sim68000__)
+#  include <m68k/sim68000/rtems/score/types.h>
+#elif defined(__rtems_m68k_simcpu32__)
+#  include <m68k/simcpu32/rtems/score/types.h>
+#elif defined(__rtems_m68k_uC5282__)
+#  include <m68k/uC5282/rtems/score/types.h>
+#elif defined(__rtems_mips_csb350__)
+#  include <mips/csb350/rtems/score/types.h>
+#elif defined(__rtems_mips_genmongoosev__)
+#  include <mips/genmongoosev/rtems/score/types.h>
+#elif defined(__rtems_mips_hurricane__)
+#  include <mips/hurricane/rtems/score/types.h>
+#elif defined(__rtems_mips_jmr3904__)
+#  include <mips/jmr3904/rtems/score/types.h>
+#elif defined(__rtems_mips_malta__)
+#  include <mips/malta/rtems/score/types.h>
+#elif defined(__rtems_mips_rbtx4925__)
+#  include <mips/rbtx4925/rtems/score/types.h>
+#elif defined(__rtems_mips_rbtx4938__)
+#  include <mips/rbtx4938/rtems/score/types.h>
+#elif defined(__rtems_moxie_moxiesim__)
+#  include <moxie/moxiesim/rtems/score/types.h>
+#elif defined(__rtems_nios2_nios2_iss__)
+#  include <nios2/nios2_iss/rtems/score/types.h>
+#elif defined(__rtems_or1k_or1ksim__)
+#  include <or1k/or1ksim/rtems/score/types.h>
+#elif defined(__rtems_powerpc_beatnik__)
+#  include <powerpc/beatnik/rtems/score/types.h>
+#elif defined(__rtems_powerpc_br_uid__)
+#  include <powerpc/br_uid/rtems/score/types.h>
+#elif defined(__rtems_powerpc_brs5l__)
+#  include <powerpc/brs5l/rtems/score/types.h>
+#elif defined(__rtems_powerpc_brs6l__)
+#  include <powerpc/brs6l/rtems/score/types.h>
+#elif defined(__rtems_powerpc_dp2__)
+#  include <powerpc/dp2/rtems/score/types.h>
+#elif defined(__rtems_powerpc_ep1a__)
+#  include <powerpc/ep1a/rtems/score/types.h>
+#elif defined(__rtems_powerpc_gwlcfm__)
+#  include <powerpc/gwlcfm/rtems/score/types.h>
+#elif defined(__rtems_powerpc_haleakala__)
+#  include <powerpc/haleakala/rtems/score/types.h>
+#elif defined(__rtems_powerpc_hsc_cm01__)
+#  include <powerpc/hsc_cm01/rtems/score/types.h>
+#elif defined(__rtems_powerpc_icecube__)
+#  include <powerpc/icecube/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mbx821_001__)
+#  include <powerpc/mbx821_001/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mbx821_002__)
+#  include <powerpc/mbx821_002/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mbx821_002b__)
+#  include <powerpc/mbx821_002b/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mbx860_001b__)
+#  include <powerpc/mbx860_001b/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mbx860_002__)
+#  include <powerpc/mbx860_002/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mbx860_005b__)
+#  include <powerpc/mbx860_005b/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mbx860_1b__)
+#  include <powerpc/mbx860_1b/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mcp750__)
+#  include <powerpc/mcp750/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mpc5566evb__)
+#  include <powerpc/mpc5566evb/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mpc5566evb_spe__)
+#  include <powerpc/mpc5566evb_spe/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mpc5643l_dpu__)
+#  include <powerpc/mpc5643l_dpu/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mpc5643l_evb__)
+#  include <powerpc/mpc5643l_evb/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mpc5668g__)
+#  include <powerpc/mpc5668g/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_app__)
+#  include <powerpc/mpc5674f_ecu508_app/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_boot__)
+#  include <powerpc/mpc5674f_ecu508_boot/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mpc5674f_rsm6__)
+#  include <powerpc/mpc5674f_rsm6/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mpc5674fevb__)
+#  include <powerpc/mpc5674fevb/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mpc5674fevb_spe__)
+#  include <powerpc/mpc5674fevb_spe/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mpc8260ads__)
+#  include <powerpc/mpc8260ads/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mpc8309som__)
+#  include <powerpc/mpc8309som/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mpc8313erdb__)
+#  include <powerpc/mpc8313erdb/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mpc8349eamds__)
+#  include <powerpc/mpc8349eamds/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mtx603e__)
+#  include <powerpc/mtx603e/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mvme2100__)
+#  include <powerpc/mvme2100/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mvme2307__)
+#  include <powerpc/mvme2307/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mvme3100__)
+#  include <powerpc/mvme3100/rtems/score/types.h>
+#elif defined(__rtems_powerpc_mvme5500__)
+#  include <powerpc/mvme5500/rtems/score/types.h>
+#elif defined(__rtems_powerpc_pghplus__)
+#  include <powerpc/pghplus/rtems/score/types.h>
+#elif defined(__rtems_powerpc_phycore_mpc5554__)
+#  include <powerpc/phycore_mpc5554/rtems/score/types.h>
+#elif defined(__rtems_powerpc_pm520_cr825__)
+#  include <powerpc/pm520_cr825/rtems/score/types.h>
+#elif defined(__rtems_powerpc_pm520_ze30__)
+#  include <powerpc/pm520_ze30/rtems/score/types.h>
+#elif defined(__rtems_powerpc_psim__)
+#  include <powerpc/psim/rtems/score/types.h>
+#elif defined(__rtems_powerpc_qemuppc__)
+#  include <powerpc/qemuppc/rtems/score/types.h>
+#elif defined(__rtems_powerpc_qemuprep__)
+#  include <powerpc/qemuprep/rtems/score/types.h>
+#elif defined(__rtems_powerpc_qemuprep_altivec__)
+#  include <powerpc/qemuprep-altivec/rtems/score/types.h>
+#elif defined(__rtems_powerpc_qoriq_core_0__)
+#  include <powerpc/qoriq_core_0/rtems/score/types.h>
+#elif defined(__rtems_powerpc_qoriq_core_1__)
+#  include <powerpc/qoriq_core_1/rtems/score/types.h>
+#elif defined(__rtems_powerpc_qoriq_p1020rdb__)
+#  include <powerpc/qoriq_p1020rdb/rtems/score/types.h>
+#elif defined(__rtems_powerpc_score603e__)
+#  include <powerpc/score603e/rtems/score/types.h>
+#elif defined(__rtems_powerpc_ss555__)
+#  include <powerpc/ss555/rtems/score/types.h>
+#elif defined(__rtems_powerpc_t32mppc__)
+#  include <powerpc/t32mppc/rtems/score/types.h>
+#elif defined(__rtems_powerpc_tqm8xx_stk8xx__)
+#  include <powerpc/tqm8xx_stk8xx/rtems/score/types.h>
+#elif defined(__rtems_powerpc_virtex__)
+#  include <powerpc/virtex/rtems/score/types.h>
+#elif defined(__rtems_powerpc_virtex4__)
+#  include <powerpc/virtex4/rtems/score/types.h>
+#elif defined(__rtems_powerpc_virtex5__)
+#  include <powerpc/virtex5/rtems/score/types.h>
+#elif defined(__rtems_sh_gensh1__)
+#  include <sh/gensh1/rtems/score/types.h>
+#elif defined(__rtems_sh_gensh2__)
+#  include <sh/gensh2/rtems/score/types.h>
+#elif defined(__rtems_sh_gensh4__)
+#  include <sh/gensh4/rtems/score/types.h>
+#elif defined(__rtems_sh_simsh1__)
+#  include <sh/simsh1/rtems/score/types.h>
+#elif defined(__rtems_sh_simsh2__)
+#  include <sh/simsh2/rtems/score/types.h>
+#elif defined(__rtems_sh_simsh2e__)
+#  include <sh/simsh2e/rtems/score/types.h>
+#elif defined(__rtems_sh_simsh4__)
+#  include <sh/simsh4/rtems/score/types.h>
+#elif defined(__rtems_sparc_erc32__)
+#  include <sparc/erc32/rtems/score/types.h>
+#elif defined(__rtems_sparc_leon2__)
+#  include <sparc/leon2/rtems/score/types.h>
+#elif defined(__rtems_sparc_leon3__)
+#  include <sparc/leon3/rtems/score/types.h>
+#elif defined(__rtems_sparc_ngmp__)
+#  include <sparc/ngmp/rtems/score/types.h>
+#elif defined(__rtems_sparc_sis__)
+#  include <sparc/sis/rtems/score/types.h>
+#elif defined(__rtems_sparc64_niagara__)
+#  include <sparc64/niagara/rtems/score/types.h>
+#elif defined(__rtems_sparc64_usiii__)
+#  include <sparc64/usiii/rtems/score/types.h>
+#elif defined(__rtems_v850_v850e1sim__)
+#  include <v850/v850e1sim/rtems/score/types.h>
+#elif defined(__rtems_v850_v850e2sim__)
+#  include <v850/v850e2sim/rtems/score/types.h>
+#elif defined(__rtems_v850_v850e2v3sim__)
+#  include <v850/v850e2v3sim/rtems/score/types.h>
+#elif defined(__rtems_v850_v850esim__)
+#  include <v850/v850esim/rtems/score/types.h>
+#elif defined(__rtems_v850_v850essim__)
+#  include <v850/v850essim/rtems/score/types.h>
+#elif defined(__rtems_v850_v850sim__)
+#  include <v850/v850sim/rtems/score/types.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/cpukit/score/include/rtems/score/userext.h b/include/rtems/score/userext.h
index 2bd8f8a88b..2bd8f8a88b 100644
--- a/cpukit/score/include/rtems/score/userext.h
+++ b/include/rtems/score/userext.h
diff --git a/cpukit/score/include/rtems/score/userextimpl.h b/include/rtems/score/userextimpl.h
index 19055f976b..19055f976b 100644
--- a/cpukit/score/include/rtems/score/userextimpl.h
+++ b/include/rtems/score/userextimpl.h
diff --git a/cpukit/score/cpu/v850/rtems/score/v850.h b/include/rtems/score/v850.h
index 26ab6c209d..26ab6c209d 100644
--- a/cpukit/score/cpu/v850/rtems/score/v850.h
+++ b/include/rtems/score/v850.h
diff --git a/cpukit/score/include/rtems/score/watchdog.h b/include/rtems/score/watchdog.h
index 06c87a138f..06c87a138f 100644
--- a/cpukit/score/include/rtems/score/watchdog.h
+++ b/include/rtems/score/watchdog.h
diff --git a/cpukit/score/include/rtems/score/watchdogimpl.h b/include/rtems/score/watchdogimpl.h
index d50e279b40..d50e279b40 100644
--- a/cpukit/score/include/rtems/score/watchdogimpl.h
+++ b/include/rtems/score/watchdogimpl.h
diff --git a/cpukit/score/include/rtems/score/wkspace.h b/include/rtems/score/wkspace.h
index 18b01d3ced..18b01d3ced 100644
--- a/cpukit/score/include/rtems/score/wkspace.h
+++ b/include/rtems/score/wkspace.h
diff --git a/cpukit/libmisc/serdbg/serdbg.h b/include/rtems/serdbg.h
index fe106bce44..fe106bce44 100644
--- a/cpukit/libmisc/serdbg/serdbg.h
+++ b/include/rtems/serdbg.h
diff --git a/cpukit/libmisc/serdbg/serdbgcnf.h b/include/rtems/serdbgcnf.h
index 9d4087ae69..9d4087ae69 100644
--- a/cpukit/libmisc/serdbg/serdbgcnf.h
+++ b/include/rtems/serdbgcnf.h
diff --git a/cpukit/libmisc/mouse/serial_mouse.h b/include/rtems/serial_mouse.h
index 174fcfb909..174fcfb909 100644
--- a/cpukit/libmisc/mouse/serial_mouse.h
+++ b/include/rtems/serial_mouse.h
diff --git a/cpukit/score/include/rtems/seterr.h b/include/rtems/seterr.h
index 1e9e0d0931..1e9e0d0931 100644
--- a/cpukit/score/include/rtems/seterr.h
+++ b/include/rtems/seterr.h
diff --git a/cpukit/libmisc/shell/shell.h b/include/rtems/shell.h
index ea8532d332..ea8532d332 100644
--- a/cpukit/libmisc/shell/shell.h
+++ b/include/rtems/shell.h
diff --git a/cpukit/libmisc/shell/shellconfig.h b/include/rtems/shellconfig.h
index cc2165b419..cc2165b419 100644
--- a/cpukit/libmisc/shell/shellconfig.h
+++ b/include/rtems/shellconfig.h
diff --git a/cpukit/libblock/include/rtems/sparse-disk.h b/include/rtems/sparse-disk.h
index e558e08925..e558e08925 100644
--- a/cpukit/libblock/include/rtems/sparse-disk.h
+++ b/include/rtems/sparse-disk.h
diff --git a/cpukit/sapi/include/rtems/sptables.h b/include/rtems/sptables.h
index dc7ea59bf7..dc7ea59bf7 100644
--- a/cpukit/sapi/include/rtems/sptables.h
+++ b/include/rtems/sptables.h
diff --git a/cpukit/libcsupport/include/spurious.h b/include/rtems/spurious.h
index 049f3bf3a0..049f3bf3a0 100644
--- a/cpukit/libcsupport/include/spurious.h
+++ b/include/rtems/spurious.h
diff --git a/cpukit/libmisc/stackchk/stackchk.h b/include/rtems/stackchk.h
index 823c8dfde0..823c8dfde0 100644
--- a/cpukit/libmisc/stackchk/stackchk.h
+++ b/include/rtems/stackchk.h
diff --git a/cpukit/include/rtems/status-checks.h b/include/rtems/status-checks.h
index 482e9bdbcb..482e9bdbcb 100644
--- a/cpukit/include/rtems/status-checks.h
+++ b/include/rtems/status-checks.h
diff --git a/cpukit/libmisc/redirector/stdio-redirect.h b/include/rtems/stdio-redirect.h
index 6f1d4cdd98..6f1d4cdd98 100644
--- a/cpukit/libmisc/redirector/stdio-redirect.h
+++ b/include/rtems/stdio-redirect.h
diff --git a/cpukit/libmisc/stringto/stringto.h b/include/rtems/stringto.h
index 878814da54..878814da54 100644
--- a/cpukit/libmisc/stringto/stringto.h
+++ b/include/rtems/stringto.h
diff --git a/cpukit/score/include/rtems/system.h b/include/rtems/system.h
index d063c78063..d063c78063 100644
--- a/cpukit/score/include/rtems/system.h
+++ b/include/rtems/system.h
diff --git a/cpukit/telnetd/telnetd.h b/include/rtems/telnetd.h
index a5c8a187e3..a5c8a187e3 100644
--- a/cpukit/telnetd/telnetd.h
+++ b/include/rtems/telnetd.h
diff --git a/cpukit/libmisc/serdbg/termios_printk.h b/include/rtems/termios_printk.h
index dcb183533a..dcb183533a 100644
--- a/cpukit/libmisc/serdbg/termios_printk.h
+++ b/include/rtems/termios_printk.h
diff --git a/cpukit/libmisc/serdbg/termios_printk_cnf.h b/include/rtems/termios_printk_cnf.h
index 03c3090c38..03c3090c38 100644
--- a/cpukit/libmisc/serdbg/termios_printk_cnf.h
+++ b/include/rtems/termios_printk_cnf.h
diff --git a/cpukit/libcsupport/include/rtems/termiostypes.h b/include/rtems/termiostypes.h
index 71be95fc06..71be95fc06 100644
--- a/cpukit/libcsupport/include/rtems/termiostypes.h
+++ b/include/rtems/termiostypes.h
diff --git a/cpukit/sapi/include/rtems/test.h b/include/rtems/test.h
index 48a33a04e5..48a33a04e5 100644
--- a/cpukit/sapi/include/rtems/test.h
+++ b/include/rtems/test.h
diff --git a/cpukit/libnetworking/rtems/tftp.h b/include/rtems/tftp.h
index ed3ebd7865..ed3ebd7865 100644
--- a/cpukit/libnetworking/rtems/tftp.h
+++ b/include/rtems/tftp.h
diff --git a/cpukit/sapi/include/rtems/timespec.h b/include/rtems/timespec.h
index e82d271492..e82d271492 100644
--- a/cpukit/sapi/include/rtems/timespec.h
+++ b/include/rtems/timespec.h
diff --git a/cpukit/libcsupport/include/rtems/tod.h b/include/rtems/tod.h
index 971e8548e8..971e8548e8 100644
--- a/cpukit/libcsupport/include/rtems/tod.h
+++ b/include/rtems/tod.h
diff --git a/c/src/lib/libbsp/shared/umon/umon.h b/include/rtems/umon.h
index 3c5bdf9f34..3c5bdf9f34 100644
--- a/c/src/lib/libbsp/shared/umon/umon.h
+++ b/include/rtems/umon.h
diff --git a/cpukit/libmisc/untar/untar.h b/include/rtems/untar.h
index c1f71dce00..c1f71dce00 100644
--- a/cpukit/libmisc/untar/untar.h
+++ b/include/rtems/untar.h
diff --git a/cpukit/include/rtems/userenv.h b/include/rtems/userenv.h
index 7d6ffb05a5..7d6ffb05a5 100644
--- a/cpukit/include/rtems/userenv.h
+++ b/include/rtems/userenv.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/vgacons.h b/include/rtems/vgacons.h
index df7615bf5e..df7615bf5e 100644
--- a/c/src/lib/libbsp/i386/pc386/console/vgacons.h
+++ b/include/rtems/vgacons.h
diff --git a/cpukit/libcsupport/include/vmeintr.h b/include/rtems/vmeintr.h
index 74bda9bf08..74bda9bf08 100644
--- a/cpukit/libcsupport/include/vmeintr.h
+++ b/include/rtems/vmeintr.h
diff --git a/cpukit/libcsupport/include/zilog/z8036.h b/include/rtems/zilog/z8036.h
index fea1493905..fea1493905 100644
--- a/cpukit/libcsupport/include/zilog/z8036.h
+++ b/include/rtems/zilog/z8036.h
diff --git a/cpukit/libcsupport/include/zilog/z8530.h b/include/rtems/zilog/z8530.h
index 161b9a022c..161b9a022c 100644
--- a/cpukit/libcsupport/include/zilog/z8530.h
+++ b/include/rtems/zilog/z8530.h
diff --git a/cpukit/libcsupport/include/zilog/z8536.h b/include/rtems/zilog/z8536.h
index d251735014..d251735014 100644
--- a/cpukit/libcsupport/include/zilog/z8536.h
+++ b/include/rtems/zilog/z8536.h
diff --git a/c/src/lib/libcpu/arm/s3c24xx/include/s3c2400.h b/include/s3c2400.h
index 092dcffe5c..092dcffe5c 100644
--- a/c/src/lib/libcpu/arm/s3c24xx/include/s3c2400.h
+++ b/include/s3c2400.h
diff --git a/c/src/lib/libcpu/arm/s3c24xx/include/s3c2410.h b/include/s3c2410.h
index d11bcf9d21..d11bcf9d21 100644
--- a/c/src/lib/libcpu/arm/s3c24xx/include/s3c2410.h
+++ b/include/s3c2410.h
diff --git a/c/src/lib/libcpu/arm/s3c24xx/include/s3c24xx.h b/include/s3c24xx.h
index 914b867abf..914b867abf 100644
--- a/c/src/lib/libcpu/arm/s3c24xx/include/s3c24xx.h
+++ b/include/s3c24xx.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/sdram.h b/include/sdram.h
index 52acaa61db..52acaa61db 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/sdram.h
+++ b/include/sdram.h
diff --git a/cpukit/posix/include/semaphore.h b/include/semaphore.h
index b22453d2af..b22453d2af 100644
--- a/cpukit/posix/include/semaphore.h
+++ b/include/semaphore.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/include/sh/gensh1/bsp.h
index ced4967c93..ced4967c93 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h
+++ b/include/sh/gensh1/bsp.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/coverhd.h b/include/sh/gensh1/coverhd.h
index 9bad9bf01a..9bad9bf01a 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/coverhd.h
+++ b/include/sh/gensh1/coverhd.h
diff --git a/cpukit/score/cpu/sh/rtems/asm.h b/include/sh/gensh1/rtems/asm.h
index ac730310cd..ac730310cd 100644
--- a/cpukit/score/cpu/sh/rtems/asm.h
+++ b/include/sh/gensh1/rtems/asm.h
diff --git a/cpukit/score/cpu/sh/rtems/score/cpu.h b/include/sh/gensh1/rtems/score/cpu.h
index 217eb7da96..217eb7da96 100644
--- a/cpukit/score/cpu/sh/rtems/score/cpu.h
+++ b/include/sh/gensh1/rtems/score/cpu.h
diff --git a/include/sh/gensh1/rtems/score/cpuatomic.h b/include/sh/gensh1/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/sh/gensh1/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/sh/rtems/score/types.h b/include/sh/gensh1/rtems/score/types.h
index 0734d1b216..0734d1b216 100644
--- a/cpukit/score/cpu/sh/rtems/score/types.h
+++ b/include/sh/gensh1/rtems/score/types.h
diff --git a/c/src/lib/libcpu/sh/sh7032/include/sci.h b/include/sh/gensh1/sh/sci.h
index 5653afca3c..5653afca3c 100644
--- a/c/src/lib/libcpu/sh/sh7032/include/sci.h
+++ b/include/sh/gensh1/sh/sci.h
diff --git a/c/src/lib/libcpu/sh/sh7032/include/sh7_pfc.h b/include/sh/gensh1/sh/sh7_pfc.h
index 1045af6af8..1045af6af8 100644
--- a/c/src/lib/libcpu/sh/sh7032/include/sh7_pfc.h
+++ b/include/sh/gensh1/sh/sh7_pfc.h
diff --git a/c/src/lib/libcpu/sh/sh7032/include/sh7_sci.h b/include/sh/gensh1/sh/sh7_sci.h
index 0b80a485d3..0b80a485d3 100644
--- a/c/src/lib/libcpu/sh/sh7032/include/sh7_sci.h
+++ b/include/sh/gensh1/sh/sh7_sci.h
diff --git a/include/sh/gensh1/tm27.h b/include/sh/gensh1/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/sh/gensh1/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/sh/gensh2/include/bsp.h b/include/sh/gensh2/bsp.h
index 6ab35109d1..6ab35109d1 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/bsp.h
+++ b/include/sh/gensh2/bsp.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/coverhd.h b/include/sh/gensh2/coverhd.h
index d6eec4fe6d..d6eec4fe6d 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/coverhd.h
+++ b/include/sh/gensh2/coverhd.h
diff --git a/include/sh/gensh2/rtems/asm.h b/include/sh/gensh2/rtems/asm.h
new file mode 100644
index 0000000000..b81e3bb9b3
--- /dev/null
+++ b/include/sh/gensh2/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/asm.h>
diff --git a/include/sh/gensh2/rtems/score/cpu.h b/include/sh/gensh2/rtems/score/cpu.h
new file mode 100644
index 0000000000..a6c899099a
--- /dev/null
+++ b/include/sh/gensh2/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/score/cpu.h>
diff --git a/include/sh/gensh2/rtems/score/cpuatomic.h b/include/sh/gensh2/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/sh/gensh2/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/sh/gensh2/rtems/score/types.h b/include/sh/gensh2/rtems/score/types.h
new file mode 100644
index 0000000000..fa30bb77da
--- /dev/null
+++ b/include/sh/gensh2/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/score/types.h>
diff --git a/c/src/lib/libcpu/sh/sh7045/include/sci.h b/include/sh/gensh2/sh/sci.h
index dc34371d48..dc34371d48 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/sci.h
+++ b/include/sh/gensh2/sh/sci.h
diff --git a/c/src/lib/libcpu/sh/sh7045/include/sh7_pfc.h b/include/sh/gensh2/sh/sh7_pfc.h
index b56433a9e2..b56433a9e2 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/sh7_pfc.h
+++ b/include/sh/gensh2/sh/sh7_pfc.h
diff --git a/c/src/lib/libcpu/sh/sh7045/include/sh7_sci.h b/include/sh/gensh2/sh/sh7_sci.h
index 7218313704..7218313704 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/sh7_sci.h
+++ b/include/sh/gensh2/sh/sh7_sci.h
diff --git a/include/sh/gensh2/tm27.h b/include/sh/gensh2/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/sh/gensh2/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/c/src/lib/libbsp/sh/gensh4/include/bsp.h b/include/sh/gensh4/bsp.h
index e9d39a9ee8..e9d39a9ee8 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/bsp.h
+++ b/include/sh/gensh4/bsp.h
diff --git a/include/sh/gensh4/coverhd.h b/include/sh/gensh4/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/sh/gensh4/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/sh/gensh4/rtems/asm.h b/include/sh/gensh4/rtems/asm.h
new file mode 100644
index 0000000000..b81e3bb9b3
--- /dev/null
+++ b/include/sh/gensh4/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/asm.h>
diff --git a/include/sh/gensh4/rtems/score/cpu.h b/include/sh/gensh4/rtems/score/cpu.h
new file mode 100644
index 0000000000..a6c899099a
--- /dev/null
+++ b/include/sh/gensh4/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/score/cpu.h>
diff --git a/include/sh/gensh4/rtems/score/cpuatomic.h b/include/sh/gensh4/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/sh/gensh4/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/sh/gensh4/rtems/score/types.h b/include/sh/gensh4/rtems/score/types.h
new file mode 100644
index 0000000000..fa30bb77da
--- /dev/null
+++ b/include/sh/gensh4/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/sh/gensh4/include/tm27.h b/include/sh/gensh4/tm27.h
index c26ec49272..c26ec49272 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/tm27.h
+++ b/include/sh/gensh4/tm27.h
diff --git a/c/src/lib/libcpu/sh/sh7045/include/io_types.h b/include/sh/io_types.h
index 1dab885672..1dab885672 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/io_types.h
+++ b/include/sh/io_types.h
diff --git a/include/sh/sci.h b/include/sh/sci.h
new file mode 100644
index 0000000000..b41e0640af
--- /dev/null
+++ b/include/sh/sci.h
@@ -0,0 +1,12 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_sh_gensh1__)
+#  include <sh/gensh1/sh/sci.h>
+#elif defined(__rtems_sh_gensh2__)
+#  include <sh/gensh2/sh/sci.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libcpu/sh/sh7045/include/sci_termios.h b/include/sh/sci_termios.h
index 63750c9461..63750c9461 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/sci_termios.h
+++ b/include/sh/sci_termios.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/sh/sh4uart.h b/include/sh/sh4uart.h
index 1e7a486eb8..1e7a486eb8 100644
--- a/c/src/lib/libcpu/sh/sh7750/include/sh/sh4uart.h
+++ b/include/sh/sh4uart.h
diff --git a/include/sh/sh7_pfc.h b/include/sh/sh7_pfc.h
new file mode 100644
index 0000000000..4a5c1b4062
--- /dev/null
+++ b/include/sh/sh7_pfc.h
@@ -0,0 +1,12 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_sh_gensh1__)
+#  include <sh/gensh1/sh/sh7_pfc.h>
+#elif defined(__rtems_sh_gensh2__)
+#  include <sh/gensh2/sh/sh7_pfc.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/include/sh/sh7_sci.h b/include/sh/sh7_sci.h
new file mode 100644
index 0000000000..71f3eef65d
--- /dev/null
+++ b/include/sh/sh7_sci.h
@@ -0,0 +1,12 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_sh_gensh1__)
+#  include <sh/gensh1/sh/sh7_sci.h>
+#elif defined(__rtems_sh_gensh2__)
+#  include <sh/gensh2/sh/sh7_sci.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/sh/shsim/include/bsp.h b/include/sh/simsh1/bsp.h
index 6e606b4e2e..6e606b4e2e 100644
--- a/c/src/lib/libbsp/sh/shsim/include/bsp.h
+++ b/include/sh/simsh1/bsp.h
diff --git a/c/src/lib/libbsp/sh/shsim/include/syscall.h b/include/sh/simsh1/bsp/syscall.h
index e5cde7217b..e5cde7217b 100644
--- a/c/src/lib/libbsp/sh/shsim/include/syscall.h
+++ b/include/sh/simsh1/bsp/syscall.h
diff --git a/include/sh/simsh1/coverhd.h b/include/sh/simsh1/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/sh/simsh1/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/sh/simsh1/rtems/asm.h b/include/sh/simsh1/rtems/asm.h
new file mode 100644
index 0000000000..b81e3bb9b3
--- /dev/null
+++ b/include/sh/simsh1/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/asm.h>
diff --git a/include/sh/simsh1/rtems/score/cpu.h b/include/sh/simsh1/rtems/score/cpu.h
new file mode 100644
index 0000000000..a6c899099a
--- /dev/null
+++ b/include/sh/simsh1/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/score/cpu.h>
diff --git a/include/sh/simsh1/rtems/score/cpuatomic.h b/include/sh/simsh1/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/sh/simsh1/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/sh/simsh1/rtems/score/types.h b/include/sh/simsh1/rtems/score/types.h
new file mode 100644
index 0000000000..fa30bb77da
--- /dev/null
+++ b/include/sh/simsh1/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/score/types.h>
diff --git a/include/sh/simsh1/tm27.h b/include/sh/simsh1/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/sh/simsh1/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/sh/simsh2/bsp.h b/include/sh/simsh2/bsp.h
new file mode 100644
index 0000000000..85a05f74ee
--- /dev/null
+++ b/include/sh/simsh2/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/simsh1/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/simsh1/bsp.h>
diff --git a/include/sh/simsh2/bsp/syscall.h b/include/sh/simsh2/bsp/syscall.h
new file mode 100644
index 0000000000..0b7e76ebb8
--- /dev/null
+++ b/include/sh/simsh2/bsp/syscall.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/simsh1/bsp/syscall.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/simsh1/bsp/syscall.h>
diff --git a/include/sh/simsh2/coverhd.h b/include/sh/simsh2/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/sh/simsh2/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/sh/simsh2/rtems/asm.h b/include/sh/simsh2/rtems/asm.h
new file mode 100644
index 0000000000..b81e3bb9b3
--- /dev/null
+++ b/include/sh/simsh2/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/asm.h>
diff --git a/include/sh/simsh2/rtems/score/cpu.h b/include/sh/simsh2/rtems/score/cpu.h
new file mode 100644
index 0000000000..a6c899099a
--- /dev/null
+++ b/include/sh/simsh2/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/score/cpu.h>
diff --git a/include/sh/simsh2/rtems/score/cpuatomic.h b/include/sh/simsh2/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/sh/simsh2/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/sh/simsh2/rtems/score/types.h b/include/sh/simsh2/rtems/score/types.h
new file mode 100644
index 0000000000..fa30bb77da
--- /dev/null
+++ b/include/sh/simsh2/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/score/types.h>
diff --git a/include/sh/simsh2/tm27.h b/include/sh/simsh2/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/sh/simsh2/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/sh/simsh2e/bsp.h b/include/sh/simsh2e/bsp.h
new file mode 100644
index 0000000000..85a05f74ee
--- /dev/null
+++ b/include/sh/simsh2e/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/simsh1/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/simsh1/bsp.h>
diff --git a/include/sh/simsh2e/bsp/syscall.h b/include/sh/simsh2e/bsp/syscall.h
new file mode 100644
index 0000000000..0b7e76ebb8
--- /dev/null
+++ b/include/sh/simsh2e/bsp/syscall.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/simsh1/bsp/syscall.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/simsh1/bsp/syscall.h>
diff --git a/include/sh/simsh2e/coverhd.h b/include/sh/simsh2e/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/sh/simsh2e/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/sh/simsh2e/rtems/asm.h b/include/sh/simsh2e/rtems/asm.h
new file mode 100644
index 0000000000..b81e3bb9b3
--- /dev/null
+++ b/include/sh/simsh2e/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/asm.h>
diff --git a/include/sh/simsh2e/rtems/score/cpu.h b/include/sh/simsh2e/rtems/score/cpu.h
new file mode 100644
index 0000000000..a6c899099a
--- /dev/null
+++ b/include/sh/simsh2e/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/score/cpu.h>
diff --git a/include/sh/simsh2e/rtems/score/cpuatomic.h b/include/sh/simsh2e/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/sh/simsh2e/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/sh/simsh2e/rtems/score/types.h b/include/sh/simsh2e/rtems/score/types.h
new file mode 100644
index 0000000000..fa30bb77da
--- /dev/null
+++ b/include/sh/simsh2e/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/score/types.h>
diff --git a/include/sh/simsh2e/tm27.h b/include/sh/simsh2e/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/sh/simsh2e/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/sh/simsh4/bsp.h b/include/sh/simsh4/bsp.h
new file mode 100644
index 0000000000..85a05f74ee
--- /dev/null
+++ b/include/sh/simsh4/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/simsh1/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/simsh1/bsp.h>
diff --git a/include/sh/simsh4/bsp/syscall.h b/include/sh/simsh4/bsp/syscall.h
new file mode 100644
index 0000000000..0b7e76ebb8
--- /dev/null
+++ b/include/sh/simsh4/bsp/syscall.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/simsh1/bsp/syscall.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/simsh1/bsp/syscall.h>
diff --git a/include/sh/simsh4/coverhd.h b/include/sh/simsh4/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/sh/simsh4/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/sh/simsh4/rtems/asm.h b/include/sh/simsh4/rtems/asm.h
new file mode 100644
index 0000000000..b81e3bb9b3
--- /dev/null
+++ b/include/sh/simsh4/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/asm.h>
diff --git a/include/sh/simsh4/rtems/score/cpu.h b/include/sh/simsh4/rtems/score/cpu.h
new file mode 100644
index 0000000000..a6c899099a
--- /dev/null
+++ b/include/sh/simsh4/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/score/cpu.h>
diff --git a/include/sh/simsh4/rtems/score/cpuatomic.h b/include/sh/simsh4/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/sh/simsh4/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/sh/simsh4/rtems/score/types.h b/include/sh/simsh4/rtems/score/types.h
new file mode 100644
index 0000000000..fa30bb77da
--- /dev/null
+++ b/include/sh/simsh4/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sh/gensh1/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sh/gensh1/rtems/score/types.h>
diff --git a/include/sh/simsh4/tm27.h b/include/sh/simsh4/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/sh/simsh4/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/cpukit/libmd/sha256.h b/include/sha256.h
index 1b6a4f4c57..1b6a4f4c57 100644
--- a/cpukit/libmd/sha256.h
+++ b/include/sha256.h
diff --git a/cpukit/libmd/sha512.h b/include/sha512.h
index 8998f4c5bf..8998f4c5bf 100644
--- a/cpukit/libmd/sha512.h
+++ b/include/sha512.h
diff --git a/c/src/lib/libbsp/arm/gp32/smc/smc.h b/include/smc.h
index 19600e8a1e..19600e8a1e 100644
--- a/c/src/lib/libbsp/arm/gp32/smc/smc.h
+++ b/include/smc.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp.h b/include/sparc/erc32/bsp.h
index 33939106d8..33939106d8 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/bsp.h
+++ b/include/sparc/erc32/bsp.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp/irq.h b/include/sparc/erc32/bsp/irq.h
index e0bc3393d8..e0bc3393d8 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/bsp/irq.h
+++ b/include/sparc/erc32/bsp/irq.h
diff --git a/include/sparc/erc32/coverhd.h b/include/sparc/erc32/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/sparc/erc32/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/c/src/lib/libcpu/sparc/include/libcpu/byteorder.h b/include/sparc/erc32/libcpu/byteorder.h
index 10b4239480..10b4239480 100644
--- a/c/src/lib/libcpu/sparc/include/libcpu/byteorder.h
+++ b/include/sparc/erc32/libcpu/byteorder.h
diff --git a/cpukit/score/cpu/sparc/rtems/asm.h b/include/sparc/erc32/rtems/asm.h
index a2b11f63fc..a2b11f63fc 100644
--- a/cpukit/score/cpu/sparc/rtems/asm.h
+++ b/include/sparc/erc32/rtems/asm.h
diff --git a/cpukit/score/cpu/sparc/rtems/score/cpu.h b/include/sparc/erc32/rtems/score/cpu.h
index 6ce065cfe4..6ce065cfe4 100644
--- a/cpukit/score/cpu/sparc/rtems/score/cpu.h
+++ b/include/sparc/erc32/rtems/score/cpu.h
diff --git a/include/sparc/erc32/rtems/score/cpuatomic.h b/include/sparc/erc32/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/sparc/erc32/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/sparc/rtems/score/types.h b/include/sparc/erc32/rtems/score/types.h
index 71a401c454..71a401c454 100644
--- a/cpukit/score/cpu/sparc/rtems/score/types.h
+++ b/include/sparc/erc32/rtems/score/types.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/tm27.h b/include/sparc/erc32/tm27.h
index 958036fbf0..958036fbf0 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/tm27.h
+++ b/include/sparc/erc32/tm27.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp.h b/include/sparc/leon2/bsp.h
index 41a1e43629..41a1e43629 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/bsp.h
+++ b/include/sparc/leon2/bsp.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp/irq.h b/include/sparc/leon2/bsp/irq.h
index 086bf253c4..086bf253c4 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/bsp/irq.h
+++ b/include/sparc/leon2/bsp/irq.h
diff --git a/include/sparc/leon2/coverhd.h b/include/sparc/leon2/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/sparc/leon2/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/c/src/lib/libbsp/sparc/leon2/include/leon.h b/include/sparc/leon2/leon.h
index 7ec6b1dcf9..7ec6b1dcf9 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/leon.h
+++ b/include/sparc/leon2/leon.h
diff --git a/include/sparc/leon2/libcpu/byteorder.h b/include/sparc/leon2/libcpu/byteorder.h
new file mode 100644
index 0000000000..9f67cf1c45
--- /dev/null
+++ b/include/sparc/leon2/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/libcpu/byteorder.h>
diff --git a/include/sparc/leon2/rtems/asm.h b/include/sparc/leon2/rtems/asm.h
new file mode 100644
index 0000000000..5691a127d5
--- /dev/null
+++ b/include/sparc/leon2/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/rtems/asm.h>
diff --git a/include/sparc/leon2/rtems/score/cpu.h b/include/sparc/leon2/rtems/score/cpu.h
new file mode 100644
index 0000000000..0c9d359cab
--- /dev/null
+++ b/include/sparc/leon2/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/rtems/score/cpu.h>
diff --git a/include/sparc/leon2/rtems/score/cpuatomic.h b/include/sparc/leon2/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/sparc/leon2/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/sparc/leon2/rtems/score/types.h b/include/sparc/leon2/rtems/score/types.h
new file mode 100644
index 0000000000..a6cb6998f4
--- /dev/null
+++ b/include/sparc/leon2/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/sparc/leon2/include/tm27.h b/include/sparc/leon2/tm27.h
index 0d28641b9b..0d28641b9b 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/tm27.h
+++ b/include/sparc/leon2/tm27.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp.h b/include/sparc/leon3/bsp.h
index 2514190750..2514190750 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/bsp.h
+++ b/include/sparc/leon3/bsp.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h b/include/sparc/leon3/bsp/irq.h
index b429c864b5..b429c864b5 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h
+++ b/include/sparc/leon3/bsp/irq.h
diff --git a/include/sparc/leon3/coverhd.h b/include/sparc/leon3/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/sparc/leon3/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/c/src/lib/libbsp/sparc/leon3/include/leon.h b/include/sparc/leon3/leon.h
index c7270cf7d9..c7270cf7d9 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/leon.h
+++ b/include/sparc/leon3/leon.h
diff --git a/include/sparc/leon3/libcpu/byteorder.h b/include/sparc/leon3/libcpu/byteorder.h
new file mode 100644
index 0000000000..9f67cf1c45
--- /dev/null
+++ b/include/sparc/leon3/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/libcpu/byteorder.h>
diff --git a/include/sparc/leon3/rtems/asm.h b/include/sparc/leon3/rtems/asm.h
new file mode 100644
index 0000000000..5691a127d5
--- /dev/null
+++ b/include/sparc/leon3/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/rtems/asm.h>
diff --git a/include/sparc/leon3/rtems/score/cpu.h b/include/sparc/leon3/rtems/score/cpu.h
new file mode 100644
index 0000000000..0c9d359cab
--- /dev/null
+++ b/include/sparc/leon3/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/rtems/score/cpu.h>
diff --git a/include/sparc/leon3/rtems/score/cpuatomic.h b/include/sparc/leon3/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/sparc/leon3/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/sparc/leon3/rtems/score/types.h b/include/sparc/leon3/rtems/score/types.h
new file mode 100644
index 0000000000..a6cb6998f4
--- /dev/null
+++ b/include/sparc/leon3/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/sparc/leon3/include/tm27.h b/include/sparc/leon3/tm27.h
index 00921d4880..00921d4880 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/tm27.h
+++ b/include/sparc/leon3/tm27.h
diff --git a/include/sparc/ngmp/bsp.h b/include/sparc/ngmp/bsp.h
new file mode 100644
index 0000000000..8962cad848
--- /dev/null
+++ b/include/sparc/ngmp/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/leon3/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/leon3/bsp.h>
diff --git a/include/sparc/ngmp/bsp/irq.h b/include/sparc/ngmp/bsp/irq.h
new file mode 100644
index 0000000000..8abe802df0
--- /dev/null
+++ b/include/sparc/ngmp/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/leon3/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/leon3/bsp/irq.h>
diff --git a/include/sparc/ngmp/coverhd.h b/include/sparc/ngmp/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/sparc/ngmp/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/sparc/ngmp/leon.h b/include/sparc/ngmp/leon.h
new file mode 100644
index 0000000000..1f3e95aa86
--- /dev/null
+++ b/include/sparc/ngmp/leon.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/leon3/leon.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/leon3/leon.h>
diff --git a/include/sparc/ngmp/libcpu/byteorder.h b/include/sparc/ngmp/libcpu/byteorder.h
new file mode 100644
index 0000000000..9f67cf1c45
--- /dev/null
+++ b/include/sparc/ngmp/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/libcpu/byteorder.h>
diff --git a/include/sparc/ngmp/rtems/asm.h b/include/sparc/ngmp/rtems/asm.h
new file mode 100644
index 0000000000..5691a127d5
--- /dev/null
+++ b/include/sparc/ngmp/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/rtems/asm.h>
diff --git a/include/sparc/ngmp/rtems/score/cpu.h b/include/sparc/ngmp/rtems/score/cpu.h
new file mode 100644
index 0000000000..0c9d359cab
--- /dev/null
+++ b/include/sparc/ngmp/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/rtems/score/cpu.h>
diff --git a/include/sparc/ngmp/rtems/score/cpuatomic.h b/include/sparc/ngmp/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/sparc/ngmp/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/sparc/ngmp/rtems/score/types.h b/include/sparc/ngmp/rtems/score/types.h
new file mode 100644
index 0000000000..a6cb6998f4
--- /dev/null
+++ b/include/sparc/ngmp/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/rtems/score/types.h>
diff --git a/include/sparc/ngmp/tm27.h b/include/sparc/ngmp/tm27.h
new file mode 100644
index 0000000000..bdee644bea
--- /dev/null
+++ b/include/sparc/ngmp/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/leon3/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/leon3/tm27.h>
diff --git a/include/sparc/sis/bsp.h b/include/sparc/sis/bsp.h
new file mode 100644
index 0000000000..c46116e5e3
--- /dev/null
+++ b/include/sparc/sis/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/bsp.h>
diff --git a/include/sparc/sis/bsp/irq.h b/include/sparc/sis/bsp/irq.h
new file mode 100644
index 0000000000..216148b882
--- /dev/null
+++ b/include/sparc/sis/bsp/irq.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/bsp/irq.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/bsp/irq.h>
diff --git a/include/sparc/sis/coverhd.h b/include/sparc/sis/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/sparc/sis/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/sparc/sis/libcpu/byteorder.h b/include/sparc/sis/libcpu/byteorder.h
new file mode 100644
index 0000000000..9f67cf1c45
--- /dev/null
+++ b/include/sparc/sis/libcpu/byteorder.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/libcpu/byteorder.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/libcpu/byteorder.h>
diff --git a/include/sparc/sis/rtems/asm.h b/include/sparc/sis/rtems/asm.h
new file mode 100644
index 0000000000..5691a127d5
--- /dev/null
+++ b/include/sparc/sis/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/rtems/asm.h>
diff --git a/include/sparc/sis/rtems/score/cpu.h b/include/sparc/sis/rtems/score/cpu.h
new file mode 100644
index 0000000000..0c9d359cab
--- /dev/null
+++ b/include/sparc/sis/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/rtems/score/cpu.h>
diff --git a/include/sparc/sis/rtems/score/cpuatomic.h b/include/sparc/sis/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/sparc/sis/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/sparc/sis/rtems/score/types.h b/include/sparc/sis/rtems/score/types.h
new file mode 100644
index 0000000000..a6cb6998f4
--- /dev/null
+++ b/include/sparc/sis/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/rtems/score/types.h>
diff --git a/include/sparc/sis/tm27.h b/include/sparc/sis/tm27.h
new file mode 100644
index 0000000000..92196c7a9a
--- /dev/null
+++ b/include/sparc/sis/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc/erc32/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc/erc32/tm27.h>
diff --git a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h b/include/sparc64/niagara/bsp.h
index 7705675a97..7705675a97 100644
--- a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h
+++ b/include/sparc64/niagara/bsp.h
diff --git a/include/sparc64/niagara/coverhd.h b/include/sparc64/niagara/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/sparc64/niagara/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/cpukit/score/cpu/sparc64/rtems/asm.h b/include/sparc64/niagara/rtems/asm.h
index f4448b03a5..f4448b03a5 100644
--- a/cpukit/score/cpu/sparc64/rtems/asm.h
+++ b/include/sparc64/niagara/rtems/asm.h
diff --git a/cpukit/score/cpu/sparc64/rtems/score/cpu.h b/include/sparc64/niagara/rtems/score/cpu.h
index ff58fc97d7..ff58fc97d7 100644
--- a/cpukit/score/cpu/sparc64/rtems/score/cpu.h
+++ b/include/sparc64/niagara/rtems/score/cpu.h
diff --git a/include/sparc64/niagara/rtems/score/cpuatomic.h b/include/sparc64/niagara/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/sparc64/niagara/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/sparc64/rtems/score/types.h b/include/sparc64/niagara/rtems/score/types.h
index 8f2c7e37a6..8f2c7e37a6 100644
--- a/cpukit/score/cpu/sparc64/rtems/score/types.h
+++ b/include/sparc64/niagara/rtems/score/types.h
diff --git a/c/src/lib/libbsp/sparc64/niagara/include/tm27.h b/include/sparc64/niagara/tm27.h
index 9001b807ab..9001b807ab 100644
--- a/c/src/lib/libbsp/sparc64/niagara/include/tm27.h
+++ b/include/sparc64/niagara/tm27.h
diff --git a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h b/include/sparc64/usiii/bsp.h
index 0fe13e3f3d..0fe13e3f3d 100644
--- a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h
+++ b/include/sparc64/usiii/bsp.h
diff --git a/include/sparc64/usiii/coverhd.h b/include/sparc64/usiii/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/sparc64/usiii/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/sparc64/usiii/rtems/asm.h b/include/sparc64/usiii/rtems/asm.h
new file mode 100644
index 0000000000..996c2f9e31
--- /dev/null
+++ b/include/sparc64/usiii/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc64/niagara/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc64/niagara/rtems/asm.h>
diff --git a/include/sparc64/usiii/rtems/score/cpu.h b/include/sparc64/usiii/rtems/score/cpu.h
new file mode 100644
index 0000000000..72b24e03f8
--- /dev/null
+++ b/include/sparc64/usiii/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc64/niagara/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc64/niagara/rtems/score/cpu.h>
diff --git a/include/sparc64/usiii/rtems/score/cpuatomic.h b/include/sparc64/usiii/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/sparc64/usiii/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/sparc64/usiii/rtems/score/types.h b/include/sparc64/usiii/rtems/score/types.h
new file mode 100644
index 0000000000..45cb03d640
--- /dev/null
+++ b/include/sparc64/usiii/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* sparc64/niagara/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <sparc64/niagara/rtems/score/types.h>
diff --git a/c/src/lib/libbsp/sparc64/usiii/include/tm27.h b/include/sparc64/usiii/tm27.h
index 14e07ca3a8..14e07ca3a8 100644
--- a/c/src/lib/libbsp/sparc64/usiii/include/tm27.h
+++ b/include/sparc64/usiii/tm27.h
diff --git a/cpukit/include/sys/_iovec.h b/include/sys/_iovec.h
index a6ca68361b..a6ca68361b 100644
--- a/cpukit/include/sys/_iovec.h
+++ b/include/sys/_iovec.h
diff --git a/cpukit/libnetworking/sys/callout.h b/include/sys/callout.h
index 150609eef6..150609eef6 100644
--- a/cpukit/libnetworking/sys/callout.h
+++ b/include/sys/callout.h
diff --git a/cpukit/libdl/include/sys/cdefs_elf.h b/include/sys/cdefs_elf.h
index 91903d6017..91903d6017 100644
--- a/cpukit/libdl/include/sys/cdefs_elf.h
+++ b/include/sys/cdefs_elf.h
diff --git a/cpukit/libnetworking/sys/conf.h b/include/sys/conf.h
index 45abb1c4d6..45abb1c4d6 100644
--- a/cpukit/libnetworking/sys/conf.h
+++ b/include/sys/conf.h
diff --git a/cpukit/libnetworking/sys/domain.h b/include/sys/domain.h
index 0112f574be..0112f574be 100644
--- a/cpukit/libnetworking/sys/domain.h
+++ b/include/sys/domain.h
diff --git a/cpukit/include/sys/endian.h b/include/sys/endian.h
index b78d8c711a..b78d8c711a 100644
--- a/cpukit/include/sys/endian.h
+++ b/include/sys/endian.h
diff --git a/cpukit/libcsupport/include/sys/event.h b/include/sys/event.h
index d92eb55d43..d92eb55d43 100644
--- a/cpukit/libcsupport/include/sys/event.h
+++ b/include/sys/event.h
diff --git a/cpukit/libdl/include/sys/exec_elf.h b/include/sys/exec_elf.h
index 08da7e809e..08da7e809e 100644
--- a/cpukit/libdl/include/sys/exec_elf.h
+++ b/include/sys/exec_elf.h
diff --git a/cpukit/libcsupport/include/sys/filio.h b/include/sys/filio.h
index f1a703a54a..f1a703a54a 100644
--- a/cpukit/libcsupport/include/sys/filio.h
+++ b/include/sys/filio.h
diff --git a/cpukit/libcsupport/include/sys/ioccom.h b/include/sys/ioccom.h
index d454328c23..d454328c23 100644
--- a/cpukit/libcsupport/include/sys/ioccom.h
+++ b/include/sys/ioccom.h
diff --git a/cpukit/libcsupport/include/sys/ioctl.h b/include/sys/ioctl.h
index e5e6fcdf08..e5e6fcdf08 100644
--- a/cpukit/libcsupport/include/sys/ioctl.h
+++ b/include/sys/ioctl.h
diff --git a/cpukit/libnetworking/sys/kernel.h b/include/sys/kernel.h
index 045bf19baf..045bf19baf 100644
--- a/cpukit/libnetworking/sys/kernel.h
+++ b/include/sys/kernel.h
diff --git a/cpukit/libnetworking/sys/libkern.h b/include/sys/libkern.h
index afeaa13db9..afeaa13db9 100644
--- a/cpukit/libnetworking/sys/libkern.h
+++ b/include/sys/libkern.h
diff --git a/cpukit/libnetworking/sys/linker_set.h b/include/sys/linker_set.h
index c83d7c845a..c83d7c845a 100644
--- a/cpukit/libnetworking/sys/linker_set.h
+++ b/include/sys/linker_set.h
diff --git a/cpukit/libnetworking/sys/malloc.h b/include/sys/malloc.h
index 2341053166..2341053166 100644
--- a/cpukit/libnetworking/sys/malloc.h
+++ b/include/sys/malloc.h
diff --git a/cpukit/libnetworking/sys/mbuf.h b/include/sys/mbuf.h
index 48e9e40c2e..48e9e40c2e 100644
--- a/cpukit/libnetworking/sys/mbuf.h
+++ b/include/sys/mbuf.h
diff --git a/cpukit/posix/include/sys/mman.h b/include/sys/mman.h
index ddf34ccabc..ddf34ccabc 100644
--- a/cpukit/posix/include/sys/mman.h
+++ b/include/sys/mman.h
diff --git a/cpukit/libnetworking/sys/mount.h b/include/sys/mount.h
index c422c7f8c4..c422c7f8c4 100644
--- a/cpukit/libnetworking/sys/mount.h
+++ b/include/sys/mount.h
diff --git a/cpukit/libcsupport/include/sys/poll.h b/include/sys/poll.h
index c955f321c7..c955f321c7 100644
--- a/cpukit/libcsupport/include/sys/poll.h
+++ b/include/sys/poll.h
diff --git a/cpukit/include/sys/priority.h b/include/sys/priority.h
index ca3f4981ec..ca3f4981ec 100644
--- a/cpukit/include/sys/priority.h
+++ b/include/sys/priority.h
diff --git a/cpukit/libnetworking/sys/proc.h b/include/sys/proc.h
index 8b8b7dc1b9..8b8b7dc1b9 100644
--- a/cpukit/libnetworking/sys/proc.h
+++ b/include/sys/proc.h
diff --git a/cpukit/libnetworking/sys/protosw.h b/include/sys/protosw.h
index e1119f9378..e1119f9378 100644
--- a/cpukit/libnetworking/sys/protosw.h
+++ b/include/sys/protosw.h
diff --git a/cpukit/libnetworking/sys/reboot.h b/include/sys/reboot.h
index 191f3a477a..191f3a477a 100644
--- a/cpukit/libnetworking/sys/reboot.h
+++ b/include/sys/reboot.h
diff --git a/cpukit/libnetworking/sys/resourcevar.h b/include/sys/resourcevar.h
index 87fc20463c..87fc20463c 100644
--- a/cpukit/libnetworking/sys/resourcevar.h
+++ b/include/sys/resourcevar.h
diff --git a/cpukit/libnetworking/sys/select.h b/include/sys/select.h
index 8a84e4cca6..8a84e4cca6 100644
--- a/cpukit/libnetworking/sys/select.h
+++ b/include/sys/select.h
diff --git a/cpukit/libnetworking/sys/signalvar.h b/include/sys/signalvar.h
index c2311cf05a..c2311cf05a 100644
--- a/cpukit/libnetworking/sys/signalvar.h
+++ b/include/sys/signalvar.h
diff --git a/cpukit/libnetworking/sys/socket.h b/include/sys/socket.h
index 603cfe108e..603cfe108e 100644
--- a/cpukit/libnetworking/sys/socket.h
+++ b/include/sys/socket.h
diff --git a/cpukit/libnetworking/sys/socketvar.h b/include/sys/socketvar.h
index 829b61d936..829b61d936 100644
--- a/cpukit/libnetworking/sys/socketvar.h
+++ b/include/sys/socketvar.h
diff --git a/cpukit/libcsupport/include/sys/sockio.h b/include/sys/sockio.h
index 85393b8894..85393b8894 100644
--- a/cpukit/libcsupport/include/sys/sockio.h
+++ b/include/sys/sockio.h
diff --git a/cpukit/libcsupport/include/sys/statvfs.h b/include/sys/statvfs.h
index cf80478aae..cf80478aae 100644
--- a/cpukit/libcsupport/include/sys/statvfs.h
+++ b/include/sys/statvfs.h
diff --git a/cpukit/libnetworking/sys/sysctl.h b/include/sys/sysctl.h
index 58ac3e007b..58ac3e007b 100644
--- a/cpukit/libnetworking/sys/sysctl.h
+++ b/include/sys/sysctl.h
diff --git a/cpukit/libnetworking/sys/syslog.h b/include/sys/syslog.h
index d6eadd4c7d..d6eadd4c7d 100644
--- a/cpukit/libnetworking/sys/syslog.h
+++ b/include/sys/syslog.h
diff --git a/cpukit/libnetworking/sys/systm.h b/include/sys/systm.h
index ae70148184..ae70148184 100644
--- a/cpukit/libnetworking/sys/systm.h
+++ b/include/sys/systm.h
diff --git a/cpukit/libcsupport/include/sys/termios.h b/include/sys/termios.h
index 648e3a2822..648e3a2822 100644
--- a/cpukit/libcsupport/include/sys/termios.h
+++ b/include/sys/termios.h
diff --git a/cpukit/libcsupport/include/sys/ttycom.h b/include/sys/ttycom.h
index 7d0fd2c0c9..7d0fd2c0c9 100644
--- a/cpukit/libcsupport/include/sys/ttycom.h
+++ b/include/sys/ttycom.h
diff --git a/cpukit/libnetworking/sys/ttydefaults.h b/include/sys/ttydefaults.h
index e81cf54f94..e81cf54f94 100644
--- a/cpukit/libnetworking/sys/ttydefaults.h
+++ b/include/sys/ttydefaults.h
diff --git a/cpukit/libnetworking/sys/ucred.h b/include/sys/ucred.h
index 84c4ebc2e6..84c4ebc2e6 100644
--- a/cpukit/libnetworking/sys/ucred.h
+++ b/include/sys/ucred.h
diff --git a/cpukit/include/sys/uio.h b/include/sys/uio.h
index 56956f0150..56956f0150 100644
--- a/cpukit/include/sys/uio.h
+++ b/include/sys/uio.h
diff --git a/cpukit/libnetworking/sys/un.h b/include/sys/un.h
index 2b8e3f5f40..2b8e3f5f40 100644
--- a/cpukit/libnetworking/sys/un.h
+++ b/include/sys/un.h
diff --git a/cpukit/libcsupport/include/sys/utsname.h b/include/sys/utsname.h
index 95dc2c1c63..95dc2c1c63 100644
--- a/cpukit/libcsupport/include/sys/utsname.h
+++ b/include/sys/utsname.h
diff --git a/cpukit/libnetworking/syslog.h b/include/syslog.h
index 830b4928ad..830b4928ad 100644
--- a/cpukit/libnetworking/syslog.h
+++ b/include/syslog.h
diff --git a/include/system_conf.h b/include/system_conf.h
new file mode 100644
index 0000000000..aa96abee6d
--- /dev/null
+++ b/include/system_conf.h
@@ -0,0 +1,12 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_lm32_lm32_evr__)
+#  include <lm32/lm32_evr/system_conf.h>
+#elif defined(__rtems_lm32_milkymist__)
+#  include <lm32/milkymist/system_conf.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/include/tm27.h b/include/tm27.h
new file mode 100644
index 0000000000..07821c4281
--- /dev/null
+++ b/include/tm27.h
@@ -0,0 +1,382 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_altcycv_devkit__)
+#  include <arm/altcycv_devkit/tm27.h>
+#elif defined(__rtems_arm_altcycv_devkit_smp__)
+#  include <arm/altcycv_devkit_smp/tm27.h>
+#elif defined(__rtems_arm_arm1136jfs__)
+#  include <arm/arm1136jfs/tm27.h>
+#elif defined(__rtems_arm_arm1136js__)
+#  include <arm/arm1136js/tm27.h>
+#elif defined(__rtems_arm_arm7tdmi__)
+#  include <arm/arm7tdmi/tm27.h>
+#elif defined(__rtems_arm_arm920__)
+#  include <arm/arm920/tm27.h>
+#elif defined(__rtems_arm_armcortexa9__)
+#  include <arm/armcortexa9/tm27.h>
+#elif defined(__rtems_arm_beagleboardorig__)
+#  include <arm/beagleboardorig/tm27.h>
+#elif defined(__rtems_arm_beagleboardxm__)
+#  include <arm/beagleboardxm/tm27.h>
+#elif defined(__rtems_arm_beagleboneblack__)
+#  include <arm/beagleboneblack/tm27.h>
+#elif defined(__rtems_arm_beaglebonewhite__)
+#  include <arm/beaglebonewhite/tm27.h>
+#elif defined(__rtems_arm_csb336__)
+#  include <arm/csb336/tm27.h>
+#elif defined(__rtems_arm_csb337__)
+#  include <arm/csb337/tm27.h>
+#elif defined(__rtems_arm_csb637__)
+#  include <arm/csb637/tm27.h>
+#elif defined(__rtems_arm_edb7312__)
+#  include <arm/edb7312/tm27.h>
+#elif defined(__rtems_arm_gba__)
+#  include <arm/gba/tm27.h>
+#elif defined(__rtems_arm_gp32__)
+#  include <arm/gp32/tm27.h>
+#elif defined(__rtems_arm_gumstix__)
+#  include <arm/gumstix/tm27.h>
+#elif defined(__rtems_arm_kit637_v6__)
+#  include <arm/kit637_v6/tm27.h>
+#elif defined(__rtems_arm_lm3s3749__)
+#  include <arm/lm3s3749/tm27.h>
+#elif defined(__rtems_arm_lm3s6965__)
+#  include <arm/lm3s6965/tm27.h>
+#elif defined(__rtems_arm_lm3s6965_qemu__)
+#  include <arm/lm3s6965_qemu/tm27.h>
+#elif defined(__rtems_arm_lm4f120__)
+#  include <arm/lm4f120/tm27.h>
+#elif defined(__rtems_arm_lpc1768_mbed__)
+#  include <arm/lpc1768_mbed/tm27.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram__)
+#  include <arm/lpc1768_mbed_ahb_ram/tm27.h>
+#elif defined(__rtems_arm_lpc1768_mbed_ahb_ram_eth__)
+#  include <arm/lpc1768_mbed_ahb_ram_eth/tm27.h>
+#elif defined(__rtems_arm_lpc17xx_ea_ram__)
+#  include <arm/lpc17xx_ea_ram/tm27.h>
+#elif defined(__rtems_arm_lpc17xx_ea_rom_int__)
+#  include <arm/lpc17xx_ea_rom_int/tm27.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_ram__)
+#  include <arm/lpc17xx_plx800_ram/tm27.h>
+#elif defined(__rtems_arm_lpc17xx_plx800_rom_int__)
+#  include <arm/lpc17xx_plx800_rom_int/tm27.h>
+#elif defined(__rtems_arm_lpc2362__)
+#  include <arm/lpc2362/tm27.h>
+#elif defined(__rtems_arm_lpc23xx_tli800__)
+#  include <arm/lpc23xx_tli800/tm27.h>
+#elif defined(__rtems_arm_lpc24xx_ea__)
+#  include <arm/lpc24xx_ea/tm27.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_ram__)
+#  include <arm/lpc24xx_ncs_ram/tm27.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_ext__)
+#  include <arm/lpc24xx_ncs_rom_ext/tm27.h>
+#elif defined(__rtems_arm_lpc24xx_ncs_rom_int__)
+#  include <arm/lpc24xx_ncs_rom_int/tm27.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_ram__)
+#  include <arm/lpc24xx_plx800_ram/tm27.h>
+#elif defined(__rtems_arm_lpc24xx_plx800_rom_int__)
+#  include <arm/lpc24xx_plx800_rom_int/tm27.h>
+#elif defined(__rtems_arm_lpc32xx_mzx__)
+#  include <arm/lpc32xx_mzx/tm27.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_1__)
+#  include <arm/lpc32xx_mzx_stage_1/tm27.h>
+#elif defined(__rtems_arm_lpc32xx_mzx_stage_2__)
+#  include <arm/lpc32xx_mzx_stage_2/tm27.h>
+#elif defined(__rtems_arm_lpc32xx_phycore__)
+#  include <arm/lpc32xx_phycore/tm27.h>
+#elif defined(__rtems_arm_lpc40xx_ea_ram__)
+#  include <arm/lpc40xx_ea_ram/tm27.h>
+#elif defined(__rtems_arm_lpc40xx_ea_rom_int__)
+#  include <arm/lpc40xx_ea_rom_int/tm27.h>
+#elif defined(__rtems_arm_nds__)
+#  include <arm/nds/tm27.h>
+#elif defined(__rtems_arm_raspberrypi__)
+#  include <arm/raspberrypi/tm27.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu__)
+#  include <arm/realview_pbx_a9_qemu/tm27.h>
+#elif defined(__rtems_arm_realview_pbx_a9_qemu_smp__)
+#  include <arm/realview_pbx_a9_qemu_smp/tm27.h>
+#elif defined(__rtems_arm_rtl22xx__)
+#  include <arm/rtl22xx/tm27.h>
+#elif defined(__rtems_arm_rtl22xx_t__)
+#  include <arm/rtl22xx_t/tm27.h>
+#elif defined(__rtems_arm_smdk2410__)
+#  include <arm/smdk2410/tm27.h>
+#elif defined(__rtems_arm_stm32f105rc__)
+#  include <arm/stm32f105rc/tm27.h>
+#elif defined(__rtems_arm_stm32f4__)
+#  include <arm/stm32f4/tm27.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk__)
+#  include <arm/tms570ls3137_hdk/tm27.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_intram__)
+#  include <arm/tms570ls3137_hdk_intram/tm27.h>
+#elif defined(__rtems_arm_tms570ls3137_hdk_sdram__)
+#  include <arm/tms570ls3137_hdk_sdram/tm27.h>
+#elif defined(__rtems_arm_xilinx_zynq_a9_qemu__)
+#  include <arm/xilinx_zynq_a9_qemu/tm27.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc702__)
+#  include <arm/xilinx_zynq_zc702/tm27.h>
+#elif defined(__rtems_arm_xilinx_zynq_zc706__)
+#  include <arm/xilinx_zynq_zc706/tm27.h>
+#elif defined(__rtems_arm_xilinx_zynq_zedboard__)
+#  include <arm/xilinx_zynq_zedboard/tm27.h>
+#elif defined(__rtems_avr_avrtest__)
+#  include <avr/avrtest/tm27.h>
+#elif defined(__rtems_bfin_TLL6527M__)
+#  include <bfin/TLL6527M/tm27.h>
+#elif defined(__rtems_bfin_bf537Stamp__)
+#  include <bfin/bf537Stamp/tm27.h>
+#elif defined(__rtems_bfin_eZKit533__)
+#  include <bfin/eZKit533/tm27.h>
+#elif defined(__rtems_h8300_h8sim__)
+#  include <h8300/h8sim/tm27.h>
+#elif defined(__rtems_h8300_h8sxsim__)
+#  include <h8300/h8sxsim/tm27.h>
+#elif defined(__rtems_i386_pc386__)
+#  include <i386/pc386/tm27.h>
+#elif defined(__rtems_i386_pc486__)
+#  include <i386/pc486/tm27.h>
+#elif defined(__rtems_i386_pc586__)
+#  include <i386/pc586/tm27.h>
+#elif defined(__rtems_i386_pc586_sse__)
+#  include <i386/pc586-sse/tm27.h>
+#elif defined(__rtems_i386_pc686__)
+#  include <i386/pc686/tm27.h>
+#elif defined(__rtems_i386_pcp4__)
+#  include <i386/pcp4/tm27.h>
+#elif defined(__rtems_lm32_lm32_evr__)
+#  include <lm32/lm32_evr/tm27.h>
+#elif defined(__rtems_lm32_milkymist__)
+#  include <lm32/milkymist/tm27.h>
+#elif defined(__rtems_m32c_m32csim__)
+#  include <m32c/m32csim/tm27.h>
+#elif defined(__rtems_m32r_m32rsim__)
+#  include <m32r/m32rsim/tm27.h>
+#elif defined(__rtems_m68k_COBRA5475__)
+#  include <m68k/COBRA5475/tm27.h>
+#elif defined(__rtems_m68k_av5282__)
+#  include <m68k/av5282/tm27.h>
+#elif defined(__rtems_m68k_csb360__)
+#  include <m68k/csb360/tm27.h>
+#elif defined(__rtems_m68k_gen68302__)
+#  include <m68k/gen68302/tm27.h>
+#elif defined(__rtems_m68k_gen68340__)
+#  include <m68k/gen68340/tm27.h>
+#elif defined(__rtems_m68k_gen68360__)
+#  include <m68k/gen68360/tm27.h>
+#elif defined(__rtems_m68k_gen68360_040__)
+#  include <m68k/gen68360_040/tm27.h>
+#elif defined(__rtems_m68k_idp__)
+#  include <m68k/idp/tm27.h>
+#elif defined(__rtems_m68k_m5484FireEngine__)
+#  include <m68k/m5484FireEngine/tm27.h>
+#elif defined(__rtems_m68k_mcf5206elite__)
+#  include <m68k/mcf5206elite/tm27.h>
+#elif defined(__rtems_m68k_mcf52235__)
+#  include <m68k/mcf52235/tm27.h>
+#elif defined(__rtems_m68k_mcf5225x__)
+#  include <m68k/mcf5225x/tm27.h>
+#elif defined(__rtems_m68k_mcf5235__)
+#  include <m68k/mcf5235/tm27.h>
+#elif defined(__rtems_m68k_mcf5329__)
+#  include <m68k/mcf5329/tm27.h>
+#elif defined(__rtems_m68k_mrm332__)
+#  include <m68k/mrm332/tm27.h>
+#elif defined(__rtems_m68k_mvme136__)
+#  include <m68k/mvme136/tm27.h>
+#elif defined(__rtems_m68k_mvme147__)
+#  include <m68k/mvme147/tm27.h>
+#elif defined(__rtems_m68k_mvme147s__)
+#  include <m68k/mvme147s/tm27.h>
+#elif defined(__rtems_m68k_mvme162__)
+#  include <m68k/mvme162/tm27.h>
+#elif defined(__rtems_m68k_mvme162lx__)
+#  include <m68k/mvme162lx/tm27.h>
+#elif defined(__rtems_m68k_mvme167__)
+#  include <m68k/mvme167/tm27.h>
+#elif defined(__rtems_m68k_ods68302__)
+#  include <m68k/ods68302/tm27.h>
+#elif defined(__rtems_m68k_pgh360__)
+#  include <m68k/pgh360/tm27.h>
+#elif defined(__rtems_m68k_sim68000__)
+#  include <m68k/sim68000/tm27.h>
+#elif defined(__rtems_m68k_simcpu32__)
+#  include <m68k/simcpu32/tm27.h>
+#elif defined(__rtems_m68k_uC5282__)
+#  include <m68k/uC5282/tm27.h>
+#elif defined(__rtems_mips_csb350__)
+#  include <mips/csb350/tm27.h>
+#elif defined(__rtems_mips_genmongoosev__)
+#  include <mips/genmongoosev/tm27.h>
+#elif defined(__rtems_mips_hurricane__)
+#  include <mips/hurricane/tm27.h>
+#elif defined(__rtems_mips_jmr3904__)
+#  include <mips/jmr3904/tm27.h>
+#elif defined(__rtems_mips_malta__)
+#  include <mips/malta/tm27.h>
+#elif defined(__rtems_mips_rbtx4925__)
+#  include <mips/rbtx4925/tm27.h>
+#elif defined(__rtems_mips_rbtx4938__)
+#  include <mips/rbtx4938/tm27.h>
+#elif defined(__rtems_moxie_moxiesim__)
+#  include <moxie/moxiesim/tm27.h>
+#elif defined(__rtems_nios2_nios2_iss__)
+#  include <nios2/nios2_iss/tm27.h>
+#elif defined(__rtems_or1k_or1ksim__)
+#  include <or1k/or1ksim/tm27.h>
+#elif defined(__rtems_powerpc_beatnik__)
+#  include <powerpc/beatnik/tm27.h>
+#elif defined(__rtems_powerpc_br_uid__)
+#  include <powerpc/br_uid/tm27.h>
+#elif defined(__rtems_powerpc_brs5l__)
+#  include <powerpc/brs5l/tm27.h>
+#elif defined(__rtems_powerpc_brs6l__)
+#  include <powerpc/brs6l/tm27.h>
+#elif defined(__rtems_powerpc_dp2__)
+#  include <powerpc/dp2/tm27.h>
+#elif defined(__rtems_powerpc_ep1a__)
+#  include <powerpc/ep1a/tm27.h>
+#elif defined(__rtems_powerpc_gwlcfm__)
+#  include <powerpc/gwlcfm/tm27.h>
+#elif defined(__rtems_powerpc_haleakala__)
+#  include <powerpc/haleakala/tm27.h>
+#elif defined(__rtems_powerpc_hsc_cm01__)
+#  include <powerpc/hsc_cm01/tm27.h>
+#elif defined(__rtems_powerpc_icecube__)
+#  include <powerpc/icecube/tm27.h>
+#elif defined(__rtems_powerpc_mbx821_001__)
+#  include <powerpc/mbx821_001/tm27.h>
+#elif defined(__rtems_powerpc_mbx821_002__)
+#  include <powerpc/mbx821_002/tm27.h>
+#elif defined(__rtems_powerpc_mbx821_002b__)
+#  include <powerpc/mbx821_002b/tm27.h>
+#elif defined(__rtems_powerpc_mbx860_001b__)
+#  include <powerpc/mbx860_001b/tm27.h>
+#elif defined(__rtems_powerpc_mbx860_002__)
+#  include <powerpc/mbx860_002/tm27.h>
+#elif defined(__rtems_powerpc_mbx860_005b__)
+#  include <powerpc/mbx860_005b/tm27.h>
+#elif defined(__rtems_powerpc_mbx860_1b__)
+#  include <powerpc/mbx860_1b/tm27.h>
+#elif defined(__rtems_powerpc_mcp750__)
+#  include <powerpc/mcp750/tm27.h>
+#elif defined(__rtems_powerpc_mpc5566evb__)
+#  include <powerpc/mpc5566evb/tm27.h>
+#elif defined(__rtems_powerpc_mpc5566evb_spe__)
+#  include <powerpc/mpc5566evb_spe/tm27.h>
+#elif defined(__rtems_powerpc_mpc5643l_dpu__)
+#  include <powerpc/mpc5643l_dpu/tm27.h>
+#elif defined(__rtems_powerpc_mpc5643l_evb__)
+#  include <powerpc/mpc5643l_evb/tm27.h>
+#elif defined(__rtems_powerpc_mpc5668g__)
+#  include <powerpc/mpc5668g/tm27.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_app__)
+#  include <powerpc/mpc5674f_ecu508_app/tm27.h>
+#elif defined(__rtems_powerpc_mpc5674f_ecu508_boot__)
+#  include <powerpc/mpc5674f_ecu508_boot/tm27.h>
+#elif defined(__rtems_powerpc_mpc5674f_rsm6__)
+#  include <powerpc/mpc5674f_rsm6/tm27.h>
+#elif defined(__rtems_powerpc_mpc5674fevb__)
+#  include <powerpc/mpc5674fevb/tm27.h>
+#elif defined(__rtems_powerpc_mpc5674fevb_spe__)
+#  include <powerpc/mpc5674fevb_spe/tm27.h>
+#elif defined(__rtems_powerpc_mpc8260ads__)
+#  include <powerpc/mpc8260ads/tm27.h>
+#elif defined(__rtems_powerpc_mpc8309som__)
+#  include <powerpc/mpc8309som/tm27.h>
+#elif defined(__rtems_powerpc_mpc8313erdb__)
+#  include <powerpc/mpc8313erdb/tm27.h>
+#elif defined(__rtems_powerpc_mpc8349eamds__)
+#  include <powerpc/mpc8349eamds/tm27.h>
+#elif defined(__rtems_powerpc_mtx603e__)
+#  include <powerpc/mtx603e/tm27.h>
+#elif defined(__rtems_powerpc_mvme2100__)
+#  include <powerpc/mvme2100/tm27.h>
+#elif defined(__rtems_powerpc_mvme2307__)
+#  include <powerpc/mvme2307/tm27.h>
+#elif defined(__rtems_powerpc_mvme3100__)
+#  include <powerpc/mvme3100/tm27.h>
+#elif defined(__rtems_powerpc_mvme5500__)
+#  include <powerpc/mvme5500/tm27.h>
+#elif defined(__rtems_powerpc_pghplus__)
+#  include <powerpc/pghplus/tm27.h>
+#elif defined(__rtems_powerpc_phycore_mpc5554__)
+#  include <powerpc/phycore_mpc5554/tm27.h>
+#elif defined(__rtems_powerpc_pm520_cr825__)
+#  include <powerpc/pm520_cr825/tm27.h>
+#elif defined(__rtems_powerpc_pm520_ze30__)
+#  include <powerpc/pm520_ze30/tm27.h>
+#elif defined(__rtems_powerpc_psim__)
+#  include <powerpc/psim/tm27.h>
+#elif defined(__rtems_powerpc_qemuppc__)
+#  include <powerpc/qemuppc/tm27.h>
+#elif defined(__rtems_powerpc_qemuprep__)
+#  include <powerpc/qemuprep/tm27.h>
+#elif defined(__rtems_powerpc_qemuprep_altivec__)
+#  include <powerpc/qemuprep-altivec/tm27.h>
+#elif defined(__rtems_powerpc_qoriq_core_0__)
+#  include <powerpc/qoriq_core_0/tm27.h>
+#elif defined(__rtems_powerpc_qoriq_core_1__)
+#  include <powerpc/qoriq_core_1/tm27.h>
+#elif defined(__rtems_powerpc_qoriq_p1020rdb__)
+#  include <powerpc/qoriq_p1020rdb/tm27.h>
+#elif defined(__rtems_powerpc_score603e__)
+#  include <powerpc/score603e/tm27.h>
+#elif defined(__rtems_powerpc_ss555__)
+#  include <powerpc/ss555/tm27.h>
+#elif defined(__rtems_powerpc_t32mppc__)
+#  include <powerpc/t32mppc/tm27.h>
+#elif defined(__rtems_powerpc_tqm8xx_stk8xx__)
+#  include <powerpc/tqm8xx_stk8xx/tm27.h>
+#elif defined(__rtems_powerpc_virtex__)
+#  include <powerpc/virtex/tm27.h>
+#elif defined(__rtems_powerpc_virtex4__)
+#  include <powerpc/virtex4/tm27.h>
+#elif defined(__rtems_powerpc_virtex5__)
+#  include <powerpc/virtex5/tm27.h>
+#elif defined(__rtems_sh_gensh1__)
+#  include <sh/gensh1/tm27.h>
+#elif defined(__rtems_sh_gensh2__)
+#  include <sh/gensh2/tm27.h>
+#elif defined(__rtems_sh_gensh4__)
+#  include <sh/gensh4/tm27.h>
+#elif defined(__rtems_sh_simsh1__)
+#  include <sh/simsh1/tm27.h>
+#elif defined(__rtems_sh_simsh2__)
+#  include <sh/simsh2/tm27.h>
+#elif defined(__rtems_sh_simsh2e__)
+#  include <sh/simsh2e/tm27.h>
+#elif defined(__rtems_sh_simsh4__)
+#  include <sh/simsh4/tm27.h>
+#elif defined(__rtems_sparc_erc32__)
+#  include <sparc/erc32/tm27.h>
+#elif defined(__rtems_sparc_leon2__)
+#  include <sparc/leon2/tm27.h>
+#elif defined(__rtems_sparc_leon3__)
+#  include <sparc/leon3/tm27.h>
+#elif defined(__rtems_sparc_ngmp__)
+#  include <sparc/ngmp/tm27.h>
+#elif defined(__rtems_sparc_sis__)
+#  include <sparc/sis/tm27.h>
+#elif defined(__rtems_sparc64_niagara__)
+#  include <sparc64/niagara/tm27.h>
+#elif defined(__rtems_sparc64_usiii__)
+#  include <sparc64/usiii/tm27.h>
+#elif defined(__rtems_v850_v850e1sim__)
+#  include <v850/v850e1sim/tm27.h>
+#elif defined(__rtems_v850_v850e2sim__)
+#  include <v850/v850e2sim/tm27.h>
+#elif defined(__rtems_v850_v850e2v3sim__)
+#  include <v850/v850e2v3sim/tm27.h>
+#elif defined(__rtems_v850_v850esim__)
+#  include <v850/v850esim/tm27.h>
+#elif defined(__rtems_v850_v850essim__)
+#  include <v850/v850essim/tm27.h>
+#elif defined(__rtems_v850_v850sim__)
+#  include <v850/v850sim/tm27.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/sparc64/shared/include/traptable.h b/include/traptable.h
index 353c60d79c..353c60d79c 100644
--- a/c/src/lib/libbsp/sparc64/shared/include/traptable.h
+++ b/include/traptable.h
diff --git a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.h b/include/tty_drv.h
index d2024c89d7..d2024c89d7 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.h
+++ b/include/tty_drv.h
diff --git a/include/uart.h b/include/uart.h
new file mode 100644
index 0000000000..da7d52dfac
--- /dev/null
+++ b/include/uart.h
@@ -0,0 +1,26 @@
+#if defined(HEADER_WARNING)
+#warning "This header should not be included directly."
+#endif
+
+
+#if defined(__rtems_arm_edb7312__)
+#  include <arm/edb7312/uart.h>
+#elif defined(__rtems_arm_rtl22xx__)
+#  include <arm/rtl22xx/uart.h>
+#elif defined(__rtems_arm_rtl22xx_t__)
+#  include <arm/rtl22xx_t/uart.h>
+#elif defined(__rtems_i386_pc386__)
+#  include <i386/pc386/uart.h>
+#elif defined(__rtems_i386_pc486__)
+#  include <i386/pc486/uart.h>
+#elif defined(__rtems_i386_pc586__)
+#  include <i386/pc586/uart.h>
+#elif defined(__rtems_i386_pc586_sse__)
+#  include <i386/pc586-sse/uart.h>
+#elif defined(__rtems_i386_pc686__)
+#  include <i386/pc686/uart.h>
+#elif defined(__rtems_i386_pcp4__)
+#  include <i386/pcp4/uart.h>
+#else
+#  error "__rtems_<arch>_<bsp>__ must be defined, for example: __rtems_sparc_erc32__"
+#endif
diff --git a/c/src/lib/libbsp/shared/umon/cli.h b/include/umon/cli.h
index 0e1689db26..0e1689db26 100644
--- a/c/src/lib/libbsp/shared/umon/cli.h
+++ b/include/umon/cli.h
diff --git a/c/src/lib/libbsp/shared/umon/monlib.h b/include/umon/monlib.h
index efbfc93d59..efbfc93d59 100644
--- a/c/src/lib/libbsp/shared/umon/monlib.h
+++ b/include/umon/monlib.h
diff --git a/c/src/lib/libbsp/shared/umon/tfs.h b/include/umon/tfs.h
index 258288bd14..258288bd14 100644
--- a/c/src/lib/libbsp/shared/umon/tfs.h
+++ b/include/umon/tfs.h
diff --git a/c/src/lib/libbsp/mips/hurricane/include/usc.h b/include/usc.h
index 167eff0949..167eff0949 100644
--- a/c/src/lib/libbsp/mips/hurricane/include/usc.h
+++ b/include/usc.h
diff --git a/cpukit/libmisc/utf8proc/utf8proc.h b/include/utf8proc/utf8proc.h
index 24a891b6c6..24a891b6c6 100644
--- a/cpukit/libmisc/utf8proc/utf8proc.h
+++ b/include/utf8proc/utf8proc.h
diff --git a/cpukit/libmisc/uuid/uuid.h b/include/uuid/uuid.h
index ca846da0f0..ca846da0f0 100644
--- a/cpukit/libmisc/uuid/uuid.h
+++ b/include/uuid/uuid.h
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/include/bsp.h b/include/v850/v850e1sim/bsp.h
index c0e5acf3aa..c0e5acf3aa 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/include/bsp.h
+++ b/include/v850/v850e1sim/bsp.h
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/include/syscall.h b/include/v850/v850e1sim/bsp/syscall.h
index d8eebdd3f9..d8eebdd3f9 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/include/syscall.h
+++ b/include/v850/v850e1sim/bsp/syscall.h
diff --git a/include/v850/v850e1sim/coverhd.h b/include/v850/v850e1sim/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/v850/v850e1sim/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/cpukit/score/cpu/v850/rtems/asm.h b/include/v850/v850e1sim/rtems/asm.h
index 265e4967ae..265e4967ae 100644
--- a/cpukit/score/cpu/v850/rtems/asm.h
+++ b/include/v850/v850e1sim/rtems/asm.h
diff --git a/cpukit/score/cpu/v850/rtems/score/cpu.h b/include/v850/v850e1sim/rtems/score/cpu.h
index e76a2a2728..e76a2a2728 100644
--- a/cpukit/score/cpu/v850/rtems/score/cpu.h
+++ b/include/v850/v850e1sim/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/v850/rtems/score/cpu_asm.h b/include/v850/v850e1sim/rtems/score/cpu_asm.h
index 8a74cc6410..8a74cc6410 100644
--- a/cpukit/score/cpu/v850/rtems/score/cpu_asm.h
+++ b/include/v850/v850e1sim/rtems/score/cpu_asm.h
diff --git a/include/v850/v850e1sim/rtems/score/cpuatomic.h b/include/v850/v850e1sim/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/v850/v850e1sim/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/cpukit/score/cpu/v850/rtems/score/types.h b/include/v850/v850e1sim/rtems/score/types.h
index 7645f5b564..7645f5b564 100644
--- a/cpukit/score/cpu/v850/rtems/score/types.h
+++ b/include/v850/v850e1sim/rtems/score/types.h
diff --git a/include/v850/v850e1sim/tm27.h b/include/v850/v850e1sim/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/v850/v850e1sim/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/v850/v850e2sim/bsp.h b/include/v850/v850e2sim/bsp.h
new file mode 100644
index 0000000000..81283fe400
--- /dev/null
+++ b/include/v850/v850e2sim/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/bsp.h>
diff --git a/include/v850/v850e2sim/bsp/syscall.h b/include/v850/v850e2sim/bsp/syscall.h
new file mode 100644
index 0000000000..b3fae2ddd4
--- /dev/null
+++ b/include/v850/v850e2sim/bsp/syscall.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/bsp/syscall.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/bsp/syscall.h>
diff --git a/include/v850/v850e2sim/coverhd.h b/include/v850/v850e2sim/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/v850/v850e2sim/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/v850/v850e2sim/rtems/asm.h b/include/v850/v850e2sim/rtems/asm.h
new file mode 100644
index 0000000000..351bff4d38
--- /dev/null
+++ b/include/v850/v850e2sim/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/asm.h>
diff --git a/include/v850/v850e2sim/rtems/score/cpu.h b/include/v850/v850e2sim/rtems/score/cpu.h
new file mode 100644
index 0000000000..c0c59cc407
--- /dev/null
+++ b/include/v850/v850e2sim/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/score/cpu.h>
diff --git a/include/v850/v850e2sim/rtems/score/cpu_asm.h b/include/v850/v850e2sim/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..055701ddfe
--- /dev/null
+++ b/include/v850/v850e2sim/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/score/cpu_asm.h>
diff --git a/include/v850/v850e2sim/rtems/score/cpuatomic.h b/include/v850/v850e2sim/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/v850/v850e2sim/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/v850/v850e2sim/rtems/score/types.h b/include/v850/v850e2sim/rtems/score/types.h
new file mode 100644
index 0000000000..cd80a0bc52
--- /dev/null
+++ b/include/v850/v850e2sim/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/score/types.h>
diff --git a/include/v850/v850e2sim/tm27.h b/include/v850/v850e2sim/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/v850/v850e2sim/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/v850/v850e2v3sim/bsp.h b/include/v850/v850e2v3sim/bsp.h
new file mode 100644
index 0000000000..81283fe400
--- /dev/null
+++ b/include/v850/v850e2v3sim/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/bsp.h>
diff --git a/include/v850/v850e2v3sim/bsp/syscall.h b/include/v850/v850e2v3sim/bsp/syscall.h
new file mode 100644
index 0000000000..b3fae2ddd4
--- /dev/null
+++ b/include/v850/v850e2v3sim/bsp/syscall.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/bsp/syscall.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/bsp/syscall.h>
diff --git a/include/v850/v850e2v3sim/coverhd.h b/include/v850/v850e2v3sim/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/v850/v850e2v3sim/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/v850/v850e2v3sim/rtems/asm.h b/include/v850/v850e2v3sim/rtems/asm.h
new file mode 100644
index 0000000000..351bff4d38
--- /dev/null
+++ b/include/v850/v850e2v3sim/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/asm.h>
diff --git a/include/v850/v850e2v3sim/rtems/score/cpu.h b/include/v850/v850e2v3sim/rtems/score/cpu.h
new file mode 100644
index 0000000000..c0c59cc407
--- /dev/null
+++ b/include/v850/v850e2v3sim/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/score/cpu.h>
diff --git a/include/v850/v850e2v3sim/rtems/score/cpu_asm.h b/include/v850/v850e2v3sim/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..055701ddfe
--- /dev/null
+++ b/include/v850/v850e2v3sim/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/score/cpu_asm.h>
diff --git a/include/v850/v850e2v3sim/rtems/score/cpuatomic.h b/include/v850/v850e2v3sim/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/v850/v850e2v3sim/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/v850/v850e2v3sim/rtems/score/types.h b/include/v850/v850e2v3sim/rtems/score/types.h
new file mode 100644
index 0000000000..cd80a0bc52
--- /dev/null
+++ b/include/v850/v850e2v3sim/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/score/types.h>
diff --git a/include/v850/v850e2v3sim/tm27.h b/include/v850/v850e2v3sim/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/v850/v850e2v3sim/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/v850/v850esim/bsp.h b/include/v850/v850esim/bsp.h
new file mode 100644
index 0000000000..81283fe400
--- /dev/null
+++ b/include/v850/v850esim/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/bsp.h>
diff --git a/include/v850/v850esim/bsp/syscall.h b/include/v850/v850esim/bsp/syscall.h
new file mode 100644
index 0000000000..b3fae2ddd4
--- /dev/null
+++ b/include/v850/v850esim/bsp/syscall.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/bsp/syscall.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/bsp/syscall.h>
diff --git a/include/v850/v850esim/coverhd.h b/include/v850/v850esim/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/v850/v850esim/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/v850/v850esim/rtems/asm.h b/include/v850/v850esim/rtems/asm.h
new file mode 100644
index 0000000000..351bff4d38
--- /dev/null
+++ b/include/v850/v850esim/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/asm.h>
diff --git a/include/v850/v850esim/rtems/score/cpu.h b/include/v850/v850esim/rtems/score/cpu.h
new file mode 100644
index 0000000000..c0c59cc407
--- /dev/null
+++ b/include/v850/v850esim/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/score/cpu.h>
diff --git a/include/v850/v850esim/rtems/score/cpu_asm.h b/include/v850/v850esim/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..055701ddfe
--- /dev/null
+++ b/include/v850/v850esim/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/score/cpu_asm.h>
diff --git a/include/v850/v850esim/rtems/score/cpuatomic.h b/include/v850/v850esim/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/v850/v850esim/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/v850/v850esim/rtems/score/types.h b/include/v850/v850esim/rtems/score/types.h
new file mode 100644
index 0000000000..cd80a0bc52
--- /dev/null
+++ b/include/v850/v850esim/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/score/types.h>
diff --git a/include/v850/v850esim/tm27.h b/include/v850/v850esim/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/v850/v850esim/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/v850/v850essim/bsp.h b/include/v850/v850essim/bsp.h
new file mode 100644
index 0000000000..81283fe400
--- /dev/null
+++ b/include/v850/v850essim/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/bsp.h>
diff --git a/include/v850/v850essim/bsp/syscall.h b/include/v850/v850essim/bsp/syscall.h
new file mode 100644
index 0000000000..b3fae2ddd4
--- /dev/null
+++ b/include/v850/v850essim/bsp/syscall.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/bsp/syscall.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/bsp/syscall.h>
diff --git a/include/v850/v850essim/coverhd.h b/include/v850/v850essim/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/v850/v850essim/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/v850/v850essim/rtems/asm.h b/include/v850/v850essim/rtems/asm.h
new file mode 100644
index 0000000000..351bff4d38
--- /dev/null
+++ b/include/v850/v850essim/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/asm.h>
diff --git a/include/v850/v850essim/rtems/score/cpu.h b/include/v850/v850essim/rtems/score/cpu.h
new file mode 100644
index 0000000000..c0c59cc407
--- /dev/null
+++ b/include/v850/v850essim/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/score/cpu.h>
diff --git a/include/v850/v850essim/rtems/score/cpu_asm.h b/include/v850/v850essim/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..055701ddfe
--- /dev/null
+++ b/include/v850/v850essim/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/score/cpu_asm.h>
diff --git a/include/v850/v850essim/rtems/score/cpuatomic.h b/include/v850/v850essim/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/v850/v850essim/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/v850/v850essim/rtems/score/types.h b/include/v850/v850essim/rtems/score/types.h
new file mode 100644
index 0000000000..cd80a0bc52
--- /dev/null
+++ b/include/v850/v850essim/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/score/types.h>
diff --git a/include/v850/v850essim/tm27.h b/include/v850/v850essim/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/v850/v850essim/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/include/v850/v850sim/bsp.h b/include/v850/v850sim/bsp.h
new file mode 100644
index 0000000000..81283fe400
--- /dev/null
+++ b/include/v850/v850sim/bsp.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/bsp.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/bsp.h>
diff --git a/include/v850/v850sim/bsp/syscall.h b/include/v850/v850sim/bsp/syscall.h
new file mode 100644
index 0000000000..b3fae2ddd4
--- /dev/null
+++ b/include/v850/v850sim/bsp/syscall.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/bsp/syscall.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/bsp/syscall.h>
diff --git a/include/v850/v850sim/coverhd.h b/include/v850/v850sim/coverhd.h
new file mode 100644
index 0000000000..51037e4129
--- /dev/null
+++ b/include/v850/v850sim/coverhd.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/coverhd.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/coverhd.h>
diff --git a/include/v850/v850sim/rtems/asm.h b/include/v850/v850sim/rtems/asm.h
new file mode 100644
index 0000000000..351bff4d38
--- /dev/null
+++ b/include/v850/v850sim/rtems/asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/asm.h>
diff --git a/include/v850/v850sim/rtems/score/cpu.h b/include/v850/v850sim/rtems/score/cpu.h
new file mode 100644
index 0000000000..c0c59cc407
--- /dev/null
+++ b/include/v850/v850sim/rtems/score/cpu.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/score/cpu.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/score/cpu.h>
diff --git a/include/v850/v850sim/rtems/score/cpu_asm.h b/include/v850/v850sim/rtems/score/cpu_asm.h
new file mode 100644
index 0000000000..055701ddfe
--- /dev/null
+++ b/include/v850/v850sim/rtems/score/cpu_asm.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/score/cpu_asm.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/score/cpu_asm.h>
diff --git a/include/v850/v850sim/rtems/score/cpuatomic.h b/include/v850/v850sim/rtems/score/cpuatomic.h
new file mode 100644
index 0000000000..6021d1c3f4
--- /dev/null
+++ b/include/v850/v850sim/rtems/score/cpuatomic.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/altcycv_devkit/rtems/score/cpuatomic.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/altcycv_devkit/rtems/score/cpuatomic.h>
diff --git a/include/v850/v850sim/rtems/score/types.h b/include/v850/v850sim/rtems/score/types.h
new file mode 100644
index 0000000000..cd80a0bc52
--- /dev/null
+++ b/include/v850/v850sim/rtems/score/types.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* v850/v850e1sim/rtems/score/types.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <v850/v850e1sim/rtems/score/types.h>
diff --git a/include/v850/v850sim/tm27.h b/include/v850/v850sim/tm27.h
new file mode 100644
index 0000000000..a283a51568
--- /dev/null
+++ b/include/v850/v850sim/tm27.h
@@ -0,0 +1,5 @@
+#if defined(HEADER_WARNING_DUPLICATE) /* arm/arm1136jfs/tm27.h */
+#warning "This header should not be included directly. (duplicate)"
+#endif
+
+#include <arm/arm1136jfs/tm27.h>
diff --git a/cpukit/score/cpu/m32c/varvects.h b/include/varvects.h
index 7168482b54..7168482b54 100644
--- a/cpukit/score/cpu/m32c/varvects.h
+++ b/include/varvects.h
diff --git a/cpukit/libnetworking/vm/vm.h b/include/vm/vm.h
index b6be3d1ca0..b6be3d1ca0 100644
--- a/cpukit/libnetworking/vm/vm.h
+++ b/include/vm/vm.h
diff --git a/cpukit/libnetworking/vm/vm_extern.h b/include/vm/vm_extern.h
index c495af60f9..c495af60f9 100644
--- a/cpukit/libnetworking/vm/vm_extern.h
+++ b/include/vm/vm_extern.h
diff --git a/cpukit/libnetworking/vm/vm_kern.h b/include/vm/vm_kern.h
index f020f2da8f..f020f2da8f 100644
--- a/cpukit/libnetworking/vm/vm_kern.h
+++ b/include/vm/vm_kern.h
diff --git a/cpukit/libnetworking/vm/vm_param.h b/include/vm/vm_param.h
index 41c52ef488..41c52ef488 100644
--- a/cpukit/libnetworking/vm/vm_param.h
+++ b/include/vm/vm_param.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/wd80x3.h b/include/wd80x3.h
index b4aa12e735..b4aa12e735 100644
--- a/c/src/lib/libbsp/i386/pc386/include/wd80x3.h
+++ b/include/wd80x3.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.h b/include/xiltemac.h
index 185b89bdc1..185b89bdc1 100644
--- a/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.h
+++ b/include/xiltemac.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/xparameters_dflt.h b/include/xparameters_dflt.h
index b31cb26fe8..b31cb26fe8 100644
--- a/c/src/lib/libbsp/powerpc/virtex/include/xparameters_dflt.h
+++ b/include/xparameters_dflt.h
diff --git a/cpukit/zlib/zlib.h b/include/zlib.h
index bfbba83e8e..bfbba83e8e 100644
--- a/cpukit/zlib/zlib.h
+++ b/include/zlib.h