New header guard.

2005-01-28 05:00:21 +00:00
parent 07750fff6a
commit 092f142af3
71 changed files with 142 additions and 142 deletions
--- a/cpukit/rtems/include/rtems.h
+++ b/cpukit/rtems/include/rtems.h
@@ -18,8 +18,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_RTEMS_GENERIC_h
-#define __RTEMS_RTEMS_GENERIC_h
+#ifndef _RTEMS_H
+#define _RTEMS_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/asr.h
+++ b/cpukit/rtems/include/rtems/rtems/asr.h
@@ -17,8 +17,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_ASR_h
-#define __RTEMS_ASR_h
+#ifndef _RTEMS_RTEMS_ASR_H
+#define _RTEMS_RTEMS_ASR_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/attr.h
+++ b/cpukit/rtems/include/rtems/rtems/attr.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_ATTRIBUTES_h
-#define __RTEMS_ATTRIBUTES_h
+#ifndef _RTEMS_RTEMS_ATTR_H
+#define _RTEMS_RTEMS_ATTR_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/cache.h
+++ b/cpukit/rtems/include/rtems/rtems/cache.h
@@ -28,8 +28,8 @@
 *  to this Manager.
 */

-#ifndef __CACHE_h
-#define __CACHE_h
+#ifndef _RTEMS_RTEMS_CACHE_H
+#define _RTEMS_RTEMS_CACHE_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/clock.h
+++ b/cpukit/rtems/include/rtems/rtems/clock.h
@@ -24,8 +24,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_CLOCK_h
-#define __RTEMS_CLOCK_h
+#ifndef _RTEMS_RTEMS_CLOCK_H
+#define _RTEMS_RTEMS_CLOCK_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/config.h
+++ b/cpukit/rtems/include/rtems/rtems/config.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_RTEMS_CONFIGURATION_h
-#define __RTEMS_RTEMS_CONFIGURATION_h
+#ifndef _RTEMS_RTEMS_CONFIG_H
+#define _RTEMS_RTEMS_CONFIG_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/dpmem.h
+++ b/cpukit/rtems/include/rtems/rtems/dpmem.h
@@ -27,8 +27,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_DUAL_PORTED_MEMORY_h
-#define __RTEMS_DUAL_PORTED_MEMORY_h
+#ifndef _RTEMS_RTEMS_DPMEM_H
+#define _RTEMS_RTEMS_DPMEM_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/event.h
+++ b/cpukit/rtems/include/rtems/rtems/event.h
@@ -23,8 +23,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_EVENT_h
-#define __RTEMS_EVENT_h
+#ifndef _RTEMS_RTEMS_EVENT_H
+#define _RTEMS_RTEMS_EVENT_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/eventmp.h
+++ b/cpukit/rtems/include/rtems/rtems/eventmp.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_EVENT_MP_h
-#define __RTEMS_EVENT_MP_h
+#ifndef _RTEMS_RTEMS_EVENTMP_H
+#define _RTEMS_RTEMS_EVENTMP_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/eventset.h
+++ b/cpukit/rtems/include/rtems/rtems/eventset.h
@@ -17,8 +17,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_EVENT_SET_h
-#define __RTEMS_EVENT_SET_h
+#ifndef _RTEMS_RTEMS_EVENTSET_H
+#define _RTEMS_RTEMS_EVENTSET_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/intr.h
+++ b/cpukit/rtems/include/rtems/rtems/intr.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_INTERRUPT_h
-#define __RTEMS_INTERRUPT_h
+#ifndef _RTEMS_RTEMS_INTR_H
+#define _RTEMS_RTEMS_INTR_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/message.h
+++ b/cpukit/rtems/include/rtems/rtems/message.h
@@ -29,8 +29,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_MESSAGE_QUEUE_h
-#define __RTEMS_MESSAGE_QUEUE_h
+#ifndef _RTEMS_RTEMS_MESSAGE_H
+#define _RTEMS_RTEMS_MESSAGE_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/modes.h
+++ b/cpukit/rtems/include/rtems/rtems/modes.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_MODES_h
-#define __RTEMS_MODES_h
+#ifndef _RTEMS_RTEMS_MODES_H
+#define _RTEMS_RTEMS_MODES_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/mp.h
+++ b/cpukit/rtems/include/rtems/rtems/mp.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_MP_h
-#define __RTEMS_MP_h
+#ifndef _RTEMS_RTEMS_MP_H
+#define _RTEMS_RTEMS_MP_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/msgmp.h
+++ b/cpukit/rtems/include/rtems/rtems/msgmp.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_MESSAGE_QUEUE_MP_h
-#define __RTEMS_MESSAGE_QUEUE_MP_h
+#ifndef _RTEMS_RTEMS_MSGMP_H
+#define _RTEMS_RTEMS_MSGMP_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/options.h
+++ b/cpukit/rtems/include/rtems/rtems/options.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_OPTIONS_h
-#define __RTEMS_OPTIONS_h
+#ifndef _RTEMS_RTEMS_OPTIONS_H
+#define _RTEMS_RTEMS_OPTIONS_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/part.h
+++ b/cpukit/rtems/include/rtems/rtems/part.h
@@ -26,8 +26,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_PARTITION_h
-#define __RTEMS_PARTITION_h
+#ifndef _RTEMS_RTEMS_PART_H
+#define _RTEMS_RTEMS_PART_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/partmp.h
+++ b/cpukit/rtems/include/rtems/rtems/partmp.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_PARTITION_MP_h
-#define __RTEMS_PARTITION_MP_h
+#ifndef _RTEMS_RTEMS_PARTMP_H
+#define _RTEMS_RTEMS_PARTMP_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/ratemon.h
+++ b/cpukit/rtems/include/rtems/rtems/ratemon.h
@@ -25,8 +25,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_RATE_MONOTONIC_h
-#define __RTEMS_RATE_MONOTONIC_h
+#ifndef _RTEMS_RTEMS_RATEMON_H
+#define _RTEMS_RTEMS_RATEMON_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/region.h
+++ b/cpukit/rtems/include/rtems/rtems/region.h
@@ -25,8 +25,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_REGION_h
-#define __RTEMS_REGION_h
+#ifndef _RTEMS_RTEMS_REGION_H
+#define _RTEMS_RTEMS_REGION_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/regionmp.h
+++ b/cpukit/rtems/include/rtems/rtems/regionmp.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_REGION_MP_h
-#define __RTEMS_REGION_MP_h
+#ifndef _RTEMS_RTEMS_REGIONMP_H
+#define _RTEMS_RTEMS_REGIONMP_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/rtemsapi.h
+++ b/cpukit/rtems/include/rtems/rtems/rtemsapi.h
@@ -15,8 +15,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_API_h
-#define __RTEMS_API_h
+#ifndef _RTEMS_RTEMS_RTEMSAPI_H
+#define _RTEMS_RTEMS_RTEMSAPI_H

 #include <rtems/config.h>

