5 files changed, 8 insertions, 8 deletions
diff --git a/lib/backupclient/BackupStoreFile.h b/lib/backupclient/BackupStoreFile.h
index 7bd75fa5..f38cd821 100644
--- a/lib/backupclient/BackupStoreFile.h
+++ b/lib/backupclient/BackupStoreFile.h
@@ -10,8 +10,7 @@
 #ifndef BACKUPSTOREFILE__H
 #define BACKUPSTOREFILE__H
 
-#include <stdlib.h>
-
+#include <cstdlib>
 #include <memory>
 
 #include "BackupClientFileAttributes.h"
diff --git a/lib/common/Logging.cpp b/lib/common/Logging.cpp
index 802f6a3b..d16b1514 100644
--- a/lib/common/Logging.cpp
+++ b/lib/common/Logging.cpp
@@ -10,7 +10,6 @@
 #include "Box.h"
 
 #include <errno.h>
-#include <string.h>
 #include <time.h>
 
 #ifdef HAVE_SYSLOG_H
@@ -20,6 +19,7 @@
 	#include <unistd.h>
 #endif
 
+#include <cstring>
 #include <iomanip>
 
 #include "BoxTime.h"
diff --git a/lib/common/Timer.cpp b/lib/common/Timer.cpp
index cac86512..01afa91b 100644
--- a/lib/common/Timer.cpp
+++ b/lib/common/Timer.cpp
@@ -15,6 +15,7 @@
 #include "Box.h"
 
 #include <signal.h>
+#include <cstring>
 
 #include "Timer.h"
 #include "Logging.h"
diff --git a/lib/common/WaitForEvent.h b/lib/common/WaitForEvent.h
index 9febf5d4..045d6d67 100644
--- a/lib/common/WaitForEvent.h
+++ b/lib/common/WaitForEvent.h
@@ -10,7 +10,7 @@
 #ifndef WAITFOREVENT__H
 #define WAITFOREVENT__H
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #ifdef HAVE_KQUEUE
 	#include <sys/event.h>
diff --git a/lib/raidfile/RaidFileRead.cpp b/lib/raidfile/RaidFileRead.cpp
index 4d32df34..0a79be57 100644
--- a/lib/raidfile/RaidFileRead.cpp
+++ b/lib/raidfile/RaidFileRead.cpp
@@ -12,7 +12,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 #include <sys/stat.h>
@@ -26,10 +25,11 @@
 	#include <dirent.h>
 #endif
 
-#include <stdio.h>
-#include <string.h>
-#include <memory>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <map>
+#include <memory>
 
 #include "RaidFileRead.h"
 #include "RaidFileException.h"