diff --git a/server/include/log.h b/server/include/log.h
index 01db2b165..bde122b48 100644
--- a/server/include/log.h
+++ b/server/include/log.h
@@ -10,6 +10,7 @@
 #ifndef _LOG_H_
 #define _LOG_H_
 
+#include <stdarg.h>
 #include <libconfig.h>
 
 #ifdef __GNUC__
diff --git a/server/include/timing.h b/server/include/timing.h
index 3a8fbccc9..ce52e09a7 100644
--- a/server/include/timing.h
+++ b/server/include/timing.h
@@ -10,9 +10,11 @@
 #ifndef _TIME_H_
 #define _TIME_H_
 
-#include <time.h>
 #include <stdio.h>
 #include <stdint.h>
+	
+#include <time.h>
+#include <sys/timerfd.h>
 
 /** Wait until timer elapsed
  *
diff --git a/server/include/utils.h b/server/include/utils.h
index 8ffadbb8a..142148022 100644
--- a/server/include/utils.h
+++ b/server/include/utils.h
@@ -11,12 +11,7 @@
 #define _UTILS_H_
 
 #include <stdlib.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <errno.h>
 #include <sched.h>
-#include <string.h>
-#include <sys/types.h>
 
 #include "log.h"
 
diff --git a/server/src/cfg.c b/server/src/cfg.c
index 848ccd4e1..dde9fc37f 100644
--- a/server/src/cfg.c
+++ b/server/src/cfg.c
@@ -6,10 +6,8 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited. 
  *********************************************************************************/
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <netdb.h>
 
 #include "utils.h"
 #include "list.h"
@@ -21,7 +19,7 @@
 #include "hooks.h"
 
 #include "socket.h"
-
+#include "file.h"
 #ifdef ENABLE_GTFPGA
  #include "gtfpga.h"
 #endif
diff --git a/server/src/file.c b/server/src/file.c
index 80682a2b6..53f4f3c4e 100644
--- a/server/src/file.c
+++ b/server/src/file.c
@@ -9,7 +9,6 @@
  *********************************************************************************/
 
 #include <unistd.h>
-#include <sys/timerfd.h>
 
 #include "file.h"
 #include "utils.h"
diff --git a/server/src/gtfpga.c b/server/src/gtfpga.c
index f2ac1a468..e5cf42dd7 100644
--- a/server/src/gtfpga.c
+++ b/server/src/gtfpga.c
@@ -8,11 +8,11 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited. 
  *********************************************************************************/
 
+#include <stdio.h>
 #include <inttypes.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include <sys/timerfd.h>
 
 #include "gtfpga.h"
 #include "utils.h"
diff --git a/server/src/hist.c b/server/src/hist.c
index ae3b04865..34e651d3a 100644
--- a/server/src/hist.c
+++ b/server/src/hist.c
@@ -8,7 +8,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <limits.h>
+#include <string.h>
 #include <float.h>
 #include <math.h>
 #include <time.h>
diff --git a/server/src/hooks.c b/server/src/hooks.c
index 9c4737232..ec0330cb8 100644
--- a/server/src/hooks.c
+++ b/server/src/hooks.c
@@ -12,8 +12,6 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited. 
  *********************************************************************************/
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <time.h>
 
diff --git a/server/src/if.c b/server/src/if.c
index 0027e8bd7..24431b3c2 100644
--- a/server/src/if.c
+++ b/server/src/if.c
@@ -12,8 +12,6 @@
 #include <dirent.h>
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/ip.h>
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <linux/if_packet.h>
diff --git a/server/src/log.c b/server/src/log.c
index 914999da9..166cc60af 100644
--- a/server/src/log.c
+++ b/server/src/log.c
@@ -7,7 +7,9 @@
  *********************************************************************************/
 
 #include <stdio.h>
+#include <string.h>
 #include <time.h>
+#include <errno.h>
 
 #include "log.h"
 #include "utils.h"
diff --git a/server/src/msg.c b/server/src/msg.c
index c224d2483..b3cf507e3 100644
--- a/server/src/msg.c
+++ b/server/src/msg.c
@@ -8,7 +8,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <ctype.h>
 
 #ifdef __linux__
