New header guard.

76 files changed, 152 insertions, 152 deletions

diff --git a/c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h b/c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h
index fc50807aff..906063b731 100644
--- a/c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h
+++ b/c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h
@@ -42,8 +42,8 @@
  */
 
 
-#ifndef _INCLUDE_PPC_h
-#define _INCLUDE_PPC_h
+#ifndef _RTEMS_SCORE_POWERPC_H
+#define _RTEMS_SCORE_POWERPC_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/arm/asm.h b/cpukit/score/cpu/arm/asm.h
index ffe5921ccf..bbaf1ed4f4 100644
--- a/cpukit/score/cpu/arm/asm.h
+++ b/cpukit/score/cpu/arm/asm.h
@@ -29,8 +29,8 @@
  *
  */
 
-#ifndef __ARM_ASM_h
-#define __ARM_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/arm/rtems/asm.h b/cpukit/score/cpu/arm/rtems/asm.h
index ffe5921ccf..bbaf1ed4f4 100644
--- a/cpukit/score/cpu/arm/rtems/asm.h
+++ b/cpukit/score/cpu/arm/rtems/asm.h
@@ -29,8 +29,8 @@
  *
  */
 
-#ifndef __ARM_ASM_h
-#define __ARM_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/arm/rtems/score/arm.h b/cpukit/score/cpu/arm/rtems/score/arm.h
index 57f714405f..97f3ee29c3 100644
--- a/cpukit/score/cpu/arm/rtems/score/arm.h
+++ b/cpukit/score/cpu/arm/rtems/score/arm.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _INCLUDE_ARM_h
-#define _INCLUDE_ARM_h
+#ifndef _RTEMS_SCORE_ARM_H
+#define _RTEMS_SCORE_ARM_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/rtems/score/cpu.h
index 53e50ac671..5ccc1d77da 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpu.h
+++ b/cpukit/score/cpu/arm/rtems/score/cpu.h
@@ -21,8 +21,8 @@
  */
 
 /* FIXME: finish commenting/cleaning up this file */
-#ifndef __CPU_h
-#define __CPU_h
+#ifndef _RTEMS_SCORE_CPU_H
+#define _RTEMS_SCORE_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu_asm.h b/cpukit/score/cpu/arm/rtems/score/cpu_asm.h
index 79065bc0d1..59b567ca2c 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpu_asm.h
+++ b/cpukit/score/cpu/arm/rtems/score/cpu_asm.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CPU_ASM_h
-#define __CPU_ASM_h
+#ifndef _RTEMS_SCORE_CPU_ASM_H
+#define _RTEMS_SCORE_CPU_ASM_H
 
 
 /* Registers saved in context switch: */
diff --git a/cpukit/score/cpu/arm/rtems/score/types.h b/cpukit/score/cpu/arm/rtems/score/types.h
index c05d414a40..c20b5edd97 100644
--- a/cpukit/score/cpu/arm/rtems/score/types.h
+++ b/cpukit/score/cpu/arm/rtems/score/types.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __rtems_score_types_h
-#define __rtems_score_types_h
+#ifndef _RTEMS_SCORE_TYPES_H
+#define _RTEMS_SCORE_TYPES_H
 
 #ifndef ASM
 
diff --git a/cpukit/score/cpu/avr/asm.h b/cpukit/score/cpu/avr/asm.h
index b9f9e33c1f..f8649c0f49 100644
--- a/cpukit/score/cpu/avr/asm.h
+++ b/cpukit/score/cpu/avr/asm.h
@@ -25,8 +25,8 @@
  *  $Id$
  */
 
-#ifndef __rtems_asm_h
-#define __rtems_asm_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/avr/rtems/asm.h b/cpukit/score/cpu/avr/rtems/asm.h
index b9f9e33c1f..f8649c0f49 100644
--- a/cpukit/score/cpu/avr/rtems/asm.h
+++ b/cpukit/score/cpu/avr/rtems/asm.h
@@ -25,8 +25,8 @@
  *  $Id$
  */
 
