From 092f142af38a00d9423c7ed7a4872a034ed0ff58 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 28 Jan 2005 05:00:21 +0000
Subject: New header guard.

---
 cpukit/rtems/include/rtems.h                 | 4 ++--
 cpukit/rtems/include/rtems/rtems/asr.h       | 4 ++--
 cpukit/rtems/include/rtems/rtems/attr.h      | 4 ++--
 cpukit/rtems/include/rtems/rtems/cache.h     | 4 ++--
 cpukit/rtems/include/rtems/rtems/clock.h     | 4 ++--
 cpukit/rtems/include/rtems/rtems/config.h    | 4 ++--
 cpukit/rtems/include/rtems/rtems/dpmem.h     | 4 ++--
 cpukit/rtems/include/rtems/rtems/event.h     | 4 ++--
 cpukit/rtems/include/rtems/rtems/eventmp.h   | 4 ++--
 cpukit/rtems/include/rtems/rtems/eventset.h  | 4 ++--
 cpukit/rtems/include/rtems/rtems/intr.h      | 4 ++--
 cpukit/rtems/include/rtems/rtems/message.h   | 4 ++--
 cpukit/rtems/include/rtems/rtems/modes.h     | 4 ++--
 cpukit/rtems/include/rtems/rtems/mp.h        | 4 ++--
 cpukit/rtems/include/rtems/rtems/msgmp.h     | 4 ++--
 cpukit/rtems/include/rtems/rtems/options.h   | 4 ++--
 cpukit/rtems/include/rtems/rtems/part.h      | 4 ++--
 cpukit/rtems/include/rtems/rtems/partmp.h    | 4 ++--
 cpukit/rtems/include/rtems/rtems/ratemon.h   | 4 ++--
 cpukit/rtems/include/rtems/rtems/region.h    | 4 ++--
 cpukit/rtems/include/rtems/rtems/regionmp.h  | 4 ++--
 cpukit/rtems/include/rtems/rtems/rtemsapi.h  | 4 ++--
 cpukit/rtems/include/rtems/rtems/sem.h       | 4 ++--
 cpukit/rtems/include/rtems/rtems/semmp.h     | 4 ++--
 cpukit/rtems/include/rtems/rtems/signal.h    | 4 ++--
 cpukit/rtems/include/rtems/rtems/signalmp.h  | 4 ++--
 cpukit/rtems/include/rtems/rtems/status.h    | 4 ++--
 cpukit/rtems/include/rtems/rtems/support.h   | 4 ++--
 cpukit/rtems/include/rtems/rtems/taskmp.h    | 4 ++--
 cpukit/rtems/include/rtems/rtems/tasks.h     | 4 ++--
 cpukit/rtems/include/rtems/rtems/timer.h     | 4 ++--
 cpukit/rtems/include/rtems/rtems/types.h     | 4 ++--
 cpukit/sapi/include/rtems/config.h           | 4 ++--
 cpukit/sapi/include/rtems/extension.h        | 4 ++--
 cpukit/sapi/include/rtems/fatal.h            | 4 ++--
 cpukit/sapi/include/rtems/init.h             | 4 ++--
 cpukit/sapi/include/rtems/io.h               | 4 ++--
 cpukit/sapi/include/rtems/mptables.h         | 4 ++--
 cpukit/sapi/include/rtems/sptables.h         | 4 ++--
 cpukit/score/include/rtems/debug.h           | 4 ++--
 cpukit/score/include/rtems/score/address.h   | 4 ++--
 cpukit/score/include/rtems/score/apiext.h    | 4 ++--
 cpukit/score/include/rtems/score/apimutex.h  | 4 ++--
 cpukit/score/include/rtems/score/bitfield.h  | 4 ++--
 cpukit/score/include/rtems/score/chain.h     | 4 ++--
 cpukit/score/include/rtems/score/context.h   | 4 ++--
 cpukit/score/include/rtems/score/copyrt.h    | 4 ++--
 cpukit/score/include/rtems/score/coremsg.h   | 4 ++--
 cpukit/score/include/rtems/score/coremutex.h | 4 ++--
 cpukit/score/include/rtems/score/coresem.h   | 4 ++--
 cpukit/score/include/rtems/score/heap.h      | 4 ++--
 cpukit/score/include/rtems/score/interr.h    | 4 ++--
 cpukit/score/include/rtems/score/isr.h       | 4 ++--
 cpukit/score/include/rtems/score/mpci.h      | 4 ++--
 cpukit/score/include/rtems/score/mppkt.h     | 4 ++--
 cpukit/score/include/rtems/score/object.h    | 4 ++--
 cpukit/score/include/rtems/score/objectmp.h  | 4 ++--
 cpukit/score/include/rtems/score/priority.h  | 4 ++--
 cpukit/score/include/rtems/score/stack.h     | 4 ++--
 cpukit/score/include/rtems/score/states.h    | 4 ++--
 cpukit/score/include/rtems/score/sysstate.h  | 4 ++--
 cpukit/score/include/rtems/score/thread.h    | 4 ++--
 cpukit/score/include/rtems/score/threadmp.h  | 4 ++--
 cpukit/score/include/rtems/score/threadq.h   | 4 ++--
 cpukit/score/include/rtems/score/tod.h       | 4 ++--
 cpukit/score/include/rtems/score/tqdata.h    | 4 ++--
 cpukit/score/include/rtems/score/userext.h   | 4 ++--
 cpukit/score/include/rtems/score/watchdog.h  | 4 ++--
 cpukit/score/include/rtems/score/wkspace.h   | 4 ++--
 cpukit/score/include/rtems/seterr.h          | 4 ++--
 cpukit/score/include/rtems/system.h          | 4 ++--
 71 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/cpukit/rtems/include/rtems.h b/cpukit/rtems/include/rtems.h
