Move cryfs code into impl/ subfolder

src/cryfs-cli/Cli.cpp

@@ -10,22 +10,22 @@
 #include <fspp/impl/FilesystemImpl.h>
 #include <cpp-utils/process/subprocess.h>
 #include <cpp-utils/io/DontEchoStdinToStdoutRAII.h>
-#include <cryfs/filesystem/CryDevice.h>
+#include <cryfs/impl/filesystem/CryDevice.h>
-#include <cryfs/config/CryConfigLoader.h>
+#include <cryfs/impl/config/CryConfigLoader.h>
-#include <cryfs/config/CryPasswordBasedKeyProvider.h>
+#include <cryfs/impl/config/CryPasswordBasedKeyProvider.h>
 #include "program_options/Parser.h"
 #include <boost/filesystem.hpp>
 
-#include <cryfs/filesystem/CryDir.h>
+#include <cryfs/impl/filesystem/CryDir.h>
 #include <gitversion/gitversion.h>
 
 #include "VersionChecker.h"
 #include <gitversion/VersionCompare.h>
 #include <cpp-utils/io/NoninteractiveConsole.h>
-#include <cryfs/localstate/LocalStateDir.h>
+#include <cryfs/impl/localstate/LocalStateDir.h>
-#include <cryfs/localstate/BasedirMetadata.h>
+#include <cryfs/impl/localstate/BasedirMetadata.h>
 #include "Environment.h"
-#include <cryfs/CryfsException.h>
+#include <cryfs/impl/CryfsException.h>
 #include <cpp-utils/thread/debugging.h>
 
 //TODO Many functions accessing the ProgramOptions object. Factor out into class that stores it as a member.

src/cryfs-cli/Cli.h

@@ -3,16 +3,16 @@
 #define MESSMER_CRYFSCLI_CLI_H
 
 #include "program_options/ProgramOptions.h"
-#include <cryfs/config/CryConfigFile.h>
+#include <cryfs/impl/config/CryConfigFile.h>
 #include <boost/filesystem/path.hpp>
 #include <cpp-utils/tempfile/TempFile.h>
 #include <cpp-utils/io/Console.h>
 #include <cpp-utils/random/RandomGenerator.h>
 #include <cpp-utils/network/HttpClient.h>
-#include <cryfs/filesystem/CryDevice.h>
+#include <cryfs/impl/filesystem/CryDevice.h>
 #include "CallAfterTimeout.h"