-#ifndef __rtems_asm_h
-#define __rtems_asm_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/avr/rtems/score/avr.h b/cpukit/score/cpu/avr/rtems/score/avr.h
index bef29fdca7..60cbe9524b 100644
--- a/cpukit/score/cpu/avr/rtems/score/avr.h
+++ b/cpukit/score/cpu/avr/rtems/score/avr.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef _rtems_score_avr_h
-#define _rtems_score_avr_h
+#ifndef _RTEMS_SCORE_AVR_H
+#define _RTEMS_SCORE_AVR_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/avr/rtems/score/cpu.h b/cpukit/score/cpu/avr/rtems/score/cpu.h
index c3299e797c..e509edda12 100644
--- a/cpukit/score/cpu/avr/rtems/score/cpu.h
+++ b/cpukit/score/cpu/avr/rtems/score/cpu.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __CPU_h
-#define __CPU_h
+#ifndef _RTEMS_SCORE_CPU_H
+#define _RTEMS_SCORE_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/avr/rtems/score/cpu_asm.h b/cpukit/score/cpu/avr/rtems/score/cpu_asm.h
index 94fa05bcd6..a509b36ae6 100644
--- a/cpukit/score/cpu/avr/rtems/score/cpu_asm.h
+++ b/cpukit/score/cpu/avr/rtems/score/cpu_asm.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __CPU_ASM_h
-#define __CPU_ASM_h
+#ifndef _RTEMS_SCORE_CPU_ASM_H
+#define _RTEMS_SCORE_CPU_ASM_H
 
 /* pull in the generated offsets */
 
diff --git a/cpukit/score/cpu/avr/rtems/score/types.h b/cpukit/score/cpu/avr/rtems/score/types.h
index c7f4b4ad90..bda1c364d7 100644
--- a/cpukit/score/cpu/avr/rtems/score/types.h
+++ b/cpukit/score/cpu/avr/rtems/score/types.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __rtems_score_types_h
-#define __rtems_score_types_h
+#ifndef _RTEMS_SCORE_TYPES_H
+#define _RTEMS_SCORE_TYPES_H
 
 #ifndef ASM
 
diff --git a/cpukit/score/cpu/c4x/asm.h b/cpukit/score/cpu/c4x/asm.h
index 1e75c78447..2311995e61 100644
--- a/cpukit/score/cpu/c4x/asm.h
+++ b/cpukit/score/cpu/c4x/asm.h
@@ -25,8 +25,8 @@
  *  $Id$
  */
 
-#ifndef __C4X_ASM_h
-#define __C4X_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/c4x/rtems/asm.h b/cpukit/score/cpu/c4x/rtems/asm.h
index 1e75c78447..2311995e61 100644
--- a/cpukit/score/cpu/c4x/rtems/asm.h
+++ b/cpukit/score/cpu/c4x/rtems/asm.h
@@ -25,8 +25,8 @@
  *  $Id$
  */
 
-#ifndef __C4X_ASM_h
-#define __C4X_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/c4x/rtems/score/c4x.h b/cpukit/score/cpu/c4x/rtems/score/c4x.h
index 926b166434..58ee32bfc7 100644
--- a/cpukit/score/cpu/c4x/rtems/score/c4x.h
+++ b/cpukit/score/cpu/c4x/rtems/score/c4x.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef _INCLUDE_C4X_h
-#define _INCLUDE_C4X_h
+#ifndef _RTEMS_SCORE_C4X_H
+#define _RTEMS_SCORE_C4X_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/c4x/rtems/score/cpu.h b/cpukit/score/cpu/c4x/rtems/score/cpu.h
index f667b9234f..b557c4d727 100644
--- a/cpukit/score/cpu/c4x/rtems/score/cpu.h
+++ b/cpukit/score/cpu/c4x/rtems/score/cpu.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __CPU_h
-#define __CPU_h
+#ifndef _RTEMS_SCORE_CPU_H
+#define _RTEMS_SCORE_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/c4x/rtems/score/cpu_asm.h b/cpukit/score/cpu/c4x/rtems/score/cpu_asm.h
index 94fa05bcd6..a509b36ae6 100644
--- a/cpukit/score/cpu/c4x/rtems/score/cpu_asm.h
+++ b/cpukit/score/cpu/c4x/rtems/score/cpu_asm.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __CPU_ASM_h
-#define __CPU_ASM_h
+#ifndef _RTEMS_SCORE_CPU_ASM_H
+#define _RTEMS_SCORE_CPU_ASM_H
 
 /* pull in the generated offsets */
 
diff --git a/cpukit/score/cpu/c4x/rtems/score/types.h b/cpukit/score/cpu/c4x/rtems/score/types.h
index b447826a63..0e0c45c516 100644
--- a/cpukit/score/cpu/c4x/rtems/score/types.h
+++ b/cpukit/score/cpu/c4x/rtems/score/types.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __rtems_score_types_h
-#define __rtems_score_types_h
+#ifndef _RTEMS_SCORE_TYPES_H
+#define _RTEMS_SCORE_TYPES_H
 
 #ifndef ASM
 
diff --git a/cpukit/score/cpu/h8300/asm.h b/cpukit/score/cpu/h8300/asm.h
index d0b7a7f23f..eca784a49f 100644
--- a/cpukit/score/cpu/h8300/asm.h
+++ b/cpukit/score/cpu/h8300/asm.h
@@ -30,8 +30,8 @@
  *  $Id$
  */
 
