diff --git a/src/Platform_unix.cpp b/src/Platform_unix.cpp
index ecccc49e..9d818ea0 100644
--- a/src/Platform_unix.cpp
+++ b/src/Platform_unix.cpp
@@ -22,8 +22,8 @@
  */
 
 #include <sched.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstring>
+#include <string>
 #include <sys/resource.h>
 #include <uv.h>
 
diff --git a/src/Summary.cpp b/src/Summary.cpp
index 9b1b6e94..c47eec9c 100644
--- a/src/Summary.cpp
+++ b/src/Summary.cpp
@@ -22,6 +22,7 @@
  */
 
 
+#include <string>
 #include <inttypes.h>
 #include <uv.h>
 
diff --git a/src/cc/Summary.cpp b/src/cc/Summary.cpp
index f6a13d3b..4c3cc784 100644
--- a/src/cc/Summary.cpp
+++ b/src/cc/Summary.cpp
@@ -23,6 +23,7 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <string>
 #include <uv.h>
 
 #include "log/Log.h"
diff --git a/src/log/SysLog.cpp b/src/log/SysLog.cpp
index f9b16cca..11988214 100644
--- a/src/log/SysLog.cpp
+++ b/src/log/SysLog.cpp
@@ -23,6 +23,7 @@
 
 
 #include <syslog.h>
+#include <string>
 
 
 #include "log/SysLog.h"
diff --git a/src/version.h b/src/version.h
index ec19a1b5..61161c84 100644
--- a/src/version.h
+++ b/src/version.h
@@ -62,7 +62,6 @@
 #   endif
 #endif
 
-#include <string>
 
 class Version
 {