16 files changed, 32 insertions, 32 deletions
diff --git a/cpukit/rtems/inline/rtems/rtems/asr.inl b/cpukit/rtems/inline/rtems/rtems/asr.inl
index 3eb5cde204..bd3b37e060 100644
--- a/cpukit/rtems/inline/rtems/rtems/asr.inl
+++ b/cpukit/rtems/inline/rtems/rtems/asr.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __INLINE_ASR_inl
-#define __INLINE_ASR_inl
+#ifndef _RTEMS_RTEMS_ASR_INL
+#define _RTEMS_RTEMS_ASR_INL
 
 #include <rtems/score/isr.h>
 
diff --git a/cpukit/rtems/inline/rtems/rtems/attr.inl b/cpukit/rtems/inline/rtems/rtems/attr.inl
index beb309c4de..387bf6b888 100644
--- a/cpukit/rtems/inline/rtems/rtems/attr.inl
+++ b/cpukit/rtems/inline/rtems/rtems/attr.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __INLINE_ATTRIBUTES_inl
-#define __INLINE_ATTRIBUTES_inl
+#ifndef _RTEMS_RTEMS_ATTR_INL
+#define _RTEMS_RTEMS_ATTR_INL
 
 /*PAGE
  *
diff --git a/cpukit/rtems/inline/rtems/rtems/dpmem.inl b/cpukit/rtems/inline/rtems/rtems/dpmem.inl
index 72bf892bdb..f80d2ebaf5 100644
--- a/cpukit/rtems/inline/rtems/rtems/dpmem.inl
+++ b/cpukit/rtems/inline/rtems/rtems/dpmem.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __INLINE_DPMEM_inl
-#define __INLINE_DPMEM_inl
+#ifndef _RTEMS_RTEMS_DPMEM_INL
+#define _RTEMS_RTEMS_DPMEM_INL
 
 
 /*PAGE
diff --git a/cpukit/rtems/inline/rtems/rtems/event.inl b/cpukit/rtems/inline/rtems/rtems/event.inl
index fec2c4b7be..0ad4bc0be3 100644
--- a/cpukit/rtems/inline/rtems/rtems/event.inl
+++ b/cpukit/rtems/inline/rtems/rtems/event.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __MACROS_EVENT_inl
-#define __MACROS_EVENT_inl
+#ifndef _RTEMS_RTEMS_EVENT_INL
+#define _RTEMS_RTEMS_EVENT_INL
 
 #endif
 /* end of include file */
diff --git a/cpukit/rtems/inline/rtems/rtems/eventset.inl b/cpukit/rtems/inline/rtems/rtems/eventset.inl
index ea253d3d8f..05f0e805d4 100644
--- a/cpukit/rtems/inline/rtems/rtems/eventset.inl
+++ b/cpukit/rtems/inline/rtems/rtems/eventset.inl
@@ -15,8 +15,8 @@
  *  $Id$
  */
 