-#ifndef __H8300_CPU_ASM_h
-#define __H8300_CPU_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/h8300/rtems/asm.h b/cpukit/score/cpu/h8300/rtems/asm.h
index d0b7a7f23f..eca784a49f 100644
--- a/cpukit/score/cpu/h8300/rtems/asm.h
+++ b/cpukit/score/cpu/h8300/rtems/asm.h
@@ -30,8 +30,8 @@
  *  $Id$
  */
 
-#ifndef __H8300_CPU_ASM_h
-#define __H8300_CPU_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/h8300/rtems/score/cpu.h b/cpukit/score/cpu/h8300/rtems/score/cpu.h
index aeaab05e37..962db4ca13 100644
--- a/cpukit/score/cpu/h8300/rtems/score/cpu.h
+++ b/cpukit/score/cpu/h8300/rtems/score/cpu.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __CPU_h
-#define __CPU_h
+#ifndef _RTEMS_SCORE_CPU_H
+#define _RTEMS_SCORE_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/h8300/rtems/score/h8300.h b/cpukit/score/cpu/h8300/rtems/score/h8300.h
index fd50970924..4abb36bbb2 100644
--- a/cpukit/score/cpu/h8300/rtems/score/h8300.h
+++ b/cpukit/score/cpu/h8300/rtems/score/h8300.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef _INCLUDE_H8300_h
-#define _INCLUDE_H8300_h
+#ifndef _RTEMS_SCORE_H8300_H
+#define _RTEMS_SCORE_H8300_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/h8300/rtems/score/types.h b/cpukit/score/cpu/h8300/rtems/score/types.h
index 59284fab9f..6b73ba5e17 100644
--- a/cpukit/score/cpu/h8300/rtems/score/types.h
+++ b/cpukit/score/cpu/h8300/rtems/score/types.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __rtems_score_types_h
-#define __rtems_score_types_h
+#ifndef _RTEMS_SCORE_TYPES_H
+#define _RTEMS_SCORE_TYPES_H
 
 #ifndef ASM
 
diff --git a/cpukit/score/cpu/i386/asm.h b/cpukit/score/cpu/i386/asm.h
index 504c5f8477..77e7e40f8b 100644
--- a/cpukit/score/cpu/i386/asm.h
+++ b/cpukit/score/cpu/i386/asm.h
@@ -25,8 +25,8 @@
  *  $Id$
  */
 
-#ifndef __i386_ASM_h
-#define __i386_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/i386/rtems/asm.h b/cpukit/score/cpu/i386/rtems/asm.h
index 504c5f8477..77e7e40f8b 100644
--- a/cpukit/score/cpu/i386/rtems/asm.h
+++ b/cpukit/score/cpu/i386/rtems/asm.h
@@ -25,8 +25,8 @@
  *  $Id$
  */
 
-#ifndef __i386_ASM_h
-#define __i386_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/i386/rtems/score/cpu.h b/cpukit/score/cpu/i386/rtems/score/cpu.h
index fe7cd532bc..3e0c1a1a92 100644
--- a/cpukit/score/cpu/i386/rtems/score/cpu.h
+++ b/cpukit/score/cpu/i386/rtems/score/cpu.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __CPU_h
-#define __CPU_h
+#ifndef _RTEMS_SCORE_CPU_H
+#define _RTEMS_SCORE_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/i386/rtems/score/i386.h b/cpukit/score/cpu/i386/rtems/score/i386.h
index 71acc5fa8f..881187091d 100644
--- a/cpukit/score/cpu/i386/rtems/score/i386.h
+++ b/cpukit/score/cpu/i386/rtems/score/i386.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __i386_h
-#define __i386_h
+#ifndef _RTEMS_SCORE_I386_H
+#define _RTEMS_SCORE_I386_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/i386/rtems/score/idtr.h b/cpukit/score/cpu/i386/rtems/score/idtr.h
index 7e79e2527c..bdc465a622 100644
--- a/cpukit/score/cpu/i386/rtems/score/idtr.h
+++ b/cpukit/score/cpu/i386/rtems/score/idtr.h
@@ -26,8 +26,8 @@
  *  Applications must not include this file directly.
  */
 
-#ifndef _rtems_score_idtr_h
-#define _rtems_score_idtr_h
+#ifndef _RTEMS_SCORE_IDTR_H
+#define _RTEMS_SCORE_IDTR_H
 
 /*
  * See page 14.9 Figure 14-2.
diff --git a/cpukit/score/cpu/i386/rtems/score/interrupts.h b/cpukit/score/cpu/i386/rtems/score/interrupts.h
index 566c77e6bb..89034a00f0 100644
--- a/cpukit/score/cpu/i386/rtems/score/interrupts.h
+++ b/cpukit/score/cpu/i386/rtems/score/interrupts.h
@@ -18,8 +18,8 @@
  *  Applications must not include this file directly.
  */
 
