New header guards.

21 files changed, 42 insertions, 42 deletions

diff --git a/cpukit/score/macros/rtems/score/address.inl b/cpukit/score/macros/rtems/score/address.inl
index 77d2d576c2..3797e8906d 100644
--- a/cpukit/score/macros/rtems/score/address.inl
+++ b/cpukit/score/macros/rtems/score/address.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __MACROS_ADDRESSES_h
-#define __MACROS_ADDRESSES_h
+#ifndef _RTEMS_SCORE_ADDRESS_INL
+#define _RTEMS_SCORE_ADDRESS_INL
 
 /*PAGE
  *
diff --git a/cpukit/score/macros/rtems/score/chain.inl b/cpukit/score/macros/rtems/score/chain.inl
index 1694130464..a11a25b671 100644
--- a/cpukit/score/macros/rtems/score/chain.inl
+++ b/cpukit/score/macros/rtems/score/chain.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __MACROS_CHAIN_h
-#define __MACROS_CHAIN_h
+#ifndef _RTEMS_SCORE_CHAIN_INL
+#define _RTEMS_SCORE_CHAIN_INL
 
 /*PAGE
  *
diff --git a/cpukit/score/macros/rtems/score/coremsg.inl b/cpukit/score/macros/rtems/score/coremsg.inl
index 488d06904b..5befe419a9 100644
--- a/cpukit/score/macros/rtems/score/coremsg.inl
+++ b/cpukit/score/macros/rtems/score/coremsg.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __CORE_MESSAGE_QUEUE_inl
-#define __CORE_MESSAGE_QUEUE_inl
+#ifndef _RTEMS_SCORE_COREMSG_INL
+#define _RTEMS_SCORE_COREMSG_INL
 
 #include <string.h>  /* for memcpy */
 
