diff --git a/testcases/kernel/fs/ext4-new-features/ext4-inode-version/ext4_test_inode_version.c b/testcases/kernel/fs/ext4-new-features/ext4-inode-version/ext4_test_inode_version.c
index 533f694..1f7647b 100644
--- a/testcases/kernel/fs/ext4-new-features/ext4-inode-version/ext4_test_inode_version.c
+++ b/testcases/kernel/fs/ext4-new-features/ext4-inode-version/ext4_test_inode_version.c
@@ -21,7 +21,7 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/testcases/kernel/fs/fs_perms/fs_perms.c b/testcases/kernel/fs/fs_perms/fs_perms.c
index 04f578e..e8c5f53 100644
--- a/testcases/kernel/fs/fs_perms/fs_perms.c
+++ b/testcases/kernel/fs/fs_perms/fs_perms.c
@@ -39,7 +39,7 @@
 #include <sys/types.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <linux/limits.h>
 
 #include "test.h"
diff --git a/testcases/kernel/fs/inode/inode02.c b/testcases/kernel/fs/inode/inode02.c
index 11a7f5d..0e42085 100644
--- a/testcases/kernel/fs/inode/inode02.c
+++ b/testcases/kernel/fs/inode/inode02.c
@@ -58,7 +58,7 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <wait.h>
+#include <sys/wait.h>
 
 #ifdef LINUX
 #include <stdlib.h>
diff --git a/testcases/kernel/mem/hugetlb/lib/hugetlb.h b/testcases/kernel/mem/hugetlb/lib/hugetlb.h
index bf2e1ed..6b5c61e 100644
--- a/testcases/kernel/mem/hugetlb/lib/hugetlb.h
+++ b/testcases/kernel/mem/hugetlb/lib/hugetlb.h
@@ -27,7 +27,7 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <errno.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include "test.h"
 
 #define SHM_RD	0400
diff --git a/testcases/kernel/sched/sched_stress/sched.h b/testcases/kernel/sched/sched_stress/sched.h
index c2830c5..8ed941e 100644
--- a/testcases/kernel/sched/sched_stress/sched.h
+++ b/testcases/kernel/sched/sched_stress/sched.h
@@ -38,7 +38,7 @@
 
 #include <sys/types.h>
 #include <unistd.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <string.h>
 #include <stdlib.h>
 #include <signal.h>
diff --git a/testcases/kernel/sched/sched_stress/sched_driver.c b/testcases/kernel/sched/sched_stress/sched_driver.c
index 3de7d5f..61573d7 100644
--- a/testcases/kernel/sched/sched_stress/sched_driver.c
+++ b/testcases/kernel/sched/sched_stress/sched_driver.c
@@ -63,7 +63,7 @@
 
 #include <sys/types.h>
 #include <unistd.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <string.h>
 #include <stdlib.h>
 #include <signal.h>
diff --git a/testcases/kernel/syscalls/ftruncate/ftruncate04.c b/testcases/kernel/syscalls/ftruncate/ftruncate04.c
index b10c6dd..d4fe691 100644
--- a/testcases/kernel/syscalls/ftruncate/ftruncate04.c
+++ b/testcases/kernel/syscalls/ftruncate/ftruncate04.c
@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <inttypes.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/testcases/kernel/syscalls/getpgid/getpgid01.c b/testcases/kernel/syscalls/getpgid/getpgid01.c
index 1f5b0f9..9af523d 100644
--- a/testcases/kernel/syscalls/getpgid/getpgid01.c
+++ b/testcases/kernel/syscalls/getpgid/getpgid01.c
@@ -46,7 +46,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <stdarg.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <sys/types.h>
 #include "test.h"
 
diff --git a/testcases/kernel/syscalls/getpgid/getpgid02.c b/testcases/kernel/syscalls/getpgid/getpgid02.c
index 65ce049..92482e3 100644
--- a/testcases/kernel/syscalls/getpgid/getpgid02.c
+++ b/testcases/kernel/syscalls/getpgid/getpgid02.c
@@ -48,7 +48,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <stdarg.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <sys/types.h>
 #include "test.h"
 