-#ifndef _rtems_score_interrupts_h
-#define _rtems_score_interrupts_h
+#ifndef _RTEMS_SCORE_INTERRUPTS_H
+#define _RTEMS_SCORE_INTERRUPTS_H
 
 #ifndef ASM
 
diff --git a/cpukit/score/cpu/i386/rtems/score/registers.h b/cpukit/score/cpu/i386/rtems/score/registers.h
index 4ceb0aa5ba..6a39b53baf 100644
--- a/cpukit/score/cpu/i386/rtems/score/registers.h
+++ b/cpukit/score/cpu/i386/rtems/score/registers.h
@@ -14,8 +14,8 @@
  *  $Id$
  */
 
-#ifndef _rtems_score_registers_h
-#define _rtems_score_registers_h
+#ifndef _RTEMS_SCORE_REGISTERS_H
+#define _RTEMS_SCORE_REGISTERS_H
 
 /*
  * definition related to EFLAGS
diff --git a/cpukit/score/cpu/i386/rtems/score/types.h b/cpukit/score/cpu/i386/rtems/score/types.h
index 1d50bb7e6c..09ca40fceb 100644
--- a/cpukit/score/cpu/i386/rtems/score/types.h
+++ b/cpukit/score/cpu/i386/rtems/score/types.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __rtems_score_types_h
-#define __rtems_score_types_h
+#ifndef _RTEMS_SCORE_TYPES_H
+#define _RTEMS_SCORE_TYPES_H
 
 #ifndef ASM
 
diff --git a/cpukit/score/cpu/m68k/asm.h b/cpukit/score/cpu/m68k/asm.h
index 2c98970a7b..180737315e 100644
--- a/cpukit/score/cpu/m68k/asm.h
+++ b/cpukit/score/cpu/m68k/asm.h
@@ -25,8 +25,8 @@
  *  $Id$
  */
 
-#ifndef __M68k_ASM_h
-#define __M68k_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/m68k/rtems/asm.h b/cpukit/score/cpu/m68k/rtems/asm.h
index 2c98970a7b..180737315e 100644
--- a/cpukit/score/cpu/m68k/rtems/asm.h
+++ b/cpukit/score/cpu/m68k/rtems/asm.h
@@ -25,8 +25,8 @@
  *  $Id$
  */
 
-#ifndef __M68k_ASM_h
-#define __M68k_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/m68k/rtems/score/cpu.h b/cpukit/score/cpu/m68k/rtems/score/cpu.h
index 7ddb048886..8f25254b4e 100644
--- a/cpukit/score/cpu/m68k/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m68k/rtems/score/cpu.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __CPU_h
-#define __CPU_h
+#ifndef _RTEMS_SCORE_CPU_H
+#define _RTEMS_SCORE_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/m68k/rtems/score/m68k.h b/cpukit/score/cpu/m68k/rtems/score/m68k.h
index be9b9dbfb4..d4ef0b4451 100644
--- a/cpukit/score/cpu/m68k/rtems/score/m68k.h
+++ b/cpukit/score/cpu/m68k/rtems/score/m68k.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __M68k_h
-#define __M68k_h
+#ifndef _RTEMS_SCORE_M68K_H
+#define _RTEMS_SCORE_M68K_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/m68k/rtems/score/types.h b/cpukit/score/cpu/m68k/rtems/score/types.h
index 0db2a96456..c28b97468e 100644
--- a/cpukit/score/cpu/m68k/rtems/score/types.h
+++ b/cpukit/score/cpu/m68k/rtems/score/types.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __rtems_score_types_h
-#define __rtems_score_types_h
+#ifndef _RTEMS_SCORE_TYPES_H
+#define _RTEMS_SCORE_TYPES_H
 
 #ifndef ASM
 
diff --git a/cpukit/score/cpu/mips/asm.h b/cpukit/score/cpu/mips/asm.h
index c060bb8091..e2420b7199 100644
--- a/cpukit/score/cpu/mips/asm.h
+++ b/cpukit/score/cpu/mips/asm.h
@@ -26,8 +26,8 @@
  */
 /* @(#)asm.h       03/15/96     1.1 */
 
-#ifndef __NO_CPU_ASM_h
-#define __NO_CPU_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/mips/rtems/asm.h b/cpukit/score/cpu/mips/rtems/asm.h
index c060bb8091..e2420b7199 100644
--- a/cpukit/score/cpu/mips/rtems/asm.h
+++ b/cpukit/score/cpu/mips/rtems/asm.h
@@ -26,8 +26,8 @@
  */
 /* @(#)asm.h       03/15/96     1.1 */
 
