Unify (and fix) include guards

2015-10-15 13:04:57 +02:00 · 2015-10-15 13:04:57 +02:00 · c9663acd85
commit c9663acd85
parent cd32499180
45 changed files with 84 additions and 76 deletions
--- a/fs_interface/Device.h
+++ b/fs_interface/Device.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_DEVICE_H_
-#define FSPP_DEVICE_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_DEVICE_H_
+#define MESSMER_FSPP_FSINTERFACE_DEVICE_H_

 #include <boost/filesystem.hpp>
 #include <messmer/cpp-utils/pointer/unique_ref.h>
--- a/fs_interface/Dir.h
+++ b/fs_interface/Dir.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_DIR_H_
-#define FSPP_DIR_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_DIR_H_
+#define MESSMER_FSPP_FSINTERFACE_DIR_H_

 #include "Node.h"
 #include <messmer/cpp-utils/pointer/unique_ref.h>
--- a/fs_interface/File.h
+++ b/fs_interface/File.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_FILE_H_
-#define FSPP_FILE_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_FILE_H_
+#define MESSMER_FSPP_FSINTERFACE_FILE_H_

 #include "Node.h"
 #include <messmer/cpp-utils/pointer/unique_ref.h>
--- a/fs_interface/Node.h
+++ b/fs_interface/Node.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_NODE_H_
-#define FSPP_NODE_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_NODE_H_
+#define MESSMER_FSPP_FSINTERFACE_NODE_H_

 #include <boost/filesystem.hpp>

--- a/fs_interface/OpenFile.h
+++ b/fs_interface/OpenFile.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_OPENFILE_H_
-#define FSPP_OPENFILE_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_OPENFILE_H_
+#define MESSMER_FSPP_FSINTERFACE_OPENFILE_H_

 #include <boost/filesystem.hpp>
 #include <sys/stat.h>
--- a/fs_interface/Symlink.h
+++ b/fs_interface/Symlink.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_SYMLINK_H_
-#define FSPP_SYMLINK_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_SYMLINK_H_
+#define MESSMER_FSPP_FSINTERFACE_SYMLINK_H_

 #include "Node.h"
 #include <messmer/cpp-utils/pointer/unique_ref.h>
--- a/fstest/FsTest.h
+++ b/fstest/FsTest.h
@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_FSTEST_H_
 #define MESSMER_FSPP_FSTEST_FSTEST_H_

--- a/fstest/FsppDeviceTest.h
+++ b/fstest/FsppDeviceTest.h
@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_FSPPDEVICETEST_H_
 #define MESSMER_FSPP_FSTEST_FSPPDEVICETEST_H_

--- a/fstest/FsppDirTest.h
+++ b/fstest/FsppDirTest.h
@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_FSPPDIRTEST_H_
 #define MESSMER_FSPP_FSTEST_FSPPDIRTEST_H_

--- a/fstest/FsppFileTest.h
+++ b/fstest/FsppFileTest.h
@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_FSPPFILETEST_H_
 #define MESSMER_FSPP_FSTEST_FSPPFILETEST_H_

--- a/fstest/FsppOpenFileTest.h
+++ b/fstest/FsppOpenFileTest.h
@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_FSPPOPENFILETEST_H_
 #define MESSMER_FSPP_FSTEST_FSPPOPENFILETEST_H_

--- a/fstest/testutils/FileSystemTest.h
+++ b/fstest/testutils/FileSystemTest.h
@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_TESTUTILS_FILESYSTEMTEST_H_
 #define MESSMER_FSPP_FSTEST_TESTUTILS_FILESYSTEMTEST_H_

--- a/fstest/testutils/FileTest.h
+++ b/fstest/testutils/FileTest.h
@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_TESTUTILS_FILETEST_H_
 #define MESSMER_FSPP_FSTEST_TESTUTILS_FILETEST_H_

--- a/fuse/Filesystem.h
+++ b/fuse/Filesystem.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_IMPL_FILESYSTEM_H_
-#define FSPP_IMPL_FILESYSTEM_H_
+#ifndef MESSMER_FSPP_FUSE_FILESYSTEM_H_
+#define MESSMER_FSPP_FUSE_FILESYSTEM_H_

 #include <boost/filesystem.hpp>
 #include <messmer/cpp-utils/pointer/unique_ref.h>
--- a/fuse/Fuse.h
+++ b/fuse/Fuse.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_FUSE_FUSE_H_
-#define FSPP_FUSE_FUSE_H_
+#ifndef MESSMER_FSPP_FUSE_FUSE_H_
+#define MESSMER_FSPP_FUSE_FUSE_H_

 #include "params.h"
 #include <cstdio>