diff --git a/testcases/kernel/syscalls/getsid/getsid01.c b/testcases/kernel/syscalls/getsid/getsid01.c
index 5d5282b..0857468 100644
--- a/testcases/kernel/syscalls/getsid/getsid01.c
+++ b/testcases/kernel/syscalls/getsid/getsid01.c
@@ -58,7 +58,7 @@
 #define _GNU_SOURCE 1
 
 #include <errno.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <unistd.h>
 #include "test.h"
 
diff --git a/testcases/kernel/syscalls/ioctl/ioctl02.c b/testcases/kernel/syscalls/ioctl/ioctl02.c
index 6c9ea98..c564823 100644
--- a/testcases/kernel/syscalls/ioctl/ioctl02.c
+++ b/testcases/kernel/syscalls/ioctl/ioctl02.c
@@ -61,7 +61,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <errno.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
diff --git a/testcases/kernel/syscalls/ipc/lib/ipcshm.h b/testcases/kernel/syscalls/ipc/lib/ipcshm.h
index 70903ca..08307d4 100644
--- a/testcases/kernel/syscalls/ipc/lib/ipcshm.h
+++ b/testcases/kernel/syscalls/ipc/lib/ipcshm.h
@@ -25,7 +25,7 @@
 #define __IPCSHM_H
 
 #include <errno.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
 
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl07.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl07.c
index a05f94a..9be3cd4 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl07.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl07.c
@@ -39,7 +39,7 @@
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <signal.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <stdio.h>
 #include "test.h"
 #include "ipcmsg.h"
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl06.c b/testcases/kernel/syscalls/ipc/semctl/semctl06.c
index c298345..14af1af 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl06.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl06.c
@@ -57,7 +57,7 @@
 #include <stdlib.h>
 #include <signal.h>
 #include "test.h"
-#include <wait.h>
+#include <sys/wait.h>
 #include "ipcsem.h"
 
 int local_flag = 1;
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl07.c b/testcases/kernel/syscalls/ipc/semctl/semctl07.c
index 3cc1eff..6e1bbf6 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl07.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl07.c
@@ -44,7 +44,7 @@
 #include <signal.h>
 #include <errno.h>
 #include <stdio.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include "ipcsem.h"
 #include "test.h"
 
diff --git a/testcases/kernel/syscalls/mkdir/mkdir09.c b/testcases/kernel/syscalls/mkdir/mkdir09.c
index 07b4fb8..de1cb69 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir09.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir09.c
@@ -42,7 +42,7 @@
  */
 
 #include <stdio.h>		/* needed by testhead.h         */
-#include <wait.h>		/* needed by testhead.h         */
+#include <sys/wait.h>		/* needed by testhead.h         */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/testcases/kernel/syscalls/mprotect/mprotect03.c b/testcases/kernel/syscalls/mprotect/mprotect03.c
index c53932d..4bda261 100644
--- a/testcases/kernel/syscalls/mprotect/mprotect03.c
+++ b/testcases/kernel/syscalls/mprotect/mprotect03.c
@@ -43,7 +43,7 @@
 #include <sys/mman.h>
 #include <limits.h>
 #include <signal.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include "test.h"
 
 #include "safe_macros.h"
diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep02.c b/testcases/kernel/syscalls/nanosleep/nanosleep02.c
index 2da8937..8ee22b4 100644
--- a/testcases/kernel/syscalls/nanosleep/nanosleep02.c
+++ b/testcases/kernel/syscalls/nanosleep/nanosleep02.c
@@ -30,7 +30,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <time.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <sys/time.h>
 #include <stdint.h>
 #include <inttypes.h>
diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep03.c b/testcases/kernel/syscalls/nanosleep/nanosleep03.c
index 2c9af6e..291396b 100644
--- a/testcases/kernel/syscalls/nanosleep/nanosleep03.c
+++ b/testcases/kernel/syscalls/nanosleep/nanosleep03.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <time.h>
-#include <wait.h>
+#include <sys/wait.h>
 
 #include "test.h"
 
diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep04.c b/testcases/kernel/syscalls/nanosleep/nanosleep04.c
index 527ad14..f5108d0 100644
--- a/testcases/kernel/syscalls/nanosleep/nanosleep04.c
+++ b/testcases/kernel/syscalls/nanosleep/nanosleep04.c
@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <time.h>
 
 #include "test.h"
diff --git a/testcases/kernel/syscalls/pause/pause02.c b/testcases/kernel/syscalls/pause/pause02.c
index 0e862a1..2d42a59 100644
--- a/testcases/kernel/syscalls/pause/pause02.c
+++ b/testcases/kernel/syscalls/pause/pause02.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <wait.h>
+#include <sys/wait.h>
 
 #include "test.h"
 
diff --git a/testcases/kernel/syscalls/pause/pause03.c b/testcases/kernel/syscalls/pause/pause03.c
index f3565e3..b1503fc 100644
--- a/testcases/kernel/syscalls/pause/pause03.c
+++ b/testcases/kernel/syscalls/pause/pause03.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <wait.h>
+#include <sys/wait.h>
 
 #include "test.h"
 #include "safe_macros.h"
diff --git a/testcases/kernel/syscalls/pipe/pipe09.c b/testcases/kernel/syscalls/pipe/pipe09.c
index 8c23573..226083b 100644
--- a/testcases/kernel/syscalls/pipe/pipe09.c
+++ b/testcases/kernel/syscalls/pipe/pipe09.c
@@ -48,7 +48,7 @@
  */
 #include <unistd.h>
 #include <signal.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <errno.h>
 #include "test.h"
 
diff --git a/testcases/kernel/syscalls/pipe/pipe10.c b/testcases/kernel/syscalls/pipe/pipe10.c
index 4aef369..48f722e 100644
--- a/testcases/kernel/syscalls/pipe/pipe10.c
+++ b/testcases/kernel/syscalls/pipe/pipe10.c
@@ -45,7 +45,7 @@
  */
 #include <errno.h>
 #include <unistd.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <string.h>
 #include "test.h"
 
diff --git a/testcases/kernel/syscalls/rename/rename14.c b/testcases/kernel/syscalls/rename/rename14.c
index 0d821ba..7e74c26 100644
--- a/testcases/kernel/syscalls/rename/rename14.c
+++ b/testcases/kernel/syscalls/rename/rename14.c
@@ -38,7 +38,7 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/testcases/kernel/syscalls/setpgid/setpgid03.c b/testcases/kernel/syscalls/setpgid/setpgid03.c
index 96ebe14..51e0eeb 100644
--- a/testcases/kernel/syscalls/setpgid/setpgid03.c
+++ b/testcases/kernel/syscalls/setpgid/setpgid03.c
@@ -28,7 +28,7 @@
  *            has performed exec()
  */
 
-#include <wait.h>
+#include <sys/wait.h>
 #include <limits.h>
 #include <signal.h>
 #include <errno.h>
diff --git a/testcases/kernel/syscalls/setpgrp/setpgrp02.c b/testcases/kernel/syscalls/setpgrp/setpgrp02.c
index 681223b..f1f6ce7 100644
--- a/testcases/kernel/syscalls/setpgrp/setpgrp02.c
+++ b/testcases/kernel/syscalls/setpgrp/setpgrp02.c
@@ -45,7 +45,7 @@
  *	None
  */
 #include <errno.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include "test.h"
 
 char *TCID = "setpgrp02";
diff --git a/testcases/kernel/syscalls/setreuid/setreuid06.c b/testcases/kernel/syscalls/setreuid/setreuid06.c
index 4771ea5..8dbeb20 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid06.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid06.c
@@ -22,7 +22,7 @@
  * Test that EPERM is set when setreuid is given an invalid user id.
  */
 
-#include <wait.h>
+#include <sys/wait.h>
 #include <limits.h>
 #include <signal.h>
 #include <errno.h>
