diff --git a/tests/basic/logchecks.c b/tests/basic/logchecks.c
index 9e3621ee043..665a0ec17be 100644
--- a/tests/basic/logchecks.c
+++ b/tests/basic/logchecks.c
@@ -10,6 +10,7 @@
 
 #include <stdio.h>
 #include <unistd.h>
+#include <sys/sysmacros.h>
 
 #include <glusterfs/glusterfs.h>
 #include <glusterfs/globals.h>
diff --git a/tests/bugs/distribute/bug-1193636.c b/tests/bugs/distribute/bug-1193636.c
index ea3f79a4e06..ac995e017d9 100644
--- a/tests/bugs/distribute/bug-1193636.c
+++ b/tests/bugs/distribute/bug-1193636.c
@@ -4,6 +4,7 @@
 #include <sys/xattr.h>
 #include <fcntl.h>
 #include <string.h>
+#include <unistd.h>
 
 #define MY_XATTR_NAME "user.ftest"
 #define MY_XATTR_VAL "ftestval"
diff --git a/tests/bugs/fuse/bug-1126048.c b/tests/bugs/fuse/bug-1126048.c
index 19165ecf6f7..69f093f92f1 100644
--- a/tests/bugs/fuse/bug-1126048.c
+++ b/tests/bugs/fuse/bug-1126048.c
@@ -5,6 +5,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
+#include <stdlib.h>
 
 /*
  * This function opens a file and to trigger migration failure, unlinks the
diff --git a/tests/bugs/protocol/bug-808400-fcntl.c b/tests/bugs/protocol/bug-808400-fcntl.c
index 1b64636f18c..fb4984d44fb 100644
--- a/tests/bugs/protocol/bug-808400-fcntl.c
+++ b/tests/bugs/protocol/bug-808400-fcntl.c
@@ -6,10 +6,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/wait.h>
-
-#ifndef linux
-#define fstat64(fd, st) fstat(fd, st)
-#endif
+#include <stdlib.h>
+#include <unistd.h>
 
 int
 run_child(char *filename)
@@ -97,9 +95,9 @@ main(int argc, char *argv[])
     system(cmd);
 
     /* wait till graph switch completes */
-    ret = fstat64(fd, &stbuf);
+    ret = fstat(fd, &stbuf);
     if (ret < 0) {
-        fprintf(stderr, "fstat64 failure (%s)\n", strerror(errno));
+        fprintf(stderr, "fstat failure (%s)\n", strerror(errno));
         goto out;
     }
 
diff --git a/tests/bugs/protocol/bug-808400-flock.c b/tests/bugs/protocol/bug-808400-flock.c
index 54a507cc227..8e2d363671d 100644
--- a/tests/bugs/protocol/bug-808400-flock.c
+++ b/tests/bugs/protocol/bug-808400-flock.c
@@ -6,10 +6,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/wait.h>
-
-#ifndef linux
-#define fstat64(fd, st) fstat(fd, st)
-#endif
+#include <stdlib.h>
+#include <unistd.h>
 
 int
 run_child(char *filename)
@@ -71,9 +69,9 @@ main(int argc, char *argv[])
     system(cmd);
 
     /* wait till graph switch completes */
-    ret = fstat64(fd, &stbuf);
+    ret = fstat(fd, &stbuf);
     if (ret < 0) {
-        fprintf(stderr, "fstat64 failure (%s)\n", strerror(errno));
+        fprintf(stderr, "fstat failure (%s)\n", strerror(errno));
         goto out;
     }
 
diff --git a/tests/bugs/write-behind/bug-1058663.c b/tests/bugs/write-behind/bug-1058663.c
index aedf97d7487..b0e767498c7 100644
--- a/tests/bugs/write-behind/bug-1058663.c
+++ b/tests/bugs/write-behind/bug-1058663.c
@@ -5,6 +5,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <signal.h>
+#include <unistd.h>
 
 #define FILE_SIZE 1048576
 
diff --git a/tests/bugs/write-behind/bug-1279730.c b/tests/bugs/write-behind/bug-1279730.c
index 706ae67b102..b8f334aa5c3 100644
--- a/tests/bugs/write-behind/bug-1279730.c
+++ b/tests/bugs/write-behind/bug-1279730.c
@@ -6,6 +6,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <assert.h>
+#include <stdlib.h>
 
 int
 main(int argc, char *argv[])
diff --git a/tests/utils/ip-in-cidr.c b/tests/utils/ip-in-cidr.c
index 85effada499..38a65ea89c2 100644
--- a/tests/utils/ip-in-cidr.c
+++ b/tests/utils/ip-in-cidr.c
@@ -6,6 +6,7 @@
 #include <netinet/in.h>
 #include <errno.h>
 #include <netdb.h>
+#include <arpa/inet.h>
 
 int
 gf_is_ip_in_net(const char *network, const char *ip_str)