score: Add and use <rtems/score/userextimpl.h>

This file contains the parts of <rtems/score/userext.h> that are only
necessary for the RTEMS implementation.

28 files changed, 252 insertions, 223 deletions

diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index 656c198a9b..79d95eabe3 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -52,6 +52,7 @@ include_rtems_score_HEADERS += include/rtems/score/timestamp64.h
 include_rtems_score_HEADERS += include/rtems/score/tod.h
 include_rtems_score_HEADERS += include/rtems/score/tqdata.h
 include_rtems_score_HEADERS += include/rtems/score/userext.h
+include_rtems_score_HEADERS += include/rtems/score/userextimpl.h
 include_rtems_score_HEADERS += include/rtems/score/watchdog.h
 include_rtems_score_HEADERS += include/rtems/score/wkspace.h
 include_rtems_score_HEADERS += include/rtems/score/cpuopts.h
diff --git a/cpukit/score/include/rtems/score/userext.h b/cpukit/score/include/rtems/score/userext.h
index b182e86172..6071d7ab3b 100644
--- a/cpukit/score/include/rtems/score/userext.h
+++ b/cpukit/score/include/rtems/score/userext.h
@@ -231,201 +231,6 @@ typedef struct {
   User_extensions_Table          Callouts;
 }   User_extensions_Control;
 
-/**
- * @brief List of active extensions.
- */
-extern Chain_Control _User_extensions_List;
-
-/**
- * @brief List of active task switch extensions.
- */
-extern Chain_Control _User_extensions_Switches_list;
-
-/**
- * @name Extension Maintainance
- *
- * @{
- */
-
-void _User_extensions_Handler_initialization( void );
-
-void _User_extensions_Add_set(
-  User_extensions_Control *extension
-);
-
-RTEMS_INLINE_ROUTINE void _User_extensions_Add_API_set(
-  User_extensions_Control *extension
-)
-{
-  _User_extensions_Add_set( extension );
-}
-
-RTEMS_INLINE_ROUTINE void _User_extensions_Add_set_with_table(
-  User_extensions_Control     *extension,
-  const User_extensions_Table *extension_table
-)
-{
-  extension->Callouts = *extension_table;
-
-  _User_extensions_Add_set( extension );
-}
-
-void _User_extensions_Remove_set(
-  User_extensions_Control *extension
-);
-
-/**
- * @brief User extension visitor.
- *
- * @param[in, out] executing The currently executing thread.
- * @param[in, out] arg The argument passed to _User_extensions_Iterate().
- * @param[in] callouts The current callouts.
- */
-typedef void (*User_extensions_Visitor)(
-  Thread_Control              *executing,
-  void                        *arg,
-  const User_extensions_Table *callouts
-);
-
-typedef struct {
-  Thread_Control *created;
-  bool            ok;
-} User_extensions_Thread_create_context;
-
-void _User_extensions_Thread_create_visitor(
-  Thread_Control              *executing,
-  void                        *arg,
-  const User_extensions_Table *callouts
-);
-
-void _User_extensions_Thread_delete_visitor(
-  Thread_Control              *executing,
-  void                        *arg,
-  const User_extensions_Table *callouts
-);
-
-void _User_extensions_Thread_start_visitor(
-  Thread_Control              *executing,
-  void                        *arg,
-  const User_extensions_Table *callouts
-);
-
-void _User_extensions_Thread_restart_visitor(
-  Thread_Control              *executing,
-  void                        *arg,
-  const User_extensions_Table *callouts
-);
-
-void _User_extensions_Thread_begin_visitor(
-  Thread_Control              *executing,
-  void                        *arg,
-  const User_extensions_Table *callouts
-);
-
-void _User_extensions_Thread_exitted_visitor(
-  Thread_Control              *executing,
-  void                        *arg,
-  const User_extensions_Table *callouts
-);
-
-typedef struct {
-  Internal_errors_Source source;
-  bool                   is_internal;
-  Internal_errors_t      error;
-} User_extensions_Fatal_context;
-
-void _User_extensions_Fatal_visitor(
-  Thread_Control              *executing,
-  void                        *arg,
-  const User_extensions_Table *callouts
-);
-
-/**
- * @brief Iterates through all user extensions and calls the visitor for each.
- *
- * @param[in, out] arg The argument passed to the visitor.
- * @param[in] visitor The visitor for each extension.
- */
-void _User_extensions_Iterate(
-  void                    *arg,
-  User_extensions_Visitor  visitor
-);
-
-/** @} */
-
-/**
- * @name Extension Callout Dispatcher
- *
- * @{
- */
-
-static inline bool _User_extensions_Thread_create( Thread_Control *created )
-{
-  User_extensions_Thread_create_context ctx = { created, true };
-
-  _User_extensions_Iterate( &ctx, _User_extensions_Thread_create_visitor );
-
-  return ctx.ok;
-}
-
-static inline void _User_extensions_Thread_delete( Thread_Control *deleted )
-{
-  _User_extensions_Iterate(
-    deleted,
-    _User_extensions_Thread_delete_visitor
-  );
-}
-
-static inline void _User_extensions_Thread_start( Thread_Control *started )
-{
-  _User_extensions_Iterate(
-    started,
-    _User_extensions_Thread_start_visitor
-  );
-}
-
-static inline void _User_extensions_Thread_restart( Thread_Control *restarted )
-{
-  _User_extensions_Iterate(
-    restarted,
-    _User_extensions_Thread_restart_visitor
-  );
-}
-
-static inline void _User_extensions_Thread_begin( Thread_Control *executing )
-{
-  _User_extensions_Iterate(
-    executing,
-    _User_extensions_Thread_begin_visitor
-  );
-}
-
-void _User_extensions_Thread_switch(
-  Thread_Control *executing,
-  Thread_Control *heir
-);
-
-static inline void _User_extensions_Thread_exitted( Thread_Control *executing )
-{
-  _User_extensions_Iterate(
-    executing,
-    _User_extensions_Thread_exitted_visitor
-  );
-}
-
-static inline void _User_extensions_Fatal(
-  Internal_errors_Source source,
-  bool                   is_internal,
-  Internal_errors_t      error
-)
-{
-  User_extensions_Fatal_context ctx = { source, is_internal, error };
-
-  _User_extensions_Iterate( &ctx, _User_extensions_Fatal_visitor );
-}
-
-/** @} */
-
 /** @} */
 
 #ifdef __cplusplus