-#ifndef __NO_CPU_ASM_h
-#define __NO_CPU_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/mips/rtems/score/cpu.h b/cpukit/score/cpu/mips/rtems/score/cpu.h
index c8d8f1f728..bcba370b35 100644
--- a/cpukit/score/cpu/mips/rtems/score/cpu.h
+++ b/cpukit/score/cpu/mips/rtems/score/cpu.h
@@ -36,8 +36,8 @@
  *  $Id$
  */
 
-#ifndef __CPU_h
-#define __CPU_h
+#ifndef _RTEMS_SCORE_CPU_H
+#define _RTEMS_SCORE_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/mips/rtems/score/mips.h b/cpukit/score/cpu/mips/rtems/score/mips.h
index ab75c9a8d1..2fc3a6d27f 100644
--- a/cpukit/score/cpu/mips/rtems/score/mips.h
+++ b/cpukit/score/cpu/mips/rtems/score/mips.h
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef _INCLUDE_MIPS_h
-#define _INCLUDE_MIPS_h
+#ifndef _RTEMS_SCORE_MIPS_H
+#define _RTEMS_SCORE_MIPS_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/mips/rtems/score/types.h b/cpukit/score/cpu/mips/rtems/score/types.h
index 2f3a7849fc..9d56f54f0c 100644
--- a/cpukit/score/cpu/mips/rtems/score/types.h
+++ b/cpukit/score/cpu/mips/rtems/score/types.h
@@ -17,8 +17,8 @@
  */
 /* @(#)mipstypes.h       08/20/96     1.4 */
 
-#ifndef __rtems_score_types_h
-#define __rtems_score_types_h
+#ifndef _RTEMS_SCORE_TYPES_H
+#define _RTEMS_SCORE_TYPES_H
 
 #ifndef ASM
 
diff --git a/cpukit/score/cpu/no_cpu/asm.h b/cpukit/score/cpu/no_cpu/asm.h
index 66b6641346..7affe4f5b5 100644
--- a/cpukit/score/cpu/no_cpu/asm.h
+++ b/cpukit/score/cpu/no_cpu/asm.h
@@ -25,8 +25,8 @@
  *  $Id$
  */
 
-#ifndef __NO_CPU_ASM_h
-#define __NO_CPU_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/no_cpu/rtems/asm.h b/cpukit/score/cpu/no_cpu/rtems/asm.h
index 66b6641346..7affe4f5b5 100644
--- a/cpukit/score/cpu/no_cpu/rtems/asm.h
+++ b/cpukit/score/cpu/no_cpu/rtems/asm.h
@@ -25,8 +25,8 @@
  *  $Id$
  */
 
-#ifndef __NO_CPU_ASM_h
-#define __NO_CPU_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h b/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
index fa04cc55a0..b71053dd7f 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
+++ b/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
@@ -29,8 +29,8 @@
  *  $Id$
  */
 
-#ifndef __CPU_h
-#define __CPU_h
+#ifndef _RTEMS_SCORE_CPU_H
+#define _RTEMS_SCORE_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpu_asm.h b/cpukit/score/cpu/no_cpu/rtems/score/cpu_asm.h
index 94fa05bcd6..a509b36ae6 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/cpu_asm.h
+++ b/cpukit/score/cpu/no_cpu/rtems/score/cpu_asm.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __CPU_ASM_h
-#define __CPU_ASM_h
+#ifndef _RTEMS_SCORE_CPU_ASM_H
+#define _RTEMS_SCORE_CPU_ASM_H
 
 /* pull in the generated offsets */
 
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/no_cpu.h b/cpukit/score/cpu/no_cpu/rtems/score/no_cpu.h
index 1cb04d4d53..8deaa256ac 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/no_cpu.h
+++ b/cpukit/score/cpu/no_cpu/rtems/score/no_cpu.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _INCLUDE_NO_CPU_h
-#define _INCLUDE_NO_CPU_h
+#ifndef _RTEMS_SCORE_NO_CPU_H
+#define _RTEMS_SCORE_NO_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/types.h b/cpukit/score/cpu/no_cpu/rtems/score/types.h
index e7ca6ba125..bf44b26dec 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/types.h
+++ b/cpukit/score/cpu/no_cpu/rtems/score/types.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __rtems_score_types_h
-#define __rtems_score_types_h
+#ifndef _RTEMS_SCORE_TYPES_H
+#define _RTEMS_SCORE_TYPES_H
 
 #ifndef ASM
 
diff --git a/cpukit/score/cpu/or32/asm.h b/cpukit/score/cpu/or32/asm.h
index 676cc2b264..d22c06c8ab 100644
--- a/cpukit/score/cpu/or32/asm.h
+++ b/cpukit/score/cpu/or32/asm.h
@@ -25,8 +25,8 @@
  *  $Id$
  */
 
