diff --git a/cpukit/include/rtems/stackchk.h b/cpukit/include/rtems/stackchk.h
index 03d342b918..02d6753b33 100644
--- a/cpukit/include/rtems/stackchk.h
+++ b/cpukit/include/rtems/stackchk.h
@@ -39,7 +39,6 @@
 
 #include <rtems.h>
 #include <rtems/print.h>
-#include <rtems/score/threadimpl.h>
 
 /**
  *  @defgroup libmisc_stackchk Stack Checker Mechanism
@@ -215,7 +214,7 @@ void rtems_stack_checker_switch_extension(
  */
  
 void rtems_stack_checker_reporter_quiet(
-  const Thread_Control *running,
+  const rtems_tcb *running,
   bool pattern_ok
 );
 
@@ -229,7 +228,7 @@ void rtems_stack_checker_reporter_quiet(
  *                       still valid or not
  */
 void rtems_stack_checker_reporter_print_details(
-  const Thread_Control *running,
+  const rtems_tcb *running,
   bool pattern_ok
 );
 
@@ -262,7 +261,7 @@ void rtems_stack_checker_reporter_print_details(
  *                       still valid or not.
  */
 typedef void (*Stack_checker_Reporter_handler)(
-  const Thread_Control *running,
+  const rtems_tcb *running,
   bool pattern_ok
 );
 
diff --git a/cpukit/libmisc/shell/main_stackuse.c b/cpukit/libmisc/shell/main_stackuse.c
index 66ab863934..625f4334c6 100644
--- a/cpukit/libmisc/shell/main_stackuse.c
+++ b/cpukit/libmisc/shell/main_stackuse.c
@@ -19,6 +19,7 @@
 #include <rtems/printer.h>
 #include <rtems/stackchk.h>
 #include <rtems/shell.h>
+#include <rtems/score/threadimpl.h>
 #include "internal.h"
 
 static int rtems_shell_main_stackuse(