score: Merge sysstate API into one file

41 files changed, 69 insertions, 144 deletions

diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index 82eb254244..290715dd22 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -101,7 +101,6 @@ include_rtems_score_HEADERS += inline/rtems/score/scheduler.inl
 include_rtems_score_HEADERS += inline/rtems/score/schedulerpriority.inl
 include_rtems_score_HEADERS += inline/rtems/score/schedulersimple.inl
 include_rtems_score_HEADERS += inline/rtems/score/states.inl
-include_rtems_score_HEADERS += inline/rtems/score/sysstate.inl
 include_rtems_score_HEADERS += inline/rtems/score/thread.inl
 include_rtems_score_HEADERS += inline/rtems/score/threadq.inl
 include_rtems_score_HEADERS += inline/rtems/score/tod.inl
diff --git a/cpukit/score/include/rtems/score/coremutex.h b/cpukit/score/include/rtems/score/coremutex.h
index bf0ac1efac..71582a9f09 100644
--- a/cpukit/score/include/rtems/score/coremutex.h
+++ b/cpukit/score/include/rtems/score/coremutex.h
@@ -26,7 +26,6 @@
 #include <rtems/score/priority.h>
 #include <rtems/score/watchdog.h>
 #include <rtems/score/interr.h>
-#include <rtems/score/sysstate.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/include/rtems/score/coremuteximpl.h b/cpukit/score/include/rtems/score/coremuteximpl.h
index 337ef01bc1..af7c3fa423 100644
--- a/cpukit/score/include/rtems/score/coremuteximpl.h
+++ b/cpukit/score/include/rtems/score/coremuteximpl.h
@@ -20,6 +20,7 @@
 
 #include <rtems/score/coremutex.h>
 #include <rtems/score/chainimpl.h>
+#include <rtems/score/sysstate.h>
 #include <rtems/score/threaddispatch.h>
 
 #ifdef __cplusplus
diff --git a/cpukit/score/include/rtems/score/sysstate.h b/cpukit/score/include/rtems/score/sysstate.h
index 7d3d6aed59..6599dff4f1 100644
--- a/cpukit/score/include/rtems/score/sysstate.h
+++ b/cpukit/score/include/rtems/score/sysstate.h
@@ -18,7 +18,7 @@
 #ifndef _RTEMS_SCORE_SYSSTATE_H
 #define _RTEMS_SCORE_SYSSTATE_H
 
-#include <rtems/score/basedefs.h> /* SCORE_EXTERN */
+#include <rtems/score/basedefs.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -79,11 +79,73 @@ SCORE_EXTERN bool _System_state_Is_multiprocessing;
 
 extern System_state_Codes _System_state_Current;
 
-/*
- *  Make it possible for the application to get the system state information.
- */
+RTEMS_INLINE_ROUTINE void _System_state_Set (
+  System_state_Codes state
+)
+{
+  _System_state_Current = state;
+}
+
+RTEMS_INLINE_ROUTINE void _System_state_Handler_initialization (
+#if defined(RTEMS_MULTIPROCESSING)
+  bool  is_multiprocessing
+#else
+  bool  is_multiprocessing __attribute__((unused))
+#endif
+)
+{
+  _System_state_Set( SYSTEM_STATE_BEFORE_INITIALIZATION );
+#if defined(RTEMS_MULTIPROCESSING)
+    _System_state_Is_multiprocessing = is_multiprocessing;
+#endif
+}
+
+RTEMS_INLINE_ROUTINE System_state_Codes _System_state_Get ( void )
+{
+  return _System_state_Current;
+}
 
-#include <rtems/score/sysstate.inl>
+RTEMS_INLINE_ROUTINE bool _System_state_Is_before_initialization (
+  System_state_Codes state
+)
+{
+  return (state == SYSTEM_STATE_BEFORE_INITIALIZATION);
+}
+
+RTEMS_INLINE_ROUTINE bool _System_state_Is_before_multitasking (
+  System_state_Codes state
+)
+{
+  return (state == SYSTEM_STATE_BEFORE_MULTITASKING);
+}
+
+RTEMS_INLINE_ROUTINE bool _System_state_Is_begin_multitasking (
+  System_state_Codes state
+)
+{
+  return (state == SYSTEM_STATE_BEGIN_MULTITASKING);
+}
+
+RTEMS_INLINE_ROUTINE bool _System_state_Is_shutdown (
+  System_state_Codes state
+)
+{
+  return (state == SYSTEM_STATE_SHUTDOWN);
+}
+
+RTEMS_INLINE_ROUTINE bool _System_state_Is_up (
+  System_state_Codes state
+)
+{
+  return (state == SYSTEM_STATE_UP);
+}
+
+RTEMS_INLINE_ROUTINE bool _System_state_Is_failed (
+  System_state_Codes state
+)
+{
+  return (state == SYSTEM_STATE_FAILED);
+}
 
 /** @} */
 
