5 files changed, 10 insertions, 10 deletions
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