diff --git a/cpukit/posix/src/sigaddset.c b/cpukit/posix/src/sigaddset.c
index 5ac0fe0f17..5c65ab60eb 100644
--- a/cpukit/posix/src/sigaddset.c
+++ b/cpukit/posix/src/sigaddset.c
@@ -15,12 +15,10 @@
 #include "config.h"
 #endif
 
-#include <pthread.h>
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
-#include <rtems/posix/psignal.h>
+#include <rtems/posix/sigset.h>
 #include <rtems/seterr.h>
 
 int sigaddset(
diff --git a/cpukit/posix/src/sigdelset.c b/cpukit/posix/src/sigdelset.c
index be0135a7b5..856eb384df 100644
--- a/cpukit/posix/src/sigdelset.c
+++ b/cpukit/posix/src/sigdelset.c
@@ -15,12 +15,10 @@
 #include "config.h"
 #endif
 
-#include <pthread.h>
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
-#include <rtems/posix/psignal.h>
+#include <rtems/posix/sigset.h>
 #include <rtems/seterr.h>
 
 /*
diff --git a/cpukit/posix/src/sigemptyset.c b/cpukit/posix/src/sigemptyset.c
index a216ad7a8c..9a6d3580ca 100644
--- a/cpukit/posix/src/sigemptyset.c
+++ b/cpukit/posix/src/sigemptyset.c
@@ -15,12 +15,10 @@
 #include "config.h"
 #endif
 
-#include <pthread.h>
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
-#include <rtems/posix/psignal.h>
+#include <rtems/posix/sigset.h>
 #include <rtems/seterr.h>
 
 int sigemptyset(
diff --git a/cpukit/posix/src/sigfillset.c b/cpukit/posix/src/sigfillset.c
index dd8aa82c69..a67b9b9a3e 100644
--- a/cpukit/posix/src/sigfillset.c
+++ b/cpukit/posix/src/sigfillset.c
@@ -15,12 +15,10 @@
 #include "config.h"
 #endif
 
-#include <pthread.h>
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
-#include <rtems/posix/psignal.h>
+#include <rtems/posix/sigset.h>
 #include <rtems/seterr.h>
 
 int sigfillset(
diff --git a/cpukit/posix/src/sigismember.c b/cpukit/posix/src/sigismember.c
index 3bdd32b729..958c5336af 100644
--- a/cpukit/posix/src/sigismember.c
+++ b/cpukit/posix/src/sigismember.c
@@ -15,12 +15,10 @@
 #include "config.h"
 #endif
 
-#include <pthread.h>
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
-#include <rtems/posix/psignal.h>
+#include <rtems/posix/sigset.h>
 #include <rtems/seterr.h>
 
 int sigismember(
diff --git a/cpukit/posix/src/sigprocmask.c b/cpukit/posix/src/sigprocmask.c
index c149a39065..d096e54e21 100644
--- a/cpukit/posix/src/sigprocmask.c
+++ b/cpukit/posix/src/sigprocmask.c
@@ -19,11 +19,6 @@
 
 #include <pthread.h>
 #include <signal.h>
-#include <errno.h>
-
-#include <rtems/system.h>
-#include <rtems/posix/pthread.h>
-#include <rtems/posix/psignal.h>
 
 int sigprocmask(
   int               how,