4 files changed, 11 insertions, 3 deletions
diff --git a/lib/backupclient/BackupClientFileAttributes.cpp b/lib/backupclient/BackupClientFileAttributes.cpp
index 3ffeb189..4bd359ac 100644
--- a/lib/backupclient/BackupClientFileAttributes.cpp
+++ b/lib/backupclient/BackupClientFileAttributes.cpp
@@ -15,11 +15,13 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
 #include <limits.h>
+
 #include <algorithm>
+#include <cstring>
 #include <new>
 #include <vector>
+
 #ifdef HAVE_SYS_XATTR_H
 #include <cerrno>
 #include <sys/xattr.h>
diff --git a/lib/backupclient/BackupStoreFile.h b/lib/backupclient/BackupStoreFile.h
index 3ee5ddb0..ee482f3e 100644
--- a/lib/backupclient/BackupStoreFile.h
+++ b/lib/backupclient/BackupStoreFile.h
@@ -10,12 +10,14 @@
 #ifndef BACKUPSTOREFILE__H
 #define BACKUPSTOREFILE__H
 
+#include <stdlib.h>
+
+#include <memory>
+
 #include "IOStream.h"
 #include "BackupClientFileAttributes.h"
 #include "BackupStoreFilename.h"
 
-#include <memory>
-
 typedef struct 
 {
 	int64_t mBytesInEncodedFiles;
diff --git a/lib/backupclient/BackupStoreFileDiff.cpp b/lib/backupclient/BackupStoreFileDiff.cpp
index d550e2ba..53636da1 100644
--- a/lib/backupclient/BackupStoreFileDiff.cpp
+++ b/lib/backupclient/BackupStoreFileDiff.cpp
@@ -9,6 +9,8 @@
 
 #include "Box.h"
 
+#include <string.h>
+
 #include <new>
 #include <map>
 
diff --git a/lib/backupclient/BackupStoreFileEncodeStream.cpp b/lib/backupclient/BackupStoreFileEncodeStream.cpp
index 423c11a3..b9d7745f 100644
--- a/lib/backupclient/BackupStoreFileEncodeStream.cpp
+++ b/lib/backupclient/BackupStoreFileEncodeStream.cpp
@@ -9,6 +9,8 @@
 
 #include "Box.h"
 
+#include <string.h>
+
 #include "BackupStoreFileEncodeStream.h"
 #include "BackupStoreFile.h"
 #include "BackupStoreFileWire.h"