run IYWU to fixup includes

encfs/BlockFileIO.cpp

@@ -20,14 +20,16 @@
 
 #include "BlockFileIO.h"
 
-#include "MemoryPool.h"
+#include <inttypes.h>
-
-#include <cstring>
 #include <rlog/rlog.h>
-
+#include <cstring>
-#include "i18n.h"
+#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) {

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

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>
+namespace rlog {
-#include <rlog/rlog.h>
+class RLogChannel;
-#include <rlog/Error.h>
+}  // namespace rlog
-#include <rlog/RLogChannel.h>
-
-#include "i18n.h"
 
 using namespace rlog;
 using namespace rel;

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;

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;

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.

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 <inttypes.h>
-#include <string.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

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 "encfs/FSConfig.h"
-#include <inttypes.h>
+#include "encfs/Interface.h"
 
 class Cipher;
+class FileIO;
+struct IORequest;
 
 /*
     Implement the FileIO interface encrypting data in blocks.

encfs/CipherKey.h

@@ -21,6 +21,8 @@
 #ifndef _CipherKey_incl_
 #define _CipherKey_incl_
 
+#include <memory>
+
 #include "shared_ptr.h"
 
 class AbstractCipherKey {

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;

encfs/ConfigVar.cpp

@@ -19,8 +19,8 @@
  */
 
 #include "ConfigVar.h"
-#include <rlog/rlog.h>
 
+#include <rlog/rlog.h>
 #include <cstring>
 
 using namespace rlog;

encfs/ConfigVar.h

@@ -21,7 +21,9 @@
 #ifndef _ConfigVar_incl_
 #define _ConfigVar_incl_
 
+#include <memory>
 #include <string>
+
 #include "shared_ptr.h"
 
 class ConfigVar {

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;

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:

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 "encfs/FSConfig.h"
-#include <sys/stat.h>
+#include "encfs/FileNode.h"
-#include <sys/types.h>
+#include "encfs/NameIO.h"
-#include <cerrno>
-#include <cstdio>
-#include <cstdlib>
-#include <pthread.h>
-#include <unistd.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;

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:

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;

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>
+namespace rlog {
-#include <rlog/Error.h>
+class RLogChannel;
+}  // namespace rlog
 
 using namespace std;
 using namespace rel;

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:

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 "autosprintf.h"
-#include "StreamNameIO.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 {

encfs/FileUtils.h

@@ -21,10 +21,14 @@
 #ifndef _FileUtils_incl_
 #define _FileUtils_incl_
 
-#include "encfs.h"
+#include <sys/types.h>
-#include "Interface.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);

encfs/Interface.cpp

@@ -20,10 +20,13 @@
 
 #include "Interface.h"
 
+#include <rlog/rlog.h>
+
 #include "ConfigVar.h"
 
-#include <rlog/rlog.h>
+namespace rlog {
-#include <rlog/RLogChannel.h>
+class RLogChannel;
+}  // namespace rlog
 
 using namespace rel;
 using namespace rlog;

encfs/MACFileIO.cpp

@@ -20,17 +20,23 @@
 
 #include "MACFileIO.h"
 
-#include "MemoryPool.h"
+#include <inttypes.h>
-#include "FileUtils.h"
-
-#include <rlog/rlog.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;

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:

encfs/MemoryPool.cpp

@@ -19,13 +19,10 @@
  */
 
 #include "MemoryPool.h"
-#include <rlog/rlog.h>
 
-#include <cstdlib>
+#include <openssl/ossl_typ.h>
-#include <cstring>
-
-#include "config.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 {

encfs/NameIO.cpp

@@ -19,20 +19,21 @@
  */
 
 #include "NameIO.h"
-#include "config.h"
 
-#include <rlog/rlog.h>
 #include <rlog/Error.h>
-
+#include <rlog/rlog.h>
-#include <map>
 #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;

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;
 

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;

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

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;
 

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:

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;
 

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();

encfs/SSL_Cipher.cpp

@@ -18,31 +18,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "encfs.h"
+#include <openssl/crypto.h>
-
-#include "config.h"
-
-#include <openssl/blowfish.h>
-#include <openssl/sha.h>
-#include <openssl/rand.h>
 #include <openssl/err.h>
+#include <openssl/evp.h>
 #include <openssl/hmac.h>
-
+#include <openssl/ossl_typ.h>
-#include "SSL_Cipher.h"
+#include <openssl/rand.h>
-#include "Range.h"
+#include <pthread.h>
-#include "MemoryPool.h"
+#include <rlog/Error.h>
-#include "Mutex.h"
+#include <rlog/rlog.h>
-
-#include <cstring>
-#include <ctime>
-
 #include <sys/mman.h>
 #include <sys/time.h>
+#include <cstring>
+#include <string>
 
-#include <rlog/rlog.h>
+#include "Mutex.h"
-#include <rlog/Error.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;

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
 

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 "encfs/CipherKey.h"
-#include <rlog/rlog.h>
+#include "encfs/NameIO.h"
-#include <rlog/Error.h>
+#include "intl/gettext.h"
-
-#include "i18n.h"
-#include <cstring>
 
 using namespace rel;
 using namespace std;

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;
 

encfs/autosprintf.cpp

@@ -28,10 +28,11 @@
 #include "autosprintf.h"
 
 #include <stdarg.h>
-#include <stdlib.h>
+#include <stdarg.h>
-#include <string.h>
 //#include "lib-asprintf.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 namespace gnu {
 

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 {

encfs/encfs.cpp

@@ -17,16 +17,20 @@
 
 #include "encfs.h"
 
-#include <cstdio>
-#include <cstring>
-#include <unistd.h>
 #include <fcntl.h>
-#include <dirent.h>
+#include <inttypes.h>
-#include <cerrno>
+#include <stdint.h>
+#include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/time.h>
-
+#include <time.h>
-#include <sys/types.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>
+namespace rel {
-#include <rlog/Error.h>
+class Lock;
+}  // namespace rel
+namespace rlog {
+class RLogChannel;
+}  // namespace rlog
 
 #ifndef MIN
 #define MIN(a, b) (((a) < (b)) ? (a) : (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

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]);

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 "fuse.h"
-#include "shared_ptr.h"
-
-#include <locale.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

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) {

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

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

encfs/test.cpp

@@ -16,28 +16,30 @@
  *
  */
 
-#include "encfs.h"
+#include <rlog/Error.h>
-
+#include <rlog/RLogChannel.h>
-#include "config.h"
+#include <rlog/StdioNode.h>
-
+#include <rlog/rlog.h>
-#include <iostream>
+#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 "encfs/CipherKey.h"
-#include "NullNameIO.h"
+#include "encfs/FSConfig.h"
-
+#include "encfs/NameIO.h"
-#include <rlog/rlog.h>
+#include "encfs/Range.h"
-#include <rlog/Error.h>
-#include <rlog/StdioNode.h>
-#include <rlog/RLogChannel.h>
 
 #define NO_DES
 #include <openssl/ssl.h>