diff --git a/server/src/path.c b/server/src/path.c
index e02a145b6..8abcea199 100644
--- a/server/src/path.c
+++ b/server/src/path.c
@@ -6,13 +6,8 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited. 
  *********************************************************************************/
 
-#include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
-
-#include <sys/timerfd.h>
-#include <sys/syscall.h>
 
 #include "utils.h"
 #include "path.h"
diff --git a/server/src/random.c b/server/src/random.c
index 735b55282..3f4d4c78a 100644
--- a/server/src/random.c
+++ b/server/src/random.c
@@ -10,10 +10,7 @@
  * @{
  **********************************************************************************/
 
-#include <stdlib.h>
 #include <unistd.h>
-#include <time.h>
-#include <sys/timerfd.h>
 
 #include "config.h"
 #include "utils.h"
diff --git a/server/src/receive.c b/server/src/receive.c
index 8b311b94c..83ca18afd 100644
--- a/server/src/receive.c
+++ b/server/src/receive.c
@@ -11,16 +11,9 @@
  *********************************************************************************/
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <string.h>
-#include <errno.h>
 #include <signal.h>
-#include <time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 
 #include "config.h"
 #include "cfg.h"
diff --git a/server/src/send.c b/server/src/send.c
index 564d00b2e..21da65e3f 100644
--- a/server/src/send.c
+++ b/server/src/send.c
@@ -11,17 +11,9 @@
  *********************************************************************************/
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <string.h>
-#include <errno.h>
 #include <signal.h>
-#include <time.h>
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 
 #include "config.h"
 #include "cfg.h"
diff --git a/server/src/server.c b/server/src/server.c
index 7997336e0..e4d708e58 100644
--- a/server/src/server.c
+++ b/server/src/server.c
@@ -7,13 +7,11 @@
  *********************************************************************************/
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
 #include <sched.h>
 #include <signal.h>
 #include <unistd.h>
-#include <sys/stat.h>
 
 #include "config.h"
 #include "utils.h"
diff --git a/server/src/socket.c b/server/src/socket.c
index d493b7d27..981e84319 100644
--- a/server/src/socket.c
+++ b/server/src/socket.c
@@ -10,21 +10,22 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited. 
  *********************************************************************************/
 
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <poll.h>
+#include <netdb.h>
+#include <arpa/inet.h>
 
 #include <linux/if_packet.h>
 #include <net/if.h>
 #include <net/ethernet.h>
-#include <arpa/inet.h>
+
 #include <netinet/ip.h>
 #include <netinet/ether.h>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <netdb.h>
 
 #include "config.h"
 #include "utils.h"
diff --git a/server/src/tc.c b/server/src/tc.c
index 00d62a870..1845b5f6b 100644
--- a/server/src/tc.c
+++ b/server/src/tc.c
@@ -8,10 +8,6 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited. 
  *********************************************************************************/
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-
 #include "utils.h"
 #include "if.h"
 #include "tc.h"
diff --git a/server/src/test.c b/server/src/test.c
index ce92145fd..eac5fb406 100644
--- a/server/src/test.c
+++ b/server/src/test.c
@@ -7,16 +7,10 @@
  *********************************************************************************/
 
 #include <stdlib.h>
-#include <signal.h>
-#include <time.h>
-#include <unistd.h>
-#include <errno.h>
 #include <string.h>
-#include <limits.h>
-#include <arpa/inet.h>
-#include <netdb.h>
+#include <signal.h>
+#include <unistd.h>
 #include <ctype.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 
 #include "config.h"
diff --git a/server/src/utils.c b/server/src/utils.c
index 9d3e55409..8598637a2 100644
--- a/server/src/utils.c
+++ b/server/src/utils.c
@@ -10,18 +10,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <unistd.h>
-#include <netdb.h>
 #include <math.h>
 #include <signal.h>
 #include <pthread.h>
-#include <fstab.h>
-
-#ifdef ENABLE_OPAL_ASYNC
- #define RTLAB
- #include <OpalPrint.h>
-#endif
 
 #include "config.h"
 #include "cfg.h"