diff --git a/apps/shell/include/shell_pri.h b/apps/shell/include/shell_pri.h
index 8e5ab6f6458a49b5c1f1b909385c3a47fa98aac4..e1a47f1d030ae1143630dc88325a5833f98db03c 100644
--- a/apps/shell/include/shell_pri.h
+++ b/apps/shell/include/shell_pri.h
@@ -32,10 +32,6 @@
 #ifndef _SHELL_PRI_H
 #define _SHELL_PRI_H
 
-#include "sys/types.h"
-#include "bits/alltypes.h"
-#include "shcmd.h"
-
 #ifdef __cplusplus
 #if __cplusplus
 extern "C" {
diff --git a/apps/shell/include/sherr.h b/apps/shell/include/sherr.h
index a560a740721eacc0e928eca02c55056ab903e5af..9645a97bcceeedc4315cd441a334086f52b7f8a5 100644
--- a/apps/shell/include/sherr.h
+++ b/apps/shell/include/sherr.h
@@ -32,9 +32,6 @@
 #ifndef _SHERR_H
 #define _SHERR_H
 
-#include "sys/types.h"
-#include "bits/alltypes.h"
-
 #ifdef __cplusplus
 #if __cplusplus
 extern "C" {
diff --git a/testsuites/unittest/common/include/osTest.h b/testsuites/unittest/common/include/osTest.h
index c902d829f30520aad1869b0c9568a70f12b2b49e..9e3d8b59ec054e151a1069ab33737beee42491ed 100644
--- a/testsuites/unittest/common/include/osTest.h
+++ b/testsuites/unittest/common/include/osTest.h
@@ -47,7 +47,6 @@
 #include <errno.h>
 #include <stdint.h>
 #include <stdarg.h>
-#include <bits/alltypes.h>
 #include <sys/prctl.h>
 #include <time.h>
 #include <search.h>
diff --git a/testsuites/unittest/process/process/it_test_process.h b/testsuites/unittest/process/process/it_test_process.h
index 67de1df2b87d8a4f59400b033ebbd30e8a9a7af8..19803d4a9fb298ed243171d173d31def0335a81c 100644
--- a/testsuites/unittest/process/process/it_test_process.h
+++ b/testsuites/unittest/process/process/it_test_process.h
@@ -36,7 +36,7 @@
 #include "sys/wait.h"
 
 #define WAIT_PARENT_FIRST_TO_RUN(tick) usleep((tick)*10 * 1000) // 10, 1000, wait time.
-#include "bits/syscall.h"
+#include "sys/syscall.h"
 
 static inline int Syscall(int nbr, int parm1, int parm2, int parm3, int parm4)
 {
diff --git a/testsuites/unittest/process/pthread/it_pthread_test.h b/testsuites/unittest/process/pthread/it_pthread_test.h
index 5a285732c7e02c5de8802a22918eed2fcfd56f76..5b148e0192f5f3988e167f847fd31131529275d1 100644
--- a/testsuites/unittest/process/pthread/it_pthread_test.h
+++ b/testsuites/unittest/process/pthread/it_pthread_test.h
@@ -38,7 +38,7 @@
 
 #define SLEEP_AND_YIELD(tick) usleep((tick)*10 * 1000)
 
-#include "bits/syscall.h"
+#include "sys/syscall.h"
 
 static inline int Syscall(int nbr, int parm1, int parm2, int parm3, int parm4)
 {
diff --git a/testsuites/unittest/process/pthread/smoke/pthread_test_011.cpp b/testsuites/unittest/process/pthread/smoke/pthread_test_011.cpp
index c82699319fbafb81ac85aa7ff7fb01e30dc08518..ac1ffd50d0ab86e73eb574d5a65e8cdbfb7a3e49 100644
--- a/testsuites/unittest/process/pthread/smoke/pthread_test_011.cpp
+++ b/testsuites/unittest/process/pthread/smoke/pthread_test_011.cpp
@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "it_pthread_test.h"
-#include "bits/syscall.h"
+#include "sys/syscall.h"
 
 void child1(void)
 {