score: Create chain implementation header

Move implementation specific parts of chain.h and chain.inl into new
header file chainimpl.h.  The chain.h contains now only the application
visible API.

29 files changed, 229 insertions, 215 deletions

diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index 6217412e12..9417227e3f 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -19,6 +19,7 @@ include_rtems_score_HEADERS += include/rtems/score/apiext.h
 include_rtems_score_HEADERS += include/rtems/score/apimutex.h
 include_rtems_score_HEADERS += include/rtems/score/bitfield.h
 include_rtems_score_HEADERS += include/rtems/score/chain.h
+include_rtems_score_HEADERS += include/rtems/score/chainimpl.h
 include_rtems_score_HEADERS += include/rtems/score/context.h
 include_rtems_score_HEADERS += include/rtems/score/copyrt.h
 include_rtems_score_HEADERS += include/rtems/score/corebarrier.h
@@ -90,7 +91,6 @@ endif
 
 ## inline
 include_rtems_score_HEADERS += inline/rtems/score/address.inl
-include_rtems_score_HEADERS += inline/rtems/score/chain.inl
 include_rtems_score_HEADERS += inline/rtems/score/heap.inl
 include_rtems_score_HEADERS += inline/rtems/score/object.inl
 include_rtems_score_HEADERS += inline/rtems/score/priority.inl
diff --git a/cpukit/score/include/rtems/score/apiext.h b/cpukit/score/include/rtems/score/apiext.h
index 54b8049241..d980bb1ecc 100644
--- a/cpukit/score/include/rtems/score/apiext.h
+++ b/cpukit/score/include/rtems/score/apiext.h
@@ -18,6 +18,13 @@
 #ifndef _RTEMS_SCORE_APIEXT_H
 #define _RTEMS_SCORE_APIEXT_H
 
+#include <rtems/score/chainimpl.h>
+#include <rtems/score/thread.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  *  @defgroup ScoreAPIExtension API Extension Handler
  *
@@ -32,9 +39,6 @@
  */
 /**@{*/
 
-#include <rtems/score/chain.h>
-#include <rtems/score/thread.h>
-
 #if defined(FUNCTIONALITY_NOT_CURRENTLY_USED_BY_ANY_API)
   /**
    *  This type defines the prototype of the Predriver Hook.
@@ -179,5 +183,9 @@ static inline void _API_extensions_Run_post_switch( Thread_Control *executing )
 
 /**@}*/
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include file */
diff --git a/cpukit/score/include/rtems/score/chain.h b/cpukit/score/include/rtems/score/chain.h
index 4b2a449823..00f30c3082 100644
--- a/cpukit/score/include/rtems/score/chain.h
+++ b/cpukit/score/include/rtems/score/chain.h
@@ -20,6 +20,10 @@
 #ifndef _RTEMS_SCORE_CHAIN_H
 #define _RTEMS_SCORE_CHAIN_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  *  @defgroup ScoreChain Chain Handler
  *
@@ -33,12 +37,6 @@
  */
 /**@{*/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/address.h>
