--- encfs/CipherFileIO.cpp
+++ encfs/CipherFileIO.cpp
@@ -23,7 +23,7 @@
 #include <rlog/rlog.h>
 
 #include <fcntl.h>
-#include <errno.h>
+#include <cerrno>
 
 using boost::shared_ptr;
 
--- encfs/ConfigVar.h
+++ encfs/ConfigVar.h
@@ -19,6 +19,7 @@
 #define _ConfigVar_incl_
 
 #include <string>
+#include <cstring>
 #include <boost/shared_ptr.hpp>
 
 using boost::shared_ptr;
--- encfs/DirNode.cpp
+++ encfs/DirNode.cpp
@@ -22,9 +22,9 @@
 
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
 #include <pthread.h>
 #include <unistd.h>
 #ifdef linux
--- encfs/FileNode.cpp
+++ encfs/FileNode.cpp
@@ -19,7 +19,7 @@
 // of sys/stat.h or other system headers (to be safe)
 #include "encfs.h"
 
-#include <errno.h>
+#include <cerrno>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
--- encfs/FileUtils.cpp
+++ encfs/FileUtils.cpp
@@ -47,9 +47,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cerrno>
 #include <string.h>
 
 #include <iostream>
--- encfs/MemoryPool.cpp
+++ encfs/MemoryPool.cpp
@@ -19,7 +19,7 @@
 #include "MemoryPool.h"
 #include <rlog/rlog.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <string.h>
 
 #include "config.h"
--- encfs/NameIO.h
+++ encfs/NameIO.h
@@ -19,6 +19,7 @@
 #define _NameIO_incl_
 
 #include <string>
+#include <cstring>
 #include <list>
 
 #include <inttypes.h>
--- encfs/RawFileIO.cpp
+++ encfs/RawFileIO.cpp
@@ -29,7 +29,7 @@
 #include <fcntl.h>
 #include <string.h>
 
-#include <errno.h>
+#include <cerrno>
 
 using namespace std;
 
--- encfs/encfs.cpp
+++ encfs/encfs.cpp
@@ -17,12 +17,12 @@
 
 #include "encfs.h"
 
-#include <stdio.h>
+#include <cstdio>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <dirent.h>
-#include <errno.h>
+#include <cerrno>
 #include <sys/statvfs.h>
 #include <sys/time.h>
 
--- encfs/encfs.h
+++ encfs/encfs.h
@@ -28,7 +28,7 @@
 #endif
 
 #ifndef linux
-#include <errno.h>
+#include <cerrno>
 
 static __inline int setfsuid(uid_t uid)
 {
--- encfs/main.cpp
+++ encfs/main.cpp
@@ -25,10 +25,10 @@
 #include <sstream>
 
 #include <assert.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 #include <sys/time.h>
-#include <errno.h>
+#include <cerrno>
 #include <string.h>
 
 #include <getopt.h>
--- encfs/readpassphrase.cpp
+++ encfs/readpassphrase.cpp
@@ -36,8 +36,8 @@
 #ifndef HAVE_READPASSPHRASE
 
 #include <signal.h>
-#include <stdio.h>
-#include <errno.h>
+#include <cstdio>
+#include <cerrno>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
--- encfs/test.cpp
+++ encfs/test.cpp
@@ -22,7 +22,7 @@
 
 #include <iostream>
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "Cipher.h"
 #include "DirNode.h"
--- intl/autosprintf.cpp
+++ intl/autosprintf.cpp
@@ -28,10 +28,10 @@
 #include "autosprintf.h"
 
 #include <stdarg.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <string.h>
 //#include "lib-asprintf.h"
-#include <stdio.h>
+#include <cstdio>
 
 namespace gnu
 {