-#ifndef __OR1K_ASM_h
-#define __OR1K_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/or32/rtems/asm.h b/cpukit/score/cpu/or32/rtems/asm.h
index 676cc2b264..d22c06c8ab 100644
--- a/cpukit/score/cpu/or32/rtems/asm.h
+++ b/cpukit/score/cpu/or32/rtems/asm.h
@@ -25,8 +25,8 @@
  *  $Id$
  */
 
-#ifndef __OR1K_ASM_h
-#define __OR1K_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/or32/rtems/score/cpu.h b/cpukit/score/cpu/or32/rtems/score/cpu.h
index 175e76ca62..7be4ca17d0 100644
--- a/cpukit/score/cpu/or32/rtems/score/cpu.h
+++ b/cpukit/score/cpu/or32/rtems/score/cpu.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _OR1K_CPU_h
-#define _OR1K_CPU_h
+#ifndef _RTEMS_SCORE_CPU_H
+#define _RTEMS_SCORE_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/or32/rtems/score/cpu_asm.h b/cpukit/score/cpu/or32/rtems/score/cpu_asm.h
index 94fa05bcd6..a509b36ae6 100644
--- a/cpukit/score/cpu/or32/rtems/score/cpu_asm.h
+++ b/cpukit/score/cpu/or32/rtems/score/cpu_asm.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __CPU_ASM_h
-#define __CPU_ASM_h
+#ifndef _RTEMS_SCORE_CPU_ASM_H
+#define _RTEMS_SCORE_CPU_ASM_H
 
 /* pull in the generated offsets */
 
diff --git a/cpukit/score/cpu/or32/rtems/score/or32.h b/cpukit/score/cpu/or32/rtems/score/or32.h
index 0d3c406d1f..73c52b9371 100644
--- a/cpukit/score/cpu/or32/rtems/score/or32.h
+++ b/cpukit/score/cpu/or32/rtems/score/or32.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _OR1K_H
-#define _OR1K_H
+#ifndef _RTEMS_SCORE_OR32_H
+#define _RTEMS_SCORE_OR32_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/or32/rtems/score/types.h b/cpukit/score/cpu/or32/rtems/score/types.h
index e71cab3b15..1e511a9c70 100644
--- a/cpukit/score/cpu/or32/rtems/score/types.h
+++ b/cpukit/score/cpu/or32/rtems/score/types.h
@@ -18,8 +18,8 @@
  *  Chris Ziomkowski. <chris@asics.ws>
  */
 
-#ifndef __rtems_score_types_h
-#define __rtems_score_types_h
+#ifndef _RTEMS_SCORE_TYPES_H
+#define _RTEMS_SCORE_TYPES_H
 
 #ifndef ASM
 
diff --git a/cpukit/score/cpu/powerpc/asm.h b/cpukit/score/cpu/powerpc/asm.h
index bbfdfa0013..f3a8fec065 100644
--- a/cpukit/score/cpu/powerpc/asm.h
+++ b/cpukit/score/cpu/powerpc/asm.h
@@ -28,8 +28,8 @@
  *  $Id$
  */
 
-#ifndef __PPC_ASM_h
-#define __PPC_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/powerpc/rtems/asm.h b/cpukit/score/cpu/powerpc/rtems/asm.h
index bbfdfa0013..f3a8fec065 100644
--- a/cpukit/score/cpu/powerpc/rtems/asm.h
+++ b/cpukit/score/cpu/powerpc/rtems/asm.h
@@ -28,8 +28,8 @@
  *  $Id$
  */
 
-#ifndef __PPC_ASM_h
-#define __PPC_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/powerpc/rtems/score/cpu.h b/cpukit/score/cpu/powerpc/rtems/score/cpu.h
index c823007a6b..ae8e208c55 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/cpu.h
+++ b/cpukit/score/cpu/powerpc/rtems/score/cpu.h
@@ -6,8 +6,8 @@
  * $Id$
  */
  
-#ifndef _rtems_score_cpu_h
-#define _rtems_score_cpu_h
+#ifndef _RTEMS_SCORE_CPU_H
+#define _RTEMS_SCORE_CPU_H
 
 #include <rtems/score/powerpc.h>              /* pick up machine definitions */
 #ifndef ASM
diff --git a/cpukit/score/cpu/powerpc/rtems/score/powerpc.h b/cpukit/score/cpu/powerpc/rtems/score/powerpc.h
index fc50807aff..906063b731 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/powerpc.h
+++ b/cpukit/score/cpu/powerpc/rtems/score/powerpc.h
@@ -42,8 +42,8 @@
  */
 
 