diff --git a/cpukit/score/inline/rtems/score/sysstate.inl b/cpukit/score/inline/rtems/score/sysstate.inl
deleted file mode 100644
index 3fa534ce17..0000000000
--- a/cpukit/score/inline/rtems/score/sysstate.inl
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * @file
- *
- * @brief System State Handler API
- */
-
-/*
- *  COPYRIGHT (c) 1989-2004.
- *  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_SYSSTATE_H
-# error "Never use <rtems/score/sysstate.inl> directly; include <rtems/score/sysstate.h> instead."
-#endif
-
-#ifndef _RTEMS_SCORE_SYSSTATE_INL
-#define _RTEMS_SCORE_SYSSTATE_INL
-
-/**
- * @addtogroup ScoreSysState
- */
-/**@{**/
-
-RTEMS_INLINE_ROUTINE void _System_state_Set (
-  System_state_Codes state
-)
-{
-  _System_state_Current = state;
-}
-
-RTEMS_INLINE_ROUTINE void _System_state_Handler_initialization (
-#if defined(RTEMS_MULTIPROCESSING)
-  bool  is_multiprocessing
-#else
-  bool  is_multiprocessing __attribute__((unused))
-#endif
-)
-{
-  _System_state_Set( SYSTEM_STATE_BEFORE_INITIALIZATION );
-#if defined(RTEMS_MULTIPROCESSING)
-    _System_state_Is_multiprocessing = is_multiprocessing;
-#endif
-}
-
-RTEMS_INLINE_ROUTINE System_state_Codes _System_state_Get ( void )
-{
-  return _System_state_Current;
-}
-
-RTEMS_INLINE_ROUTINE bool _System_state_Is_before_initialization (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_BEFORE_INITIALIZATION);
-}
-
-RTEMS_INLINE_ROUTINE bool _System_state_Is_before_multitasking (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_BEFORE_MULTITASKING);
-}
-
-RTEMS_INLINE_ROUTINE bool _System_state_Is_begin_multitasking (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_BEGIN_MULTITASKING);
-}
-
-RTEMS_INLINE_ROUTINE bool _System_state_Is_shutdown (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_SHUTDOWN);
-}
-
-RTEMS_INLINE_ROUTINE bool _System_state_Is_up (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_UP);
-}
-
-RTEMS_INLINE_ROUTINE bool _System_state_Is_failed (
-  System_state_Codes state
-)
-{
-  return (state == SYSTEM_STATE_FAILED);
-}
-
-/** @} */
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/thread.inl b/cpukit/score/inline/rtems/score/thread.inl
index 88438d66bc..9c0aecb01a 100644
--- a/cpukit/score/inline/rtems/score/thread.inl
+++ b/cpukit/score/inline/rtems/score/thread.inl
@@ -23,7 +23,6 @@
 #ifndef _RTEMS_SCORE_THREAD_INL
 #define _RTEMS_SCORE_THREAD_INL
 
