diff --git a/src/config/CryCipher.h b/src/config/CryCipher.h
index cdc5221c..791de072 100644
--- a/src/config/CryCipher.h
+++ b/src/config/CryCipher.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_CRYCIPHER_H
-#define CRYFS_CRYCIPHER_H
+#pragma once
+#ifndef MESSMER_CRYFS_SRC_CONFIG_CRYCIPHER_H
+#define MESSMER_CRYFS_SRC_CONFIG_CRYCIPHER_H
 
 #include <vector>
 #include <string>
diff --git a/src/config/CryConfig.h b/src/config/CryConfig.h
index 2329a953..c79279a5 100644
--- a/src/config/CryConfig.h
+++ b/src/config/CryConfig.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_LIB_CRYCONFIG_H_
-#define CRYFS_LIB_CRYCONFIG_H_
+#ifndef MESSMER_CRYFS_SRC_CONFIG_CRYCONFIG_H_
+#define MESSMER_CRYFS_SRC_CONFIG_CRYCONFIG_H_
 
 #include <boost/filesystem/path.hpp>
 
diff --git a/src/config/CryConfigLoader.h b/src/config/CryConfigLoader.h
index 7cd05151..5b466fc3 100644
--- a/src/config/CryConfigLoader.h
+++ b/src/config/CryConfigLoader.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CRYFS_SRC_CRYCONFIGLOADER_H_
-#define MESSMER_CRYFS_SRC_CRYCONFIGLOADER_H_
+#ifndef MESSMER_CRYFS_SRC_CONFIG_CRYCONFIGLOADER_H_
+#define MESSMER_CRYFS_SRC_CONFIG_CRYCONFIGLOADER_H_
 
 #include <messmer/cpp-utils/pointer/unique_ref.h>
 #include <boost/filesystem/path.hpp>
diff --git a/src/filesystem/CryDevice.h b/src/filesystem/CryDevice.h
index 63025357..808be96b 100644
--- a/src/filesystem/CryDevice.h
+++ b/src/filesystem/CryDevice.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_LIB_CRYDEVICE_H_
-#define CRYFS_LIB_CRYDEVICE_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_CRYDEVICE_H_
+#define MESSMER_CRYFS_FILESYSTEM_CRYDEVICE_H_
 
 #include <messmer/blockstore/interface/BlockStore.h>
 #include "../config/CryConfigLoader.h"
diff --git a/src/filesystem/CryDir.h b/src/filesystem/CryDir.h
index 41345271..cfd46c60 100644
--- a/src/filesystem/CryDir.h
+++ b/src/filesystem/CryDir.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_LIB_CRYDIR_H_
-#define CRYFS_LIB_CRYDIR_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_CRYDIR_H_
+#define MESSMER_CRYFS_FILESYSTEM_CRYDIR_H_
 
 #include <messmer/fspp/fs_interface/Dir.h>
 #include "CryNode.h"
diff --git a/src/filesystem/CryFile.h b/src/filesystem/CryFile.h
index dc76fdd2..ceb642ef 100644
--- a/src/filesystem/CryFile.h
+++ b/src/filesystem/CryFile.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_LIB_CRYFILE_H_
-#define CRYFS_LIB_CRYFILE_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_CRYFILE_H_
+#define MESSMER_CRYFS_FILESYSTEM_CRYFILE_H_
 
 #include "parallelaccessfsblobstore/FileBlobRef.h"
 #include "parallelaccessfsblobstore/DirBlobRef.h"
diff --git a/src/filesystem/CryNode.h b/src/filesystem/CryNode.h
index 3e66eb22..8403514a 100644
--- a/src/filesystem/CryNode.h
+++ b/src/filesystem/CryNode.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_LIB_CRYNODE_H_
-#define CRYFS_LIB_CRYNODE_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_CRYNODE_H_
+#define MESSMER_CRYFS_FILESYSTEM_CRYNODE_H_
 
 #include <messmer/fspp/fs_interface/Node.h>
 #include "messmer/cpp-utils/macros.h"
