Make encfs include paths consistent.

encfs/BlockFileIO.cpp

@@ -25,10 +25,10 @@
 #include <cstring>
 #include <memory>
 
+#include "FSConfig.h"
+#include "FileIO.h"
 #include "FileUtils.h"
 #include "MemoryPool.h"
-#include "encfs/FSConfig.h"
-#include "encfs/FileIO.h"
 #include "i18n.h"
 
 template <typename Type>

encfs/BlockNameIO.cpp

@@ -25,9 +25,9 @@
 #include <cstring>
 
 #include "Cipher.h"
+#include "CipherKey.h"
+#include "NameIO.h"
 #include "base64.h"
-#include "encfs/CipherKey.h"
-#include "encfs/NameIO.h"
 #include "intl/gettext.h"
 
 namespace rlog {

encfs/BlockNameIO.h

@@ -25,8 +25,8 @@
 #include <memory>
 
 #include "CipherKey.h"
+#include "Interface.h"
 #include "NameIO.h"
-#include "encfs/Interface.h"
 #include "shared_ptr.h"
 
 class Cipher;

encfs/Cipher.cpp

@@ -26,6 +26,7 @@
 #include <utility>
 
 #include "Cipher.h"
+#include "CipherKey.h"
 #include "Interface.h"
 // for static build.  Need to reference the modules which are registered at
 // run-time, to ensure that the linker doesn't optimize them away.
@@ -33,7 +34,6 @@
 #include "Range.h"
 #include "SSL_Cipher.h"
 #include "base64.h"
-#include "encfs/CipherKey.h"
 
 using namespace std;
 using namespace rel;

encfs/CipherFileIO.cpp

@@ -29,10 +29,10 @@
 #include <sys/stat.h>
 #include <cerrno>
 
+#include "BlockFileIO.h"
 #include "Cipher.h"
-#include "encfs/BlockFileIO.h"
+#include "CipherKey.h"
-#include "encfs/CipherKey.h"
+#include "FileIO.h"
-#include "encfs/FileIO.h"
 
 /*
     - Version 2:0 adds support for a per-file initialization vector with a

encfs/CipherFileIO.h

@@ -28,9 +28,9 @@
 
 #include "BlockFileIO.h"
 #include "CipherKey.h"
+#include "FSConfig.h"
 #include "FileUtils.h"
-#include "encfs/FSConfig.h"
+#include "Interface.h"
-#include "encfs/Interface.h"
 
 class Cipher;
 class FileIO;

encfs/ConfigReader.cpp

@@ -27,7 +27,7 @@
 #include <cstring>
 #include <utility>
 
-#include "encfs/ConfigVar.h"
+#include "ConfigVar.h"
 
 using namespace std;
 using namespace rlog;

encfs/DirNode.cpp

@@ -27,10 +27,10 @@
 #include <cstdio>
 
 #include "DirNode.h"
+#include "FSConfig.h"
+#include "FileNode.h"
 #include "FileUtils.h"
-#include "encfs/FSConfig.h"
+#include "NameIO.h"
-#include "encfs/FileNode.h"
-#include "encfs/NameIO.h"
 #ifdef linux
 #include <sys/fsuid.h>
 #endif

encfs/FileNode.h

@@ -30,8 +30,8 @@
 
 #include "CipherKey.h"
 #include "FileUtils.h"
+#include "FSConfig.h"
 #include "encfs.h"
-#include "encfs/FSConfig.h"
 
 class Cipher;
 class DirNode;

encfs/FileUtils.cpp

@@ -49,18 +49,18 @@
 
 #include "BlockNameIO.h"
 #include "Cipher.h"
+#include "CipherKey.h"
 #include "ConfigReader.h"
+#include "ConfigVar.h"
 #include "Context.h"
 #include "DirNode.h"
 #include "FSConfig.h"
 #include "FileUtils.h"
+#include "Interface.h"
+#include "NameIO.h"
+#include "Range.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"

encfs/MACFileIO.cpp

@@ -26,11 +26,11 @@
 #include <sys/stat.h>
 #include <cstring>
 
+#include "BlockFileIO.h"
+#include "Cipher.h"
+#include "FileIO.h"
 #include "FileUtils.h"
 #include "MemoryPool.h"
-#include "encfs/BlockFileIO.h"
-#include "encfs/Cipher.h"
-#include "encfs/FileIO.h"
 #include "i18n.h"
 
 namespace rlog {

encfs/MACFileIO.h

@@ -27,9 +27,9 @@
 
 #include "BlockFileIO.h"
 #include "Cipher.h"
-#include "encfs/CipherKey.h"
+#include "CipherKey.h"
-#include "encfs/FSConfig.h"
+#include "FSConfig.h"
-#include "encfs/Interface.h"
+#include "Interface.h"
 
 class Cipher;
 class FileIO;

encfs/NameIO.cpp

@@ -30,10 +30,10 @@
 #include <utility>
 
 #include "BlockNameIO.h"
+#include "CipherKey.h"
+#include "Interface.h"
 #include "NullNameIO.h"
 #include "StreamNameIO.h"
-#include "encfs/CipherKey.h"
-#include "encfs/Interface.h"
 
 using namespace std;
 using namespace rel;

encfs/NullCipher.cpp

@@ -23,9 +23,9 @@
 #include <cstring>
 #include <memory>
 
+#include "Cipher.h"
 #include "Interface.h"
 #include "Range.h"
-#include "encfs/Cipher.h"
 
 using namespace std;
 using namespace rel;

encfs/NullCipher.h

@@ -24,8 +24,8 @@
 #include <stdint.h>
 
 #include "Cipher.h"
+#include "CipherKey.h"
 #include "Interface.h"
-#include "encfs/CipherKey.h"
 
 /*
     Implements Cipher interface for a pass-through mode.  May be useful for

encfs/NullNameIO.cpp

@@ -23,8 +23,8 @@
 #include <cstring>
 #include <memory>
 
-#include "encfs/CipherKey.h"
+#include "CipherKey.h"
-#include "encfs/NameIO.h"
+#include "NameIO.h"
 
 class Cipher;
 

encfs/NullNameIO.h

@@ -23,8 +23,8 @@
 
 #include <stdint.h>
 
+#include "Interface.h"
 #include "NameIO.h"
-#include "encfs/Interface.h"
 
 class NullNameIO : public NameIO {
  public:

encfs/RawFileIO.cpp

@@ -29,8 +29,8 @@
 #include <cerrno>
 #include <cstring>
 
+#include "FileIO.h"
 #include "RawFileIO.h"
-#include "encfs/FileIO.h"
 
 using namespace std;
 

encfs/RawFileIO.h

@@ -24,8 +24,8 @@
 #include <sys/types.h>
 #include <string>
 
+#include "Interface.h"
 #include "FileIO.h"
-#include "encfs/Interface.h"
 
 class RawFileIO : public FileIO {
  public:

encfs/SSL_Cipher.cpp

@@ -32,11 +32,11 @@
 #include <cstring>
 #include <string>
 
+#include "Cipher.h"
+#include "Interface.h"
 #include "Mutex.h"
 #include "Range.h"
 #include "SSL_Cipher.h"
-#include "encfs/Cipher.h"
-#include "encfs/Interface.h"
 #include "intl/gettext.h"
 
 namespace rlog {

encfs/SSL_Cipher.h

@@ -25,8 +25,8 @@
 #include <memory>
 
 #include "Cipher.h"
+#include "CipherKey.h"
 #include "Interface.h"
-#include "encfs/CipherKey.h"
 
 class SSLKey;
 #ifndef EVP_CIPHER

encfs/StreamNameIO.cpp

@@ -25,9 +25,9 @@
 #include <cstring>
 
 #include "Cipher.h"
+#include "CipherKey.h"
+#include "NameIO.h"
 #include "base64.h"
-#include "encfs/CipherKey.h"
-#include "encfs/NameIO.h"
 #include "intl/gettext.h"
 
 using namespace rel;

encfs/StreamNameIO.h

@@ -25,8 +25,8 @@
 #include <memory>
 
 #include "CipherKey.h"
+#include "Interface.h"
 #include "NameIO.h"
-#include "encfs/Interface.h"
 
 class Cipher;
 

encfs/encfs.cpp

@@ -49,8 +49,8 @@
 
 #include "Context.h"
 #include "DirNode.h"
+#include "FileNode.h"
 #include "FileUtils.h"
-#include "encfs/FileNode.h"
 #include "fuse.h"
 
 namespace rel {

encfs/encfsctl.cpp

@@ -36,14 +36,14 @@
 #include <openssl/ssl.h>
 
 #include "Cipher.h"
+#include "CipherKey.h"
 #include "DirNode.h"
+#include "FSConfig.h"
 #include "FileNode.h"
 #include "FileUtils.h"
+#include "Interface.h"
 #include "autosprintf.h"
 #include "config.h"
-#include "encfs/CipherKey.h"
-#include "encfs/FSConfig.h"
-#include "encfs/Interface.h"
 #include "i18n.h"
 #include "intl/gettext.h"
 

encfs/test.cpp

@@ -31,15 +31,15 @@
 
 #include "BlockNameIO.h"
 #include "Cipher.h"
+#include "CipherKey.h"
 #include "DirNode.h"
+#include "FSConfig.h"
 #include "FileUtils.h"
 #include "Interface.h"
 #include "MemoryPool.h"
+#include "NameIO.h"
+#include "Range.h"
 #include "StreamNameIO.h"
-#include "encfs/CipherKey.h"
-#include "encfs/FSConfig.h"
-#include "encfs/NameIO.h"
-#include "encfs/Range.h"
 
 #define NO_DES
 #include <openssl/ssl.h>