New header guard.

32 files changed, 64 insertions, 64 deletions

diff --git a/cpukit/score/include/rtems/debug.h b/cpukit/score/include/rtems/debug.h
index f8babe848f..31f0005709 100644
--- a/cpukit/score/include/rtems/debug.h
+++ b/cpukit/score/include/rtems/debug.h
@@ -17,8 +17,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_DEBUG_h
-#define __RTEMS_DEBUG_h
+#ifndef _RTEMS_DEBUG_H
+#define _RTEMS_DEBUG_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/include/rtems/score/address.h b/cpukit/score/include/rtems/score/address.h
index 2b6ceb2b6f..aab714afd4 100644
--- a/cpukit/score/include/rtems/score/address.h
+++ b/cpukit/score/include/rtems/score/address.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_ADDRESSES_h
-#define __RTEMS_ADDRESSES_h
+#ifndef _RTEMS_SCORE_ADDRESS_H
+#define _RTEMS_SCORE_ADDRESS_H
 
 /**
  *  @defgroup ScoreAddress Address Handler
diff --git a/cpukit/score/include/rtems/score/apiext.h b/cpukit/score/include/rtems/score/apiext.h
index 6e995631e8..cd794bc2d1 100644
--- a/cpukit/score/include/rtems/score/apiext.h
+++ b/cpukit/score/include/rtems/score/apiext.h
@@ -15,8 +15,8 @@
  *  $Id$
  */
 
-#ifndef __API_EXTENSIONS_h
-#define __API_EXTENSIONS_h
+#ifndef _RTEMS_SCORE_APIEXT_H
+#define _RTEMS_SCORE_APIEXT_H
 
 /**
  *  @defgroup ScoreAPIExtension API Extension Handler
diff --git a/cpukit/score/include/rtems/score/apimutex.h b/cpukit/score/include/rtems/score/apimutex.h
index 4b59e972c7..914207fc81 100644
--- a/cpukit/score/include/rtems/score/apimutex.h
+++ b/cpukit/score/include/rtems/score/apimutex.h
@@ -17,8 +17,8 @@
  *  $Id$
  */
 