--- a/cpukit/rtems/include/rtems/rtems/sem.h
+++ b/cpukit/rtems/include/rtems/rtems/sem.h
@@ -26,8 +26,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_SEMAPHORE_h
-#define __RTEMS_SEMAPHORE_h
+#ifndef _RTEMS_RTEMS_SEM_H
+#define _RTEMS_RTEMS_SEM_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/semmp.h
+++ b/cpukit/rtems/include/rtems/rtems/semmp.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_SEMAPHORE_MP_h
-#define __RTEMS_SEMAPHORE_MP_h
+#ifndef _RTEMS_RTEMS_SEMMP_H
+#define _RTEMS_RTEMS_SEMMP_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/signal.h
+++ b/cpukit/rtems/include/rtems/rtems/signal.h
@@ -22,8 +22,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_SIGNAL_h
-#define __RTEMS_SIGNAL_h
+#ifndef _RTEMS_RTEMS_SIGNAL_H
+#define _RTEMS_RTEMS_SIGNAL_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/signalmp.h
+++ b/cpukit/rtems/include/rtems/rtems/signalmp.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_SIGNAL_MP_h
-#define __RTEMS_SIGNAL_MP_h
+#ifndef _RTEMS_RTEMS_SIGNALMP_H
+#define _RTEMS_RTEMS_SIGNALMP_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/status.h
+++ b/cpukit/rtems/include/rtems/rtems/status.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_STATUS_h
-#define __RTEMS_STATUS_h
+#ifndef _RTEMS_RTEMS_STATUS_H
+#define _RTEMS_RTEMS_STATUS_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/support.h
+++ b/cpukit/rtems/include/rtems/rtems/support.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_RTEMS_SUPPORT_h
-#define __RTEMS_RTEMS_SUPPORT_h
+#ifndef _RTEMS_RTEMS_SUPPORT_H
+#define _RTEMS_RTEMS_SUPPORT_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/taskmp.h
+++ b/cpukit/rtems/include/rtems/rtems/taskmp.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_RTEMS_TASKS_MP_h
-#define __RTEMS_RTEMS_TASKS_MP_h
+#ifndef _RTEMS_RTEMS_TASKMP_H
+#define _RTEMS_RTEMS_TASKMP_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/tasks.h
+++ b/cpukit/rtems/include/rtems/rtems/tasks.h
@@ -33,8 +33,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_RTEMS_TASKS_h
-#define __RTEMS_RTEMS_TASKS_h
+#ifndef _RTEMS_RTEMS_TASKS_H
+#define _RTEMS_RTEMS_TASKS_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/timer.h
+++ b/cpukit/rtems/include/rtems/rtems/timer.h
@@ -33,8 +33,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_TIMER_h
-#define __RTEMS_TIMER_h
+#ifndef _RTEMS_RTEMS_TIMER_H
+#define _RTEMS_RTEMS_TIMER_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/include/rtems/rtems/types.h
+++ b/cpukit/rtems/include/rtems/rtems/types.h
@@ -15,8 +15,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_RTEMS_TYPES_h
-#define __RTEMS_RTEMS_TYPES_h
+#ifndef _RTEMS_RTEMS_TYPES_H
+#define _RTEMS_RTEMS_TYPES_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/sapi/include/rtems/config.h
+++ b/cpukit/sapi/include/rtems/config.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_CONFIGURATION_h
-#define __RTEMS_CONFIGURATION_h
+#ifndef _RTEMS_CONFIG_H
+#define _RTEMS_CONFIG_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/sapi/include/rtems/extension.h
+++ b/cpukit/sapi/include/rtems/extension.h
@@ -23,8 +23,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_EXTENSION_MANAGER_h
-#define __RTEMS_EXTENSION_MANAGER_h
+#ifndef _RTEMS_EXTENSION_H
+#define _RTEMS_EXTENSION_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/sapi/include/rtems/fatal.h
+++ b/cpukit/sapi/include/rtems/fatal.h
@@ -22,8 +22,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_FATAL_h
-#define __RTEMS_FATAL_h
+#ifndef _RTEMS_FATAL_H
+#define _RTEMS_FATAL_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/sapi/include/rtems/init.h
+++ b/cpukit/sapi/include/rtems/init.h
@@ -25,8 +25,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_INIT_h
-#define __RTEMS_INIT_h
+#ifndef _RTEMS_INIT_H
+#define _RTEMS_INIT_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/sapi/include/rtems/io.h
+++ b/cpukit/sapi/include/rtems/io.h
@@ -27,8 +27,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_IO_h
-#define __RTEMS_IO_h
+#ifndef _RTEMS_IO_H
+#define _RTEMS_IO_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/sapi/include/rtems/mptables.h
+++ b/cpukit/sapi/include/rtems/mptables.h
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_MPTABLES_h
-#define __RTEMS_MPTABLES_h
+#ifndef _RTEMS_MPTABLES_H
+#define _RTEMS_MPTABLES_H

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/sapi/include/rtems/sptables.h
+++ b/cpukit/sapi/include/rtems/sptables.h
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_SPTABLES_h
-#define __RTEMS_SPTABLES_h
+#ifndef _RTEMS_SPTABLES_H
+#define _RTEMS_SPTABLES_H

 #ifdef __cplusplus
 extern "C" {
--- 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" {
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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" {
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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" {
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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" {