-
 /**
  *  @typedef Chain_Node
  *
@@ -94,187 +92,11 @@ typedef union {
   } Tail;
 } Chain_Control;
 
-/**
- *  @brief Chain initializer for an empty chain with designator @a name.
- */
-#define CHAIN_INITIALIZER_EMPTY(name) \
-  { { { &(name).Tail.Node, NULL }, &(name).Head.Node } }
-
-/**
- *  @brief Chain definition for an empty chain with designator @a name.
- */
-#define CHAIN_DEFINE_EMPTY(name) \
-  Chain_Control name = CHAIN_INITIALIZER_EMPTY(name)
-
-/**
- *  @brief Initialize a chain header.
- *
- *  This routine initializes @a the_chain structure to manage the
- *  contiguous array of @a number_nodes nodes which starts at
- *  @a starting_address.  Each node is of @a node_size bytes.
- *
- *  @param[in] the_chain specifies the chain to initialize
- *  @param[in] starting_address is the starting address of the array
- *         of elements
- *  @param[in] number_nodes is the numebr of nodes that will be in the chain
- *  @param[in] node_size is the size of each node
- */
-void _Chain_Initialize(
-  Chain_Control *the_chain,
-  void          *starting_address,
-  size_t         number_nodes,
-  size_t         node_size
-);
-
-/**
- *  @brief Extract the specified node from a chain.
- *
- *  This routine extracts @a the_node from the chain on which it resides.
- *  It disables interrupts to ensure the atomicity of the extract operation.
- *
- *  @param[in] the_node is the node to be extracted
- *
- *  - INTERRUPT LATENCY:
- *    + single case
- */
-void _Chain_Extract(
-  Chain_Node *the_node
-);
-
-/**
- *  @brief Obtain the first node on a chain.
- *
- *  This function removes the first node from @a the_chain and returns
- *  a pointer to that node.  If @a the_chain is empty, then NULL is returned.
- *
- *  @retval This method returns a pointer a node.  If a node was removed,
- *          then a pointer to that node is returned.  If @a the_chain was
- *          empty, then NULL is returned.
- *
- *  @note It disables interrupts to ensure the atomicity of the get operation.
- */
-Chain_Node *_Chain_Get(
-  Chain_Control *the_chain
-);
-
-/**
- *  @brief Insert a node on a chain.
- *
- *  This routine inserts @a the_node on a chain immediately following
- *  @a after_node.
- *
- *  @param[in] after_node is the pointer to the node in chain to be
- *             inserted after
- *  @param[in] the_node is the pointer to the node to be inserted
- *
- *  @note It disables interrupts to ensure the atomicity
- *  of the insert operation.
- *
- *  - INTERRUPT LATENCY:
- *    + single case
- */
-void _Chain_Insert(
-  Chain_Node *after_node,
-  Chain_Node *the_node
-);
-
-/**
- *  @brief Append a node on the end of a chain.
- *
- *  This routine appends @a the_node onto the end of @a the_chain.
- *
- *  @note It disables interrupts to ensure the atomicity of the
- *  append operation.
- */
-void _Chain_Append(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-/**
- * @brief Append a node and check if the chain was empty before.
- *
- * This routine appends the_node onto the end of the_chain.
- *
- * @param[in] the_chain is the chain to be operated upon.
- * @param[in] the_node is the node to be appended.
- *
- * @note It disables interrupts to ensure the atomicity of the append
- * operation.
- *
- * @retval true The chain was empty before.
- * @retval false The chain contained at least one node before.
- */
-bool _Chain_Append_with_empty_check(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-/**
- * @brief Prepend a node and check if the chain was empty before.
- *
- * This routine prepends the_node onto the front of the_chain.
- *
- * @param[in] the_chain is the chain to be operated upon.
- * @param[in] the_node is the node to be prepended.
- *
- * @note It disables interrupts to ensure the atomicity of the append
- * operation.
- *
- * @retval true The chain was empty before.
- * @retval false The chain contained at least one node before.
- */
-bool _Chain_Prepend_with_empty_check(
-  Chain_Control *the_chain,
-  Chain_Node    *the_node
-);
-
-/**
- * @brief Get the first node and check if the chain is empty afterwards.
- *
- * This function removes the first node from the_chain and returns
- * a pointer to that node in @a the_node.  If the_chain is empty, then NULL is
- * returned.
- *
- * @param[in] the_chain is the chain to attempt to get the first node from.
- * @param[out] the_node is the first node on the chain or NULL if the chain is
- * empty.
- *
- * @note It disables interrupts to ensure the atomicity of the append
- * operation.
- *
- * @retval true The chain is empty now.
- * @retval false The chain contains at least one node now.
- *
- *  - INTERRUPT LATENCY:
- *    + single case
- */
-bool _Chain_Get_with_empty_check(
-  Chain_Control *the_chain,
-  Chain_Node **the_node
-);
-
-/**
- * @brief Returns the node count of the chain.
- *
- * @param[in] chain The chain.
- *
- * @note It does NOT disable interrupts to ensure the atomicity of the
- * operation.
- *
- * @retval The node count of the chain.
- */
-size_t _Chain_Node_count_unprotected( const Chain_Control *chain );
-
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/chain.inl>
-#endif
+/**@}*/
 
 #ifdef __cplusplus
 }
 #endif
 
-/**@}*/
-
 #endif
 /* end of include file */
diff --git a/cpukit/score/inline/rtems/score/chain.inl b/cpukit/score/include/rtems/score/chainimpl.h
index 3c33669666..f87ce82098 100644
--- a/cpukit/score/inline/rtems/score/chain.inl
+++ b/cpukit/score/include/rtems/score/chainimpl.h
@@ -15,12 +15,15 @@
  *  http://www.rtems.com/license/LICENSE.
  */
 
-#ifndef _RTEMS_SCORE_CHAIN_H
-# error "Never use <rtems/score/chain.inl> directly; include <rtems/score/chain.h> instead."
-#endif
+#ifndef _RTEMS_SCORE_CHAINIMPL_H
+#define _RTEMS_SCORE_CHAINIMPL_H
+
+#include <rtems/score/chain.h>
+#include <rtems/score/address.h>
 
-#ifndef _RTEMS_SCORE_CHAIN_INL
-#define _RTEMS_SCORE_CHAIN_INL
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /**
  * @addtogroup ScoreChain
@@ -28,6 +31,178 @@
 /**@{**/
 
 /**
+ *  @brief Chain initializer for an empty chain with designator @a name.
+ */
+#define CHAIN_INITIALIZER_EMPTY(name) \
+  { { { &(name).Tail.Node, NULL }, &(name).Head.Node } }
+
+/**
+ *  @brief Chain definition for an empty chain with designator @a name.
+ */
+#define CHAIN_DEFINE_EMPTY(name) \
+  Chain_Control name = CHAIN_INITIALIZER_EMPTY(name)
+
+/**
+ *  @brief Initialize a chain header.
+ *
+ *  This routine initializes @a the_chain structure to manage the
+ *  contiguous array of @a number_nodes nodes which starts at
+ *  @a starting_address.  Each node is of @a node_size bytes.
+ *
+ *  @param[in] the_chain specifies the chain to initialize
+ *  @param[in] starting_address is the starting address of the array
+ *         of elements
+ *  @param[in] number_nodes is the numebr of nodes that will be in the chain
+ *  @param[in] node_size is the size of each node
+ */
+void _Chain_Initialize(
+  Chain_Control *the_chain,
+  void          *starting_address,
+  size_t         number_nodes,
+  size_t         node_size
+);
+
+/**
+ *  @brief Extract the specified node from a chain.
+ *
+ *  This routine extracts @a the_node from the chain on which it resides.
+ *  It disables interrupts to ensure the atomicity of the extract operation.
+ *
+ *  @param[in] the_node is the node to be extracted
+ *
+ *  - INTERRUPT LATENCY:
+ *    + single case
+ */
+void _Chain_Extract(
+  Chain_Node *the_node
+);
+
+/**
+ *  @brief Obtain the first node on a chain.
+ *
+ *  This function removes the first node from @a the_chain and returns
+ *  a pointer to that node.  If @a the_chain is empty, then NULL is returned.
+ *
+ *  @retval This method returns a pointer a node.  If a node was removed,
+ *          then a pointer to that node is returned.  If @a the_chain was
+ *          empty, then NULL is returned.
+ *
+ *  @note It disables interrupts to ensure the atomicity of the get operation.
+ */
+Chain_Node *_Chain_Get(
+  Chain_Control *the_chain
+);
+
+/**
+ *  @brief Insert a node on a chain.
+ *
+ *  This routine inserts @a the_node on a chain immediately following
+ *  @a after_node.
+ *
+ *  @param[in] after_node is the pointer to the node in chain to be
+ *             inserted after
+ *  @param[in] the_node is the pointer to the node to be inserted
+ *
+ *  @note It disables interrupts to ensure the atomicity
+ *  of the insert operation.
+ *
+ *  - INTERRUPT LATENCY:
+ *    + single case
+ */
+void _Chain_Insert(
+  Chain_Node *after_node,
+  Chain_Node *the_node
+);
+
+/**
+ *  @brief Append a node on the end of a chain.
+ *
+ *  This routine appends @a the_node onto the end of @a the_chain.
+ *
+ *  @note It disables interrupts to ensure the atomicity of the
+ *  append operation.
+ */
+void _Chain_Append(
+  Chain_Control *the_chain,
+  Chain_Node    *the_node
+);
+
+/**
+ * @brief Append a node and check if the chain was empty before.
+ *
+ * This routine appends the_node onto the end of the_chain.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ * @param[in] the_node is the node to be appended.
+ *
+ * @note It disables interrupts to ensure the atomicity of the append
+ * operation.
+ *
+ * @retval true The chain was empty before.
+ * @retval false The chain contained at least one node before.
+ */
+bool _Chain_Append_with_empty_check(
+  Chain_Control *the_chain,
+  Chain_Node    *the_node
+);
+
+/**
+ * @brief Prepend a node and check if the chain was empty before.
+ *
+ * This routine prepends the_node onto the front of the_chain.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ * @param[in] the_node is the node to be prepended.
+ *
+ * @note It disables interrupts to ensure the atomicity of the append
+ * operation.
+ *
+ * @retval true The chain was empty before.
+ * @retval false The chain contained at least one node before.
+ */
+bool _Chain_Prepend_with_empty_check(
+  Chain_Control *the_chain,
+  Chain_Node    *the_node
+);
+
+/**
+ * @brief Get the first node and check if the chain is empty afterwards.
+ *
+ * This function removes the first node from the_chain and returns
+ * a pointer to that node in @a the_node.  If the_chain is empty, then NULL is
+ * returned.
+ *
+ * @param[in] the_chain is the chain to attempt to get the first node from.
+ * @param[out] the_node is the first node on the chain or NULL if the chain is
+ * empty.
+ *
+ * @note It disables interrupts to ensure the atomicity of the append
+ * operation.
+ *
+ * @retval true The chain is empty now.
+ * @retval false The chain contains at least one node now.
+ *
+ *  - INTERRUPT LATENCY:
+ *    + single case
+ */
+bool _Chain_Get_with_empty_check(
+  Chain_Control *the_chain,
+  Chain_Node **the_node
+);
+
+/**
+ * @brief Returns the node count of the chain.
+ *
+ * @param[in] chain The chain.
+ *
+ * @note It does NOT disable interrupts to ensure the atomicity of the
+ * operation.
+ *
+ * @retval The node count of the chain.
+ */
+size_t _Chain_Node_count_unprotected( const Chain_Control *chain );
+
+/**
  * @brief Set off chain.
  *
  * This function sets the next and previous fields of the @a node to NULL
@@ -769,5 +944,9 @@ RTEMS_INLINE_ROUTINE void _Chain_Insert_ordered_unprotected(
 
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include file */
diff --git a/cpukit/score/include/rtems/score/coremsgimpl.h b/cpukit/score/include/rtems/score/coremsgimpl.h
index f579e6363b..d9f8f91c0b 100644
--- a/cpukit/score/include/rtems/score/coremsgimpl.h
+++ b/cpukit/score/include/rtems/score/coremsgimpl.h
@@ -20,6 +20,7 @@
 #define _RTEMS_SCORE_COREMSGIMPL_H
 
 #include <rtems/score/coremsg.h>
+#include <rtems/score/chainimpl.h>
 
 #include <limits.h>
 #include <string.h>
diff --git a/cpukit/score/include/rtems/score/coremuteximpl.h b/cpukit/score/include/rtems/score/coremuteximpl.h
index e84875d963..5a139556ca 100644
--- a/cpukit/score/include/rtems/score/coremuteximpl.h
+++ b/cpukit/score/include/rtems/score/coremuteximpl.h
@@ -19,6 +19,7 @@
 #define _RTEMS_SCORE_COREMUTEXIMPL_H
 
 #include <rtems/score/coremutex.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/threaddispatch.h>
 
 #ifdef __cplusplus
diff --git a/cpukit/score/include/rtems/score/userextimpl.h b/cpukit/score/include/rtems/score/userextimpl.h
index 6ecdcc579a..a79b858b26 100644
--- a/cpukit/score/include/rtems/score/userextimpl.h
+++ b/cpukit/score/include/rtems/score/userextimpl.h
@@ -19,6 +19,7 @@
 #define _RTEMS_SCORE_USEREXTIMPL_H
 
 #include <rtems/score/userext.h>
+#include <rtems/score/chainimpl.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/inline/rtems/score/schedulerpriority.inl b/cpukit/score/inline/rtems/score/schedulerpriority.inl
index 4655f9501f..fc108d6ae5 100644
--- a/cpukit/score/inline/rtems/score/schedulerpriority.inl
+++ b/cpukit/score/inline/rtems/score/schedulerpriority.inl
@@ -24,6 +24,7 @@
 #ifndef _RTEMS_SCORE_SCHEDULERPRIORITY_INL
 #define _RTEMS_SCORE_SCHEDULERPRIORITY_INL
 
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/wkspace.h>
 
 /**
diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am
index 7fb91095f6..4159f144c5 100644
--- a/cpukit/score/preinstall.am
+++ b/cpukit/score/preinstall.am
@@ -59,6 +59,10 @@ $(PROJECT_INCLUDE)/rtems/score/chain.h: include/rtems/score/chain.h $(PROJECT_IN
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/chain.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/chain.h
 
+$(PROJECT_INCLUDE)/rtems/score/chainimpl.h: include/rtems/score/chainimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/chainimpl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/chainimpl.h
+
 $(PROJECT_INCLUDE)/rtems/score/context.h: include/rtems/score/context.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/context.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/context.h
@@ -291,10 +295,6 @@ $(PROJECT_INCLUDE)/rtems/score/address.inl: inline/rtems/score/address.inl $(PRO
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/address.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/address.inl
 
-$(PROJECT_INCLUDE)/rtems/score/chain.inl: inline/rtems/score/chain.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/chain.inl
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/chain.inl
-
 $(PROJECT_INCLUDE)/rtems/score/heap.inl: inline/rtems/score/heap.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/heap.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/heap.inl
diff --git a/cpukit/score/src/chain.c b/cpukit/score/src/chain.c
index 7e63107876..7c7eb61a2f 100644
--- a/cpukit/score/src/chain.c
+++ b/cpukit/score/src/chain.c
@@ -21,7 +21,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/address.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/isr.h>
 
 void _Chain_Initialize(
diff --git a/cpukit/score/src/chainappend.c b/cpukit/score/src/chainappend.c
index 5774118aeb..a95ac1cc6a 100644
--- a/cpukit/score/src/chainappend.c
+++ b/cpukit/score/src/chainappend.c
@@ -20,7 +20,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/address.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/isr.h>
 
 /*
diff --git a/cpukit/score/src/chainappendempty.c b/cpukit/score/src/chainappendempty.c
index 33033df8ed..5aedbfd6b1 100644
--- a/cpukit/score/src/chainappendempty.c
+++ b/cpukit/score/src/chainappendempty.c
@@ -25,7 +25,7 @@
 #endif
 
 #include <rtems/system.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/isr.h>
 
 bool _Chain_Append_with_empty_check(
diff --git a/cpukit/score/src/chainextract.c b/cpukit/score/src/chainextract.c
index 05a3fd61d5..84d37245c2 100644
--- a/cpukit/score/src/chainextract.c
+++ b/cpukit/score/src/chainextract.c
@@ -21,7 +21,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/address.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/isr.h>
 
 void _Chain_Extract(
diff --git a/cpukit/score/src/chainget.c b/cpukit/score/src/chainget.c
index 82a491fac1..bd1e47c6e5 100644
--- a/cpukit/score/src/chainget.c
+++ b/cpukit/score/src/chainget.c
@@ -20,7 +20,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/address.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/isr.h>
 
 Chain_Node *_Chain_Get(
diff --git a/cpukit/score/src/chaingetempty.c b/cpukit/score/src/chaingetempty.c
index 3f9be4de5b..d05f9f8c85 100644
--- a/cpukit/score/src/chaingetempty.c
+++ b/cpukit/score/src/chaingetempty.c
@@ -25,7 +25,7 @@
 #endif
 
 #include <rtems/system.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/isr.h>
 
 bool _Chain_Get_with_empty_check(
diff --git a/cpukit/score/src/chaininsert.c b/cpukit/score/src/chaininsert.c
index c7b12129be..8191b1061a 100644
--- a/cpukit/score/src/chaininsert.c
+++ b/cpukit/score/src/chaininsert.c
@@ -21,7 +21,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/address.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/isr.h>
 
 /*
diff --git a/cpukit/score/src/chainnodecount.c b/cpukit/score/src/chainnodecount.c
index 3b54d93468..ba3fbaf236 100644
--- a/cpukit/score/src/chainnodecount.c
+++ b/cpukit/score/src/chainnodecount.c
@@ -16,7 +16,7 @@
   #include "config.h"
 #endif
 
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 
 size_t _Chain_Node_count_unprotected( const Chain_Control *chain )
 {
diff --git a/cpukit/score/src/chainprependempty.c b/cpukit/score/src/chainprependempty.c
index 9dfd9a653f..98fe6085a8 100644
--- a/cpukit/score/src/chainprependempty.c
+++ b/cpukit/score/src/chainprependempty.c
@@ -25,7 +25,7 @@
 #endif
 
 #include <rtems/system.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/isr.h>
 
 bool _Chain_Prepend_with_empty_check(
diff --git a/cpukit/score/src/objectactivecount.c b/cpukit/score/src/objectactivecount.c
index 3b148235f2..2cfa56aefb 100644
--- a/cpukit/score/src/objectactivecount.c
+++ b/cpukit/score/src/objectactivecount.c
@@ -17,6 +17,7 @@
 #endif
 
 #include <rtems/score/object.h>
+#include <rtems/score/chainimpl.h>
 
 Objects_Maximum _Objects_Active_count(
   const Objects_Information *information
diff --git a/cpukit/score/src/objectallocate.c b/cpukit/score/src/objectallocate.c
index 15db8d38fb..9083075bdc 100644
--- a/cpukit/score/src/objectallocate.c
+++ b/cpukit/score/src/objectallocate.c
@@ -20,7 +20,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/address.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/object.h>
 #if defined(RTEMS_MULTIPROCESSING)
 #include <rtems/score/objectmp.h>
diff --git a/cpukit/score/src/objectextendinformation.c b/cpukit/score/src/objectextendinformation.c
index e7120511e1..63eae12b88 100644
--- a/cpukit/score/src/objectextendinformation.c
+++ b/cpukit/score/src/objectextendinformation.c
@@ -20,7 +20,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/address.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/object.h>
 #if defined(RTEMS_MULTIPROCESSING)
 #include <rtems/score/objectmp.h>
diff --git a/cpukit/score/src/objectfree.c b/cpukit/score/src/objectfree.c
index 2e1f657141..b10f7f87ee 100644
--- a/cpukit/score/src/objectfree.c
+++ b/cpukit/score/src/objectfree.c
@@ -20,7 +20,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/address.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/object.h>
 #if defined(RTEMS_MULTIPROCESSING)
 #include <rtems/score/objectmp.h>
diff --git a/cpukit/score/src/objectinitializeinformation.c b/cpukit/score/src/objectinitializeinformation.c
index 0ec2db7fab..82c488a13f 100644
--- a/cpukit/score/src/objectinitializeinformation.c
+++ b/cpukit/score/src/objectinitializeinformation.c
@@ -20,7 +20,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/address.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/object.h>
 #if defined(RTEMS_MULTIPROCESSING)
 #include <rtems/score/objectmp.h>
diff --git a/cpukit/score/src/objectshrinkinformation.c b/cpukit/score/src/objectshrinkinformation.c
index 466a85df74..dd262526a6 100644
--- a/cpukit/score/src/objectshrinkinformation.c
+++ b/cpukit/score/src/objectshrinkinformation.c
@@ -20,7 +20,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/address.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/object.h>
 #if defined(RTEMS_MULTIPROCESSING)
 #include <rtems/score/objectmp.h>
diff --git a/cpukit/score/src/threadq.c b/cpukit/score/src/threadq.c
index 900a3f6b03..4563f0ffff 100644
--- a/cpukit/score/src/threadq.c
+++ b/cpukit/score/src/threadq.c
@@ -19,7 +19,7 @@
 #endif
 
 #include <rtems/system.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/object.h>
 #include <rtems/score/states.h>
diff --git a/cpukit/score/src/threadqenqueuefifo.c b/cpukit/score/src/threadqenqueuefifo.c
index ab1404cf72..44bdfd5988 100644
--- a/cpukit/score/src/threadqenqueuefifo.c
+++ b/cpukit/score/src/threadqenqueuefifo.c
@@ -19,7 +19,7 @@
 #endif
 
 #include <rtems/system.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/object.h>
 #include <rtems/score/states.h>
diff --git a/cpukit/score/src/threadqenqueuepriority.c b/cpukit/score/src/threadqenqueuepriority.c
index d367a40554..57117028dc 100644
--- a/cpukit/score/src/threadqenqueuepriority.c
+++ b/cpukit/score/src/threadqenqueuepriority.c
@@ -19,7 +19,7 @@
 #endif
 
 #include <rtems/system.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/object.h>
 #include <rtems/score/states.h>
diff --git a/cpukit/score/src/threadqfirstfifo.c b/cpukit/score/src/threadqfirstfifo.c
index c22debdd0f..08d90ce1c0 100644
--- a/cpukit/score/src/threadqfirstfifo.c
+++ b/cpukit/score/src/threadqfirstfifo.c
@@ -19,7 +19,7 @@
 #endif
 
 #include <rtems/system.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/object.h>
 #include <rtems/score/states.h>
diff --git a/cpukit/score/src/threadqfirstpriority.c b/cpukit/score/src/threadqfirstpriority.c
index eefc88b168..5b2d56a30e 100644
--- a/cpukit/score/src/threadqfirstpriority.c
+++ b/cpukit/score/src/threadqfirstpriority.c
@@ -23,7 +23,7 @@
 #endif
 
 #include <rtems/system.h>
-#include <rtems/score/chain.h>
+#include <rtems/score/chainimpl.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/object.h>
 #include <rtems/score/states.h>