diff --git a/src/filesystem/CryOpenFile.h b/src/filesystem/CryOpenFile.h
index 88cb052c..4170ce5e 100644
--- a/src/filesystem/CryOpenFile.h
+++ b/src/filesystem/CryOpenFile.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_LIB_CRYOPENFILE_H_
-#define CRYFS_LIB_CRYOPENFILE_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_CRYOPENFILE_H_
+#define MESSMER_CRYFS_FILESYSTEM_CRYOPENFILE_H_
 
 #include "messmer/fspp/fs_interface/OpenFile.h"
 #include "parallelaccessfsblobstore/FileBlobRef.h"
diff --git a/src/filesystem/CrySymlink.h b/src/filesystem/CrySymlink.h
index 9205a4b0..86ad0503 100644
--- a/src/filesystem/CrySymlink.h
+++ b/src/filesystem/CrySymlink.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_LIB_CRYSYMLINK_H_
-#define CRYFS_LIB_CRYSYMLINK_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_CRYSYMLINK_H_
+#define MESSMER_CRYFS_FILESYSTEM_CRYSYMLINK_H_
 
 #include <messmer/fspp/fs_interface/Symlink.h>
 #include "CryNode.h"
diff --git a/src/filesystem/cachingfsblobstore/CachingFsBlobStore.h b/src/filesystem/cachingfsblobstore/CachingFsBlobStore.h
index 9f319253..a46e16a5 100644
--- a/src/filesystem/cachingfsblobstore/CachingFsBlobStore.h
+++ b/src/filesystem/cachingfsblobstore/CachingFsBlobStore.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_CACHINGFSBLOBSTORE_CACHINGFSBLOBSTORE_H
-#define CRYFS_CACHINGFSBLOBSTORE_CACHINGFSBLOBSTORE_H
+#pragma once
+#ifndef MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_CACHINGFSBLOBSTORE_H
+#define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_CACHINGFSBLOBSTORE_H
 
 #include <messmer/cpp-utils/pointer/unique_ref.h>
 #include "../fsblobstore/FsBlobStore.h"
diff --git a/src/filesystem/cachingfsblobstore/DirBlobRef.h b/src/filesystem/cachingfsblobstore/DirBlobRef.h
index ba07da50..fe5d8504 100644
--- a/src/filesystem/cachingfsblobstore/DirBlobRef.h
+++ b/src/filesystem/cachingfsblobstore/DirBlobRef.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_DIRBLOBREF_H
-#define CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_DIRBLOBREF_H
+#pragma once
+#ifndef MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_DIRBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_DIRBLOBREF_H
 
 #include "FsBlobRef.h"
 #include "../fsblobstore/DirBlob.h"
diff --git a/src/filesystem/cachingfsblobstore/FileBlobRef.h b/src/filesystem/cachingfsblobstore/FileBlobRef.h
index 2cf45477..b9babec7 100644
--- a/src/filesystem/cachingfsblobstore/FileBlobRef.h
+++ b/src/filesystem/cachingfsblobstore/FileBlobRef.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FILEBLOBREF_H
-#define CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FILEBLOBREF_H
+#pragma once
+#ifndef MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FILEBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FILEBLOBREF_H
 
 #include "FsBlobRef.h"
 #include "../fsblobstore/FileBlob.h"
diff --git a/src/filesystem/cachingfsblobstore/FsBlobRef.h b/src/filesystem/cachingfsblobstore/FsBlobRef.h
index df168033..104d1ba2 100644
--- a/src/filesystem/cachingfsblobstore/FsBlobRef.h
+++ b/src/filesystem/cachingfsblobstore/FsBlobRef.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_CACHINGFSBLOBSTORE_FSBLOBREF_H
-#define CRYFS_CACHINGFSBLOBSTORE_FSBLOBREF_H
+#pragma once
+#ifndef MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FSBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FSBLOBREF_H
 
 #include "../fsblobstore/FsBlob.h"
 