-#include <cryfs/config/CryConfigLoader.h>
+#include <cryfs/impl/config/CryConfigLoader.h>
-#include <cryfs/ErrorCodes.h>
+#include <cryfs/impl/ErrorCodes.h>
 
 namespace cryfs_cli {
     class Cli final {

src/cryfs-cli/main.cpp

@@ -1,7 +1,7 @@
 #include "Cli.h"
 #include <cpp-utils/random/Random.h>
 #include <cpp-utils/io/IOStreamConsole.h>
-#include <cryfs/CryfsException.h>
+#include <cryfs/impl/CryfsException.h>
 
 #if defined(_MSC_VER)
 #include <cpp-utils/network/WinHttpClient.h>

src/cryfs-cli/program_options/Parser.cpp

@@ -2,8 +2,8 @@
 #include "utils.h"
 #include <iostream>
 #include <boost/optional.hpp>
-#include <cryfs/config/CryConfigConsole.h>
+#include <cryfs/impl/config/CryConfigConsole.h>
-#include <cryfs/CryfsException.h>
+#include <cryfs/impl/CryfsException.h>
 #include <cryfs-cli/Environment.h>
 
 namespace po = boost::program_options;

src/cryfs-cli/program_options/Parser.h

@@ -4,7 +4,7 @@
 
 #include "ProgramOptions.h"
 #include <boost/program_options.hpp>
-#include <cryfs/ErrorCodes.h>
+#include <cryfs/impl/ErrorCodes.h>
 
 namespace cryfs_cli {
     namespace program_options {

src/cryfs-unmount/Cli.cpp

@@ -2,7 +2,7 @@
 #include <fspp/fuse/Fuse.h>
 #include <cryfs-unmount/program_options/Parser.h>
 #include <gitversion/gitversion.h>
-#include <cryfs/CryfsException.h>
+#include <cryfs/impl/CryfsException.h>
 
 #include <iostream>
 

src/cryfs-unmount/main_unmount.cpp

@@ -4,7 +4,7 @@
 #endif
 
 #include <iostream>
-#include <cryfs/CryfsException.h>
+#include <cryfs/impl/CryfsException.h>
 #include <cpp-utils/assert/backtrace.h>
 #include "Cli.h"
 

src/cryfs-unmount/program_options/Parser.cpp

@@ -1,8 +1,8 @@
 #include "Parser.h"
 #include <iostream>
 #include <boost/optional.hpp>
-#include <cryfs/config/CryConfigConsole.h>
+#include <cryfs/impl/config/CryConfigConsole.h>
-#include <cryfs/CryfsException.h>
+#include <cryfs/impl/CryfsException.h>
 #include <cryfs-cli/Environment.h>
 
 namespace po = boost::program_options;

src/cryfs-unmount/program_options/Parser.h

@@ -4,7 +4,7 @@
 
 #include "ProgramOptions.h"
 #include <boost/program_options.hpp>
-#include <cryfs/ErrorCodes.h>
+#include <cryfs/impl/ErrorCodes.h>
 
 namespace cryfs_unmount {
 	namespace program_options {

src/cryfs/CMakeLists.txt

@@ -2,51 +2,51 @@ project (cryfs)
 
 set(LIB_SOURCES
 #    cryfs.cpp
-        CryfsException.cpp
+        impl/CryfsException.cpp
-        config/crypto/outer/OuterConfig.cpp
+        impl/config/crypto/outer/OuterConfig.cpp
-        config/crypto/outer/OuterEncryptor.cpp
+        impl/config/crypto/outer/OuterEncryptor.cpp
-        config/crypto/CryConfigEncryptorFactory.cpp
+        impl/config/crypto/CryConfigEncryptorFactory.cpp
-        config/crypto/inner/ConcreteInnerEncryptor.cpp
+        impl/config/crypto/inner/ConcreteInnerEncryptor.cpp
-        config/crypto/inner/InnerConfig.cpp
+        impl/config/crypto/inner/InnerConfig.cpp
-        config/crypto/inner/InnerEncryptor.cpp
+        impl/config/crypto/inner/InnerEncryptor.cpp
-        config/crypto/CryConfigEncryptor.cpp
+        impl/config/crypto/CryConfigEncryptor.cpp
-        config/CryConfigConsole.cpp
+        impl/config/CryConfigConsole.cpp
-        config/CryConfigLoader.cpp
+        impl/config/CryConfigLoader.cpp
-        config/CryConfig.cpp
+        impl/config/CryConfig.cpp
-        config/CryConfigFile.cpp
+        impl/config/CryConfigFile.cpp
-        config/CryCipher.cpp
+        impl/config/CryCipher.cpp
-        config/CryConfigCreator.cpp
+        impl/config/CryConfigCreator.cpp
-        config/CryKeyProvider.cpp
+        impl/config/CryKeyProvider.cpp
-        config/CryPasswordBasedKeyProvider.cpp
+        impl/config/CryPasswordBasedKeyProvider.cpp
-        config/CryPresetPasswordBasedKeyProvider.cpp
+        impl/config/CryPresetPasswordBasedKeyProvider.cpp
-        filesystem/CryOpenFile.cpp
+        impl/filesystem/CryOpenFile.cpp
-        filesystem/fsblobstore/utils/DirEntry.cpp
+        impl/filesystem/fsblobstore/utils/DirEntry.cpp
-        filesystem/fsblobstore/utils/DirEntryList.cpp
+        impl/filesystem/fsblobstore/utils/DirEntryList.cpp
-        filesystem/fsblobstore/FsBlobStore.cpp
+        impl/filesystem/fsblobstore/FsBlobStore.cpp
-        filesystem/fsblobstore/FsBlobView.cpp
+        impl/filesystem/fsblobstore/FsBlobView.cpp
-        filesystem/fsblobstore/FileBlob.cpp
+        impl/filesystem/fsblobstore/FileBlob.cpp
-        filesystem/fsblobstore/FsBlob.cpp
+        impl/filesystem/fsblobstore/FsBlob.cpp
-        filesystem/fsblobstore/SymlinkBlob.cpp
+        impl/filesystem/fsblobstore/SymlinkBlob.cpp
-        filesystem/fsblobstore/DirBlob.cpp
+        impl/filesystem/fsblobstore/DirBlob.cpp
-        filesystem/CryNode.cpp
+        impl/filesystem/CryNode.cpp
-        filesystem/parallelaccessfsblobstore/DirBlobRef.cpp
+        impl/filesystem/parallelaccessfsblobstore/DirBlobRef.cpp
-        filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.cpp
+        impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.cpp
-        filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.cpp
+        impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.cpp
-        filesystem/parallelaccessfsblobstore/FsBlobRef.cpp
+        impl/filesystem/parallelaccessfsblobstore/FsBlobRef.cpp
-        filesystem/parallelaccessfsblobstore/FileBlobRef.cpp
+        impl/filesystem/parallelaccessfsblobstore/FileBlobRef.cpp
-        filesystem/parallelaccessfsblobstore/SymlinkBlobRef.cpp
+        impl/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.cpp
-        filesystem/CrySymlink.cpp
+        impl/filesystem/CrySymlink.cpp
-        filesystem/CryDir.cpp
+        impl/filesystem/CryDir.cpp
-        filesystem/cachingfsblobstore/DirBlobRef.cpp
+        impl/filesystem/cachingfsblobstore/DirBlobRef.cpp
-        filesystem/cachingfsblobstore/CachingFsBlobStore.cpp
+        impl/filesystem/cachingfsblobstore/CachingFsBlobStore.cpp
-        filesystem/cachingfsblobstore/FsBlobRef.cpp
+        impl/filesystem/cachingfsblobstore/FsBlobRef.cpp
-        filesystem/cachingfsblobstore/FileBlobRef.cpp
+        impl/filesystem/cachingfsblobstore/FileBlobRef.cpp
-        filesystem/cachingfsblobstore/SymlinkBlobRef.cpp
+        impl/filesystem/cachingfsblobstore/SymlinkBlobRef.cpp
-        filesystem/CryFile.cpp
+        impl/filesystem/CryFile.cpp
-        filesystem/CryDevice.cpp
+        impl/filesystem/CryDevice.cpp
-        localstate/LocalStateDir.cpp
+        impl/localstate/LocalStateDir.cpp
-        localstate/LocalStateMetadata.cpp
+        impl/localstate/LocalStateMetadata.cpp
-        localstate/BasedirMetadata.cpp
+        impl/localstate/BasedirMetadata.cpp
 )
 
 add_library(${PROJECT_NAME} STATIC ${LIB_SOURCES})

src/cryfs/impl/config/CryCipher.cpp

@@ -2,7 +2,7 @@
 
 #include <cpp-utils/crypto/symmetric/ciphers.h>
 #include <blockstore/implementations/encrypted/EncryptedBlockStore2.h>
-#include "crypto/inner/ConcreteInnerEncryptor.h"
+#include "cryfs/impl/config/crypto/inner/ConcreteInnerEncryptor.h"
 
 using std::vector;
 using std::string;

src/cryfs/impl/config/CryCipher.h

@@ -7,7 +7,7 @@
 #include <cpp-utils/pointer/unique_ref.h>
 #include <blockstore/interface/BlockStore2.h>
 #include <cpp-utils/random/RandomGenerator.h>
-#include "crypto/inner/InnerEncryptor.h"
+#include "cryfs/impl/config/crypto/inner/InnerEncryptor.h"
 #include <cpp-utils/crypto/symmetric/EncryptionKey.h>
 
 namespace cryfs {

src/cryfs/impl/config/CryConfigCreator.cpp

@@ -2,8 +2,8 @@
 #include "CryCipher.h"
 #include <gitversion/gitversion.h>
 #include <cpp-utils/random/Random.h>
-#include <cryfs/localstate/LocalStateDir.h>
+#include <cryfs/impl/localstate/LocalStateDir.h>
-#include <cryfs/localstate/LocalStateMetadata.h>
+#include <cryfs/impl/localstate/LocalStateMetadata.h>
 
 using cpputils::Console;
 using cpputils::RandomGenerator;

src/cryfs/impl/config/CryConfigCreator.h

@@ -5,7 +5,7 @@
 #include <cpp-utils/pointer/unique_ref.h>
 #include <cpp-utils/random/RandomGenerator.h>
 #include <cpp-utils/io/Console.h>
-#include <cryfs/localstate/LocalStateDir.h>
+#include <cryfs/impl/localstate/LocalStateDir.h>
 #include "CryConfig.h"
 #include "CryConfigConsole.h"
 

src/cryfs/impl/config/CryConfigFile.h

@@ -7,7 +7,7 @@
 #include "CryConfig.h"
 #include <cpp-utils/crypto/symmetric/ciphers.h>
 #include <cpp-utils/either.h>
-#include "crypto/CryConfigEncryptorFactory.h"
+#include "cryfs/impl/config/crypto/CryConfigEncryptorFactory.h"
 
 namespace cryfs {
     class CryConfigFile final {

src/cryfs/impl/config/CryConfigLoader.cpp

@@ -6,9 +6,9 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <gitversion/gitversion.h>
 #include <gitversion/VersionCompare.h>
-#include "cryfs/localstate/LocalStateDir.h"
+#include "cryfs/impl/localstate/LocalStateDir.h"
-#include "cryfs/localstate/LocalStateMetadata.h"
+#include "cryfs/impl/localstate/LocalStateMetadata.h"
-#include "cryfs/CryfsException.h"
+#include "cryfs/impl/CryfsException.h"
 
 namespace bf = boost::filesystem;
 using cpputils::Console;

src/cryfs/impl/config/crypto/CryConfigEncryptor.h

@@ -6,9 +6,9 @@
 #include <cpp-utils/data/Deserializer.h>
 #include <cpp-utils/data/Serializer.h>
 #include <cpp-utils/crypto/symmetric/ciphers.h>
-#include "inner/InnerEncryptor.h"
+#include "cryfs/impl/config/crypto/inner/InnerEncryptor.h"
-#include "outer/OuterEncryptor.h"
+#include "cryfs/impl/config/crypto/outer/OuterEncryptor.h"
-#include "../CryCipher.h"
+#include "cryfs/impl/config/CryCipher.h"
 
 namespace cryfs {
     //TODO Use own exception for cpputils::Serializer/cpputils::Deserializer errors and only catch them

src/cryfs/impl/config/crypto/CryConfigEncryptorFactory.cpp

@@ -1,7 +1,7 @@
 #include "CryConfigEncryptorFactory.h"
 #include <cpp-utils/crypto/symmetric/ciphers.h>
-#include "outer/OuterConfig.h"
+#include "cryfs/impl/config/crypto/outer/OuterConfig.h"
-#include "cryfs/config/CryKeyProvider.h"
+#include "cryfs/impl/config/CryKeyProvider.h"
 
 using namespace cpputils::logging;
 using boost::optional;

src/cryfs/impl/config/crypto/CryConfigEncryptorFactory.h

@@ -2,11 +2,11 @@
 #ifndef MESSMER_CRYFS_SRC_CONFIG_CRYPTO_CRYCONFIGENCRYPTORFACTORY_H
 #define MESSMER_CRYFS_SRC_CONFIG_CRYPTO_CRYCONFIGENCRYPTORFACTORY_H
 
-#include "inner/ConcreteInnerEncryptor.h"
+#include "cryfs/impl/config/crypto/inner/ConcreteInnerEncryptor.h"
 #include "CryConfigEncryptor.h"
 #include <cpp-utils/pointer/unique_ref.h>
 #include <cpp-utils/crypto/kdf/Scrypt.h>
-#include "../CryCipher.h"
+#include "cryfs/impl/config/CryCipher.h"
 
 namespace cryfs {
     class CryKeyProvider;

src/cryfs/impl/filesystem/CryDevice.cpp

@@ -1,6 +1,6 @@
 #include <blockstore/implementations/caching/CachingBlockStore2.h>
 #include <cpp-utils/crypto/symmetric/ciphers.h>
-#include "cryfs/filesystem/parallelaccessfsblobstore/DirBlobRef.h"
+#include "cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h"
 #include "CryDevice.h"
 
 #include "CryDir.h"
@@ -13,14 +13,14 @@
 #include <blockstore/implementations/low2highlevel/LowToHighLevelBlockStore.h>
 #include <blockstore/implementations/encrypted/EncryptedBlockStore2.h>
 #include <blockstore/implementations/integrity/IntegrityBlockStore2.h>
-#include "cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h"
+#include "cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h"
-#include "cryfs/filesystem/cachingfsblobstore/CachingFsBlobStore.h"
+#include "cryfs/impl/filesystem/cachingfsblobstore/CachingFsBlobStore.h"
-#include "cryfs/config/CryCipher.h"
+#include "cryfs/impl/config/CryCipher.h"
 #include <cpp-utils/system/homedir.h>
 #include <gitversion/VersionCompare.h>
 #include <blockstore/interface/BlockStore2.h>
-#include "cryfs/localstate/LocalStateDir.h"
+#include "cryfs/impl/localstate/LocalStateDir.h"
-#include <cryfs/CryfsException.h>
+#include <cryfs/impl/CryfsException.h>
 
 using std::string;
 

src/cryfs/impl/filesystem/CryDevice.h

@@ -4,16 +4,16 @@
 
 #include <blockstore/interface/BlockStore.h>
 #include <blockstore/interface/BlockStore2.h>
-#include "cryfs/config/CryConfigFile.h"
+#include "cryfs/impl/config/CryConfigFile.h"
 
 #include <boost/filesystem.hpp>
 #include <fspp/fs_interface/Device.h>
-#include <cryfs/localstate/LocalStateDir.h>
+#include <cryfs/impl/localstate/LocalStateDir.h>
 
-#include "cryfs/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h"
+#include "cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h"
-#include "cryfs/filesystem/parallelaccessfsblobstore/DirBlobRef.h"
+#include "cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h"
-#include "cryfs/filesystem/parallelaccessfsblobstore/FileBlobRef.h"
+#include "cryfs/impl/filesystem/parallelaccessfsblobstore/FileBlobRef.h"
-#include "cryfs/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h"
+#include "cryfs/impl/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h"
 
 namespace cryfs {
 

src/cryfs/impl/filesystem/CryDir.cpp

@@ -9,7 +9,7 @@
 #include "CryFile.h"
 #include "CryOpenFile.h"
 #include <cpp-utils/system/time.h>
-#include "fsblobstore/utils/TimestampUpdateBehavior.h"
+#include "cryfs/impl/filesystem/fsblobstore/utils/TimestampUpdateBehavior.h"
 
 //TODO Get rid of this in favor of exception hierarchy
 using fspp::fuse::FuseErrnoException;

src/cryfs/impl/filesystem/CryDir.h

@@ -4,7 +4,7 @@
 
 #include <fspp/fs_interface/Dir.h>
 #include "CryNode.h"
-#include "parallelaccessfsblobstore/DirBlobRef.h"
+#include "cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h"
 
 namespace cryfs {
 

src/cryfs/impl/filesystem/CryFile.h

@@ -2,8 +2,8 @@
 #ifndef MESSMER_CRYFS_FILESYSTEM_CRYFILE_H_
 #define MESSMER_CRYFS_FILESYSTEM_CRYFILE_H_
 
-#include "parallelaccessfsblobstore/FileBlobRef.h"
+#include "cryfs/impl/filesystem/parallelaccessfsblobstore/FileBlobRef.h"
-#include "parallelaccessfsblobstore/DirBlobRef.h"
+#include "cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h"
 #include <fspp/fs_interface/File.h>
 #include "CryNode.h"
 

src/cryfs/impl/filesystem/CryNode.h

@@ -5,7 +5,7 @@
 #include <fspp/fs_interface/Node.h>
 #include <cpp-utils/macros.h>
 #include <fspp/fs_interface/Dir.h>
-#include "parallelaccessfsblobstore/DirBlobRef.h"
+#include "cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h"
 #include "CryDevice.h"
 
 namespace cryfs {

src/cryfs/impl/filesystem/CryOpenFile.h

@@ -3,8 +3,8 @@
 #define MESSMER_CRYFS_FILESYSTEM_CRYOPENFILE_H_
 
 #include <fspp/fs_interface/OpenFile.h>
-#include "parallelaccessfsblobstore/FileBlobRef.h"
+#include "cryfs/impl/filesystem/parallelaccessfsblobstore/FileBlobRef.h"
-#include "parallelaccessfsblobstore/DirBlobRef.h"
+#include "cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h"
 
 namespace cryfs {
 class CryDevice;

src/cryfs/impl/filesystem/CrySymlink.cpp

@@ -3,8 +3,8 @@
 #include <fspp/fs_interface/FuseErrnoException.h>
 #include "CryDevice.h"
 #include "CrySymlink.h"
-#include "parallelaccessfsblobstore/SymlinkBlobRef.h"
+#include "cryfs/impl/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h"
-#include "fsblobstore/utils/TimestampUpdateBehavior.h"
+#include "cryfs/impl/filesystem/fsblobstore/utils/TimestampUpdateBehavior.h"
 
 //TODO Get rid of this in favor of exception hierarchy
 

src/cryfs/impl/filesystem/CrySymlink.h

@@ -4,8 +4,8 @@
 
 #include <fspp/fs_interface/Symlink.h>
 #include "CryNode.h"
-#include "parallelaccessfsblobstore/SymlinkBlobRef.h"
+#include "cryfs/impl/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h"
-#include "parallelaccessfsblobstore/DirBlobRef.h"
+#include "cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h"
 
 namespace cryfs {
 

src/cryfs/impl/filesystem/cachingfsblobstore/CachingFsBlobStore.cpp

@@ -1,5 +1,5 @@
 #include "CachingFsBlobStore.h"
-#include "../fsblobstore/FsBlobStore.h"
+#include "cryfs/impl/filesystem/fsblobstore/FsBlobStore.h"
 
 using cpputils::unique_ref;
 using cpputils::make_unique_ref;

src/cryfs/impl/filesystem/cachingfsblobstore/CachingFsBlobStore.h

@@ -3,7 +3,7 @@
 #define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_CACHINGFSBLOBSTORE_H
 
 #include <cpp-utils/pointer/unique_ref.h>
-#include "../fsblobstore/FsBlobStore.h"
+#include "cryfs/impl/filesystem/fsblobstore/FsBlobStore.h"
 #include <blockstore/implementations/caching/cache/Cache.h>
 #include "FileBlobRef.h"
 #include "DirBlobRef.h"

src/cryfs/impl/filesystem/cachingfsblobstore/DirBlobRef.h

@@ -3,8 +3,8 @@
 #define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_DIRBLOBREF_H
 
 #include "FsBlobRef.h"
-#include "../fsblobstore/DirBlob.h"
+#include "cryfs/impl/filesystem/fsblobstore/DirBlob.h"
-#include "../fsblobstore/utils/TimestampUpdateBehavior.h"
+#include "cryfs/impl/filesystem/fsblobstore/utils/TimestampUpdateBehavior.h"
 #include <fspp/fs_interface/Node.h>
 
 namespace cryfs {

src/cryfs/impl/filesystem/cachingfsblobstore/FileBlobRef.h

@@ -3,7 +3,7 @@
 #define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FILEBLOBREF_H
 
 #include "FsBlobRef.h"
-#include "../fsblobstore/FileBlob.h"
+#include "cryfs/impl/filesystem/fsblobstore/FileBlob.h"
 
 namespace cryfs {
 namespace cachingfsblobstore {

src/cryfs/impl/filesystem/cachingfsblobstore/FsBlobRef.h

@@ -2,7 +2,7 @@
 #ifndef MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FSBLOBREF_H
 #define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FSBLOBREF_H
 
-#include "../fsblobstore/FsBlob.h"
+#include "cryfs/impl/filesystem/fsblobstore/FsBlob.h"
 
 namespace cryfs {
 namespace cachingfsblobstore {

src/cryfs/impl/filesystem/cachingfsblobstore/SymlinkBlobRef.h

@@ -3,7 +3,7 @@
 #define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_SYMLINKBLOBREF_H
 
 #include "FsBlobRef.h"
-#include "../fsblobstore/SymlinkBlob.h"
+#include "cryfs/impl/filesystem/fsblobstore/SymlinkBlob.h"
 
 namespace cryfs {
 namespace cachingfsblobstore {

src/cryfs/impl/filesystem/fsblobstore/DirBlob.cpp

@@ -6,7 +6,7 @@
 
 #include <blobstore/implementations/onblocks/utils/Math.h>
 #include <cpp-utils/data/Data.h>
-#include "../CryDevice.h"
+#include "cryfs/impl/filesystem/CryDevice.h"
 #include "FileBlob.h"
 #include "SymlinkBlob.h"
 #include <cpp-utils/system/stat.h>

src/cryfs/impl/filesystem/fsblobstore/DirBlob.h

@@ -7,7 +7,7 @@
 #include <fspp/fs_interface/Dir.h>
 #include <fspp/fs_interface/Node.h>
 #include "FsBlob.h"
-#include "utils/DirEntryList.h"
+#include "cryfs/impl/filesystem/fsblobstore/utils/DirEntryList.h"
 #include <mutex>
 
 namespace cryfs {

src/cryfs/impl/filesystem/parallelaccessfsblobstore/DirBlobRef.h

@@ -3,8 +3,8 @@
 #define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_DIRBLOBREF_H
 
 #include "FsBlobRef.h"
-#include "../cachingfsblobstore/DirBlobRef.h"
+#include "cryfs/impl/filesystem/cachingfsblobstore/DirBlobRef.h"
-#include "../fsblobstore/utils/TimestampUpdateBehavior.h"
+#include "cryfs/impl/filesystem/fsblobstore/utils/TimestampUpdateBehavior.h"
 #include <fspp/fs_interface/Node.h>
 
 namespace cryfs {

src/cryfs/impl/filesystem/parallelaccessfsblobstore/FileBlobRef.h

@@ -3,7 +3,7 @@
 #define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FILEBLOBREF_H
 
 #include "FsBlobRef.h"
-#include "../cachingfsblobstore/FileBlobRef.h"
+#include "cryfs/impl/filesystem/cachingfsblobstore/FileBlobRef.h"
 
 namespace cryfs {
 namespace parallelaccessfsblobstore {

src/cryfs/impl/filesystem/parallelaccessfsblobstore/FsBlobRef.h

@@ -3,7 +3,7 @@
 #define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FSBLOBREF_H
 
 #include <parallelaccessstore/ParallelAccessStore.h>
-#include "../cachingfsblobstore/FsBlobRef.h"
+#include "cryfs/impl/filesystem/cachingfsblobstore/FsBlobRef.h"
 
 namespace cryfs {
 namespace parallelaccessfsblobstore {

src/cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.cpp

@@ -1,6 +1,6 @@
 #include "ParallelAccessFsBlobStore.h"
 #include "ParallelAccessFsBlobStoreAdapter.h"
-#include "../fsblobstore/FsBlobStore.h"
+#include "cryfs/impl/filesystem/fsblobstore/FsBlobStore.h"
 
 namespace bf = boost::filesystem;
 using cpputils::unique_ref;

src/cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h

@@ -6,7 +6,7 @@
 #include "FileBlobRef.h"
 #include "DirBlobRef.h"
 #include "SymlinkBlobRef.h"
-#include "../cachingfsblobstore/CachingFsBlobStore.h"
+#include "cryfs/impl/filesystem/cachingfsblobstore/CachingFsBlobStore.h"
 #include "ParallelAccessFsBlobStoreAdapter.h"
 
 namespace cryfs {

src/cryfs/impl/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.h

@@ -4,7 +4,7 @@
 
 #include <cpp-utils/macros.h>
 #include <parallelaccessstore/ParallelAccessStore.h>
-#include "../cachingfsblobstore/CachingFsBlobStore.h"
+#include "cryfs/impl/filesystem/cachingfsblobstore/CachingFsBlobStore.h"
 
 namespace cryfs {
 namespace parallelaccessfsblobstore {

src/cryfs/impl/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h

@@ -3,7 +3,7 @@
 #define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_SYMLINKBLOBREF_H
 
 #include "FsBlobRef.h"
-#include "../cachingfsblobstore/SymlinkBlobRef.h"
+#include "cryfs/impl/filesystem/cachingfsblobstore/SymlinkBlobRef.h"
 
 namespace cryfs {
 namespace parallelaccessfsblobstore {