--- a/fuse/FuseErrnoException.h
+++ b/fuse/FuseErrnoException.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_FUSE_FUSEERRNOEXCEPTION_H_
-#define FSPP_FUSE_FUSEERRNOEXCEPTION_H_
+#ifndef MESSMER_FSPP_FUSE_FUSEERRNOEXCEPTION_H_
+#define MESSMER_FSPP_FUSE_FUSEERRNOEXCEPTION_H_

 #include <stdexcept>
 #include <errno.h>
--- a/fuse/params.h
+++ b/fuse/params.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_FUSE_PARAMS_H_
-#define FSPP_FUSE_PARAMS_H_
+#ifndef MESSMER_FSPP_FUSE_PARAMS_H_
+#define MESSMER_FSPP_FUSE_PARAMS_H_

 #define FUSE_USE_VERSION 26
 #include <fuse.h>
--- a/impl/FilesystemImpl.h
+++ b/impl/FilesystemImpl.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_IMPL_FILESYSTEMIMPL_H_
-#define FSPP_IMPL_FILESYSTEMIMPL_H_
+#ifndef MESSMER_FSPP_IMPL_FILESYSTEMIMPL_H_
+#define MESSMER_FSPP_IMPL_FILESYSTEMIMPL_H_

 #include "FuseOpenFileList.h"
 #include "../fuse/Filesystem.h"
--- a/impl/FuseOpenFileList.h
+++ b/impl/FuseOpenFileList.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_IMPL_FUSEOPENFILELIST_H_
-#define FSPP_IMPL_FUSEOPENFILELIST_H_
+#ifndef MESSMER_FSPP_IMPL_FUSEOPENFILELIST_H_
+#define MESSMER_FSPP_IMPL_FUSEOPENFILELIST_H_

 #include "../fs_interface/File.h"
 #include "../fs_interface/OpenFile.h"
--- a/impl/IdList.h
+++ b/impl/IdList.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_FUSE_IDLIST_H_
-#define FSPP_FUSE_IDLIST_H_
+#ifndef MESSMER_FSPP_IMPL_IDLIST_H_
+#define MESSMER_FSPP_IMPL_IDLIST_H_

 #include <map>
 #include <mutex>
--- a/impl/Profiler.h
+++ b/impl/Profiler.h
@ -1,5 +1,6 @@
-#ifndef FSPP_IMPL_PROFILER_H
-#define FSPP_IMPL_PROFILER_H
+#pragma once
+#ifndef MESSMER_FSPP_IMPL_PROFILER_H
+#define MESSMER_FSPP_IMPL_PROFILER_H

 #include <atomic>
 #include <chrono>
--- a/test/fuse/access/testutils/FuseAccessTest.h
+++ b/test/fuse/access/testutils/FuseAccessTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_ACCESS_TESTUTILS_FUSEACCESSTEST_H_
-#define TEST_FSPP_FUSE_ACCESS_TESTUTILS_FUSEACCESSTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_ACCESS_TESTUTILS_FUSEACCESSTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_ACCESS_TESTUTILS_FUSEACCESSTEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.h
+++ b/test/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_CREATEANDOPENFILE_TESTUTILS_FUSECREATEANDOPENTEST_H_
-#define TEST_FSPP_FUSE_CREATEANDOPENFILE_TESTUTILS_FUSECREATEANDOPENTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_CREATEANDOPENFILE_TESTUTILS_FUSECREATEANDOPENTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_CREATEANDOPENFILE_TESTUTILS_FUSECREATEANDOPENTEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/fuse/fdatasync/testutils/FuseFdatasyncTest.h
+++ b/test/fuse/fdatasync/testutils/FuseFdatasyncTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_FDATASYNC_TESTUTILS_FUSEFDATASYNCTEST_H_
-#define TEST_FSPP_FUSE_FDATASYNC_TESTUTILS_FUSEFDATASYNCTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_FDATASYNC_TESTUTILS_FUSEFDATASYNCTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_FDATASYNC_TESTUTILS_FUSEFDATASYNCTEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/fuse/flush/testutils/FuseFlushTest.h
+++ b/test/fuse/flush/testutils/FuseFlushTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_FLUSH_TESTUTILS_FUSEFLUSHTEST_H_
-#define TEST_FSPP_FUSE_FLUSH_TESTUTILS_FUSEFLUSHTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_FLUSH_TESTUTILS_FUSEFLUSHTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_FLUSH_TESTUTILS_FUSEFLUSHTEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/fuse/fstat/testutils/FuseFstatTest.h
+++ b/test/fuse/fstat/testutils/FuseFstatTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_FSTAT_TESTUTILS_FUSEFSTATTEST_H_
-#define TEST_FSPP_FUSE_FSTAT_TESTUTILS_FUSEFSTATTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_FSTAT_TESTUTILS_FUSEFSTATTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_FSTAT_TESTUTILS_FUSEFSTATTEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/fuse/fsync/testutils/FuseFsyncTest.h
+++ b/test/fuse/fsync/testutils/FuseFsyncTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_FSYNC_TESTUTILS_FUSEFSYNCTEST_H_
-#define TEST_FSPP_FUSE_FSYNC_TESTUTILS_FUSEFSYNCTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_FSYNC_TESTUTILS_FUSEFSYNCTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_FSYNC_TESTUTILS_FUSEFSYNCTEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/fuse/ftruncate/testutils/FuseFTruncateTest.h
+++ b/test/fuse/ftruncate/testutils/FuseFTruncateTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_FTRUNCATE_TESTUTILS_FUSEFTRUNCATETEST_H_
-#define TEST_FSPP_FUSE_FTRUNCATE_TESTUTILS_FUSEFTRUNCATETEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_FTRUNCATE_TESTUTILS_FUSEFTRUNCATETEST_H_
+#define MESSMER_FSPP_TEST_FUSE_FTRUNCATE_TESTUTILS_FUSEFTRUNCATETEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/fuse/lstat/testutils/FuseLstatReturnTest.h
+++ b/test/fuse/lstat/testutils/FuseLstatReturnTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_LSTAT_FUSELSTATRETURNTEST_H_
-#define TEST_FSPP_FUSE_LSTAT_FUSELSTATRETURNTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_LSTAT_TESTUTILS_FUSELSTATRETURNTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_LSTAT_TESTUTILS_FUSELSTATRETURNTEST_H_

 #include "FuseLstatTest.h"