-#ifndef __INLINE_EVENT_SET_inl
-#define __INLINE_EVENT_SET_inl
+#ifndef _RTEMS_RTEMS_EVENTSET_INL
+#define _RTEMS_RTEMS_EVENTSET_INL
 
 /*PAGE
  *
diff --git a/cpukit/rtems/inline/rtems/rtems/message.inl b/cpukit/rtems/inline/rtems/rtems/message.inl
index 35ddd2f45e..06ccc32e1e 100644
--- a/cpukit/rtems/inline/rtems/rtems/message.inl
+++ b/cpukit/rtems/inline/rtems/rtems/message.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __MESSAGE_QUEUE_inl
-#define __MESSAGE_QUEUE_inl
+#ifndef _RTEMS_RTEMS_MESSAGE_INL
+#define _RTEMS_RTEMS_MESSAGE_INL
 
 #include <rtems/score/wkspace.h>
 
diff --git a/cpukit/rtems/inline/rtems/rtems/modes.inl b/cpukit/rtems/inline/rtems/rtems/modes.inl
index 95571305d9..eef7a3d9f3 100644
--- a/cpukit/rtems/inline/rtems/rtems/modes.inl
+++ b/cpukit/rtems/inline/rtems/rtems/modes.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __MODES_inl
-#define __MODES_inl
+#ifndef _RTEMS_RTEMS_MODES_INL
+#define _RTEMS_RTEMS_MODES_INL
 
 /*PAGE
  *
diff --git a/cpukit/rtems/inline/rtems/rtems/options.inl b/cpukit/rtems/inline/rtems/rtems/options.inl
index 8b046bca3e..1aa5ba6e0d 100644
--- a/cpukit/rtems/inline/rtems/rtems/options.inl
+++ b/cpukit/rtems/inline/rtems/rtems/options.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __OPTIONS_inl
-#define __OPTIONS_inl
+#ifndef _RTEMS_RTEMS_OPTIONS_INL
+#define _RTEMS_RTEMS_OPTIONS_INL
 
 /*PAGE
  *
diff --git a/cpukit/rtems/inline/rtems/rtems/part.inl b/cpukit/rtems/inline/rtems/rtems/part.inl
index 0f6cb2c975..1e8f3b2f8d 100644
--- a/cpukit/rtems/inline/rtems/rtems/part.inl
+++ b/cpukit/rtems/inline/rtems/rtems/part.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __PARTITION_inl
-#define __PARTITION_inl
+#ifndef _RTEMS_RTEMS_PART_INL
+#define _RTEMS_RTEMS_PART_INL
 
 /*PAGE
  *
diff --git a/cpukit/rtems/inline/rtems/rtems/ratemon.inl b/cpukit/rtems/inline/rtems/rtems/ratemon.inl
index d42eb13f9f..97f177d66e 100644
--- a/cpukit/rtems/inline/rtems/rtems/ratemon.inl
+++ b/cpukit/rtems/inline/rtems/rtems/ratemon.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __RATE_MONOTONIC_inl
-#define __RATE_MONOTONIC_inl
+#ifndef _RTEMS_RTEMS_RATEMON_INL
+#define _RTEMS_RTEMS_RATEMON_INL
 
 /*PAGE
  *
diff --git a/cpukit/rtems/inline/rtems/rtems/region.inl b/cpukit/rtems/inline/rtems/rtems/region.inl
index a4c7e6d2ab..412efec203 100644
--- a/cpukit/rtems/inline/rtems/rtems/region.inl
+++ b/cpukit/rtems/inline/rtems/rtems/region.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __REGION_inl
-#define __REGION_inl
+#ifndef _RTEMS_RTEMS_REGION_INL
+#define _RTEMS_RTEMS_REGION_INL
 
 /*PAGE
  *
diff --git a/cpukit/rtems/inline/rtems/rtems/sem.inl b/cpukit/rtems/inline/rtems/rtems/sem.inl
index a83eb8bde2..fd1924017f 100644
--- a/cpukit/rtems/inline/rtems/rtems/sem.inl
+++ b/cpukit/rtems/inline/rtems/rtems/sem.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __SEMAPHORE_inl
-#define __SEMAPHORE_inl
+#ifndef _RTEMS_RTEMS_SEM_INL
+#define _RTEMS_RTEMS_SEM_INL
 
 /*PAGE
  *
diff --git a/cpukit/rtems/inline/rtems/rtems/status.inl b/cpukit/rtems/inline/rtems/rtems/status.inl
index a648862899..c1e5d998cb 100644
--- a/cpukit/rtems/inline/rtems/rtems/status.inl
+++ b/cpukit/rtems/inline/rtems/rtems/status.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __INLINE_STATUS_inl
-#define __INLINE_STATUS_inl
+#ifndef _RTEMS_RTEMS_STATUS_INL
+#define _RTEMS_RTEMS_STATUS_INL
 
 /*PAGE
  *
diff --git a/cpukit/rtems/inline/rtems/rtems/support.inl b/cpukit/rtems/inline/rtems/rtems/support.inl
index cb1adac729..4c507b0daf 100644
--- a/cpukit/rtems/inline/rtems/rtems/support.inl
+++ b/cpukit/rtems/inline/rtems/rtems/support.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
  
-#ifndef __RTEMS_SUPPORT_inl
-#define __RTEMS_SUPPORT_inl
+#ifndef _RTEMS_RTEMS_SUPPORT_INL
+#define _RTEMS_RTEMS_SUPPORT_INL
 
 /*PAGE
  *
diff --git a/cpukit/rtems/inline/rtems/rtems/tasks.inl b/cpukit/rtems/inline/rtems/rtems/tasks.inl
index 84b316f00b..1926ade36b 100644
--- a/cpukit/rtems/inline/rtems/rtems/tasks.inl
+++ b/cpukit/rtems/inline/rtems/rtems/tasks.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __RTEMS_TASKS_inl
-#define __RTEMS_TASKS_inl
+#ifndef _RTEMS_RTEMS_TASKS_INL
+#define _RTEMS_RTEMS_TASKS_INL
 
 /*PAGE
  *
diff --git a/cpukit/rtems/inline/rtems/rtems/timer.inl b/cpukit/rtems/inline/rtems/rtems/timer.inl
index ad24f475ce..6660af6e40 100644
--- a/cpukit/rtems/inline/rtems/rtems/timer.inl
+++ b/cpukit/rtems/inline/rtems/rtems/timer.inl
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef __TIMER_inl
-#define __TIMER_inl
+#ifndef _RTEMS_RTEMS_TIMER_INL
+#define _RTEMS_RTEMS_TIMER_INL
 
 /*PAGE
  *