-#ifndef _INCLUDE_PPC_h
-#define _INCLUDE_PPC_h
+#ifndef _RTEMS_SCORE_POWERPC_H
+#define _RTEMS_SCORE_POWERPC_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/powerpc/rtems/score/ppc.h b/cpukit/score/cpu/powerpc/rtems/score/ppc.h
index 528648b1b2..e5f09a7b35 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/ppc.h
+++ b/cpukit/score/cpu/powerpc/rtems/score/ppc.h
@@ -10,8 +10,8 @@
  *  $Id$
  */
 
-#ifndef __rtems_score_ppc_h
-#define __rtems_score_ppc_h
+#ifndef _RTEMS_SCORE_PPC_H
+#define _RTEMS_SCORE_PPC_H
 #ifndef RTEMS_NO_WARN_DEPRECATED
 #warning <rtems/score/ppc.h> is deprecated, use <rtems/score/powerpc.h> instead
 #endif
diff --git a/cpukit/score/cpu/powerpc/rtems/score/types.h b/cpukit/score/cpu/powerpc/rtems/score/types.h
index 6913bba249..3946407f5a 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/types.h
+++ b/cpukit/score/cpu/powerpc/rtems/score/types.h
@@ -33,8 +33,8 @@
  *  $Id$
  */
 
-#ifndef __rtems_score_types_h
-#define __rtems_score_types_h
+#ifndef _RTEMS_SCORE_TYPES_H
+#define _RTEMS_SCORE_TYPES_H
 
 #ifndef ASM
 
diff --git a/cpukit/score/cpu/sh/asm.h b/cpukit/score/cpu/sh/asm.h
index 62065c906f..b7009cb505 100644
--- a/cpukit/score/cpu/sh/asm.h
+++ b/cpukit/score/cpu/sh/asm.h
@@ -40,8 +40,8 @@
  *  $Id$
  */
 
-#ifndef __CPU_SH_ASM_h
-#define __CPU_SH_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/sh/rtems/asm.h b/cpukit/score/cpu/sh/rtems/asm.h
index 62065c906f..b7009cb505 100644
--- a/cpukit/score/cpu/sh/rtems/asm.h
+++ b/cpukit/score/cpu/sh/rtems/asm.h
@@ -40,8 +40,8 @@
  *  $Id$
  */
 
-#ifndef __CPU_SH_ASM_h
-#define __CPU_SH_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/sh/rtems/score/cpu.h b/cpukit/score/cpu/sh/rtems/score/cpu.h
index a546ebf1df..4cc407ddbc 100644
--- a/cpukit/score/cpu/sh/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sh/rtems/score/cpu.h
@@ -26,8 +26,8 @@
  *  $Id$
  */
 
-#ifndef _SH_CPU_h
-#define _SH_CPU_h
+#ifndef _RTEMS_SCORE_CPU_H
+#define _RTEMS_SCORE_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/sh/rtems/score/sh.h b/cpukit/score/cpu/sh/rtems/score/sh.h
index 011e019335..98ddcf6997 100644
--- a/cpukit/score/cpu/sh/rtems/score/sh.h
+++ b/cpukit/score/cpu/sh/rtems/score/sh.h
@@ -26,8 +26,8 @@
  *  $Id$
  */
 
-#ifndef _sh_h
-#define _sh_h
+#ifndef _RTEMS_SCORE_SH_H
+#define _RTEMS_SCORE_SH_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/sh/rtems/score/sh_io.h b/cpukit/score/cpu/sh/rtems/score/sh_io.h
index 44b62b6c0e..e3f91bdcde 100644
--- a/cpukit/score/cpu/sh/rtems/score/sh_io.h
+++ b/cpukit/score/cpu/sh/rtems/score/sh_io.h
@@ -28,8 +28,8 @@
  *  $Id$
  */
 
-#ifndef _asm_io_h
-#define _asm_io_h
+#ifndef _RTEMS_SCORE_SH_IO_H
+#define _RTEMS_SCORE_SH_IO_H
  
 #define readb(addr) 	(*(volatile unsigned char *) (addr))
 #define readw(addr) 	(*(volatile unsigned short *) (addr))
diff --git a/cpukit/score/cpu/sh/rtems/score/types.h b/cpukit/score/cpu/sh/rtems/score/types.h
index 7ff5c6ccd3..0eedec7888 100644
--- a/cpukit/score/cpu/sh/rtems/score/types.h
+++ b/cpukit/score/cpu/sh/rtems/score/types.h
@@ -26,8 +26,8 @@
  *  $Id$
  */
 
-#ifndef __rtems_score_types_h
-#define __rtems_score_types_h
+#ifndef _RTEMS_SCORE_TYPES_H
+#define _RTEMS_SCORE_TYPES_H
 
 #ifndef ASM
 
