6 files changed, 36 insertions, 0 deletions
diff --git a/c/src/exec/rtems/headers/event.h b/c/src/exec/rtems/headers/event.h
index 0add026e5c..4cd3b1cbea 100644
--- a/c/src/exec/rtems/headers/event.h
+++ b/c/src/exec/rtems/headers/event.h
@@ -55,6 +55,16 @@ typedef enum {
 }  Event_Sync_states;
 
 /*
+ *  Event_Manager_initialization
+ *
+ *  DESCRIPTION:
+ *
+ *  This routine performs the initialization necessary for this manager.
+ */
+ 
+void _Event_Manager_initialization( void );
+
+/*
  *  rtems_event_send
  *
  *  DESCRIPTION:
diff --git a/c/src/exec/rtems/headers/support.h b/c/src/exec/rtems/headers/support.h
index f4b26d6a61..3305ffd4d3 100644
--- a/c/src/exec/rtems/headers/support.h
+++ b/c/src/exec/rtems/headers/support.h
@@ -85,7 +85,9 @@ extern "C" {
 #define RTEMS_MILLISECONDS_TO_TICKS(_ms) \
         TOD_MILLISECONDS_TO_TICKS(_ms)
 
+#ifndef __RTEMS_APPLICATION__
 #include <rtems/rtems/support.inl>
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/c/src/exec/rtems/include/rtems/rtems/event.h b/c/src/exec/rtems/include/rtems/rtems/event.h
index 0add026e5c..4cd3b1cbea 100644
--- a/c/src/exec/rtems/include/rtems/rtems/event.h
+++ b/c/src/exec/rtems/include/rtems/rtems/event.h
@@ -55,6 +55,16 @@ typedef enum {
 }  Event_Sync_states;
 
 /*
+ *  Event_Manager_initialization
+ *
+ *  DESCRIPTION:
+ *
+ *  This routine performs the initialization necessary for this manager.
+ */
+ 
+void _Event_Manager_initialization( void );
+
+/*
  *  rtems_event_send
  *
  *  DESCRIPTION:
diff --git a/c/src/exec/rtems/include/rtems/rtems/support.h b/c/src/exec/rtems/include/rtems/rtems/support.h
index f4b26d6a61..3305ffd4d3 100644
--- a/c/src/exec/rtems/include/rtems/rtems/support.h
+++ b/c/src/exec/rtems/include/rtems/rtems/support.h
@@ -85,7 +85,9 @@ extern "C" {
 #define RTEMS_MILLISECONDS_TO_TICKS(_ms) \
         TOD_MILLISECONDS_TO_TICKS(_ms)
 
+#ifndef __RTEMS_APPLICATION__
 #include <rtems/rtems/support.inl>
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/cpukit/rtems/include/rtems/rtems/event.h b/cpukit/rtems/include/rtems/rtems/event.h
index 0add026e5c..4cd3b1cbea 100644
--- a/cpukit/rtems/include/rtems/rtems/event.h
+++ b/cpukit/rtems/include/rtems/rtems/event.h
@@ -55,6 +55,16 @@ typedef enum {
 }  Event_Sync_states;
 
 /*
+ *  Event_Manager_initialization
+ *
+ *  DESCRIPTION:
+ *
+ *  This routine performs the initialization necessary for this manager.
+ */
+ 
+void _Event_Manager_initialization( void );
+
+/*
  *  rtems_event_send
  *
  *  DESCRIPTION:
diff --git a/cpukit/rtems/include/rtems/rtems/support.h b/cpukit/rtems/include/rtems/rtems/support.h
index f4b26d6a61..3305ffd4d3 100644
--- a/cpukit/rtems/include/rtems/rtems/support.h
+++ b/cpukit/rtems/include/rtems/rtems/support.h
@@ -85,7 +85,9 @@ extern "C" {
 #define RTEMS_MILLISECONDS_TO_TICKS(_ms) \
         TOD_MILLISECONDS_TO_TICKS(_ms)
 
+#ifndef __RTEMS_APPLICATION__
 #include <rtems/rtems/support.inl>
+#endif
 
 #ifdef __cplusplus
 }