diff --git a/include/common.h b/include/common.h
index 7c6c030..e691b0b 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,7 +1,7 @@
 #ifndef _COMMON_H_
 #define _COMMON_H_
 
-#define VERSION "0.9.4"
+#define VERSION "0.9.5"
 
 #define RANDOM_PORT_START 41952
 #define RANDOM_PORT_END   65535
diff --git a/include/utils/logger.h b/include/utils/logger.h
index a555e41..48ecc04 100644
--- a/include/utils/logger.h
+++ b/include/utils/logger.h
@@ -1,10 +1,6 @@
 #ifndef _LOG_H
 #define _LOG_H
 
-#include <time.h>
-#include <stdio.h>
-#include <stdarg.h>
-
 enum {
     LOG_DEBUG,
     LOG_INFO,
diff --git a/src/common.c b/src/common.c
index fbda24d..35640a4 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "logger.h"
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
index dcb9334..cfd80e2 100644
--- a/src/utils/CMakeLists.txt
+++ b/src/utils/CMakeLists.txt
@@ -1,4 +1,4 @@
 cmake_minimum_required(VERSION 2.8.12)
 
-aux_source_directory(. utils_src)
+aux_source_directory(${PROJECT_SOURCE_DIR}/src/utils utils_src)
 add_library(utils ${utils_src})
diff --git a/src/utils/logger.c b/src/utils/logger.c
index ef4ea45..73b68b5 100644
--- a/src/utils/logger.c
+++ b/src/utils/logger.c
@@ -1,4 +1,7 @@
+#include <time.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include "logger.h"
 
 int LOG_LEVEL = LOG_INFO; // default log level
diff --git a/src/utils/network.c b/src/utils/network.c
index d28b9e1..cb118b4 100644
--- a/src/utils/network.c
+++ b/src/utils/network.c
@@ -1,11 +1,9 @@
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <pthread.h>
 #include <sys/time.h>
 #include <arpa/inet.h>
-#include <netinet/in.h>
 #include "network.h"
 #include "logger.h"