diff --git a/cpukit/score/cpu/sparc/asm.h b/cpukit/score/cpu/sparc/asm.h
index 7137d71603..14ea9f155a 100644
--- a/cpukit/score/cpu/sparc/asm.h
+++ b/cpukit/score/cpu/sparc/asm.h
@@ -22,8 +22,8 @@
  *  $Id$
  */
 
-#ifndef __SPARC_ASM_h
-#define __SPARC_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/sparc/rtems/asm.h b/cpukit/score/cpu/sparc/rtems/asm.h
index 7137d71603..14ea9f155a 100644
--- a/cpukit/score/cpu/sparc/rtems/asm.h
+++ b/cpukit/score/cpu/sparc/rtems/asm.h
@@ -22,8 +22,8 @@
  *  $Id$
  */
 
-#ifndef __SPARC_ASM_h
-#define __SPARC_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/sparc/rtems/score/cpu.h b/cpukit/score/cpu/sparc/rtems/score/cpu.h
index 383636c6f2..cf2cfcebd8 100644
--- a/cpukit/score/cpu/sparc/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc/rtems/score/cpu.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __CPU_h
-#define __CPU_h
+#ifndef _RTEMS_SCORE_CPU_H
+#define _RTEMS_SCORE_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/sparc/rtems/score/sparc.h b/cpukit/score/cpu/sparc/rtems/score/sparc.h
index b96372ebe2..c6ec7b1deb 100644
--- a/cpukit/score/cpu/sparc/rtems/score/sparc.h
+++ b/cpukit/score/cpu/sparc/rtems/score/sparc.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef _INCLUDE_SPARC_h
-#define _INCLUDE_SPARC_h
+#ifndef _RTEMS_SCORE_SPARC_H
+#define _RTEMS_SCORE_SPARC_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/sparc/rtems/score/types.h b/cpukit/score/cpu/sparc/rtems/score/types.h
index 8b2d7fd740..4a3a719489 100644
--- a/cpukit/score/cpu/sparc/rtems/score/types.h
+++ b/cpukit/score/cpu/sparc/rtems/score/types.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __rtems_score_types_h
-#define __rtems_score_types_h
+#ifndef _RTEMS_SCORE_TYPES_H
+#define _RTEMS_SCORE_TYPES_H
 
 #ifndef ASM
 
diff --git a/cpukit/score/cpu/unix/asm.h b/cpukit/score/cpu/unix/asm.h
index c768fac6ac..24abe24387 100644
--- a/cpukit/score/cpu/unix/asm.h
+++ b/cpukit/score/cpu/unix/asm.h
@@ -19,8 +19,8 @@
  *  $Id$
  */
 
-#ifndef __UNIX_ASM_h
-#define __UNIX_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/unix/rtems/asm.h b/cpukit/score/cpu/unix/rtems/asm.h
index c768fac6ac..24abe24387 100644
--- a/cpukit/score/cpu/unix/rtems/asm.h
+++ b/cpukit/score/cpu/unix/rtems/asm.h
@@ -19,8 +19,8 @@
  *  $Id$
  */
 
-#ifndef __UNIX_ASM_h
-#define __UNIX_ASM_h
+#ifndef _RTEMS_ASM_H
+#define _RTEMS_ASM_H
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
diff --git a/cpukit/score/cpu/unix/rtems/score/cpu.h b/cpukit/score/cpu/unix/rtems/score/cpu.h
index cabd2979ca..edb31b3bd4 100644
--- a/cpukit/score/cpu/unix/rtems/score/cpu.h
+++ b/cpukit/score/cpu/unix/rtems/score/cpu.h
@@ -15,8 +15,8 @@
  *  $Id$
  */
 
-#ifndef __CPU_h
-#define __CPU_h
+#ifndef _RTEMS_SCORE_CPU_H
+#define _RTEMS_SCORE_CPU_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/unix/rtems/score/types.h b/cpukit/score/cpu/unix/rtems/score/types.h
index 00c48e00f4..1063011c50 100644
--- a/cpukit/score/cpu/unix/rtems/score/types.h
+++ b/cpukit/score/cpu/unix/rtems/score/types.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __rtems_score_types_h
-#define __rtems_score_types_h
+#ifndef _RTEMS_SCORE_TYPES_H
+#define _RTEMS_SCORE_TYPES_H
 
 #ifndef ASM
 
diff --git a/cpukit/score/cpu/unix/rtems/score/unix.h b/cpukit/score/cpu/unix/rtems/score/unix.h
index bca0df8c79..cd8c3ffb51 100644
--- a/cpukit/score/cpu/unix/rtems/score/unix.h
+++ b/cpukit/score/cpu/unix/rtems/score/unix.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __UNIX_h
-#define __UNIX_h
+#ifndef _RTEMS_SCORE_UNIX_H
+#define _RTEMS_SCORE_UNIX_H
 
 #ifdef __cplusplus
 extern "C" {