index 0968ef455d..2cbfee49f0 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/asr.h b/cpukit/rtems/include/rtems/rtems/asr.h
index 91ac8a47a7..6fb7f3db91 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/attr.h b/cpukit/rtems/include/rtems/rtems/attr.h
index f9b9b5ef8a..22e78ee052 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/cache.h b/cpukit/rtems/include/rtems/rtems/cache.h
index 86c8c9d810..17645346c3 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/clock.h b/cpukit/rtems/include/rtems/rtems/clock.h
index 33ac23fae7..c5f8bb080c 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/config.h b/cpukit/rtems/include/rtems/rtems/config.h
index 2b68e72862..d9c43d556d 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/dpmem.h b/cpukit/rtems/include/rtems/rtems/dpmem.h
index ed0b44b739..dc48eec822 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/event.h b/cpukit/rtems/include/rtems/rtems/event.h
index 7c22a5b874..6de5e76516 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/eventmp.h b/cpukit/rtems/include/rtems/rtems/eventmp.h
index 04ea3b0de8..e3b149b7d6 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/eventset.h b/cpukit/rtems/include/rtems/rtems/eventset.h
index f0a8e086bb..77fbabf763 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/intr.h b/cpukit/rtems/include/rtems/rtems/intr.h
index c9a0655d9d..281cf8e57b 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/message.h b/cpukit/rtems/include/rtems/rtems/message.h
index 17708cca4c..778500e363 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/modes.h b/cpukit/rtems/include/rtems/rtems/modes.h
index 5f6d4000ef..5a6131297c 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/mp.h b/cpukit/rtems/include/rtems/rtems/mp.h
index b31b4fb493..cebdb2a175 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/msgmp.h b/cpukit/rtems/include/rtems/rtems/msgmp.h
index f489b1dd9a..6fa68e93ba 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/options.h b/cpukit/rtems/include/rtems/rtems/options.h
index bd96e0ac51..70f17d700c 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/part.h b/cpukit/rtems/include/rtems/rtems/part.h
index e663392b7e..75a947d881 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/partmp.h b/cpukit/rtems/include/rtems/rtems/partmp.h
index e9397785d8..9369dc286c 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/ratemon.h b/cpukit/rtems/include/rtems/rtems/ratemon.h
index a8057f96fd..0d9d5aa903 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/region.h b/cpukit/rtems/include/rtems/rtems/region.h
index acd333ec6d..a27dd7879b 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/regionmp.h b/cpukit/rtems/include/rtems/rtems/regionmp.h
index 1d6f4cd0f0..2b0eeac29a 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/rtemsapi.h b/cpukit/rtems/include/rtems/rtems/rtemsapi.h
index dd725e1a4e..d1c2a0538c 100644
--- 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>
 
diff --git a/cpukit/rtems/include/rtems/rtems/sem.h b/cpukit/rtems/include/rtems/rtems/sem.h
index a311bfa2ce..89c00ded78 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/semmp.h b/cpukit/rtems/include/rtems/rtems/semmp.h
index b78c847c62..9af338bbf7 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/signal.h b/cpukit/rtems/include/rtems/rtems/signal.h
index 0d70bbb8ba..a516970ca4 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/signalmp.h b/cpukit/rtems/include/rtems/rtems/signalmp.h
index 0dd1c3d526..a706beae80 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/status.h b/cpukit/rtems/include/rtems/rtems/status.h
index d4a108e4b3..d088f01917 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/support.h b/cpukit/rtems/include/rtems/rtems/support.h
index 695178cdfe..1fd5b997fc 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/taskmp.h b/cpukit/rtems/include/rtems/rtems/taskmp.h
index f955dabbab..9adae0ced6 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/tasks.h b/cpukit/rtems/include/rtems/rtems/tasks.h
index 0edf306d92..c4a3a9dc0d 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/timer.h b/cpukit/rtems/include/rtems/rtems/timer.h
index 520e6db22c..8048754fd4 100644
--- 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" {
diff --git a/cpukit/rtems/include/rtems/rtems/types.h b/cpukit/rtems/include/rtems/rtems/types.h
index f800b79592..810f4767b5 100644
--- 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" {
diff --git a/cpukit/sapi/include/rtems/config.h b/cpukit/sapi/include/rtems/config.h
index 74e7597d44..cb7af0dc8c 100644
--- 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" {
diff --git a/cpukit/sapi/include/rtems/extension.h b/cpukit/sapi/include/rtems/extension.h
index 868f73fe92..65ac6ce280 100644
--- 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" {
diff --git a/cpukit/sapi/include/rtems/fatal.h b/cpukit/sapi/include/rtems/fatal.h
index b46d2b35ff..9d870776c4 100644
--- 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" {
diff --git a/cpukit/sapi/include/rtems/init.h b/cpukit/sapi/include/rtems/init.h
index 717927d81d..3d3a25f732 100644
--- 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" {
diff --git a/cpukit/sapi/include/rtems/io.h b/cpukit/sapi/include/rtems/io.h
index e2b12ac701..0a09736f7a 100644
--- 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" {
diff --git a/cpukit/sapi/include/rtems/mptables.h b/cpukit/sapi/include/rtems/mptables.h
index d9e79b77dc..bcb51c5e96 100644
--- 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" {
diff --git a/cpukit/sapi/include/rtems/sptables.h b/cpukit/sapi/include/rtems/sptables.h
index 0dc98c9c62..a5af70b171 100644
--- 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" {
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" {
-- 
cgit v1.2.3