Use proper C++ includes.

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>

---
 BlockFileIO.cpp    |    2 +-
 BlockNameIO.cpp    |    2 +-
 CipherFileIO.cpp   |    2 +-
 ConfigReader.cpp   |    2 +-
 DirNode.cpp        |    6 +++---
 FileNode.cpp       |    2 +-
 FileUtils.cpp      |   10 +++++-----
 MACFileIO.cpp      |    2 +-
 MemoryPool.cpp     |    4 ++--
 NullCipher.cpp     |    2 +-
 RawFileIO.cpp      |    5 ++---
 SSL_Cipher.cpp     |    2 +-
 encfs.cpp          |    7 ++++---
 main.cpp           |    6 +++---
 readpassphrase.cpp |   10 +++++-----
 test.cpp           |    2 +-
 16 files changed, 33 insertions(+), 33 deletions(-)

Index: encfs/BlockFileIO.cpp
===================================================================
--- encfs.orig/BlockFileIO.cpp
+++ encfs/BlockFileIO.cpp
@@ -19,7 +19,7 @@
 
 #include "MemoryPool.h"
 
-#include <string.h>
+#include <cstring>
 #include <rlog/rlog.h>
 
 #include "i18n.h"
Index: encfs/BlockNameIO.cpp
===================================================================
--- encfs.orig/BlockNameIO.cpp
+++ encfs/BlockNameIO.cpp
@@ -20,7 +20,7 @@
 #include "Cipher.h"
 #include "base64.h"
 
-#include <string.h>
+#include <cstring>
 #include <rlog/rlog.h>
 #include <rlog/Error.h>
 #include <rlog/RLogChannel.h>
Index: encfs/CipherFileIO.cpp
===================================================================
--- encfs.orig/CipherFileIO.cpp
+++ encfs/CipherFileIO.cpp
@@ -22,8 +22,8 @@
 
 #include <rlog/rlog.h>
 
+#include <cerrno>
 #include <fcntl.h>
-#include <errno.h>
 
 using boost::shared_ptr;
 
Index: encfs/ConfigReader.cpp
===================================================================
--- encfs.orig/ConfigReader.cpp
+++ encfs/ConfigReader.cpp
@@ -19,11 +19,11 @@
 
 #include <rlog/rlog.h>
 
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <string.h>
 
 
 using namespace std;
Index: encfs/DirNode.cpp
===================================================================
--- encfs.orig/DirNode.cpp
+++ encfs/DirNode.cpp
@@ -20,11 +20,11 @@
 #include "DirNode.h"
 #include "FileUtils.h"
 
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <pthread.h>
 #include <unistd.h>
 #ifdef linux
Index: encfs/FileNode.cpp
===================================================================
--- encfs.orig/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>
Index: encfs/FileUtils.cpp
===================================================================
--- encfs.orig/FileUtils.cpp
+++ encfs/FileUtils.cpp
@@ -40,17 +40,17 @@
 #include <rlog/rlog.h>
 #include <rlog/Error.h>
 
+#include <cctype>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
 
 #include <iostream>
 #include <sstream>
Index: encfs/MACFileIO.cpp
===================================================================
--- encfs.orig/MACFileIO.cpp
+++ encfs/MACFileIO.cpp
@@ -23,7 +23,7 @@
 #include <rlog/Error.h>
 #include <rlog/RLogChannel.h>
 
-#include <string.h>
+#include <cstring>
 
 #include "i18n.h"
 
Index: encfs/MemoryPool.cpp
===================================================================
--- encfs.orig/MemoryPool.cpp
+++ encfs/MemoryPool.cpp
@@ -19,8 +19,8 @@
 #include "MemoryPool.h"
 #include <rlog/rlog.h>
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "config.h"
 #include <pthread.h>
Index: encfs/NullCipher.cpp
===================================================================
--- encfs.orig/NullCipher.cpp
+++ encfs/NullCipher.cpp
@@ -23,7 +23,7 @@
 #include <boost/shared_ptr.hpp>
 #include <rlog/rlog.h>
 
-#include <string.h>
+#include <cstring>
 
 using namespace std;
 using namespace rel;
Index: encfs/RawFileIO.cpp
===================================================================
--- encfs.orig/RawFileIO.cpp
+++ encfs/RawFileIO.cpp
@@ -24,12 +24,11 @@
 
 #include <rlog/rlog.h>
 
+#include <cerrno>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <string.h>
-
-#include <errno.h>
 
 using namespace std;
 
Index: encfs/SSL_Cipher.cpp
===================================================================
--- encfs.orig/SSL_Cipher.cpp
+++ encfs/SSL_Cipher.cpp
@@ -31,7 +31,7 @@
 #include "MemoryPool.h"
 #include "Mutex.h"
 
-#include <string.h>
+#include <cstring>
 
 #include <sys/mman.h>
 
Index: encfs/encfs.cpp
===================================================================
--- encfs.orig/encfs.cpp
+++ encfs/encfs.cpp
@@ -17,12 +17,13 @@
 
 #include "encfs.h"
 
-#include <stdio.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
+
 #include <unistd.h>
 #include <fcntl.h>
 #include <dirent.h>
-#include <errno.h>
 #include <sys/statvfs.h>
 #include <sys/time.h>
 
Index: encfs/main.cpp
===================================================================
--- encfs.orig/main.cpp
+++ encfs/main.cpp
@@ -24,12 +24,12 @@
 #include <string>
 #include <sstream>
 
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
 #include <assert.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include <errno.h>
-#include <string.h>
 
 #include <getopt.h>
 
Index: encfs/readpassphrase.cpp
===================================================================
--- encfs.orig/readpassphrase.cpp
+++ encfs/readpassphrase.cpp
@@ -35,16 +35,16 @@ static const char rcsid[] = "$OpenBSD: r
 
 #ifndef HAVE_READPASSPHRASE
 
-#include <signal.h>
-#include <stdio.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
+#include <csignal>
+#include <cstdio>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <paths.h>
-#include <string.h>
-#include <ctype.h>
 
 #include <termios.h>
 #include <readpassphrase.h>
Index: encfs/test.cpp
===================================================================
--- encfs.orig/test.cpp
+++ encfs/test.cpp
@@ -22,7 +22,7 @@
 
 #include <iostream>
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "Cipher.h"
 #include "DirNode.h"