diff --git a/cpukit/score/include/rtems/score/userextimpl.h b/cpukit/score/include/rtems/score/userextimpl.h
new file mode 100644
index 0000000000..665278e24e
--- /dev/null
+++ b/cpukit/score/include/rtems/score/userextimpl.h
@@ -0,0 +1,235 @@
+/**
+ * @file
+ *
+ * @ingroup ScoreUserExt
+ *
+ * @brief User Extension Handler API.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2009.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ */
+
+#ifndef _RTEMS_SCORE_USEREXTIMPL_H
+#define _RTEMS_SCORE_USEREXTIMPL_H
+
+#include <rtems/score/userext.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @addtogroup ScoreUserExt
+ *
+ * @{
+ */
+
+/**
+ * @brief List of active extensions.
+ */
+extern Chain_Control _User_extensions_List;
+
+/**
+ * @brief List of active task switch extensions.
+ */
+extern Chain_Control _User_extensions_Switches_list;
+
+/**
+ * @name Extension Maintainance
+ *
+ * @{
+ */
+
+void _User_extensions_Handler_initialization( void );
+
+void _User_extensions_Add_set(
+  User_extensions_Control *extension
+);
+
+RTEMS_INLINE_ROUTINE void _User_extensions_Add_API_set(
+  User_extensions_Control *extension
+)
+{
+  _User_extensions_Add_set( extension );
+}
+
+RTEMS_INLINE_ROUTINE void _User_extensions_Add_set_with_table(
+  User_extensions_Control     *extension,
+  const User_extensions_Table *extension_table
+)
+{
+  extension->Callouts = *extension_table;
+
+  _User_extensions_Add_set( extension );
+}
+
+void _User_extensions_Remove_set(
+  User_extensions_Control *extension
+);
+
+/**
+ * @brief User extension visitor.
+ *
+ * @param[in, out] executing The currently executing thread.
+ * @param[in, out] arg The argument passed to _User_extensions_Iterate().
+ * @param[in] callouts The current callouts.
+ */
+typedef void (*User_extensions_Visitor)(
+  Thread_Control              *executing,
+  void                        *arg,
+  const User_extensions_Table *callouts
+);
+
+typedef struct {
+  Thread_Control *created;
+  bool            ok;
+} User_extensions_Thread_create_context;
+
+void _User_extensions_Thread_create_visitor(
+  Thread_Control              *executing,
+  void                        *arg,
+  const User_extensions_Table *callouts
+);
+
+void _User_extensions_Thread_delete_visitor(
+  Thread_Control              *executing,
+  void                        *arg,
+  const User_extensions_Table *callouts
+);
+
+void _User_extensions_Thread_start_visitor(
+  Thread_Control              *executing,
+  void                        *arg,
+  const User_extensions_Table *callouts
+);
+
+void _User_extensions_Thread_restart_visitor(
+  Thread_Control              *executing,
+  void                        *arg,
+  const User_extensions_Table *callouts
+);
+
+void _User_extensions_Thread_begin_visitor(
+  Thread_Control              *executing,
+  void                        *arg,
+  const User_extensions_Table *callouts
+);
+
+void _User_extensions_Thread_exitted_visitor(
+  Thread_Control              *executing,
+  void                        *arg,
+  const User_extensions_Table *callouts
+);
+
+typedef struct {
+  Internal_errors_Source source;
+  bool                   is_internal;
+  Internal_errors_t      error;
+} User_extensions_Fatal_context;
+
+void _User_extensions_Fatal_visitor(
+  Thread_Control              *executing,
+  void                        *arg,
+  const User_extensions_Table *callouts
+);
+
+/**
+ * @brief Iterates through all user extensions and calls the visitor for each.
+ *
+ * @param[in, out] arg The argument passed to the visitor.
+ * @param[in] visitor The visitor for each extension.
+ */
+void _User_extensions_Iterate(
+  void                    *arg,
+  User_extensions_Visitor  visitor
+);
+
+/** @} */
+
+/**
+ * @name Extension Callout Dispatcher
+ *
+ * @{
+ */
+
+static inline bool _User_extensions_Thread_create( Thread_Control *created )
+{
+  User_extensions_Thread_create_context ctx = { created, true };
+
+  _User_extensions_Iterate( &ctx, _User_extensions_Thread_create_visitor );
+
+  return ctx.ok;
+}
+
+static inline void _User_extensions_Thread_delete( Thread_Control *deleted )
+{
+  _User_extensions_Iterate(
+    deleted,
+    _User_extensions_Thread_delete_visitor
+  );
+}
+
+static inline void _User_extensions_Thread_start( Thread_Control *started )
+{
+  _User_extensions_Iterate(
+    started,
+    _User_extensions_Thread_start_visitor
+  );
+}
+
+static inline void _User_extensions_Thread_restart( Thread_Control *restarted )
+{
+  _User_extensions_Iterate(
+    restarted,
+    _User_extensions_Thread_restart_visitor
+  );
+}
+
+static inline void _User_extensions_Thread_begin( Thread_Control *executing )
+{
+  _User_extensions_Iterate(
+    executing,
+    _User_extensions_Thread_begin_visitor
+  );
+}
+
+void _User_extensions_Thread_switch(
+  Thread_Control *executing,
+  Thread_Control *heir
+);
+
+static inline void _User_extensions_Thread_exitted( Thread_Control *executing )
+{
+  _User_extensions_Iterate(
+    executing,
+    _User_extensions_Thread_exitted_visitor
+  );
+}
+
+static inline void _User_extensions_Fatal(
+  Internal_errors_Source source,
+  bool                   is_internal,
+  Internal_errors_t      error
+)
+{
+  User_extensions_Fatal_context ctx = { source, is_internal, error };
+
+  _User_extensions_Iterate( &ctx, _User_extensions_Fatal_visitor );
+}
+
+/** @} */
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/* end of include file */
diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am
index 09c6fa93ac..e887758e17 100644
--- a/cpukit/score/preinstall.am
+++ b/cpukit/score/preinstall.am
@@ -191,6 +191,10 @@ $(PROJECT_INCLUDE)/rtems/score/userext.h: include/rtems/score/userext.h $(PROJEC
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/userext.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/userext.h
 
+$(PROJECT_INCLUDE)/rtems/score/userextimpl.h: include/rtems/score/userextimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/userextimpl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/userextimpl.h
+
 $(PROJECT_INCLUDE)/rtems/score/watchdog.h: include/rtems/score/watchdog.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/watchdog.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/watchdog.h
diff --git a/cpukit/score/src/interr.c b/cpukit/score/src/interr.c
index 50b3ffdde6..3e5eb79d6c 100644
--- a/cpukit/score/src/interr.c
+++ b/cpukit/score/src/interr.c
@@ -13,10 +13,9 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/interr.h>
 #include <rtems/score/sysstate.h>
-#include <rtems/score/userext.h>
+#include <rtems/score/userextimpl.h>
 
 System_state_Codes _System_state_Current;
 
diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c
index af5c67fc47..b598627740 100644
--- a/cpukit/score/src/thread.c
+++ b/cpukit/score/src/thread.c
@@ -27,7 +27,6 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/config.h>
 
diff --git a/cpukit/score/src/threadclearstate.c b/cpukit/score/src/threadclearstate.c
index 00e53977a7..492f5336fc 100644
--- a/cpukit/score/src/threadclearstate.c
+++ b/cpukit/score/src/threadclearstate.c
@@ -25,7 +25,6 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
 #include <rtems/score/wkspace.h>
 
 /*
diff --git a/cpukit/score/src/threadclose.c b/cpukit/score/src/threadclose.c
index 48e6e6a36a..6fc72b5cb0 100644
--- a/cpukit/score/src/threadclose.c
+++ b/cpukit/score/src/threadclose.c
@@ -25,7 +25,7 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
+#include <rtems/score/userextimpl.h>
 #include <rtems/score/wkspace.h>
 
 void _Thread_Close(
diff --git a/cpukit/score/src/threadcreateidle.c b/cpukit/score/src/threadcreateidle.c
index 86209ca6ed..1f10065e5b 100644
--- a/cpukit/score/src/threadcreateidle.c
+++ b/cpukit/score/src/threadcreateidle.c
@@ -25,7 +25,6 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/config.h>
 #if defined(RTEMS_SMP)
diff --git a/cpukit/score/src/threaddelayended.c b/cpukit/score/src/threaddelayended.c
index ecd5050dfa..307064a631 100644
--- a/cpukit/score/src/threaddelayended.c
+++ b/cpukit/score/src/threaddelayended.c
@@ -25,7 +25,6 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
 #include <rtems/score/wkspace.h>
 
 /*
diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c
index 8a77d1b4fe..db1f1043f2 100644
--- a/cpukit/score/src/threaddispatch.c
+++ b/cpukit/score/src/threaddispatch.c
@@ -24,7 +24,7 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
+#include <rtems/score/userextimpl.h>
 #include <rtems/score/wkspace.h>
 
 #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
diff --git a/cpukit/score/src/threadhandler.c b/cpukit/score/src/threadhandler.c
index ba53fc3bc7..78671422f6 100644
--- a/cpukit/score/src/threadhandler.c
+++ b/cpukit/score/src/threadhandler.c
@@ -28,7 +28,7 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
+#include <rtems/score/userextimpl.h>
 #include <rtems/score/wkspace.h>
 #if defined(RTEMS_SMP)
   #include <rtems/score/smp.h>
diff --git a/cpukit/score/src/threadinitialize.c b/cpukit/score/src/threadinitialize.c
index 54116ad5e9..7fb650768b 100644
--- a/cpukit/score/src/threadinitialize.c
+++ b/cpukit/score/src/threadinitialize.c
@@ -25,7 +25,7 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
+#include <rtems/score/userextimpl.h>
 #include <rtems/score/watchdog.h>
 #include <rtems/score/wkspace.h>
 
diff --git a/cpukit/score/src/threadloadenv.c b/cpukit/score/src/threadloadenv.c
index 9088a57c6e..d2dd049016 100644
--- a/cpukit/score/src/threadloadenv.c
+++ b/cpukit/score/src/threadloadenv.c
@@ -25,7 +25,6 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
 #include <rtems/score/wkspace.h>
 
 /*
diff --git a/cpukit/score/src/threadready.c b/cpukit/score/src/threadready.c
index 8037f1750a..0eb00e6c05 100644
--- a/cpukit/score/src/threadready.c
+++ b/cpukit/score/src/threadready.c
@@ -25,7 +25,6 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
 #include <rtems/score/wkspace.h>
 
 /*
diff --git a/cpukit/score/src/threadreset.c b/cpukit/score/src/threadreset.c
index c71f0af18d..18dcce81fc 100644
--- a/cpukit/score/src/threadreset.c
+++ b/cpukit/score/src/threadreset.c
@@ -25,7 +25,6 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
 #include <rtems/score/wkspace.h>
 
 /*
diff --git a/cpukit/score/src/threadrestart.c b/cpukit/score/src/threadrestart.c
index 657b62ac6e..f78c028b66 100644
--- a/cpukit/score/src/threadrestart.c
+++ b/cpukit/score/src/threadrestart.c
@@ -25,7 +25,7 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
+#include <rtems/score/userextimpl.h>
 #include <rtems/score/wkspace.h>
 
 /*
diff --git a/cpukit/score/src/threadsetstate.c b/cpukit/score/src/threadsetstate.c
index 94798f3a53..1372b5d919 100644
--- a/cpukit/score/src/threadsetstate.c
+++ b/cpukit/score/src/threadsetstate.c
@@ -25,7 +25,6 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
 #include <rtems/score/wkspace.h>
 
 /*
diff --git a/cpukit/score/src/threadsettransient.c b/cpukit/score/src/threadsettransient.c
index dd3c780937..1624e676bb 100644
--- a/cpukit/score/src/threadsettransient.c
+++ b/cpukit/score/src/threadsettransient.c
@@ -26,7 +26,6 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
 #include <rtems/score/wkspace.h>
 
 /*
diff --git a/cpukit/score/src/threadstackallocate.c b/cpukit/score/src/threadstackallocate.c
index d844564cb1..d0a2b65a03 100644
--- a/cpukit/score/src/threadstackallocate.c
+++ b/cpukit/score/src/threadstackallocate.c
@@ -24,7 +24,6 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/config.h>
 
diff --git a/cpukit/score/src/threadstackfree.c b/cpukit/score/src/threadstackfree.c
index 410ebb0b3f..1c20bad349 100644
--- a/cpukit/score/src/threadstackfree.c
+++ b/cpukit/score/src/threadstackfree.c
@@ -25,7 +25,6 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/config.h>
 
diff --git a/cpukit/score/src/threadstart.c b/cpukit/score/src/threadstart.c
index 8e89f691ef..550404a2e4 100644
--- a/cpukit/score/src/threadstart.c
+++ b/cpukit/score/src/threadstart.c
@@ -25,7 +25,7 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
+#include <rtems/score/userextimpl.h>
 #include <rtems/score/wkspace.h>
 
 /*
diff --git a/cpukit/score/src/threadstartmultitasking.c b/cpukit/score/src/threadstartmultitasking.c
index 62f7b41a22..acc5b26f75 100644
--- a/cpukit/score/src/threadstartmultitasking.c
+++ b/cpukit/score/src/threadstartmultitasking.c
@@ -25,7 +25,6 @@
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
-#include <rtems/score/userext.h>
 #include <rtems/score/wkspace.h>
 
 /*
diff --git a/cpukit/score/src/userext.c b/cpukit/score/src/userext.c
index 78162f6cdd..8159629423 100644
--- a/cpukit/score/src/userext.c
+++ b/cpukit/score/src/userext.c
@@ -20,7 +20,7 @@
 #endif
 
 #include <rtems/config.h>
-#include <rtems/score/userext.h>
+#include <rtems/score/userextimpl.h>
 #include <rtems/score/wkspace.h>
 
 CHAIN_DEFINE_EMPTY( _User_extensions_Switches_list );
diff --git a/cpukit/score/src/userextaddset.c b/cpukit/score/src/userextaddset.c
index 09509f6da8..d24dc4a8e9 100644
--- a/cpukit/score/src/userextaddset.c
+++ b/cpukit/score/src/userextaddset.c
@@ -19,8 +19,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/score/userext.h>
+#include <rtems/score/userextimpl.h>
 
 void _User_extensions_Add_set(
   User_extensions_Control *the_extension
diff --git a/cpukit/score/src/userextiterate.c b/cpukit/score/src/userextiterate.c
index bab63ef99b..7dd2ab3a11 100644
--- a/cpukit/score/src/userextiterate.c
+++ b/cpukit/score/src/userextiterate.c
@@ -17,7 +17,7 @@
 #endif
 
 #include <rtems/config.h>
-#include <rtems/score/userext.h>
+#include <rtems/score/userextimpl.h>
 
 CHAIN_DEFINE_EMPTY( _User_extensions_List );
 
diff --git a/cpukit/score/src/userextremoveset.c b/cpukit/score/src/userextremoveset.c
index 1b950ed6be..e90ff77e72 100644
--- a/cpukit/score/src/userextremoveset.c
+++ b/cpukit/score/src/userextremoveset.c
@@ -19,8 +19,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/score/userext.h>
+#include <rtems/score/userextimpl.h>
 
 void _User_extensions_Remove_set (
   User_extensions_Control  *the_extension
diff --git a/cpukit/score/src/userextthreadswitch.c b/cpukit/score/src/userextthreadswitch.c
index e80b4c362b..43d3afe0bd 100644
--- a/cpukit/score/src/userextthreadswitch.c
+++ b/cpukit/score/src/userextthreadswitch.c
@@ -19,8 +19,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/score/userext.h>
+#include <rtems/score/userextimpl.h>
 
 void _User_extensions_Thread_switch (
   Thread_Control *executing,