diff --git a/cpukit/score/macros/rtems/score/coremutex.inl b/cpukit/score/macros/rtems/score/coremutex.inl
index ef020d81c5..e0620d337a 100644
--- a/cpukit/score/macros/rtems/score/coremutex.inl
+++ b/cpukit/score/macros/rtems/score/coremutex.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __MACROS_CORE_MUTEX_h
-#define __MACROS_CORE_MUTEX_h
+#ifndef _RTEMS_SCORE_COREMUTEX_INL
+#define _RTEMS_SCORE_COREMUTEX_INL
 
 
 /*PAGE
diff --git a/cpukit/score/macros/rtems/score/coresem.inl b/cpukit/score/macros/rtems/score/coresem.inl
index 6afb95ff12..51e5949004 100644
--- a/cpukit/score/macros/rtems/score/coresem.inl
+++ b/cpukit/score/macros/rtems/score/coresem.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __MACROS_CORE_SEMAPHORE_h
-#define __MACROS_CORE_SEMAPHORE_h
+#ifndef _RTEMS_SCORE_CORESEM_INL
+#define _RTEMS_SCORE_CORESEM_INL
 
 /*PAGE
  *
diff --git a/cpukit/score/macros/rtems/score/heap.inl b/cpukit/score/macros/rtems/score/heap.inl
index fc75ee0657..a7a7a11a44 100644
--- a/cpukit/score/macros/rtems/score/heap.inl
+++ b/cpukit/score/macros/rtems/score/heap.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __HEAP_inl
-#define __HEAP_inl
+#ifndef _RTEMS_SCORE_HEAP_INL
+#define _RTEMS_SCORE_HEAP_INL
 
 /*
  * WARNING: this file is only visually checked against
diff --git a/cpukit/score/macros/rtems/score/isr.inl b/cpukit/score/macros/rtems/score/isr.inl
index 7ffb9cc210..a193a88d75 100644
--- a/cpukit/score/macros/rtems/score/isr.inl
+++ b/cpukit/score/macros/rtems/score/isr.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __ISR_inl
-#define __ISR_inl
+#ifndef _RTEMS_SCORE_ISR_INL
+#define _RTEMS_SCORE_ISR_INL
 
 /*PAGE
  *
diff --git a/cpukit/score/macros/rtems/score/mppkt.inl b/cpukit/score/macros/rtems/score/mppkt.inl
index 155a48e775..fcb423138b 100644
--- a/cpukit/score/macros/rtems/score/mppkt.inl
+++ b/cpukit/score/macros/rtems/score/mppkt.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __MACROS_MP_PACKET_h
-#define __MACROS_MP_PACKET_h
+#ifndef _RTEMS_SCORE_MPPKT_INL
+#define _RTEMS_SCORE_MPPKT_INL
 
 /*PAGE
  *
diff --git a/cpukit/score/macros/rtems/score/object.inl b/cpukit/score/macros/rtems/score/object.inl
index 765b27354b..69c8a0a2bf 100644
--- a/cpukit/score/macros/rtems/score/object.inl
+++ b/cpukit/score/macros/rtems/score/object.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __OBJECTS_inl
-#define __OBJECTS_inl
+#ifndef _RTEMS_SCORE_OBJECT_INL
+#define _RTEMS_SCORE_OBJECT_INL
 
 /*PAGE
  *
diff --git a/cpukit/score/macros/rtems/score/objectmp.inl b/cpukit/score/macros/rtems/score/objectmp.inl
index c8952b4f2d..008eebfc7a 100644
--- a/cpukit/score/macros/rtems/score/objectmp.inl
+++ b/cpukit/score/macros/rtems/score/objectmp.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __MACROS_MP_OBJECTS_inl
-#define __MACROS_MP_OBJECTS_inl
+#ifndef _RTEMS_SCORE_OBJECTMP_INL
+#define _RTEMS_SCORE_OBJECTMP_INL
 
 /*PAGE
  *
diff --git a/cpukit/score/macros/rtems/score/priority.inl b/cpukit/score/macros/rtems/score/priority.inl
index 057f36ea65..a46d6d4ab0 100644
--- a/cpukit/score/macros/rtems/score/priority.inl
+++ b/cpukit/score/macros/rtems/score/priority.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __PRIORITY_inl
-#define __PRIORITY_inl
+#ifndef _RTEMS_SCORE_PRIORITY_INL
+#define _RTEMS_SCORE_PRIORITY_INL
 
 #include <rtems/score/bitfield.h>
 
diff --git a/cpukit/score/macros/rtems/score/stack.inl b/cpukit/score/macros/rtems/score/stack.inl
index 3b3deb6bbf..48d63bd861 100644
--- a/cpukit/score/macros/rtems/score/stack.inl
+++ b/cpukit/score/macros/rtems/score/stack.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __STACK_inl
-#define __STACK_inl
+#ifndef _RTEMS_SCORE_STACK_INL
+#define _RTEMS_SCORE_STACK_INL
 
 /*PAGE
  *
diff --git a/cpukit/score/macros/rtems/score/states.inl b/cpukit/score/macros/rtems/score/states.inl
index 545271dc79..32ab000d24 100644
--- a/cpukit/score/macros/rtems/score/states.inl
+++ b/cpukit/score/macros/rtems/score/states.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __STATES_inl
-#define __STATES_inl
+#ifndef _RTEMS_SCORE_STATES_INL
+#define _RTEMS_SCORE_STATES_INL
 
 /*PAGE
  *
diff --git a/cpukit/score/macros/rtems/score/sysstate.inl b/cpukit/score/macros/rtems/score/sysstate.inl
index b19bf67386..618bbaf976 100644
--- a/cpukit/score/macros/rtems/score/sysstate.inl
+++ b/cpukit/score/macros/rtems/score/sysstate.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __SYSTEM_STATE_inl
-#define __SYSTEM_STATE_inl
+#ifndef _RTEMS_SCORE_SYSSTATE_INL
+#define _RTEMS_SCORE_SYSSTATE_INL
 
 /*PAGE
  *
diff --git a/cpukit/score/macros/rtems/score/thread.inl b/cpukit/score/macros/rtems/score/thread.inl
index 090552e845..b5b94799c8 100644
--- a/cpukit/score/macros/rtems/score/thread.inl
+++ b/cpukit/score/macros/rtems/score/thread.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __THREAD_inl
-#define __THREAD_inl
+#ifndef _RTEMS_SCORE_THREAD_INL
+#define _RTEMS_SCORE_THREAD_INL
 
 /*PAGE
  *
diff --git a/cpukit/score/macros/rtems/score/threadmp.inl b/cpukit/score/macros/rtems/score/threadmp.inl
index c78789e255..e9127b6733 100644
--- a/cpukit/score/macros/rtems/score/threadmp.inl
+++ b/cpukit/score/macros/rtems/score/threadmp.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __MACROS_MP_THREAD_h
-#define __MACROS_MP_THREAD_h
+#ifndef _RTEMS_SCORE_THREADMP_INL
+#define _RTEMS_SCORE_THREADMP_INL
 
 /*PAGE
  *
diff --git a/cpukit/score/macros/rtems/score/tod.inl b/cpukit/score/macros/rtems/score/tod.inl
index 850a53acb9..00e5a249f0 100644
--- a/cpukit/score/macros/rtems/score/tod.inl
+++ b/cpukit/score/macros/rtems/score/tod.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __TIME_OF_DAY_inl
-#define __TIME_OF_DAY_inl
+#ifndef _RTEMS_SCORE_TOD_INL
+#define _RTEMS_SCORE_TOD_INL
 
 /*PAGE
  *
diff --git a/cpukit/score/macros/rtems/score/tqdata.inl b/cpukit/score/macros/rtems/score/tqdata.inl
index 35145ff971..8ea7725839 100644
--- a/cpukit/score/macros/rtems/score/tqdata.inl
+++ b/cpukit/score/macros/rtems/score/tqdata.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __THREAD_QUEUE_DATA_inl
-#define __THREAD_QUEUE_DATA_inl
+#ifndef _RTEMS_SCORE_TQDATA_INL
+#define _RTEMS_SCORE_TQDATA_INL
 
 /*PAGE
  *
diff --git a/cpukit/score/macros/rtems/score/userext.inl b/cpukit/score/macros/rtems/score/userext.inl
index cbb72b24f9..b18e212e3e 100644
--- a/cpukit/score/macros/rtems/score/userext.inl
+++ b/cpukit/score/macros/rtems/score/userext.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __USER_EXTENSIONS_inl
-#define __USER_EXTENSIONS_inl
+#ifndef _RTEMS_SCORE_USEREXT_INL
+#define _RTEMS_SCORE_USEREXT_INL
 
 #include <rtems/score/wkspace.h>
 
diff --git a/cpukit/score/macros/rtems/score/watchdog.inl b/cpukit/score/macros/rtems/score/watchdog.inl
index 895fd55743..ca02774781 100644
--- a/cpukit/score/macros/rtems/score/watchdog.inl
+++ b/cpukit/score/macros/rtems/score/watchdog.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __WATCHDOG_inl
-#define __WATCHDOG_inl
+#ifndef _RTEMS_SCORE_WATCHDOG_INL
+#define _RTEMS_SCORE_WATCHDOG_INL
 
 #include <rtems/score/object.h>
 
diff --git a/cpukit/score/macros/rtems/score/wkspace.inl b/cpukit/score/macros/rtems/score/wkspace.inl
index 239bb54e68..27a20e68e8 100644
--- a/cpukit/score/macros/rtems/score/wkspace.inl
+++ b/cpukit/score/macros/rtems/score/wkspace.inl
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef __WORKSPACE_inl
-#define __WORKSPACE_inl
+#ifndef _RTEMS_SCORE_WKSPACE_INL
+#define _RTEMS_SCORE_WKSPACE_INL
 
 /*PAGE
  *