--- a/test/fuse/lstat/testutils/FuseLstatTest.h
+++ b/test/fuse/lstat/testutils/FuseLstatTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_LSTAT_FUSELSTATTEST_H_
-#define TEST_FSPP_FUSE_LSTAT_FUSELSTATTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_LSTAT_TESTUTILS_FUSELSTATTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_LSTAT_TESTUTILS_FUSELSTATTEST_H_

 #include <string>
 #include <functional>
--- a/test/fuse/mkdir/testutils/FuseMkdirTest.h
+++ b/test/fuse/mkdir/testutils/FuseMkdirTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_MKDIR_TESTUTILS_FUSEMKDIRTEST_H_
-#define TEST_FSPP_FUSE_MKDIR_TESTUTILS_FUSEMKDIRTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_MKDIR_TESTUTILS_FUSEMKDIRTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_MKDIR_TESTUTILS_FUSEMKDIRTEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/fuse/openFile/testutils/FuseOpenTest.h
+++ b/test/fuse/openFile/testutils/FuseOpenTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_OPENFILE_TESTUTILS_FUSEOPENTEST_H_
-#define TEST_FSPP_FUSE_OPENFILE_TESTUTILS_FUSEOPENTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_OPENFILE_TESTUTILS_FUSEOPENTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_OPENFILE_TESTUTILS_FUSEOPENTEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/fuse/read/testutils/FuseReadTest.h
+++ b/test/fuse/read/testutils/FuseReadTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_READ_TESTUTILS_FUSEREADTEST_H_
-#define TEST_FSPP_FUSE_READ_TESTUTILS_FUSEREADTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_READ_TESTUTILS_FUSEREADTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_READ_TESTUTILS_FUSEREADTEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/fuse/readDir/testutils/FuseReadDirTest.h
+++ b/test/fuse/readDir/testutils/FuseReadDirTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_READDIR_TESTUTILS_FUSEREADDIRTEST_H_
-#define TEST_FSPP_FUSE_READDIR_TESTUTILS_FUSEREADDIRTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_READDIR_TESTUTILS_FUSEREADDIRTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_READDIR_TESTUTILS_FUSEREADDIRTEST_H_

 #include "../../../testutils/FuseTest.h"
 #include <dirent.h>