-#ifndef __API_MUTEX_h
-#define __API_MUTEX_h
+#ifndef _RTEMS_SCORE_APIMUTEX_H
+#define _RTEMS_SCORE_APIMUTEX_H
 
 /**
  *  @defgroup ScoreAPIMutex API Mutex Handler
diff --git a/cpukit/score/include/rtems/score/bitfield.h b/cpukit/score/include/rtems/score/bitfield.h
index db47de7a8e..71fe09db6f 100644
--- a/cpukit/score/include/rtems/score/bitfield.h
+++ b/cpukit/score/include/rtems/score/bitfield.h
@@ -15,8 +15,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_BITFIELD_h
-#define __RTEMS_BITFIELD_h
+#ifndef _RTEMS_SCORE_BITFIELD_H
+#define _RTEMS_SCORE_BITFIELD_H
 
 /**
  *  @defgroup ScoreBitfield Bitfield Handler
diff --git a/cpukit/score/include/rtems/score/chain.h b/cpukit/score/include/rtems/score/chain.h
index 497b00d635..0e3e930257 100644
--- a/cpukit/score/include/rtems/score/chain.h
+++ b/cpukit/score/include/rtems/score/chain.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_CHAIN_h
-#define __RTEMS_CHAIN_h
+#ifndef _RTEMS_SCORE_CHAIN_H
+#define _RTEMS_SCORE_CHAIN_H
 
 /**
  *  @defgroup ScoreChain Chain Handler
diff --git a/cpukit/score/include/rtems/score/context.h b/cpukit/score/include/rtems/score/context.h
index 6d6e230ade..5c7e0fa3b9 100644
--- a/cpukit/score/include/rtems/score/context.h
+++ b/cpukit/score/include/rtems/score/context.h
@@ -15,8 +15,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_CONTEXT_h
-#define __RTEMS_CONTEXT_h
+#ifndef _RTEMS_SCORE_CONTEXT_H
+#define _RTEMS_SCORE_CONTEXT_H
 
 /**
  *  @defgroup ScoreContext Context Handler
diff --git a/cpukit/score/include/rtems/score/copyrt.h b/cpukit/score/include/rtems/score/copyrt.h
index 13cff2d935..c89806b920 100644
--- a/cpukit/score/include/rtems/score/copyrt.h
+++ b/cpukit/score/include/rtems/score/copyrt.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_COPYRIGHT_h
-#define __RTEMS_COPYRIGHT_h
+#ifndef _RTEMS_SCORE_COPYRT_H
+#define _RTEMS_SCORE_COPYRT_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/include/rtems/score/coremsg.h b/cpukit/score/include/rtems/score/coremsg.h
index 924c4e3e51..55817f3ff4 100644
--- a/cpukit/score/include/rtems/score/coremsg.h
+++ b/cpukit/score/include/rtems/score/coremsg.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_CORE_MESSAGE_QUEUE_h
-#define __RTEMS_CORE_MESSAGE_QUEUE_h
+#ifndef _RTEMS_SCORE_COREMSG_H
+#define _RTEMS_SCORE_COREMSG_H
 
 /**
  *  @defgroup ScoreMessageQueue Message Queue Handler
diff --git a/cpukit/score/include/rtems/score/coremutex.h b/cpukit/score/include/rtems/score/coremutex.h
index afd2cc8684..1d95f8265e 100644
--- a/cpukit/score/include/rtems/score/coremutex.h
+++ b/cpukit/score/include/rtems/score/coremutex.h
@@ -18,8 +18,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_CORE_MUTEX_h
-#define __RTEMS_CORE_MUTEX_h
+#ifndef _RTEMS_SCORE_COREMUTEX_H
+#define _RTEMS_SCORE_COREMUTEX_H
 
 /**
  *  @defgroup ScoreMutex Mutex Handler
diff --git a/cpukit/score/include/rtems/score/coresem.h b/cpukit/score/include/rtems/score/coresem.h
index 163957e1cf..866e59d360 100644
--- a/cpukit/score/include/rtems/score/coresem.h
+++ b/cpukit/score/include/rtems/score/coresem.h
@@ -18,8 +18,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_CORE_COUNTING_SEMAPHORE_h
-#define __RTEMS_CORE_COUNTING_SEMAPHORE_h
+#ifndef _RTEMS_SCORE_CORESEM_H
+#define _RTEMS_SCORE_CORESEM_H
 
 /**
  *  @defgroup ScoreSemaphore Semaphore Handler
diff --git a/cpukit/score/include/rtems/score/heap.h b/cpukit/score/include/rtems/score/heap.h
index 42c79bea9c..da0aea361d 100644
--- a/cpukit/score/include/rtems/score/heap.h
+++ b/cpukit/score/include/rtems/score/heap.h
@@ -28,8 +28,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_HEAP_h
-#define __RTEMS_HEAP_h
+#ifndef _RTEMS_SCORE_HEAP_H
+#define _RTEMS_SCORE_HEAP_H
 
 /**
  *  @defgroup ScoreHeap Heap Handler
diff --git a/cpukit/score/include/rtems/score/interr.h b/cpukit/score/include/rtems/score/interr.h
index ea75940531..cdc4551b84 100644
--- a/cpukit/score/include/rtems/score/interr.h
+++ b/cpukit/score/include/rtems/score/interr.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_INTERNAL_ERROR_h
-#define __RTEMS_INTERNAL_ERROR_h
+#ifndef _RTEMS_SCORE_INTERR_H
+#define _RTEMS_SCORE_INTERR_H
 
 /**
  *  @defgroup ScoreIntErr Internal Error Handler
diff --git a/cpukit/score/include/rtems/score/isr.h b/cpukit/score/include/rtems/score/isr.h
index dd60424ce0..45a4f1f676 100644
--- a/cpukit/score/include/rtems/score/isr.h
+++ b/cpukit/score/include/rtems/score/isr.h
@@ -18,8 +18,8 @@
  *  $Id$
  */
 
-#ifndef __ISR_h
-#define __ISR_h
+#ifndef _RTEMS_SCORE_ISR_H
+#define _RTEMS_SCORE_ISR_H
 
 /**
  *  @defgroup ScoreISR ISR Handler
diff --git a/cpukit/score/include/rtems/score/mpci.h b/cpukit/score/include/rtems/score/mpci.h
index e32bda8c22..cf82d2f3eb 100644
--- a/cpukit/score/include/rtems/score/mpci.h
+++ b/cpukit/score/include/rtems/score/mpci.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __MPCI_h
-#define __MPCI_h
+#ifndef _RTEMS_SCORE_MPCI_H
+#define _RTEMS_SCORE_MPCI_H
 
 /**
  *  @defgroup ScoreMPCI MPCI Handler
diff --git a/cpukit/score/include/rtems/score/mppkt.h b/cpukit/score/include/rtems/score/mppkt.h
index 0c72866371..1867ae45a9 100644
--- a/cpukit/score/include/rtems/score/mppkt.h
+++ b/cpukit/score/include/rtems/score/mppkt.h
@@ -19,8 +19,8 @@
  *  $Id$
  */
 
