Include missing <rtems/score/threaddispatch.h>

c/src/lib/libbsp/powerpc/shared/startup/panic.c

@@ -5,8 +5,8 @@
 #include <rtems/bspIo.h>
 #include <rtems/error.h>
 #include <libcpu/stackTrace.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/percpu.h>
-#include <rtems/score/thread.inl>
+#include <rtems/score/threaddispatch.h>
 
 static void
 rebootQuestion(void)

c/src/lib/libbsp/shared/clock_driver_simidle.c

@@ -5,9 +5,9 @@
  *  it with a special IDLE task.
  */
 
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <rtems.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/percpu.h>
+#include <rtems/score/threaddispatch.h>
 
 #define CLOCK_VECTOR 0
 

c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_hdl.c

@@ -8,11 +8,11 @@
  *  http://www.rtems.com/license/LICENSE.
  */
 
-#include <rtems.h>
-#include <rtems/score/apiext.h>
-
 #include <bsp/vectors.h>
 
+#include <rtems/score/apiext.h>
+#include <rtems/score/threaddispatch.h>
+
 /* Provide temp. storage space for a few registers.
  * This is used by the assembly code prior to setting up
  * the stack.

c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_print.c

@@ -19,6 +19,8 @@
 
 #include <bsp/vectors.h>
 
+#include <rtems/score/threaddispatch.h>
+
 #ifndef __SPE__
   #define GET_GPR(gpr) (gpr)
 #else

c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c

@@ -31,9 +31,9 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/score/cpu.h>
+#include <rtems/score/percpu.h>
 #include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/sh.h>
 
 #include <rtems/score/ispsh7032.h>

c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c

@@ -32,7 +32,7 @@
 #include <rtems/system.h>
 #include <rtems/score/cpu.h>
 #include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/sh.h>
 
 #include <rtems/score/ispsh7045.h>

c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c

@@ -32,7 +32,7 @@
 #include <rtems/system.h>
 #include <rtems/score/cpu.h>
 #include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/sh.h>
 #include <rtems/score/ispsh7750.h>
 #include <rtems/score/iosh7750.h>

c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c

@@ -12,7 +12,8 @@
 #include <rtems/system.h>
 #include <rtems/score/cpu.h>
 #include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/percpu.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/sh.h>
 
 #if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)

cpukit/libcsupport/src/malloc_deferred.c

@@ -27,6 +27,8 @@
 
 #include "malloc_p.h"
 
+#include <rtems/score/threaddispatch.h>
+
 RTEMS_CHAIN_DEFINE_EMPTY(RTEMS_Malloc_GC_list);
 
 bool malloc_is_system_state_OK(void)

cpukit/libcsupport/src/privateenv.c

@@ -20,12 +20,10 @@
   #include "config.h"
 #endif
 
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-
 #include <stdlib.h>
 
 #include <rtems/libio_.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 
 /**
  *  Instantiate a private user environment for the calling thread.

cpukit/libcsupport/src/sup_fs_location.c

@@ -23,12 +23,10 @@
   #include "config.h"
 #endif
 
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-
 #include <stdlib.h>
 
 #include <rtems/libio_.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 
 static rtems_filesystem_global_location_t *deferred_released_global_locations;
 

cpukit/libcsupport/src/umask.c

@@ -18,11 +18,10 @@
   #include "config.h"
 #endif
 
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
-
 #include <sys/stat.h>
 
 #include <rtems/libio_.h>
+#include <rtems/score/threaddispatch.h>
 
 /**
  *  POSIX 1003.1b 5.3.3 - Set File Creation Mask

cpukit/posix/src/adjtime.c

@@ -22,13 +22,11 @@
 #include <sys/time.h>
 #include <errno.h>
 
-#include <rtems/system.h>
+#include <rtems/score/timespec.h>
+#include <rtems/score/threaddispatch.h>
+#include <rtems/score/tod.h>
 #include <rtems/config.h>
 #include <rtems/seterr.h>
-#include <rtems/score/tod.h>
-#include <rtems/posix/time.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/timespec.h>
 
 /**
  * This method was initially added as part of porting NTP to RTEMS.

cpukit/posix/src/clocksettime.c

@@ -21,11 +21,8 @@
 #include <time.h>
 #include <errno.h>
 
-#include <rtems/system.h>
+#include <rtems/score/threaddispatch.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
 #include <rtems/score/tod.h>
-
 #include <rtems/seterr.h>
 
 /*

cpukit/rtems/src/clockset.c

@@ -18,14 +18,10 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/config.h>
-#include <rtems/rtems/status.h>
 #include <rtems/rtems/clock.h>
-#include <rtems/score/isr.h>
+#include <rtems/score/threaddispatch.h>
-#include <rtems/score/thread.h>
 #include <rtems/score/tod.h>
-#include <rtems/score/watchdog.h>
+#include <rtems/config.h>
 
 rtems_status_code rtems_clock_set(
   const rtems_time_of_day *tod

cpukit/rtems/src/eventreceive.c

@@ -21,6 +21,7 @@
 #include <rtems/rtems/eventimpl.h>
 #include <rtems/rtems/tasks.h>
 #include <rtems/score/statesimpl.h>
+#include <rtems/score/threaddispatch.h>
 
 rtems_status_code rtems_event_receive(
   rtems_event_set  event_in,

cpukit/rtems/src/semcreate.c

@@ -28,7 +28,7 @@
 #include <rtems/rtems/semimpl.h>
 #include <rtems/score/coremuteximpl.h>
 #include <rtems/score/coresemimpl.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/sysstate.h>
 
 #include <rtems/score/interr.h>

cpukit/rtems/src/signalcatch.c

@@ -18,16 +18,12 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/rtems/asrimpl.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/asr.h>
-#include <rtems/score/isr.h>
-#include <rtems/rtems/modes.h>
 #include <rtems/rtems/signal.h>
-#include <rtems/score/thread.h>
+#include <rtems/rtems/asrimpl.h>
-#include <rtems/score/apiext.h>
 #include <rtems/rtems/tasks.h>
+#include <rtems/score/apiext.h>
+#include <rtems/score/isrlevel.h>
+#include <rtems/score/threaddispatch.h>
 
 static void _RTEMS_signal_Post_switch_hook( Thread_Control *executing )
 {

cpukit/rtems/src/systemeventreceive.c

@@ -27,6 +27,7 @@
 #include <rtems/rtems/eventimpl.h>
 #include <rtems/rtems/tasks.h>
 #include <rtems/score/statesimpl.h>
+#include <rtems/score/threaddispatch.h>
 
 rtems_status_code rtems_event_system_receive(
   rtems_event_set  event_in,

cpukit/rtems/src/workspacegreedy.c

@@ -24,8 +24,9 @@
 #endif
 
 #include <rtems/rtems/support.h>
-#include <rtems/score/wkspace.h>
 #include <rtems/score/heapimpl.h>
+#include <rtems/score/threaddispatch.h>
+#include <rtems/score/wkspace.h>
 
 void *rtems_workspace_greedy_allocate(
   const uintptr_t *block_sizes,

cpukit/sapi/src/ioregisterdriver.c

@@ -21,10 +21,9 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/io.h>
 #include <rtems/rtems/intr.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 
 static inline bool rtems_io_is_empty_table(
   const rtems_driver_address_table *table

cpukit/sapi/src/iounregisterdriver.c

@@ -19,10 +19,10 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/io.h>
 #include <rtems/rtems/intr.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
+
 #include <string.h>
 
 rtems_status_code rtems_io_unregister_driver(

cpukit/score/cpu/arm/armv7m-isr-enter-leave.c

@@ -23,7 +23,8 @@
 #endif
 
 #include <rtems/score/armv7m.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/threaddispatch.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 

cpukit/score/cpu/lm32/irq.c

@@ -17,11 +17,9 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/score/cpu.h>
-#include <rtems/score/thread.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/percpu.h>
+#include <rtems/score/threaddispatch.h>
 
 #if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
   unsigned long    *_old_stack_ptr;

cpukit/score/include/rtems/score/coresemimpl.h

@@ -20,6 +20,7 @@
 #define _RTEMS_SCORE_CORESEMIMPL_H
 
 #include <rtems/score/coresem.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/threadqimpl.h>
 
 #ifdef __cplusplus

cpukit/score/src/pheapwalk.c

@@ -19,8 +19,8 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/protectedheap.h>
+#include <rtems/score/threaddispatch.h>
 
 bool _Protected_heap_Walk(
   Heap_Control *the_heap,

cpukit/score/src/threadenabledispatch.c

@@ -22,11 +22,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
-
-#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
-  #include <rtems/score/timestamp.h>
-#endif
 
 #if defined (__THREAD_DO_NOT_INLINE_ENABLE_DISPATCH__ )
 void _Thread_Enable_dispatch( void )