6 files changed, 12 insertions, 12 deletions
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