diff --git a/encfs/BlockFileIO.cpp b/encfs/BlockFileIO.cpp
index 69b3cf3..949237d 100644
--- a/encfs/BlockFileIO.cpp
+++ b/encfs/BlockFileIO.cpp
@@ -20,14 +20,16 @@
 
 #include "BlockFileIO.h"
 
-#include "MemoryPool.h"
-
-#include <cstring>
+#include <inttypes.h>
 #include <rlog/rlog.h>
-
-#include "i18n.h"
+#include <cstring>
+#include <memory>
 
 #include "FileUtils.h"
+#include "MemoryPool.h"
+#include "encfs/FSConfig.h"
+#include "encfs/FileIO.h"
+#include "i18n.h"
 
 template <typename Type>
 inline Type min(Type A, Type B) {
diff --git a/encfs/BlockFileIO.h b/encfs/BlockFileIO.h
index 24d8ef5..cbd6a7f 100644
--- a/encfs/BlockFileIO.h
+++ b/encfs/BlockFileIO.h
@@ -21,8 +21,10 @@
 #ifndef _BlockFileIO_incl_
 #define _BlockFileIO_incl_
 
-#include "FileIO.h"
+#include <sys/types.h>
+
 #include "FSConfig.h"
+#include "FileIO.h"
 
 /*
     Implements block scatter / gather interface.  Requires derived classes to
diff --git a/encfs/BlockNameIO.cpp b/encfs/BlockNameIO.cpp
index 43da99f..47f49e3 100644
--- a/encfs/BlockNameIO.cpp
+++ b/encfs/BlockNameIO.cpp
@@ -20,15 +20,19 @@
 
 #include "BlockNameIO.h"
 
+#include <rlog/Error.h>
+#include <rlog/rlog.h>
+#include <cstring>
+
 #include "Cipher.h"
 #include "base64.h"
+#include "encfs/CipherKey.h"
+#include "encfs/NameIO.h"
+#include "intl/gettext.h"
 
-#include <cstring>
-#include <rlog/rlog.h>
-#include <rlog/Error.h>
-#include <rlog/RLogChannel.h>
-
-#include "i18n.h"
+namespace rlog {
+class RLogChannel;
+}  // namespace rlog
 
 using namespace rlog;
 using namespace rel;
diff --git a/encfs/BlockNameIO.h b/encfs/BlockNameIO.h
index b253d89..e28c949 100644
--- a/encfs/BlockNameIO.h
+++ b/encfs/BlockNameIO.h
@@ -21,8 +21,12 @@
 #ifndef _BlockNameIO_incl_
 #define _BlockNameIO_incl_
 
-#include "NameIO.h"
+#include <stdint.h>
+#include <memory>
+
 #include "CipherKey.h"
+#include "NameIO.h"
+#include "encfs/Interface.h"
 #include "shared_ptr.h"
 
 class Cipher;
diff --git a/encfs/Cipher.cpp b/encfs/Cipher.cpp
index 48f7681..e7c371a 100644
--- a/encfs/Cipher.cpp
+++ b/encfs/Cipher.cpp
@@ -18,22 +18,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
+#include <stddef.h>
+#include <iostream>
+#include <list>
+#include <map>
+#include <string>
+#include <utility>
 
 #include "Cipher.h"
 #include "Interface.h"
-#include "Range.h"
-#include "base64.h"
-
-#include <map>
-#include <list>
-#include <string>
-#include <iostream>
-
 // for static build.  Need to reference the modules which are registered at
 // run-time, to ensure that the linker doesn't optimize them away.
 #include "NullCipher.h"
+#include "Range.h"
 #include "SSL_Cipher.h"
+#include "base64.h"
+#include "encfs/CipherKey.h"
 
 using namespace std;
 using namespace rel;
diff --git a/encfs/Cipher.h b/encfs/Cipher.h
index 310f60b..c21ea69 100644
--- a/encfs/Cipher.h
+++ b/encfs/Cipher.h
@@ -21,15 +21,16 @@
 #ifndef _Cipher_incl_
 #define _Cipher_incl_
 
-#include "encfs.h"
-
-#include "Range.h"
-#include "Interface.h"
-#include "CipherKey.h"
-
-#include <string>
-#include <list>
 #include <inttypes.h>
+#include <stdint.h>
+#include <list>
+#include <memory>
+#include <string>
+
+#include "CipherKey.h"
+#include "Interface.h"
+#include "Range.h"
+#include "encfs.h"
 
 /*
     Mostly pure virtual interface defining operations on a cipher.
diff --git a/encfs/CipherFileIO.cpp b/encfs/CipherFileIO.cpp
index 1ede309..3992c05 100644
--- a/encfs/CipherFileIO.cpp
+++ b/encfs/CipherFileIO.cpp
@@ -20,17 +20,19 @@
 
 #include "CipherFileIO.h"
 
-#include "Cipher.h"
-#include "MemoryPool.h"
-
-#include <rlog/rlog.h>
-#include <rlog/Error.h>
-
 #include <fcntl.h>
-#include <cerrno>
-#include <string.h>
-
+#include <inttypes.h>
 #include <openssl/sha.h>
+#include <rlog/Error.h>
+#include <rlog/rlog.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <cerrno>
+
+#include "Cipher.h"
+#include "encfs/BlockFileIO.h"
+#include "encfs/CipherKey.h"
+#include "encfs/FileIO.h"
 
 /*
     - Version 2:0 adds support for a per-file initialization vector with a
diff --git a/encfs/CipherFileIO.h b/encfs/CipherFileIO.h
index 0c59253..b59f4ed 100644
--- a/encfs/CipherFileIO.h
+++ b/encfs/CipherFileIO.h
@@ -21,13 +21,20 @@
 #ifndef _CipherFileIO_incl_
 #define _CipherFileIO_incl_
 
+#include <inttypes.h>
+#include <stdint.h>
+#include <sys/types.h>
+#include <memory>
+
 #include "BlockFileIO.h"
 #include "CipherKey.h"
 #include "FileUtils.h"
-
-#include <inttypes.h>
+#include "encfs/FSConfig.h"
+#include "encfs/Interface.h"
 
 class Cipher;
+class FileIO;
+struct IORequest;
 
 /*
     Implement the FileIO interface encrypting data in blocks.
diff --git a/encfs/CipherKey.h b/encfs/CipherKey.h
index 1de3bc8..7054fd8 100644
--- a/encfs/CipherKey.h
+++ b/encfs/CipherKey.h
@@ -21,6 +21,8 @@
 #ifndef _CipherKey_incl_
 #define _CipherKey_incl_
 
+#include <memory>
+
 #include "shared_ptr.h"
 
 class AbstractCipherKey {
diff --git a/encfs/ConfigReader.cpp b/encfs/ConfigReader.cpp
index 4fa9d04..3402945 100644
--- a/encfs/ConfigReader.cpp
+++ b/encfs/ConfigReader.cpp
@@ -20,13 +20,14 @@
 
 #include "ConfigReader.h"
 
-#include <rlog/rlog.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
+#include <rlog/rlog.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <cstring>
+#include <utility>
+
+#include "encfs/ConfigVar.h"
 
 using namespace std;
 using namespace rlog;
diff --git a/encfs/ConfigVar.cpp b/encfs/ConfigVar.cpp
index b107e2a..4c38941 100644
--- a/encfs/ConfigVar.cpp
+++ b/encfs/ConfigVar.cpp
@@ -19,8 +19,8 @@
  */
 
 #include "ConfigVar.h"
-#include <rlog/rlog.h>
 
+#include <rlog/rlog.h>
 #include <cstring>
 
 using namespace rlog;
diff --git a/encfs/ConfigVar.h b/encfs/ConfigVar.h
index f6c40b5..aad8a87 100644
--- a/encfs/ConfigVar.h
+++ b/encfs/ConfigVar.h
@@ -21,7 +21,9 @@
 #ifndef _ConfigVar_incl_
 #define _ConfigVar_incl_
 
+#include <memory>
 #include <string>
+
 #include "shared_ptr.h"
 
 class ConfigVar {
diff --git a/encfs/Context.cpp b/encfs/Context.cpp
index cf4cc06..90a1973 100644
--- a/encfs/Context.cpp
+++ b/encfs/Context.cpp
@@ -19,11 +19,10 @@
  */
 
 #include <rlog/rlog.h>
+#include <utility>
 
 #include "Context.h"
 #include "DirNode.h"
-#include "FileNode.h"
-#include "FileUtils.h"
 #include "Mutex.h"
 
 using namespace rel;
diff --git a/encfs/Context.h b/encfs/Context.h
index 1f6f9b0..eda8b74 100644
--- a/encfs/Context.h
+++ b/encfs/Context.h
@@ -21,6 +21,8 @@
 #ifndef _Context_incl_
 #define _Context_incl_
 
+#include <pthread.h>
+#include <memory>
 #include <set>
 
 #ifdef USE_HASHMAP
@@ -33,10 +35,10 @@
 #include "encfs.h"
 #include "shared_ptr.h"
 
+class DirNode;
+class FileNode;
 struct EncFS_Args;
 struct EncFS_Opts;
-class FileNode;
-class DirNode;
 
 class EncFS_Context {
  public:
diff --git a/encfs/DirNode.cpp b/encfs/DirNode.cpp
index 0bad425..8e7eff4 100644
--- a/encfs/DirNode.cpp
+++ b/encfs/DirNode.cpp
@@ -18,31 +18,33 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "encfs.h"
+#include <pthread.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <utime.h>
+#include <cerrno>
+#include <cstdio>
 
 #include "DirNode.h"
 #include "FileUtils.h"
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <cerrno>
-#include <cstdio>
-#include <cstdlib>
-#include <pthread.h>
-#include <unistd.h>
+#include "encfs/FSConfig.h"
+#include "encfs/FileNode.h"
+#include "encfs/NameIO.h"
 #ifdef linux
 #include <sys/fsuid.h>
 #endif
 
+#include <rlog/Error.h>
+#include <rlog/rlog.h>
 #include <cstring>
 
 #include "Context.h"
-#include "Cipher.h"
 #include "Mutex.h"
-#include <rlog/rlog.h>
-#include <rlog/Error.h>
 
-#include <iostream>
+namespace rlog {
+class RLogChannel;
+}  // namespace rlog
 
 using namespace std;
 using namespace rel;
diff --git a/encfs/DirNode.h b/encfs/DirNode.h
index 5ec1dc1..50258cd 100644
--- a/encfs/DirNode.h
+++ b/encfs/DirNode.h
@@ -21,24 +21,28 @@
 #ifndef _DirNode_incl_
 #define _DirNode_incl_
 
-#include <inttypes.h>
 #include <dirent.h>
+#include <inttypes.h>
+#include <pthread.h>
+#include <stdint.h>
 #include <sys/types.h>
-
-#include <map>
 #include <list>
-#include <vector>
+#include <map>
+#include <memory>
 #include <string>
+#include <vector>
 
-#include "FileNode.h"
-#include "NameIO.h"
 #include "CipherKey.h"
 #include "FSConfig.h"
+#include "FileNode.h"
+#include "NameIO.h"
 
 class Cipher;
+class EncFS_Context;
+class FileNode;
+class NameIO;
 class RenameOp;
 struct RenameEl;
-class EncFS_Context;
 
 class DirTraverse {
  public:
diff --git a/encfs/FileIO.h b/encfs/FileIO.h
index 602b02a..3031612 100644
--- a/encfs/FileIO.h
+++ b/encfs/FileIO.h
@@ -21,11 +21,12 @@
 #ifndef _FileIO_incl_
 #define _FileIO_incl_
 
-#include "encfs.h"
-
 #include <inttypes.h>
+#include <stdint.h>
+#include <sys/types.h>
 
 #include "Interface.h"
+#include "encfs.h"
 
 struct IORequest {
   off_t offset;
diff --git a/encfs/FileNode.cpp b/encfs/FileNode.cpp
index d1abfb9..1fc6f1a 100644
--- a/encfs/FileNode.cpp
+++ b/encfs/FileNode.cpp
@@ -18,37 +18,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Include encfs first, because we need to include fuse.h before any inclusion
-// of sys/stat.h or other system headers (to be safe)
-#include "encfs.h"
-
 #include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <fcntl.h>
 #include <unistd.h>
 #ifdef linux
 #include <sys/fsuid.h>
 #endif
 
+#include <rlog/rlog.h>
 #include <cstring>
 
-#include "config.h"
-
+#include "CipherFileIO.h"
+#include "FileIO.h"
 #include "FileNode.h"
 #include "FileUtils.h"
-#include "Cipher.h"
-#include "CipherFileIO.h"
-#include "RawFileIO.h"
 #include "MACFileIO.h"
-#include "DirNode.h"
-
-#include "FileIO.h"
-#include "MemoryPool.h"
 #include "Mutex.h"
+#include "RawFileIO.h"
 
-#include <rlog/rlog.h>
-#include <rlog/Error.h>
+namespace rlog {
+class RLogChannel;
+}  // namespace rlog
 
 using namespace std;
 using namespace rel;
diff --git a/encfs/FileNode.h b/encfs/FileNode.h
index 4fa5acd..ff853c7 100644
--- a/encfs/FileNode.h
+++ b/encfs/FileNode.h
@@ -21,17 +21,21 @@
 #ifndef _FileNode_incl_
 #define _FileNode_incl_
 
-#include "encfs.h"
-#include "CipherKey.h"
-#include "FileUtils.h"
-
 #include <inttypes.h>
+#include <pthread.h>
+#include <stdint.h>
 #include <sys/types.h>
+#include <memory>
 #include <string>
 
+#include "CipherKey.h"
+#include "FileUtils.h"
+#include "encfs.h"
+#include "encfs/FSConfig.h"
+
 class Cipher;
-class FileIO;
 class DirNode;
+class FileIO;
 
 class FileNode {
  public:
diff --git a/encfs/FileUtils.cpp b/encfs/FileUtils.cpp
index 0f45fb2..15ccf4e 100644
--- a/encfs/FileUtils.cpp
+++ b/encfs/FileUtils.cpp
@@ -24,36 +24,29 @@
 #endif
 #define _BSD_SOURCE  // pick up setenv on RH7.3
 
-#include <rlog/rlog.h>
-#include <rlog/Error.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <cctype>
-#include <cstdio>
-#include <cstdlib>
-#include <cerrno>
-#include <cstring>
-
-#include <iostream>
-#include <fstream>
-#include <sstream>
-
 #include <boost/version.hpp>
 #include <boost/archive/xml_iarchive.hpp>
 #include <boost/archive/xml_oarchive.hpp>
-#include <boost/serialization/split_free.hpp>
 #include <boost/serialization/binary_object.hpp>
+#include <boost/serialization/nvp.hpp>
+#include <boost/serialization/split_free.hpp>
+#include <fcntl.h>
+#include <rlog/Error.h>
+#include <rlog/rlog.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <cctype>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+#include <fstream>
+#include <list>
+#include <vector>
 
-#include "encfs.h"
-#include "config.h"
-
-#include "autosprintf.h"
-#include "readpassphrase.h"
 #include "BlockNameIO.h"
 #include "Cipher.h"
 #include "ConfigReader.h"
@@ -61,10 +54,16 @@
 #include "DirNode.h"
 #include "FSConfig.h"
 #include "FileUtils.h"
-#include "NullNameIO.h"
-#include "StreamNameIO.h"
-
+#include "autosprintf.h"
+#include "config.h"
+#include "encfs/CipherKey.h"
+#include "encfs/ConfigVar.h"
+#include "encfs/Interface.h"
+#include "encfs/NameIO.h"
+#include "encfs/Range.h"
 #include "i18n.h"
+#include "intl/gettext.h"
+#include "readpassphrase.h"
 
 // disable rlog section grouping for this file.. seems to cause problems
 #undef RLOG_SECTION
@@ -128,7 +127,7 @@ struct ConfigInfo {
       {".encfs", Config_Prehistoric, NULL, NULL, NULL, 0, 0},
       {NULL, Config_None, NULL, NULL, NULL, 0, 0}};
 
-#include "boost-versioning.h"
+#include "boost-versioning.h" // IWYU pragma: keep
 
 // define serialization helpers
 namespace boost {
diff --git a/encfs/FileUtils.h b/encfs/FileUtils.h
index 5e0f941..ced272f 100644
--- a/encfs/FileUtils.h
+++ b/encfs/FileUtils.h
@@ -21,10 +21,14 @@
 #ifndef _FileUtils_incl_
 #define _FileUtils_incl_
 
-#include "encfs.h"
-#include "Interface.h"
+#include <sys/types.h>
+#include <memory>
+#include <string>
+
 #include "CipherKey.h"
 #include "FSConfig.h"
+#include "Interface.h"
+#include "encfs.h"
 
 // true if the path points to an existing node (of any type)
 bool fileExists(const char *fileName);
diff --git a/encfs/Interface.cpp b/encfs/Interface.cpp
index 3e78689..46f4dc4 100644
--- a/encfs/Interface.cpp
+++ b/encfs/Interface.cpp
@@ -20,10 +20,13 @@
 
 #include "Interface.h"
 
+#include <rlog/rlog.h>
+
 #include "ConfigVar.h"
 
-#include <rlog/rlog.h>
-#include <rlog/RLogChannel.h>
+namespace rlog {
+class RLogChannel;
+}  // namespace rlog
 
 using namespace rel;
 using namespace rlog;
diff --git a/encfs/MACFileIO.cpp b/encfs/MACFileIO.cpp
index d432a02..4d39367 100644
--- a/encfs/MACFileIO.cpp
+++ b/encfs/MACFileIO.cpp
@@ -20,17 +20,23 @@
 
 #include "MACFileIO.h"
 
-#include "MemoryPool.h"
-#include "FileUtils.h"
-
-#include <rlog/rlog.h>
+#include <inttypes.h>
 #include <rlog/Error.h>
-#include <rlog/RLogChannel.h>
-
+#include <rlog/rlog.h>
+#include <sys/stat.h>
 #include <cstring>
 
+#include "FileUtils.h"
+#include "MemoryPool.h"
+#include "encfs/BlockFileIO.h"
+#include "encfs/Cipher.h"
+#include "encfs/FileIO.h"
 #include "i18n.h"
 
+namespace rlog {
+class RLogChannel;
+}  // namespace rlog
+
 using namespace rlog;
 using namespace rel;
 using namespace std;
diff --git a/encfs/MACFileIO.h b/encfs/MACFileIO.h
index 1e5666d..5c0d881 100644
--- a/encfs/MACFileIO.h
+++ b/encfs/MACFileIO.h
@@ -21,8 +21,19 @@
 #ifndef _MACFileIO_incl_
 #define _MACFileIO_incl_
 
+#include <stdint.h>
+#include <sys/types.h>
+#include <memory>
+
 #include "BlockFileIO.h"
 #include "Cipher.h"
+#include "encfs/CipherKey.h"
+#include "encfs/FSConfig.h"
+#include "encfs/Interface.h"
+
+class Cipher;
+class FileIO;
+struct IORequest;
 
 class MACFileIO : public BlockFileIO {
  public:
diff --git a/encfs/MemoryPool.cpp b/encfs/MemoryPool.cpp
index e19d5f4..d21bdb0 100644
--- a/encfs/MemoryPool.cpp
+++ b/encfs/MemoryPool.cpp
@@ -19,13 +19,10 @@
  */
 
 #include "MemoryPool.h"
-#include <rlog/rlog.h>
 
-#include <cstdlib>
-#include <cstring>
-
-#include "config.h"
+#include <openssl/ossl_typ.h>
 #include <pthread.h>
+#include <cstring>
 
 #ifdef HAVE_VALGRIND_MEMCHECK_H
 #include <valgrind/memcheck.h>
@@ -34,9 +31,8 @@
 #define VALGRIND_MAKE_MEM_UNDEFINED(a, b)
 #endif
 
-using namespace rlog;
-
 #include <openssl/buffer.h>
+
 #define BLOCKDATA(BLOCK) (unsigned char *) BLOCK->data->data
 
 struct BlockList {
diff --git a/encfs/NameIO.cpp b/encfs/NameIO.cpp
index 35ed038..60b400b 100644
--- a/encfs/NameIO.cpp
+++ b/encfs/NameIO.cpp
@@ -19,20 +19,21 @@
  */
 
 #include "NameIO.h"
-#include "config.h"
 
-#include <rlog/rlog.h>
 #include <rlog/Error.h>
-
-#include <map>
+#include <rlog/rlog.h>
 #include <cstring>
-
 // for static build.  Need to reference the modules which are registered at
 // run-time, to ensure that the linker doesn't optimize them away.
 #include <iostream>
+#include <map>
+#include <utility>
+
 #include "BlockNameIO.h"
-#include "StreamNameIO.h"
 #include "NullNameIO.h"
+#include "StreamNameIO.h"
+#include "encfs/CipherKey.h"
+#include "encfs/Interface.h"
 
 using namespace std;
 using namespace rel;
diff --git a/encfs/NameIO.h b/encfs/NameIO.h
index 8c0591e..916c2c2 100644
--- a/encfs/NameIO.h
+++ b/encfs/NameIO.h
@@ -21,13 +21,15 @@
 #ifndef _NameIO_incl_
 #define _NameIO_incl_
 
-#include <string>
-#include <list>
-
 #include <inttypes.h>
+#include <stdint.h>
+#include <string.h>
+#include <list>
+#include <memory>
+#include <string>
 
-#include "Interface.h"
 #include "CipherKey.h"
+#include "Interface.h"
 
 class Cipher;
 
diff --git a/encfs/NullCipher.cpp b/encfs/NullCipher.cpp
index 93a153f..a56f831 100644
--- a/encfs/NullCipher.cpp
+++ b/encfs/NullCipher.cpp
@@ -21,11 +21,11 @@
 #include "NullCipher.h"
 
 #include <cstring>
-#include <rlog/rlog.h>
+#include <memory>
 
-#include "Range.h"
 #include "Interface.h"
-#include "shared_ptr.h"
+#include "Range.h"
+#include "encfs/Cipher.h"
 
 using namespace std;
 using namespace rel;
diff --git a/encfs/NullCipher.h b/encfs/NullCipher.h
index 0e46ea5..fab50ae 100644
--- a/encfs/NullCipher.h
+++ b/encfs/NullCipher.h
@@ -21,8 +21,11 @@
 #ifndef _NullCipher_incl_
 #define _NullCipher_incl_
 
+#include <stdint.h>
+
 #include "Cipher.h"
 #include "Interface.h"
+#include "encfs/CipherKey.h"
 
 /*
     Implements Cipher interface for a pass-through mode.  May be useful for
diff --git a/encfs/NullNameIO.cpp b/encfs/NullNameIO.cpp
index d4b331b..09ce9e6 100644
--- a/encfs/NullNameIO.cpp
+++ b/encfs/NullNameIO.cpp
@@ -20,10 +20,13 @@
 
 #include "NullNameIO.h"
 
-#include "Cipher.h"
-#include "base64.h"
-
 #include <cstring>
+#include <memory>
+
+#include "encfs/CipherKey.h"
+#include "encfs/NameIO.h"
+
+class Cipher;
 
 using namespace rel;
 
diff --git a/encfs/NullNameIO.h b/encfs/NullNameIO.h
index 2de8f58..e57a8cd 100644
--- a/encfs/NullNameIO.h
+++ b/encfs/NullNameIO.h
@@ -21,7 +21,10 @@
 #ifndef _NullNameIO_incl_
 #define _NullNameIO_incl_
 
+#include <stdint.h>
+
 #include "NameIO.h"
+#include "encfs/Interface.h"
 
 class NullNameIO : public NameIO {
  public:
diff --git a/encfs/RawFileIO.cpp b/encfs/RawFileIO.cpp
index b567d0b..3d736e3 100644
--- a/encfs/RawFileIO.cpp
+++ b/encfs/RawFileIO.cpp
@@ -21,18 +21,16 @@
 #ifdef linux
 #define _XOPEN_SOURCE 500  // pick up pread , pwrite
 #endif
-#include <unistd.h>
-
-#include "RawFileIO.h"
-
-#include <rlog/rlog.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
+#include <inttypes.h>
+#include <rlog/rlog.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <cerrno>
 #include <cstring>
 
-#include <cerrno>
+#include "RawFileIO.h"
+#include "encfs/FileIO.h"
 
 using namespace std;
 
diff --git a/encfs/RawFileIO.h b/encfs/RawFileIO.h
index 90e68ec..d4f8eac 100644
--- a/encfs/RawFileIO.h
+++ b/encfs/RawFileIO.h
@@ -21,10 +21,12 @@
 #ifndef _RawFileIO_incl_
 #define _RawFileIO_incl_
 
-#include "FileIO.h"
-
+#include <sys/types.h>
 #include <string>
 
+#include "FileIO.h"
+#include "encfs/Interface.h"
+
 class RawFileIO : public FileIO {
  public:
   RawFileIO();
diff --git a/encfs/SSL_Cipher.cpp b/encfs/SSL_Cipher.cpp
index 09fa0bf..3ab5321 100644
--- a/encfs/SSL_Cipher.cpp
+++ b/encfs/SSL_Cipher.cpp
@@ -18,31 +18,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "encfs.h"
-
-#include "config.h"
-
-#include <openssl/blowfish.h>
-#include <openssl/sha.h>
-#include <openssl/rand.h>
+#include <openssl/crypto.h>
 #include <openssl/err.h>
+#include <openssl/evp.h>
 #include <openssl/hmac.h>
-
-#include "SSL_Cipher.h"
-#include "Range.h"
-#include "MemoryPool.h"
-#include "Mutex.h"
-
-#include <cstring>
-#include <ctime>
-
+#include <openssl/ossl_typ.h>
+#include <openssl/rand.h>
+#include <pthread.h>
+#include <rlog/Error.h>
+#include <rlog/rlog.h>
 #include <sys/mman.h>
 #include <sys/time.h>
+#include <cstring>
+#include <string>
 
-#include <rlog/rlog.h>
-#include <rlog/Error.h>
+#include "Mutex.h"
+#include "Range.h"
+#include "SSL_Cipher.h"
+#include "encfs/Cipher.h"
+#include "encfs/Interface.h"
+#include "intl/gettext.h"
 
-#include "i18n.h"
+namespace rlog {
+class RLogChannel;
+}  // namespace rlog
 
 using namespace std;
 using namespace rel;
diff --git a/encfs/SSL_Cipher.h b/encfs/SSL_Cipher.h
index f79f2b5..ba3bed2 100644
--- a/encfs/SSL_Cipher.h
+++ b/encfs/SSL_Cipher.h
@@ -21,12 +21,17 @@
 #ifndef _SSL_Cipher_incl_
 #define _SSL_Cipher_incl_
 
+#include <stdint.h>
+#include <memory>
+
 #include "Cipher.h"
 #include "Interface.h"
+#include "encfs/CipherKey.h"
 
 class SSLKey;
 #ifndef EVP_CIPHER
 struct evp_cipher_st;
+
 typedef struct evp_cipher_st EVP_CIPHER;
 #endif
 
diff --git a/encfs/StreamNameIO.cpp b/encfs/StreamNameIO.cpp
index 3070a49..14aac4d 100644
--- a/encfs/StreamNameIO.cpp
+++ b/encfs/StreamNameIO.cpp
@@ -20,14 +20,15 @@
 
 #include "StreamNameIO.h"
 
+#include <rlog/Error.h>
+#include <rlog/rlog.h>
+#include <cstring>
+
 #include "Cipher.h"
 #include "base64.h"
-
-#include <rlog/rlog.h>
-#include <rlog/Error.h>
-
-#include "i18n.h"
-#include <cstring>
+#include "encfs/CipherKey.h"
+#include "encfs/NameIO.h"
+#include "intl/gettext.h"
 
 using namespace rel;
 using namespace std;
diff --git a/encfs/StreamNameIO.h b/encfs/StreamNameIO.h
index 3149ce8..f98fd60 100644
--- a/encfs/StreamNameIO.h
+++ b/encfs/StreamNameIO.h
@@ -21,8 +21,12 @@
 #ifndef _StreamNameIO_incl_
 #define _StreamNameIO_incl_
 
-#include "NameIO.h"
+#include <stdint.h>
+#include <memory>
+
 #include "CipherKey.h"
+#include "NameIO.h"
+#include "encfs/Interface.h"
 
 class Cipher;
 
diff --git a/encfs/autosprintf.cpp b/encfs/autosprintf.cpp
index 955b74f..16e8549 100644
--- a/encfs/autosprintf.cpp
+++ b/encfs/autosprintf.cpp
@@ -28,10 +28,11 @@
 #include "autosprintf.h"
 
 #include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
+#include <stdarg.h>
 //#include "lib-asprintf.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 namespace gnu {
 
diff --git a/encfs/boost-versioning.h b/encfs/boost-versioning.h
index 9432f0b..7f97ab3 100644
--- a/encfs/boost-versioning.h
+++ b/encfs/boost-versioning.h
@@ -18,8 +18,6 @@ BOOST_CLASS_VERSION(EncFSConfig, V6SubVersion)
 // we specify in BOOST_CLASS_VERSION below.  Without this, manual editing
 // of the file is needed before boost will allow us to read it.
 
-// See bug http://code.google.com/p/encfs/issues/detail?id=60
-
 BOOST_CLASS_VERSION(EncFSConfig, 20)
 
 namespace boost {
diff --git a/encfs/encfs.cpp b/encfs/encfs.cpp
index 193a110..389b1f7 100644
--- a/encfs/encfs.cpp
+++ b/encfs/encfs.cpp
@@ -17,16 +17,20 @@
 
 #include "encfs.h"
 
-#include <cstdio>
-#include <cstring>
-#include <unistd.h>
 #include <fcntl.h>
-#include <dirent.h>
-#include <cerrno>
+#include <inttypes.h>
+#include <stdint.h>
+#include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/time.h>
-
-#include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
+#include <utime.h>
+#include <cerrno>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+#include <memory>
 #ifdef linux
 #include <sys/fsuid.h>
 #endif
@@ -37,19 +41,24 @@
 #include <attr/xattr.h>
 #endif
 
+#include <rlog/Error.h>
+#include <rlog/rlog.h>
 #include <functional>
-#include <map>
 #include <string>
 #include <vector>
 
-#include "DirNode.h"
-#include "MemoryPool.h"
-#include "FileUtils.h"
-#include "Mutex.h"
 #include "Context.h"
+#include "DirNode.h"
+#include "FileUtils.h"
+#include "encfs/FileNode.h"
+#include "fuse.h"
 
-#include <rlog/rlog.h>
-#include <rlog/Error.h>
+namespace rel {
+class Lock;
+}  // namespace rel
+namespace rlog {
+class RLogChannel;
+}  // namespace rlog
 
 #ifndef MIN
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
diff --git a/encfs/encfs.h b/encfs/encfs.h
index 684ab1d..6539e50 100644
--- a/encfs/encfs.h
+++ b/encfs/encfs.h
@@ -21,11 +21,12 @@
 #ifndef _encfs_incl_
 #define _encfs_incl_
 
-#include "config.h"
 #include <fuse.h>
+#include <rlog/rlog.h>
+#include <sys/types.h>
 #include <unistd.h>
 
-#include <rlog/rlog.h>
+#include "config.h"
 
 #if defined(HAVE_SYS_XATTR_H) | defined(HAVE_ATTR_XATTR_H)
 #define HAVE_XATTR
diff --git a/encfs/encfsctl.cpp b/encfs/encfsctl.cpp
index 62ba142..b1bfc2c 100644
--- a/encfs/encfsctl.cpp
+++ b/encfs/encfsctl.cpp
@@ -15,32 +15,37 @@
  * more details.
  */
 
-#include "encfs.h"
-
 #include <fcntl.h>
 #include <getopt.h>
-#include <iostream>
-#include <string>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <limits.h>
-
-#include <rlog/rlog.h>
-#include <rlog/StdioNode.h>
 #include <rlog/RLogChannel.h>
+#include <rlog/StdioNode.h>
+#include <rlog/rlog.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <unistd.h>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
 
 #define NO_DES
 #include <openssl/ssl.h>
 
 #include "Cipher.h"
-#include "Context.h"
 #include "DirNode.h"
 #include "FileNode.h"
 #include "FileUtils.h"
 #include "autosprintf.h"
 #include "config.h"
+#include "encfs/CipherKey.h"
+#include "encfs/FSConfig.h"
+#include "encfs/Interface.h"
 #include "i18n.h"
-#include "shared_ptr.h"
+#include "intl/gettext.h"
 
 #ifndef PATH_MAX
 #define PATH_MAX 4096
@@ -702,9 +707,6 @@ int main(int argc, char **argv) {
   StdioNode *slog = new StdioNode(STDERR_FILENO);
   slog->subscribeTo(GetGlobalChannel("error"));
   slog->subscribeTo(GetGlobalChannel("warning"));
-#ifndef NO_DEBUG
-// slog->subscribeTo( GetGlobalChannel("debug") );
-#endif
 
   if (argc < 2) {
     usage(argv[0]);
diff --git a/encfs/main.cpp b/encfs/main.cpp
index fe97266..adcd08b 100644
--- a/encfs/main.cpp
+++ b/encfs/main.cpp
@@ -16,41 +16,37 @@
  *
  */
 
+#include <getopt.h>
+#include <pthread.h>
+#include <rlog/RLogChannel.h>
+#include <rlog/StdioNode.h>
+#include <rlog/SyslogNode.h>
+#include <rlog/rlog.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
+#include <exception>
 #include <iostream>
 #include <memory>
-#include <string>
 #include <sstream>
+#include <string>
 
-#include <cassert>
-#include <cstdio>
-#include <unistd.h>
-#include <sys/time.h>
-#include <cerrno>
-#include <cstring>
-
-#include <getopt.h>
-
-#include <rlog/rlog.h>
-#include <rlog/Error.h>
-#include <rlog/RLogChannel.h>
-#include <rlog/SyslogNode.h>
-#include <rlog/StdioNode.h>
-
-#include "autosprintf.h"
-#include "ConfigReader.h"
 #include "Context.h"
-#include "DirNode.h"
 #include "FileUtils.h"
-#include "Interface.h"
 #include "MemoryPool.h"
+#include "autosprintf.h"
 #include "config.h"
 #include "encfs.h"
-#include "openssl.h"
-#include "shared_ptr.h"
-
-#include <locale.h>
-
+#include "fuse.h"
 #include "i18n.h"
+#include "openssl.h"
+
+class DirNode;
 
 // Fuse version >= 26 requires another argument to fuse_unmount, which we
 // don't have.  So use the backward compatible call instead..
@@ -614,18 +610,6 @@ int main(int argc, char *argv[]) {
   encfs_oper.utimens = encfs_utimens;
 // encfs_oper.bmap = encfs_bmap;
 
-#if (__FreeBSD__ >= 10) || defined(__APPLE__)
-// encfs_oper.setvolname
-// encfs_oper.exchange
-// encfs_oper.getxtimes
-// encfs_oper.setbkuptime
-// encfs_oper.setchgtime
-// encfs_oper.setcrtime
-// encfs_oper.chflags
-// encfs_oper.setattr_x
-// encfs_oper.fsetattr_x
-#endif
-
   openssl_init(encfsArgs->isThreaded);
 
   // context is not a smart pointer because it will live for the life of
diff --git a/encfs/makeKey.cpp b/encfs/makeKey.cpp
index f4e2195..35471cc 100644
--- a/encfs/makeKey.cpp
+++ b/encfs/makeKey.cpp
@@ -18,17 +18,16 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "encfs.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <iostream>
+#include <memory>
+#include <string>
 
 #include "Cipher.h"
 #include "CipherKey.h"
 #include "openssl.h"
 
-#include <iostream>
-
-#include <sys/types.h>
-#include <unistd.h>
-
 using namespace std;
 
 void genKey(const shared_ptr<Cipher> &cipher) {
diff --git a/encfs/openssl.cpp b/encfs/openssl.cpp
index db7ff03..6128294 100644
--- a/encfs/openssl.cpp
+++ b/encfs/openssl.cpp
@@ -20,13 +20,14 @@
 
 #include "openssl.h"
 
+#include <openssl/crypto.h>
 #include <pthread.h>
-
 #include <rlog/rlog.h>
+#include <stdlib.h>
 
 #define NO_DES
-#include <openssl/ssl.h>
 #include <openssl/rand.h>
+#include <openssl/ssl.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
diff --git a/encfs/readpassphrase.cpp b/encfs/readpassphrase.cpp
index a354f97..a400b01 100644
--- a/encfs/readpassphrase.cpp
+++ b/encfs/readpassphrase.cpp
@@ -37,18 +37,17 @@ static const char rcsid[] =
 
 #ifndef HAVE_READPASSPHRASE
 
+#include <fcntl.h>
+#include <paths.h>
+#include <sys/types.h>
+#include <termios.h>
+#include <unistd.h>
+#include <cctype>
+#include <cerrno>
 #include <csignal>
 #include <cstdio>
-#include <cerrno>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <paths.h>
 #include <cstring>
-#include <cctype>
 
-#include <termios.h>
 #include "readpassphrase.h"
 
 #ifdef TCSASOFT
diff --git a/encfs/test.cpp b/encfs/test.cpp
index a955b19..8c7c985 100644
--- a/encfs/test.cpp
+++ b/encfs/test.cpp
@@ -16,28 +16,30 @@
  *
  */
 
-#include "encfs.h"
-
-#include "config.h"
-
-#include <iostream>
-
+#include <rlog/Error.h>
+#include <rlog/RLogChannel.h>
+#include <rlog/StdioNode.h>
+#include <rlog/rlog.h>
+#include <time.h>
+#include <unistd.h>
 #include <cstdlib>
+#include <iostream>
+#include <list>
+#include <memory>
 #include <sstream>
+#include <string>
 
+#include "BlockNameIO.h"
 #include "Cipher.h"
 #include "DirNode.h"
-#include "MemoryPool.h"
-#include "Interface.h"
 #include "FileUtils.h"
+#include "Interface.h"
+#include "MemoryPool.h"
 #include "StreamNameIO.h"
-#include "BlockNameIO.h"
-#include "NullNameIO.h"
-
-#include <rlog/rlog.h>
-#include <rlog/Error.h>
-#include <rlog/StdioNode.h>
-#include <rlog/RLogChannel.h>
+#include "encfs/CipherKey.h"
+#include "encfs/FSConfig.h"
+#include "encfs/NameIO.h"
+#include "encfs/Range.h"
 
 #define NO_DES
 #include <openssl/ssl.h>