diff --git a/testcases/kernel/syscalls/setsid/setsid01.c b/testcases/kernel/syscalls/setsid/setsid01.c
index ad5687c..ed8f0e4 100644
--- a/testcases/kernel/syscalls/setsid/setsid01.c
+++ b/testcases/kernel/syscalls/setsid/setsid01.c
@@ -30,7 +30,7 @@
  * RESTRICTIONS
  * 	This test doesn't follow good LTP format - PLEASE FIX!
  */
-#include <wait.h>
+#include <sys/wait.h>
 #include <limits.h>
 #include <signal.h>
 #include <errno.h>
diff --git a/testcases/kernel/syscalls/times/times03.c b/testcases/kernel/syscalls/times/times03.c
index 9234a63..f6f8323 100644
--- a/testcases/kernel/syscalls/times/times03.c
+++ b/testcases/kernel/syscalls/times/times03.c
@@ -48,7 +48,7 @@
 #include <sys/types.h>
 #include <sys/times.h>
 #include <errno.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <time.h>
 #include "test.h"
 #include <signal.h>
diff --git a/testcases/kernel/syscalls/utime/utime03.c b/testcases/kernel/syscalls/utime/utime03.c
index b2d6bf0..c595671 100644
--- a/testcases/kernel/syscalls/utime/utime03.c
+++ b/testcases/kernel/syscalls/utime/utime03.c
@@ -83,7 +83,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <utime.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <time.h>
diff --git a/testcases/kernel/syscalls/utime/utime06.c b/testcases/kernel/syscalls/utime/utime06.c
index 5a02f1e..2a97cce 100644
--- a/testcases/kernel/syscalls/utime/utime06.c
+++ b/testcases/kernel/syscalls/utime/utime06.c
@@ -44,7 +44,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <utime.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/mount.h>
diff --git a/testcases/kernel/syscalls/vfork/vfork02.c b/testcases/kernel/syscalls/vfork/vfork02.c
index 8ba75f8..aadc599 100644
--- a/testcases/kernel/syscalls/vfork/vfork02.c
+++ b/testcases/kernel/syscalls/vfork/vfork02.c
@@ -75,7 +75,7 @@
 #include <string.h>
 #include <signal.h>
 #include <sys/stat.h>
-#include <wait.h>
+#include <sys/wait.h>
 
 #include "test.h"
 
diff --git a/testcases/kernel/syscalls/vhangup/vhangup01.c b/testcases/kernel/syscalls/vhangup/vhangup01.c
index 4aeede8..c35dec2 100644
--- a/testcases/kernel/syscalls/vhangup/vhangup01.c
+++ b/testcases/kernel/syscalls/vhangup/vhangup01.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <pwd.h>
-#include <wait.h>
+#include <sys/wait.h>
 
 #include "test.h"
 #include "safe_macros.h"
diff --git a/testcases/kernel/syscalls/vhangup/vhangup02.c b/testcases/kernel/syscalls/vhangup/vhangup02.c
index 136b268..b6bca5d 100644
--- a/testcases/kernel/syscalls/vhangup/vhangup02.c
+++ b/testcases/kernel/syscalls/vhangup/vhangup02.c
@@ -44,7 +44,7 @@
 #include <sys/types.h>
 #include <errno.h>
 #include <pwd.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include "test.h"
 
 void setup(void);
diff --git a/testcases/kernel/syscalls/write/write05.c b/testcases/kernel/syscalls/write/write05.c
index 2969773..bcbe858 100644
--- a/testcases/kernel/syscalls/write/write05.c
+++ b/testcases/kernel/syscalls/write/write05.c
@@ -57,7 +57,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <stdio.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <sys/mman.h>
 #include "test.h"
 
diff --git a/testcases/misc/math/float/tfloat.h b/testcases/misc/math/float/tfloat.h
index fb0eda4..50cb73d 100644
--- a/testcases/misc/math/float/tfloat.h
+++ b/testcases/misc/math/float/tfloat.h
@@ -31,7 +31,7 @@
 #include <limits.h>
 #include <errno.h>
 #include <string.h>
-#include <wait.h>
+#include <sys/wait.h>
 /*extern char *sys_errlist[ ];*/
 
 #ifdef __MATH__