-#include <rtems/score/sysstate.h>
 #include <rtems/score/context.h>
 
 /**
diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am
index 6df393d2e2..85cd03f8dc 100644
--- a/cpukit/score/preinstall.am
+++ b/cpukit/score/preinstall.am
@@ -335,10 +335,6 @@ $(PROJECT_INCLUDE)/rtems/score/states.inl: inline/rtems/score/states.inl $(PROJE
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/states.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/states.inl
 
-$(PROJECT_INCLUDE)/rtems/score/sysstate.inl: inline/rtems/score/sysstate.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sysstate.inl
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sysstate.inl
-
 $(PROJECT_INCLUDE)/rtems/score/thread.inl: inline/rtems/score/thread.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/thread.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/thread.inl
diff --git a/cpukit/score/src/heapallocate.c b/cpukit/score/src/heapallocate.c
index 6367fac426..4284f56c74 100644
--- a/cpukit/score/src/heapallocate.c
+++ b/cpukit/score/src/heapallocate.c
@@ -22,7 +22,6 @@
 #endif
 
 #include <rtems/system.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/heapimpl.h>
 
 #ifndef HEAP_PROTECTION
diff --git a/cpukit/score/src/heapextend.c b/cpukit/score/src/heapextend.c
index 571bba8428..183fac3bb2 100644
--- a/cpukit/score/src/heapextend.c
+++ b/cpukit/score/src/heapextend.c
@@ -22,7 +22,6 @@
 #endif
 
 #include <rtems/system.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/heapimpl.h>
 
 static void _Heap_Free_block( Heap_Control *heap, Heap_Block *block )
diff --git a/cpukit/score/src/heapgetfreeinfo.c b/cpukit/score/src/heapgetfreeinfo.c
index de6e3dc555..2e5ac4276f 100644
--- a/cpukit/score/src/heapgetfreeinfo.c
+++ b/cpukit/score/src/heapgetfreeinfo.c
@@ -20,7 +20,6 @@
 #endif
 
 #include <rtems/system.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/heapimpl.h>
 
 void _Heap_Get_free_information(
diff --git a/cpukit/score/src/heapresizeblock.c b/cpukit/score/src/heapresizeblock.c
index f791efee44..dae90c14dc 100644
--- a/cpukit/score/src/heapresizeblock.c
+++ b/cpukit/score/src/heapresizeblock.c
@@ -22,7 +22,6 @@
 #endif
 
 #include <rtems/system.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/heapimpl.h>
 
 static Heap_Resize_status _Heap_Resize_block_checked(
diff --git a/cpukit/score/src/heapsizeofuserarea.c b/cpukit/score/src/heapsizeofuserarea.c
index 7c4d9f3e2e..4d9fd9a31f 100644
--- a/cpukit/score/src/heapsizeofuserarea.c
+++ b/cpukit/score/src/heapsizeofuserarea.c
@@ -20,7 +20,6 @@
 #endif
 
 #include <rtems/system.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/heapimpl.h>
 
 bool _Heap_Size_of_alloc_area(
diff --git a/cpukit/score/src/objectallocate.c b/cpukit/score/src/objectallocate.c
index 9083075bdc..6d1818229d 100644
--- a/cpukit/score/src/objectallocate.c
+++ b/cpukit/score/src/objectallocate.c
@@ -27,7 +27,6 @@
 #endif
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/isr.h>
 
 /* #define RTEMS_DEBUG_OBJECT_ALLOCATION */
diff --git a/cpukit/score/src/objectextendinformation.c b/cpukit/score/src/objectextendinformation.c
index 63eae12b88..96b26f3f3a 100644
--- a/cpukit/score/src/objectextendinformation.c
+++ b/cpukit/score/src/objectextendinformation.c
@@ -27,7 +27,6 @@
 #endif
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/isr.h>
 
 #include <string.h>  /* for memcpy() */
