4 files changed, 5 insertions, 8 deletions
diff --git a/cpukit/libcsupport/src/malloc_deferred.c b/cpukit/libcsupport/src/malloc_deferred.c
index 9e6fbb3bf8..e085484941 100644
--- a/cpukit/libcsupport/src/malloc_deferred.c
+++ b/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)
diff --git a/cpukit/libcsupport/src/privateenv.c b/cpukit/libcsupport/src/privateenv.c
index f5fd67db95..6e9ba3b62c 100644
--- a/cpukit/libcsupport/src/privateenv.c
+++ b/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.
diff --git a/cpukit/libcsupport/src/sup_fs_location.c b/cpukit/libcsupport/src/sup_fs_location.c
index b4713c554c..dc4b665b0d 100644
--- a/cpukit/libcsupport/src/sup_fs_location.c
+++ b/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;
 
diff --git a/cpukit/libcsupport/src/umask.c b/cpukit/libcsupport/src/umask.c
index 1a5daa51cd..a35acbe2af 100644
--- a/cpukit/libcsupport/src/umask.c
+++ b/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