diff --git a/src/filesystem/cachingfsblobstore/SymlinkBlobRef.h b/src/filesystem/cachingfsblobstore/SymlinkBlobRef.h
index 0f5e4b48..d15924e1 100644
--- a/src/filesystem/cachingfsblobstore/SymlinkBlobRef.h
+++ b/src/filesystem/cachingfsblobstore/SymlinkBlobRef.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_SYMLINKBLOBREF_H
-#define CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_SYMLINKBLOBREF_H
+#pragma once
+#ifndef MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_SYMLINKBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_SYMLINKBLOBREF_H
 
 #include "FsBlobRef.h"
 #include "../fsblobstore/SymlinkBlob.h"
diff --git a/src/filesystem/fsblobstore/DirBlob.h b/src/filesystem/fsblobstore/DirBlob.h
index 833f4f92..fa4dce20 100644
--- a/src/filesystem/fsblobstore/DirBlob.h
+++ b/src/filesystem/fsblobstore/DirBlob.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_FSBLOBSTORE_DIRBLOB_H_
-#define CRYFS_FSBLOBSTORE_DIRBLOB_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_DIRBLOB_H_
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_DIRBLOB_H_
 
 #include <messmer/blockstore/utils/Key.h>
 #include <messmer/cpp-utils/macros.h>
diff --git a/src/filesystem/fsblobstore/FileBlob.h b/src/filesystem/fsblobstore/FileBlob.h
index c214fd01..5aad572a 100644
--- a/src/filesystem/fsblobstore/FileBlob.h
+++ b/src/filesystem/fsblobstore/FileBlob.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_FSBLOBSTORE_FILEBLOB_H_
-#define CRYFS_FSBLOBSTORE_FILEBLOB_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_FILEBLOB_H_
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_FILEBLOB_H_
 
 #include "FsBlob.h"
 
diff --git a/src/filesystem/fsblobstore/FsBlob.h b/src/filesystem/fsblobstore/FsBlob.h
index 985ba7c2..1a8b399b 100644
--- a/src/filesystem/fsblobstore/FsBlob.h
+++ b/src/filesystem/fsblobstore/FsBlob.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_FSBLOBSTORE_FSBLOB_H
-#define CRYFS_FSBLOBSTORE_FSBLOB_H
+#pragma once
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_FSBLOB_H
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_FSBLOB_H
 
 #include <messmer/cpp-utils/pointer/unique_ref.h>
 #include <messmer/blobstore/interface/Blob.h>
diff --git a/src/filesystem/fsblobstore/FsBlobStore.h b/src/filesystem/fsblobstore/FsBlobStore.h
index 05f8ea33..308c92f4 100644
--- a/src/filesystem/fsblobstore/FsBlobStore.h
+++ b/src/filesystem/fsblobstore/FsBlobStore.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_FSBLOBSTORE_FSBLOBSTORE_H
-#define CRYFS_FSBLOBSTORE_FSBLOBSTORE_H
+#pragma once
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_FSBLOBSTORE_H
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_FSBLOBSTORE_H
 
 #include <messmer/cpp-utils/lock/LockPool.h>
 #include <messmer/cpp-utils/pointer/unique_ref.h>