-#ifndef __MP_PACKET_h
-#define __MP_PACKET_h
+#ifndef _RTEMS_SCORE_MPPKT_H
+#define _RTEMS_SCORE_MPPKT_H
 
 /**
  *  @defgroup ScoreMPPacket MP Packet Handler
diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/score/include/rtems/score/object.h
index f56382887e..03ac837bc6 100644
--- a/cpukit/score/include/rtems/score/object.h
+++ b/cpukit/score/include/rtems/score/object.h
@@ -18,8 +18,8 @@
  *  $Id$
  */
 
-#ifndef __OBJECTS_h
-#define __OBJECTS_h
+#ifndef _RTEMS_SCORE_OBJECT_H
+#define _RTEMS_SCORE_OBJECT_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/include/rtems/score/objectmp.h b/cpukit/score/include/rtems/score/objectmp.h
index da4758d806..7f9e25b707 100644
--- a/cpukit/score/include/rtems/score/objectmp.h
+++ b/cpukit/score/include/rtems/score/objectmp.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_OBJECTS_MP_h
-#define __RTEMS_OBJECTS_MP_h
+#ifndef _RTEMS_SCORE_OBJECTMP_H
+#define _RTEMS_SCORE_OBJECTMP_H
 
 /**
  *  @defgroup ScoreObjectMP Object Handler Multiprocessing Support
diff --git a/cpukit/score/include/rtems/score/priority.h b/cpukit/score/include/rtems/score/priority.h
index 800ef41a98..58b70add1b 100644
--- a/cpukit/score/include/rtems/score/priority.h
+++ b/cpukit/score/include/rtems/score/priority.h
@@ -17,8 +17,8 @@
  *  $Id$
  */
 
-#ifndef __PRIORITY_h
-#define __PRIORITY_h
+#ifndef _RTEMS_SCORE_PRIORITY_H
+#define _RTEMS_SCORE_PRIORITY_H
 
 /**
  *  @defgroup ScorePriority Priority Handler
diff --git a/cpukit/score/include/rtems/score/stack.h b/cpukit/score/include/rtems/score/stack.h
index a45ca80433..d0f61ab8c6 100644
--- a/cpukit/score/include/rtems/score/stack.h
+++ b/cpukit/score/include/rtems/score/stack.h
@@ -17,8 +17,8 @@
  *  $Id$
  */
 
-#ifndef __STACK_h
-#define __STACK_h
+#ifndef _RTEMS_SCORE_STACK_H
+#define _RTEMS_SCORE_STACK_H
 
 /**
  *  @defgroup ScoreStack Stack Handler
diff --git a/cpukit/score/include/rtems/score/states.h b/cpukit/score/include/rtems/score/states.h
index 1cfceddab2..2b3cac9eb8 100644
--- a/cpukit/score/include/rtems/score/states.h
+++ b/cpukit/score/include/rtems/score/states.h
@@ -15,8 +15,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_STATES_h
-#define __RTEMS_STATES_h
+#ifndef _RTEMS_SCORE_STATES_H
+#define _RTEMS_SCORE_STATES_H
 
 /**
  *  @defgroup ScoreStates Thread States Handler
diff --git a/cpukit/score/include/rtems/score/sysstate.h b/cpukit/score/include/rtems/score/sysstate.h
index 3e10972a4a..314c0bb2aa 100644
--- a/cpukit/score/include/rtems/score/sysstate.h
+++ b/cpukit/score/include/rtems/score/sysstate.h
@@ -15,8 +15,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_SYSTEM_STATE_h
-#define __RTEMS_SYSTEM_STATE_h
+#ifndef _RTEMS_SCORE_SYSSTATE_H
+#define _RTEMS_SCORE_SYSSTATE_H
 
 /**
  *  @defgroup ScoreSysState System State Handler
diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h
index c2ddab46f2..02bf0cbd86 100644
--- a/cpukit/score/include/rtems/score/thread.h
+++ b/cpukit/score/include/rtems/score/thread.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __THREAD_h
-#define __THREAD_h
+#ifndef _RTEMS_SCORE_THREAD_H
+#define _RTEMS_SCORE_THREAD_H
 
 /**
  *  @defgroup ScoreThread Thread Handler
diff --git a/cpukit/score/include/rtems/score/threadmp.h b/cpukit/score/include/rtems/score/threadmp.h
index f9bd5d0367..b3ecea6199 100644
--- a/cpukit/score/include/rtems/score/threadmp.h
+++ b/cpukit/score/include/rtems/score/threadmp.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_THREAD_MP_h
-#define __RTEMS_THREAD_MP_h
+#ifndef _RTEMS_SCORE_THREADMP_H
+#define _RTEMS_SCORE_THREADMP_H
 
 /**
  *  @defgroup ScoreThreadMP Thread Handler Multiprocessing Support
diff --git a/cpukit/score/include/rtems/score/threadq.h b/cpukit/score/include/rtems/score/threadq.h
index 7385c29905..572993e72a 100644
--- a/cpukit/score/include/rtems/score/threadq.h
+++ b/cpukit/score/include/rtems/score/threadq.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __THREAD_QUEUE_h
-#define __THREAD_QUEUE_h
+#ifndef _RTEMS_SCORE_THREADQ_H
+#define _RTEMS_SCORE_THREADQ_H
 
 /**
  *  @defgroup ScoreThreadQ Thread Queue Handler
diff --git a/cpukit/score/include/rtems/score/tod.h b/cpukit/score/include/rtems/score/tod.h
index e47cc9d71e..904541f311 100644
--- a/cpukit/score/include/rtems/score/tod.h
+++ b/cpukit/score/include/rtems/score/tod.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __TIME_OF_DAY_h
-#define __TIME_OF_DAY_h
+#ifndef _RTEMS_SCORE_TOD_H
+#define _RTEMS_SCORE_TOD_H
 
 /**
  *  @defgroup ScoreTOD Time Of Day (TOD) Handler
diff --git a/cpukit/score/include/rtems/score/tqdata.h b/cpukit/score/include/rtems/score/tqdata.h
index f50487807d..4b72aed609 100644
--- a/cpukit/score/include/rtems/score/tqdata.h
+++ b/cpukit/score/include/rtems/score/tqdata.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __THREAD_QUEUE_DATA_h
-#define __THREAD_QUEUE_DATA_h
+#ifndef _RTEMS_SCORE_TQDATA_H
+#define _RTEMS_SCORE_TQDATA_H
 
 /**
  *  @defgroup ScoreThreadQData Thread Queue Handler Data Definition
diff --git a/cpukit/score/include/rtems/score/userext.h b/cpukit/score/include/rtems/score/userext.h
index 0e09419fcd..bb443ce2f6 100644
--- a/cpukit/score/include/rtems/score/userext.h
+++ b/cpukit/score/include/rtems/score/userext.h
@@ -17,8 +17,8 @@
  *  $Id$
  */
 