diff --git a/cpukit/score/src/objectfree.c b/cpukit/score/src/objectfree.c
index b10f7f87ee..d6861118c9 100644
--- a/cpukit/score/src/objectfree.c
+++ b/cpukit/score/src/objectfree.c
@@ -27,7 +27,6 @@
 #endif
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/isr.h>
 
 void _Objects_Free(
diff --git a/cpukit/score/src/objectget.c b/cpukit/score/src/objectget.c
index eca8ea9925..5d05cc83a2 100644
--- a/cpukit/score/src/objectget.c
+++ b/cpukit/score/src/objectget.c
@@ -27,7 +27,6 @@
 #endif
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/isr.h>
 
 Objects_Control *_Objects_Get(
diff --git a/cpukit/score/src/objectgetisr.c b/cpukit/score/src/objectgetisr.c
index 56f74715e1..a7073842ac 100644
--- a/cpukit/score/src/objectgetisr.c
+++ b/cpukit/score/src/objectgetisr.c
@@ -27,7 +27,6 @@
 #endif
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/isr.h>
 
 Objects_Control *_Objects_Get_isr_disable(
diff --git a/cpukit/score/src/objectgetnext.c b/cpukit/score/src/objectgetnext.c
index 16e16cd8d8..2a0ef43488 100644
--- a/cpukit/score/src/objectgetnext.c
+++ b/cpukit/score/src/objectgetnext.c
@@ -27,7 +27,6 @@
 #endif
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/isr.h>
 
 /*
diff --git a/cpukit/score/src/objectgetnoprotection.c b/cpukit/score/src/objectgetnoprotection.c
index 30b61cc41d..e2083b4d09 100644
--- a/cpukit/score/src/objectgetnoprotection.c
+++ b/cpukit/score/src/objectgetnoprotection.c
@@ -27,7 +27,6 @@
 #endif
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/isr.h>
 
 Objects_Control *_Objects_Get_no_protection(
diff --git a/cpukit/score/src/objectnametoid.c b/cpukit/score/src/objectnametoid.c
index 7648f22cc4..bf3bb4c6d6 100644
--- a/cpukit/score/src/objectnametoid.c
+++ b/cpukit/score/src/objectnametoid.c
@@ -27,7 +27,6 @@
 #endif
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/isr.h>
 
 Objects_Name_or_id_lookup_errors _Objects_Name_to_id_u32(
diff --git a/cpukit/score/src/objectnametoidstring.c b/cpukit/score/src/objectnametoidstring.c
index 1b88e06fb4..4023635855 100644
--- a/cpukit/score/src/objectnametoidstring.c
+++ b/cpukit/score/src/objectnametoidstring.c
@@ -29,7 +29,6 @@
 #endif
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/isr.h>
 
 #if defined(RTEMS_SCORE_OBJECT_ENABLE_STRING_NAMES)
diff --git a/cpukit/score/src/objectshrinkinformation.c b/cpukit/score/src/objectshrinkinformation.c
index dd262526a6..686d0f2a5c 100644
--- a/cpukit/score/src/objectshrinkinformation.c
+++ b/cpukit/score/src/objectshrinkinformation.c
@@ -27,7 +27,6 @@
 #endif
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/isr.h>
 
 void _Objects_Shrink_information(
diff --git a/cpukit/score/src/threadclearstate.c b/cpukit/score/src/threadclearstate.c
index cf59f3b561..6e8cb48304 100644
--- a/cpukit/score/src/threadclearstate.c
+++ b/cpukit/score/src/threadclearstate.c
@@ -27,7 +27,6 @@
 #include <rtems/score/priority.h>
 #include <rtems/score/scheduler.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadclose.c b/cpukit/score/src/threadclose.c
index e6fec8566f..912e5d4271 100644
--- a/cpukit/score/src/threadclose.c
+++ b/cpukit/score/src/threadclose.c
@@ -27,7 +27,6 @@
 #include <rtems/score/priority.h>
 #include <rtems/score/scheduler.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threaddispatch.h>
 #include <rtems/score/threadq.h>
diff --git a/cpukit/score/src/threadcreateidle.c b/cpukit/score/src/threadcreateidle.c
index d11b296157..cef6d03886 100644
--- a/cpukit/score/src/threadcreateidle.c
+++ b/cpukit/score/src/threadcreateidle.c
@@ -28,7 +28,6 @@
 #include <rtems/score/smp.h>
 #include <rtems/score/stackimpl.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threaddelayended.c b/cpukit/score/src/threaddelayended.c
index dc8ccb4248..98b2f03b2c 100644
--- a/cpukit/score/src/threaddelayended.c
+++ b/cpukit/score/src/threaddelayended.c
@@ -26,7 +26,6 @@
 #include <rtems/score/object.h>
 #include <rtems/score/priority.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threaddispatch.h>
 #include <rtems/score/threadq.h>
diff --git a/cpukit/score/src/threaddisabledispatch.c b/cpukit/score/src/threaddisabledispatch.c
index d89bc924fd..de19b8976e 100644
--- a/cpukit/score/src/threaddisabledispatch.c
+++ b/cpukit/score/src/threaddisabledispatch.c
@@ -21,6 +21,7 @@
 #endif
 
 #include <rtems/system.h>
+#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threaddispatch.h>
 
diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c
index adce3a18d3..177a3d839d 100644
--- a/cpukit/score/src/threaddispatch.c
+++ b/cpukit/score/src/threaddispatch.c
@@ -26,7 +26,6 @@
 #include <rtems/score/object.h>
 #include <rtems/score/priority.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threaddispatch.h>
 #include <rtems/score/threadq.h>
diff --git a/cpukit/score/src/threaddispatchdisablelevel.c b/cpukit/score/src/threaddispatchdisablelevel.c
index d5f3ff601b..439a6e6a32 100644
--- a/cpukit/score/src/threaddispatchdisablelevel.c
+++ b/cpukit/score/src/threaddispatchdisablelevel.c
@@ -23,7 +23,6 @@
 #include <rtems/score/object.h>
 #include <rtems/score/priority.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/threaddispatch.h>
 
 #define NO_OWNER_CPU 0xffffffffU
diff --git a/cpukit/score/src/threadget.c b/cpukit/score/src/threadget.c
index 69551f0b11..a2b81b3e14 100644
--- a/cpukit/score/src/threadget.c
+++ b/cpukit/score/src/threadget.c
@@ -27,7 +27,6 @@
 #include <rtems/score/object.h>
 #include <rtems/score/priority.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threaddispatch.h>
 #include <rtems/score/threadq.h>
diff --git a/cpukit/score/src/threadhandler.c b/cpukit/score/src/threadhandler.c
index 85f8f6e4bd..fa57fc510b 100644
--- a/cpukit/score/src/threadhandler.c
+++ b/cpukit/score/src/threadhandler.c
@@ -26,7 +26,6 @@
 #include <rtems/score/object.h>
 #include <rtems/score/priority.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threaddispatch.h>
 #include <rtems/score/threadq.h>
diff --git a/cpukit/score/src/threadinitialize.c b/cpukit/score/src/threadinitialize.c
index f3b25e9bd4..5c778a8b25 100644
--- a/cpukit/score/src/threadinitialize.c
+++ b/cpukit/score/src/threadinitialize.c
@@ -28,7 +28,6 @@
 #include <rtems/score/scheduler.h>
 #include <rtems/score/stackimpl.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/userextimpl.h>
diff --git a/cpukit/score/src/threadloadenv.c b/cpukit/score/src/threadloadenv.c
index 6cce54fb1a..b368b748b1 100644
--- a/cpukit/score/src/threadloadenv.c
+++ b/cpukit/score/src/threadloadenv.c
@@ -27,7 +27,6 @@
 #include <rtems/score/object.h>
 #include <rtems/score/priority.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadready.c b/cpukit/score/src/threadready.c
index d1e57a431a..0b5149c669 100644
--- a/cpukit/score/src/threadready.c
+++ b/cpukit/score/src/threadready.c
@@ -27,7 +27,6 @@
 #include <rtems/score/priority.h>
 #include <rtems/score/scheduler.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadreset.c b/cpukit/score/src/threadreset.c
index 575cd272c8..fb4278de1b 100644
--- a/cpukit/score/src/threadreset.c
+++ b/cpukit/score/src/threadreset.c
@@ -26,7 +26,6 @@
 #include <rtems/score/object.h>
 #include <rtems/score/priority.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadrestart.c b/cpukit/score/src/threadrestart.c
index 2409e69fc5..26dd61aac2 100644
--- a/cpukit/score/src/threadrestart.c
+++ b/cpukit/score/src/threadrestart.c
@@ -26,7 +26,6 @@
 #include <rtems/score/object.h>
 #include <rtems/score/priority.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/userextimpl.h>
diff --git a/cpukit/score/src/threadsetstate.c b/cpukit/score/src/threadsetstate.c
index f72cdec750..abe5eebcf6 100644
--- a/cpukit/score/src/threadsetstate.c
+++ b/cpukit/score/src/threadsetstate.c
@@ -30,7 +30,6 @@
 #include <rtems/score/priority.h>
 #include <rtems/score/scheduler.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadsettransient.c b/cpukit/score/src/threadsettransient.c
index b09939684f..5d22a52a1b 100644
--- a/cpukit/score/src/threadsettransient.c
+++ b/cpukit/score/src/threadsettransient.c
@@ -29,7 +29,6 @@
 #include <rtems/score/scheduler.h>
 #include <rtems/score/schedulerpriority.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadstackallocate.c b/cpukit/score/src/threadstackallocate.c
index 0f64f59e1b..5d9230efd0 100644
--- a/cpukit/score/src/threadstackallocate.c
+++ b/cpukit/score/src/threadstackallocate.c
@@ -28,7 +28,6 @@
 #include <rtems/score/priority.h>
 #include <rtems/score/stackimpl.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadstackfree.c b/cpukit/score/src/threadstackfree.c
index 8a441009ec..0e59ef7915 100644
--- a/cpukit/score/src/threadstackfree.c
+++ b/cpukit/score/src/threadstackfree.c
@@ -26,7 +26,6 @@
 #include <rtems/score/object.h>
 #include <rtems/score/priority.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadstart.c b/cpukit/score/src/threadstart.c
index 4e24f39cfc..dddf744206 100644
--- a/cpukit/score/src/threadstart.c
+++ b/cpukit/score/src/threadstart.c
@@ -27,7 +27,6 @@
 #include <rtems/score/object.h>
 #include <rtems/score/priority.h>
 #include <rtems/score/states.h>
-#include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/userextimpl.h>