diff --git a/src/filesystem/fsblobstore/MagicNumbers.h b/src/filesystem/fsblobstore/MagicNumbers.h
index 545e2376..44c2d263 100644
--- a/src/filesystem/fsblobstore/MagicNumbers.h
+++ b/src/filesystem/fsblobstore/MagicNumbers.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_FSBLOBSTORE_MAGICNUMBERS_H_
-#define CRYFS_FSBLOBSTORE_MAGICNUMBERS_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_MAGICNUMBERS_H_
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_MAGICNUMBERS_H_
 
 namespace cryfs {
 namespace fsblobstore {
diff --git a/src/filesystem/fsblobstore/SymlinkBlob.h b/src/filesystem/fsblobstore/SymlinkBlob.h
index 401326b1..e224e4e8 100644
--- a/src/filesystem/fsblobstore/SymlinkBlob.h
+++ b/src/filesystem/fsblobstore/SymlinkBlob.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_FSBLOBSTORE_SYMLINKBLOB_H_
-#define CRYFS_FSBLOBSTORE_SYMLINKBLOB_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_SYMLINKBLOB_H_
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_SYMLINKBLOB_H_
 
 #include <boost/filesystem/path.hpp>
 #include "FsBlob.h"
diff --git a/src/filesystem/fsblobstore/utils/DirEntry.h b/src/filesystem/fsblobstore/utils/DirEntry.h
index 45a85713..dc189000 100644
--- a/src/filesystem/fsblobstore/utils/DirEntry.h
+++ b/src/filesystem/fsblobstore/utils/DirEntry.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRY_H
-#define CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRY_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRY_H
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRY_H
 
 #include <messmer/blockstore/utils/Key.h>
 #include <messmer/fspp/fs_interface/Dir.h>
diff --git a/src/filesystem/fsblobstore/utils/DirEntryList.h b/src/filesystem/fsblobstore/utils/DirEntryList.h
index c7d258b1..9e278a52 100644
--- a/src/filesystem/fsblobstore/utils/DirEntryList.h
+++ b/src/filesystem/fsblobstore/utils/DirEntryList.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRYLIST_H
-#define CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRYLIST_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRYLIST_H
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRYLIST_H
 
 #include <messmer/cpp-utils/data/Data.h>
 #include "DirEntry.h"
diff --git a/src/filesystem/parallelaccessfsblobstore/DirBlobRef.h b/src/filesystem/parallelaccessfsblobstore/DirBlobRef.h
index f4e9f402..6b33192e 100644
--- a/src/filesystem/parallelaccessfsblobstore/DirBlobRef.h
+++ b/src/filesystem/parallelaccessfsblobstore/DirBlobRef.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_DIRBLOBREF_H
-#define CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_DIRBLOBREF_H
+#pragma once
+#ifndef MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_DIRBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_DIRBLOBREF_H
 
 #include "FsBlobRef.h"
 #include "../cachingfsblobstore/DirBlobRef.h"
diff --git a/src/filesystem/parallelaccessfsblobstore/FileBlobRef.h b/src/filesystem/parallelaccessfsblobstore/FileBlobRef.h
index 191f3337..12321e04 100644
--- a/src/filesystem/parallelaccessfsblobstore/FileBlobRef.h
+++ b/src/filesystem/parallelaccessfsblobstore/FileBlobRef.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FILEBLOBREF_H
-#define CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FILEBLOBREF_H
+#pragma once
+#ifndef MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FILEBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FILEBLOBREF_H
 
 #include "FsBlobRef.h"
 #include "../cachingfsblobstore/FileBlobRef.h"
diff --git a/src/filesystem/parallelaccessfsblobstore/FsBlobRef.h b/src/filesystem/parallelaccessfsblobstore/FsBlobRef.h
index 8c3cd538..96dc5787 100644
--- a/src/filesystem/parallelaccessfsblobstore/FsBlobRef.h
+++ b/src/filesystem/parallelaccessfsblobstore/FsBlobRef.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_PARALLELACCESSFSBLOBSTORE_FSBLOBREF_H
-#define CRYFS_PARALLELACCESSFSBLOBSTORE_FSBLOBREF_H
+#pragma once
+#ifndef MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FSBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FSBLOBREF_H
 
 #include <messmer/parallelaccessstore/ParallelAccessStore.h>
 #include "../cachingfsblobstore/FsBlobRef.h"
diff --git a/src/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h b/src/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h
index 7bca9a7b..d17febcd 100644
--- a/src/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h
+++ b/src/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_PARALLELACCESSFSBLOBSTORE_H
-#define CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_PARALLELACCESSFSBLOBSTORE_H
+#pragma once
+#ifndef MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_PARALLELACCESSFSBLOBSTORE_H
+#define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_PARALLELACCESSFSBLOBSTORE_H
 
 #include <messmer/parallelaccessstore/ParallelAccessStore.h>
 #include "FileBlobRef.h"
diff --git a/src/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.h b/src/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.h
index 27a542e8..fb704e0a 100644
--- a/src/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.h
+++ b/src/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_PARALLELACCESSFSBLOBSTOREADAPTER_H_
 #define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_PARALLELACCESSFSBLOBSTOREADAPTER_H_
 
diff --git a/src/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h b/src/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h
index c9378266..2060a7b7 100644
--- a/src/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h
+++ b/src/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_SYMLINKBLOBREF_H
-#define CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_SYMLINKBLOBREF_H
+#pragma once
+#ifndef MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_SYMLINKBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_SYMLINKBLOBREF_H
 
 #include "FsBlobRef.h"
 #include "../cachingfsblobstore/SymlinkBlobRef.h"
diff --git a/src/main.cpp b/src/main.cpp
index f6f23304..5ed9aa38 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,4 @@
-#include <messmer/blockstore/implementations/ondisk/OnDiskBlockStore.h>
+ß#include <messmer/blockstore/implementations/ondisk/OnDiskBlockStore.h>
 #include <messmer/blockstore/implementations/inmemory/InMemoryBlockStore.h>
 #include <messmer/blockstore/implementations/inmemory/InMemoryBlock.h>
 #include <cmath>
diff --git a/src/program_options/Parser.h b/src/program_options/Parser.h
index 1115e555..852686a4 100644
--- a/src/program_options/Parser.h
+++ b/src/program_options/Parser.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_PROGRAMOPTIONS_PARSER_H
-#define CRYFS_PROGRAMOPTIONS_PARSER_H
+#pragma once
+#ifndef MESSMER_CRYFS_PROGRAMOPTIONS_PARSER_H
+#define MESSMER_CRYFS_PROGRAMOPTIONS_PARSER_H
 
 #include "ProgramOptions.h"
 #include <boost/program_options.hpp>
diff --git a/src/program_options/ProgramOptions.h b/src/program_options/ProgramOptions.h
index 6d1b8d21..2b86c81f 100644
--- a/src/program_options/ProgramOptions.h
+++ b/src/program_options/ProgramOptions.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_PROGRAMOPTIONS_PROGRAMOPTIONS_H
-#define CRYFS_PROGRAMOPTIONS_PROGRAMOPTIONS_H
+#pragma once
+#ifndef MESSMER_CRYFS_PROGRAMOPTIONS_PROGRAMOPTIONS_H
+#define MESSMER_CRYFS_PROGRAMOPTIONS_PROGRAMOPTIONS_H
 
 #include <vector>
 #include <string>
diff --git a/src/program_options/utils.h b/src/program_options/utils.h
index 7eef72cd..8b5f42ed 100644
--- a/src/program_options/utils.h
+++ b/src/program_options/utils.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_PROGRAMOPTIONS_UTILS_H
-#define CRYFS_PROGRAMOPTIONS_UTILS_H
+#pragma once
+#ifndef MESSMER_CRYFS_PROGRAMOPTIONS_UTILS_H
+#define MESSMER_CRYFS_PROGRAMOPTIONS_UTILS_H
 
 #include <utility>
 #include <vector>
diff --git a/test/program_options/testutils/ProgramOptionsTestBase.h b/test/program_options/testutils/ProgramOptionsTestBase.h
index 0a351785..d4d220c4 100644
--- a/test/program_options/testutils/ProgramOptionsTestBase.h
+++ b/test/program_options/testutils/ProgramOptionsTestBase.h
@@ -1,5 +1,6 @@
-#ifndef CRYFS_TEST_PROGRAMOPTIONS_PROGRAMOPTIONSTEST_H
-#define CRYFS_TEST_PROGRAMOPTIONS_PROGRAMOPTIONSTEST_H
+#pragma once
+#ifndef MESSMER_CRYFS_TEST_PROGRAMOPTIONS_PROGRAMOPTIONSTEST_H
+#define MESSMER_CRYFS_TEST_PROGRAMOPTIONS_PROGRAMOPTIONSTEST_H
 
 #include <google/gtest/gtest.h>