-#ifndef __USER_EXTENSIONS_h
-#define __USER_EXTENSIONS_h
+#ifndef _RTEMS_SCORE_USEREXT_H
+#define _RTEMS_SCORE_USEREXT_H
 
 /**
  *  @defgroup ScoreUserExt User Extension Handler
diff --git a/cpukit/score/include/rtems/score/watchdog.h b/cpukit/score/include/rtems/score/watchdog.h
index ff99103977..124187c899 100644
--- a/cpukit/score/include/rtems/score/watchdog.h
+++ b/cpukit/score/include/rtems/score/watchdog.h
@@ -17,8 +17,8 @@
  *  $Id$
  */
 
-#ifndef __WATCHDOG_h
-#define __WATCHDOG_h
+#ifndef _RTEMS_SCORE_WATCHDOG_H
+#define _RTEMS_SCORE_WATCHDOG_H
 
 /**
  *  @defgroup ScoreWatchdog Watchdog Handler
diff --git a/cpukit/score/include/rtems/score/wkspace.h b/cpukit/score/include/rtems/score/wkspace.h
index a4015d2a51..f438c39e1e 100644
--- a/cpukit/score/include/rtems/score/wkspace.h
+++ b/cpukit/score/include/rtems/score/wkspace.h
@@ -17,8 +17,8 @@
  *  $Id$
  */
 
-#ifndef __WORKSPACE_h
-#define __WORKSPACE_h
+#ifndef _RTEMS_SCORE_WKSPACE_H
+#define _RTEMS_SCORE_WKSPACE_H
 
 /**
  *  @defgroup ScoreWorkspace Workspace Handler
diff --git a/cpukit/score/include/rtems/seterr.h b/cpukit/score/include/rtems/seterr.h
index cacd0e7a52..9e5ebe931e 100644
--- a/cpukit/score/include/rtems/seterr.h
+++ b/cpukit/score/include/rtems/seterr.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_SET_ERRNO_h
-#define __RTEMS_SET_ERRNO_h
+#ifndef _RTEMS_SETERR_H
+#define _RTEMS_SETERR_H
 
 #define rtems_set_errno_and_return_minus_one( _error ) \
   do { errno = (_error); return -1; } while(0)
diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h
index 1092cf4aa1..27b6ecd432 100644
--- a/cpukit/score/include/rtems/system.h
+++ b/cpukit/score/include/rtems/system.h
@@ -17,8 +17,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_SYSTEM_h
-#define __RTEMS_SYSTEM_h
+#ifndef _RTEMS_SYSTEM_H
+#define _RTEMS_SYSTEM_H
 
 #ifdef __cplusplus
 extern "C" {