--- a/test/fuse/rename/testutils/FuseRenameTest.h
+++ b/test/fuse/rename/testutils/FuseRenameTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_RENAME_TESTUTILS_FUSERENAMETEST_H_
-#define TEST_FSPP_FUSE_RENAME_TESTUTILS_FUSERENAMETEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_RENAME_TESTUTILS_FUSERENAMETEST_H_
+#define MESSMER_FSPP_TEST_FUSE_RENAME_TESTUTILS_FUSERENAMETEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/fuse/rmdir/testutils/FuseRmdirTest.h
+++ b/test/fuse/rmdir/testutils/FuseRmdirTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_RMDIR_TESTUTILS_FUSERMDIRTEST_H_
-#define TEST_FSPP_FUSE_RMDIR_TESTUTILS_FUSERMDIRTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_RMDIR_TESTUTILS_FUSERMDIRTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_RMDIR_TESTUTILS_FUSERMDIRTEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/fuse/statfs/testutils/FuseStatfsReturnTest.h
+++ b/test/fuse/statfs/testutils/FuseStatfsReturnTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_STATFS_FUSESTATFSRETURNTEST_H_
-#define TEST_FSPP_FUSE_STATFS_FUSESTATFSRETURNTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_STATFS_TESTUTILS_FUSESTATFSRETURNTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_STATFS_TESTUTILS_FUSESTATFSRETURNTEST_H_

 #include "FuseStatfsTest.h"

--- a/test/fuse/statfs/testutils/FuseStatfsTest.h
+++ b/test/fuse/statfs/testutils/FuseStatfsTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_STATFS_FUSESTATFSTEST_H_
-#define TEST_FSPP_FUSE_STATFS_FUSESTATFSTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_STATFS_TESTUTILS_FUSESTATFSTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_STATFS_TESTUTILS_FUSESTATFSTEST_H_

 #include <string>
 #include <functional>
--- a/test/fuse/truncate/testutils/FuseTruncateTest.h
+++ b/test/fuse/truncate/testutils/FuseTruncateTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_TRUNCATE_TESTUTILS_FUSETRUNCATETEST_H_
-#define TEST_FSPP_FUSE_TRUNCATE_TESTUTILS_FUSETRUNCATETEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_TRUNCATE_TESTUTILS_FUSETRUNCATETEST_H_
+#define MESSMER_FSPP_TEST_FUSE_TRUNCATE_TESTUTILS_FUSETRUNCATETEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/fuse/unlink/testutils/FuseUnlinkTest.h
+++ b/test/fuse/unlink/testutils/FuseUnlinkTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_UNLINK_TESTUTILS_FUSEUNLINKTEST_H_
-#define TEST_FSPP_FUSE_UNLINK_TESTUTILS_FUSEUNLINKTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_UNLINK_TESTUTILS_FUSEUNLINKTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_UNLINK_TESTUTILS_FUSEUNLINKTEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/fuse/utimens/testutils/FuseUtimensTest.h
+++ b/test/fuse/utimens/testutils/FuseUtimensTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_UTIMENS_TESTUTILS_FUSEUTIMENSTEST_H_
-#define TEST_FSPP_FUSE_UTIMENS_TESTUTILS_FUSEUTIMENSTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_UTIMENS_TESTUTILS_FUSEUTIMENSTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_UTIMENS_TESTUTILS_FUSEUTIMENSTEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/fuse/write/testutils/FuseWriteTest.h
+++ b/test/fuse/write/testutils/FuseWriteTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_WRITE_TESTUTILS_FUSEWRITETEST_H_
-#define TEST_FSPP_FUSE_WRITE_TESTUTILS_FUSEWRITETEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_WRITE_TESTUTILS_FUSEWRITETEST_H_
+#define MESSMER_FSPP_TEST_FUSE_WRITE_TESTUTILS_FUSEWRITETEST_H_

 #include "../../../testutils/FuseTest.h"

--- a/test/testutils/FuseTest.h
+++ b/test/testutils/FuseTest.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_TESTUTILS_FUSETEST_H_
-#define TEST_TESTUTILS_FUSETEST_H_
+#ifndef MESSMER_FSPP_TEST_TESTUTILS_FUSETEST_H_
+#define MESSMER_FSPP_TEST_TESTUTILS_FUSETEST_H_

 #include "google/gtest/gtest.h"
 #include "google/gmock/gmock.h"
--- a/test/testutils/FuseThread.h
+++ b/test/testutils/FuseThread.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_TESTUTILS_FUSETHREAD_H_
-#define TEST_TESTUTILS_FUSETHREAD_H_
+#ifndef MESSMER_FSPP_TEST_TESTUTILS_FUSETHREAD_H_
+#define MESSMER_FSPP_TEST_TESTUTILS_FUSETHREAD_H_

 #include <thread>

--- a/test/testutils/InMemoryFile.h
+++ b/test/testutils/InMemoryFile.h
@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKS_MESSMER_FSPP_TEST_TESTUTILS_INMEMORYFILE_H_
-#define BLOCKS_MESSMER_FSPP_TEST_TESTUTILS_INMEMORYFILE_H_
+#ifndef MESSMER_FSPP_TEST_TESTUTILS_INMEMORYFILE_H_
+#define MESSMER_FSPP_TEST_TESTUTILS_INMEMORYFILE_H_

 #include <messmer/cpp-utils/data/Data.h>