From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 30 Sep 2023 17:46:24 +0000 (+0200)
Subject: refactor: Move fmtmacros to util
X-Git-Tag: v4.9~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef96a84ac911fdd3d6e7a6642bd56b74fa7c997f;p=thirdparty%2Fccache.git

refactor: Move fmtmacros to util
---

diff --git a/src/Config.cpp b/src/Config.cpp
index ca27da956..74aee464d 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -25,7 +25,6 @@
 #include <core/common.hpp>
 #include <core/exceptions.hpp>
 #include <core/types.hpp>
-#include <fmtmacros.hpp>
 #include <util/DirEntry.hpp>
 #include <util/Tokenizer.hpp>
 #include <util/UmaskScope.hpp>
@@ -34,6 +33,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>
diff --git a/src/Hash.cpp b/src/Hash.cpp
index 749d0ba0f..8198e6684 100644
--- a/src/Hash.cpp
+++ b/src/Hash.cpp
@@ -19,10 +19,10 @@
 #include "Hash.hpp"
 
 #include "Logging.hpp"
-#include "fmtmacros.hpp"
 
 #include <util/Fd.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>
 
diff --git a/src/InodeCache.cpp b/src/InodeCache.cpp
index 26339b589..87d4ec5e0 100644
--- a/src/InodeCache.cpp
+++ b/src/InodeCache.cpp
@@ -22,7 +22,6 @@
 #include "Hash.hpp"
 #include "Logging.hpp"
 #include "Util.hpp"
-#include "fmtmacros.hpp"
 
 #include <util/DirEntry.hpp>
 #include <util/Fd.hpp>
@@ -30,6 +29,7 @@
 #include <util/TemporaryFile.hpp>
 #include <util/conversion.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 
 #include <fcntl.h>
 #include <libgen.h>
diff --git a/src/Logging.cpp b/src/Logging.cpp
index c9d306b89..4090335f9 100644
--- a/src/Logging.cpp
+++ b/src/Logging.cpp
@@ -24,9 +24,9 @@
 #include "Util.hpp"
 #include "Win32Util.hpp"
 #include "execute.hpp"
-#include "fmtmacros.hpp"
 
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/time.hpp>
 #include <util/wincompat.hpp>
 
diff --git a/src/MiniTrace.cpp b/src/MiniTrace.cpp
index ec3914cf7..8e1091bda 100644
--- a/src/MiniTrace.cpp
+++ b/src/MiniTrace.cpp
@@ -19,7 +19,6 @@
 #include "MiniTrace.hpp"
 
 #include "ArgsInfo.hpp"
-#include "fmtmacros.hpp"
 
 #include <core/exceptions.hpp>
 #include <util/TemporaryFile.hpp>
@@ -27,6 +26,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
diff --git a/src/ProgressBar.cpp b/src/ProgressBar.cpp
index e7ca1b4e1..da0ee2530 100644
--- a/src/ProgressBar.cpp
+++ b/src/ProgressBar.cpp
@@ -18,9 +18,8 @@
 
 #include "ProgressBar.hpp"
 
-#include "fmtmacros.hpp"
-
 #include <util/assertions.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/wincompat.hpp>
 
 #include "third_party/fmt/core.h"
diff --git a/src/Util.cpp b/src/Util.cpp
index 9099d0a5f..79b91af9a 100644
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -25,11 +25,11 @@
 
 #include <Config.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/DirEntry.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>
diff --git a/src/argprocessing.cpp b/src/argprocessing.cpp
index 0144e28d6..bdfd25dac 100644
--- a/src/argprocessing.cpp
+++ b/src/argprocessing.cpp
@@ -21,12 +21,12 @@
 #include "Context.hpp"
 #include "Logging.hpp"
 #include "compopt.hpp"
-#include "fmtmacros.hpp"
 #include "language.hpp"
 
 #include <Depfile.hpp>
 #include <Util.hpp>
 #include <util/assertions.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>
diff --git a/src/ccache.cpp b/src/ccache.cpp
index 7d037e5cc..ee1497d93 100644
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -33,7 +33,6 @@
 #include "argprocessing.hpp"
 #include "compopt.hpp"
 #include "execute.hpp"
-#include "fmtmacros.hpp"
 #include "hashutil.hpp"
 #include "language.hpp"
 
@@ -57,6 +56,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/process.hpp>
 #include <util/string.hpp>
diff --git a/src/compopt.cpp b/src/compopt.cpp
index 668adccb2..86a6cbb1e 100644
--- a/src/compopt.cpp
+++ b/src/compopt.cpp
@@ -18,7 +18,7 @@
 
 #include "compopt.hpp"
 
-#include "fmtmacros.hpp"
+#include <util/fmtmacros.hpp>
 
 #include "third_party/fmt/core.h"
 
diff --git a/src/core/AtomicFile.cpp b/src/core/AtomicFile.cpp
index c827993b2..a709a75ac 100644
--- a/src/core/AtomicFile.cpp
+++ b/src/core/AtomicFile.cpp
@@ -18,12 +18,12 @@
 
 #include <core/AtomicFile.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/TemporaryFile.hpp>
 #include <util/assertions.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 
 namespace fs = util::filesystem;
 
diff --git a/src/core/CacheEntry.cpp b/src/core/CacheEntry.cpp
index b0b5c165b..df2b762f0 100644
--- a/src/core/CacheEntry.cpp
+++ b/src/core/CacheEntry.cpp
@@ -25,10 +25,10 @@
 #include <core/Result.hpp>
 #include <core/exceptions.hpp>
 #include <core/types.hpp>
-#include <fmtmacros.hpp>
 #include <util/TimePoint.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/zstd.hpp>
 
 #include <cstring>
diff --git a/src/core/CacheEntryDataReader.hpp b/src/core/CacheEntryDataReader.hpp
index cd6793f4a..ad73fbb26 100644
--- a/src/core/CacheEntryDataReader.hpp
+++ b/src/core/CacheEntryDataReader.hpp
@@ -19,8 +19,8 @@
 #pragma once
 
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/conversion.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 #include <third_party/nonstd/span.hpp>
diff --git a/src/core/CacheEntryDataWriter.hpp b/src/core/CacheEntryDataWriter.hpp
index 8bbff8ca3..19e91272c 100644
--- a/src/core/CacheEntryDataWriter.hpp
+++ b/src/core/CacheEntryDataWriter.hpp
@@ -19,8 +19,8 @@
 #pragma once
 
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/conversion.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 #include <third_party/nonstd/span.hpp>
diff --git a/src/core/Manifest.cpp b/src/core/Manifest.cpp
index e9cfadd80..f497aa408 100644
--- a/src/core/Manifest.cpp
+++ b/src/core/Manifest.cpp
@@ -24,9 +24,9 @@
 #include <core/CacheEntryDataReader.hpp>
 #include <core/CacheEntryDataWriter.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <hashutil.hpp>
 #include <util/XXH3_64.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 // Manifest data format
diff --git a/src/core/Result.cpp b/src/core/Result.cpp
index 4de7c729f..c490aceba 100644
--- a/src/core/Result.cpp
+++ b/src/core/Result.cpp
@@ -29,11 +29,11 @@
 #include <core/CacheEntryDataWriter.hpp>
 #include <core/Statistic.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/Bytes.hpp>
 #include <util/DirEntry.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>
diff --git a/src/core/ResultExtractor.cpp b/src/core/ResultExtractor.cpp
index 38347959e..8024a4a4d 100644
--- a/src/core/ResultExtractor.cpp
+++ b/src/core/ResultExtractor.cpp
@@ -19,14 +19,13 @@
 #include "ResultExtractor.hpp"
 
 #include "Util.hpp"
-#include "fmtmacros.hpp"
 
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/Bytes.hpp>
 #include <util/DirEntry.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/wincompat.hpp>
 
 #include <fcntl.h>
diff --git a/src/core/ResultInspector.cpp b/src/core/ResultInspector.cpp
index b27a3f1d3..20a4939d5 100644
--- a/src/core/ResultInspector.cpp
+++ b/src/core/ResultInspector.cpp
@@ -20,7 +20,8 @@
 
 #include "Context.hpp"
 #include "Logging.hpp"
-#include "fmtmacros.hpp"
+
+#include <util/fmtmacros.hpp>
 
 namespace core {
 
diff --git a/src/core/ResultRetriever.cpp b/src/core/ResultRetriever.cpp
index 0f48c8ecb..a72ff401d 100644
--- a/src/core/ResultRetriever.cpp
+++ b/src/core/ResultRetriever.cpp
@@ -27,11 +27,11 @@
 #include <core/MsvcShowIncludesOutput.hpp>
 #include <core/common.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/DirEntry.hpp>
 #include <util/Fd.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>
diff --git a/src/core/Statistics.cpp b/src/core/Statistics.cpp
index ff6d65fed..f72ce4906 100644
--- a/src/core/Statistics.cpp
+++ b/src/core/Statistics.cpp
@@ -21,8 +21,8 @@
 #include <Config.hpp>
 #include <Logging.hpp>
 #include <Util.hpp>
-#include <fmtmacros.hpp>
 #include <util/TextTable.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 #include <util/time.hpp>
 
diff --git a/src/core/StatsLog.cpp b/src/core/StatsLog.cpp
index 3202d2c6d..71b645562 100644
--- a/src/core/StatsLog.cpp
+++ b/src/core/StatsLog.cpp
@@ -21,7 +21,7 @@
 #include <File.hpp>
 #include <Logging.hpp>
 #include <core/Statistics.hpp>
-#include <fmtmacros.hpp>
+#include <util/fmtmacros.hpp>
 
 #include <fstream>
 
diff --git a/src/core/common.cpp b/src/core/common.cpp
index 54f49e088..9efe5462a 100644
--- a/src/core/common.cpp
+++ b/src/core/common.cpp
@@ -20,12 +20,12 @@
 
 #include <Context.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/Finalizer.hpp>
 #include <util/Tokenizer.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 
 using IncludeDelimiter = util::Tokenizer::IncludeDelimiter;
diff --git a/src/core/mainoptions.cpp b/src/core/mainoptions.cpp
index d8134e6d1..1e9c85b8a 100644
--- a/src/core/mainoptions.cpp
+++ b/src/core/mainoptions.cpp
@@ -35,7 +35,6 @@
 #include <core/Statistics.hpp>
 #include <core/StatsLog.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <storage/Storage.hpp>
 #include <storage/local/LocalStorage.hpp>
 #include <util/Fd.hpp>
@@ -48,6 +47,7 @@
 #include <util/environment.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 #include <fcntl.h>
diff --git a/src/core/types.cpp b/src/core/types.cpp
index 2793a188a..5c5845b6b 100644
--- a/src/core/types.cpp
+++ b/src/core/types.cpp
@@ -20,8 +20,8 @@
 
 #include <Config.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/assertions.hpp>
+#include <util/fmtmacros.hpp>
 
 namespace core {
 
diff --git a/src/execute.cpp b/src/execute.cpp
index 2c2ae6e7b..68450fb09 100644
--- a/src/execute.cpp
+++ b/src/execute.cpp
@@ -28,7 +28,6 @@
 
 #include <ccache.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/DirEntry.hpp>
 #include <util/Fd.hpp>
 #include <util/Finalizer.hpp>
@@ -36,6 +35,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>
diff --git a/src/hashutil.cpp b/src/hashutil.cpp
index fc43e8764..ede773209 100644
--- a/src/hashutil.cpp
+++ b/src/hashutil.cpp
@@ -27,9 +27,9 @@
 #include "macroskip.hpp"
 
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/DirEntry.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 #include <util/time.hpp>
 #include <util/wincompat.hpp>
diff --git a/src/storage/Storage.cpp b/src/storage/Storage.cpp
index 889ca98e2..ddbfadf7d 100644
--- a/src/storage/Storage.cpp
+++ b/src/storage/Storage.cpp
@@ -25,10 +25,10 @@
 #include <core/CacheEntry.hpp>
 #include <core/Statistic.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <storage/remote/FileStorage.hpp>
 #include <storage/remote/HttpStorage.hpp>
 #include <util/assertions.hpp>
+#include <util/fmtmacros.hpp>
 #ifdef HAVE_REDIS_STORAGE_BACKEND
 #  include <storage/remote/RedisStorage.hpp>
 #endif
diff --git a/src/storage/local/LocalStorage.cpp b/src/storage/local/LocalStorage.cpp
index b87cf6fff..d130843a0 100644
--- a/src/storage/local/LocalStorage.cpp
+++ b/src/storage/local/LocalStorage.cpp
@@ -31,7 +31,6 @@
 #include <core/Statistics.hpp>
 #include <core/common.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/Duration.hpp>
 #include <util/TemporaryFile.hpp>
 #include <util/TextTable.hpp>
@@ -40,6 +39,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/process.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>
diff --git a/src/storage/local/StatsFile.cpp b/src/storage/local/StatsFile.cpp
index 4c46cf45a..3f543e80b 100644
--- a/src/storage/local/StatsFile.cpp
+++ b/src/storage/local/StatsFile.cpp
@@ -21,9 +21,9 @@
 #include <Logging.hpp>
 #include <core/AtomicFile.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/LockFile.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 
 namespace storage::local {
 
diff --git a/src/storage/local/util.cpp b/src/storage/local/util.cpp
index 9aacb94d6..9d8e9d664 100644
--- a/src/storage/local/util.cpp
+++ b/src/storage/local/util.cpp
@@ -20,9 +20,9 @@
 
 #include <Util.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 using util::DirEntry;
diff --git a/src/storage/remote/FileStorage.cpp b/src/storage/remote/FileStorage.cpp
index 221dcdc68..ebf3c7f5f 100644
--- a/src/storage/remote/FileStorage.cpp
+++ b/src/storage/remote/FileStorage.cpp
@@ -22,7 +22,6 @@
 #include <Util.hpp>
 #include <core/AtomicFile.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/Bytes.hpp>
 #include <util/DirEntry.hpp>
 #include <util/UmaskScope.hpp>
@@ -30,6 +29,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 #include <sys/stat.h> // for mode_t
diff --git a/src/storage/remote/HttpStorage.cpp b/src/storage/remote/HttpStorage.cpp
index 89d649c35..dd0310f1e 100644
--- a/src/storage/remote/HttpStorage.cpp
+++ b/src/storage/remote/HttpStorage.cpp
@@ -22,9 +22,9 @@
 #include <Logging.hpp>
 #include <ccache.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/assertions.hpp>
 #include <util/expected.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 #include <util/types.hpp>
 
diff --git a/src/storage/remote/RedisStorage.cpp b/src/storage/remote/RedisStorage.cpp
index 1121f8a97..e124c3cd1 100644
--- a/src/storage/remote/RedisStorage.cpp
+++ b/src/storage/remote/RedisStorage.cpp
@@ -21,9 +21,9 @@
 #include <Hash.hpp>
 #include <Logging.hpp>
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/assertions.hpp>
 #include <util/expected.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp> // for timeval
 
diff --git a/src/test_lockfile.cpp b/src/test_lockfile.cpp
index 62fc53597..ed6823ab9 100644
--- a/src/test_lockfile.cpp
+++ b/src/test_lockfile.cpp
@@ -18,9 +18,9 @@
 
 #include <Config.hpp>
 #include <Logging.hpp>
-#include <fmtmacros.hpp>
 #include <util/LockFile.hpp>
 #include <util/LongLivedLockFileManager.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 #include <memory>
diff --git a/src/util/DirEntry.cpp b/src/util/DirEntry.cpp
index 8dad7e939..ced852c1c 100644
--- a/src/util/DirEntry.cpp
+++ b/src/util/DirEntry.cpp
@@ -20,9 +20,9 @@
 
 #include <Logging.hpp>
 #include <Win32Util.hpp>
-#include <fmtmacros.hpp>
 #include <util/Finalizer.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/wincompat.hpp>
 
 #ifdef _WIN32
diff --git a/src/util/LockFile.cpp b/src/util/LockFile.cpp
index 188f337d1..c3f670e90 100644
--- a/src/util/LockFile.cpp
+++ b/src/util/LockFile.cpp
@@ -21,12 +21,12 @@
 #include "Logging.hpp"
 #include "Util.hpp"
 #include "Win32Util.hpp"
-#include "fmtmacros.hpp"
 
 #include <util/DirEntry.hpp>
 #include <util/assertions.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/process.hpp>
 #include <util/wincompat.hpp>
 
diff --git a/src/util/TemporaryFile.cpp b/src/util/TemporaryFile.cpp
index 04115e8db..2c946a834 100644
--- a/src/util/TemporaryFile.cpp
+++ b/src/util/TemporaryFile.cpp
@@ -18,9 +18,9 @@
 
 #include "TemporaryFile.hpp"
 
-#include <fmtmacros.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/process.hpp>
 
 #include <cstdlib>
diff --git a/src/util/assertions.cpp b/src/util/assertions.cpp
index f5486a035..a84cb59b5 100644
--- a/src/util/assertions.cpp
+++ b/src/util/assertions.cpp
@@ -17,9 +17,9 @@
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 #include "Util.hpp"
-#include "fmtmacros.hpp"
 
 #include <util/assertions.hpp>
+#include <util/fmtmacros.hpp>
 
 #include "third_party/fmt/core.h"
 
diff --git a/src/util/environment.cpp b/src/util/environment.cpp
index 57e0470ae..3baca88f4 100644
--- a/src/util/environment.cpp
+++ b/src/util/environment.cpp
@@ -18,7 +18,7 @@
 
 #include "environment.hpp"
 
-#include <fmtmacros.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/wincompat.hpp>
 
 namespace util {
diff --git a/src/util/expected.hpp b/src/util/expected.hpp
index f1e8469e9..5e4385ef2 100644
--- a/src/util/expected.hpp
+++ b/src/util/expected.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <fmtmacros.hpp>
+#include <util/fmtmacros.hpp>
 
 #include <string_view>
 #include <utility>
diff --git a/src/util/file.cpp b/src/util/file.cpp
index 76d2b18c2..fdc211214 100644
--- a/src/util/file.cpp
+++ b/src/util/file.cpp
@@ -20,7 +20,6 @@
 
 #include <Logging.hpp>
 #include <Win32Util.hpp>
-#include <fmtmacros.hpp>
 #include <util/Bytes.hpp>
 #include <util/DirEntry.hpp>
 #include <util/Fd.hpp>
@@ -29,6 +28,7 @@
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
diff --git a/src/fmtmacros.hpp b/src/util/fmtmacros.hpp
similarity index 100%
rename from src/fmtmacros.hpp
rename to src/util/fmtmacros.hpp
diff --git a/src/util/path.cpp b/src/util/path.cpp
index c9891d6e7..ba2ad669c 100644
--- a/src/util/path.cpp
+++ b/src/util/path.cpp
@@ -19,9 +19,9 @@
 #include "path.hpp"
 
 #include <Util.hpp>
-#include <fmtmacros.hpp>
 #include <util/DirEntry.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 #ifdef _WIN32
diff --git a/src/util/string.cpp b/src/util/string.cpp
index 21139ab96..8db2f0464 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -18,8 +18,8 @@
 
 #include "string.hpp"
 
-#include <fmtmacros.hpp>
 #include <util/assertions.hpp>
+#include <util/fmtmacros.hpp>
 
 #include <algorithm>
 #include <cctype>
diff --git a/unittest/TestUtil.cpp b/unittest/TestUtil.cpp
index 0cd9add6e..8f0c0a0b2 100644
--- a/unittest/TestUtil.cpp
+++ b/unittest/TestUtil.cpp
@@ -21,8 +21,8 @@
 #include "../src/Util.hpp"
 
 #include <core/exceptions.hpp>
-#include <fmtmacros.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/wincompat.hpp>
 
diff --git a/unittest/main.cpp b/unittest/main.cpp
index 4a97f2d94..034fd5ec2 100644
--- a/unittest/main.cpp
+++ b/unittest/main.cpp
@@ -16,10 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/fmtmacros.hpp"
-
 #include <util/environment.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 
 #include "third_party/fmt/core.h"
diff --git a/unittest/test_Config.cpp b/unittest/test_Config.cpp
index ae2dc9094..683e8c447 100644
--- a/unittest/test_Config.cpp
+++ b/unittest/test_Config.cpp
@@ -18,12 +18,12 @@
 
 #include "../src/Config.hpp"
 #include "../src/Util.hpp"
-#include "../src/fmtmacros.hpp"
 #include "TestUtil.hpp"
 
 #include <core/exceptions.hpp>
 #include <util/environment.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 
 #include "third_party/doctest.h"
 #include "third_party/fmt/core.h"
diff --git a/unittest/test_Depfile.cpp b/unittest/test_Depfile.cpp
index 1915399e4..8540610c9 100644
--- a/unittest/test_Depfile.cpp
+++ b/unittest/test_Depfile.cpp
@@ -18,10 +18,10 @@
 
 #include "../src/Context.hpp"
 #include "../src/Depfile.hpp"
-#include "../src/fmtmacros.hpp"
 #include "TestUtil.hpp"
 
 #include <Util.hpp>
+#include <util/fmtmacros.hpp>
 
 #include "third_party/doctest.h"
 
diff --git a/unittest/test_Util.cpp b/unittest/test_Util.cpp
index da7713804..d258e2e5e 100644
--- a/unittest/test_Util.cpp
+++ b/unittest/test_Util.cpp
@@ -18,13 +18,13 @@
 
 #include "../src/Config.hpp"
 #include "../src/Util.hpp"
-#include "../src/fmtmacros.hpp"
 #include "TestUtil.hpp"
 
 #include <core/exceptions.hpp>
 #include <util/environment.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/wincompat.hpp>
 
diff --git a/unittest/test_argprocessing.cpp b/unittest/test_argprocessing.cpp
index 7da184444..f9941be2f 100644
--- a/unittest/test_argprocessing.cpp
+++ b/unittest/test_argprocessing.cpp
@@ -19,13 +19,13 @@
 #include "../src/Args.hpp"
 #include "../src/Config.hpp"
 #include "../src/Context.hpp"
-#include "../src/fmtmacros.hpp"
 #include "TestUtil.hpp"
 #include "argprocessing.hpp"
 
 #include <Util.hpp>
 #include <core/Statistic.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
 #include <util/wincompat.hpp>
diff --git a/unittest/test_ccache.cpp b/unittest/test_ccache.cpp
index e0172a568..d2fd04be5 100644
--- a/unittest/test_ccache.cpp
+++ b/unittest/test_ccache.cpp
@@ -18,10 +18,10 @@
 
 #include "../src/Context.hpp"
 #include "../src/ccache.hpp"
-#include "../src/fmtmacros.hpp"
 #include "TestUtil.hpp"
 
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 #include <util/wincompat.hpp>
 
diff --git a/unittest/test_storage_local_StatsFile.cpp b/unittest/test_storage_local_StatsFile.cpp
index 3135b09e7..83cf9c638 100644
--- a/unittest/test_storage_local_StatsFile.cpp
+++ b/unittest/test_storage_local_StatsFile.cpp
@@ -20,9 +20,9 @@
 
 #include <Util.hpp>
 #include <core/Statistic.hpp>
-#include <fmtmacros.hpp>
 #include <storage/local/StatsFile.hpp>
 #include <util/file.hpp>
+#include <util/fmtmacros.hpp>
 
 #include <third_party/doctest.h>
 
diff --git a/unittest/test_storage_local_util.cpp b/unittest/test_storage_local_util.cpp
index b44468709..e5c40b6b5 100644
--- a/unittest/test_storage_local_util.cpp
+++ b/unittest/test_storage_local_util.cpp
@@ -18,10 +18,10 @@
 
 #include "TestUtil.hpp"
 
-#include <fmtmacros.hpp>
 #include <storage/local/util.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 
 #include <third_party/doctest.h>
 
diff --git a/unittest/test_util_file.cpp b/unittest/test_util_file.cpp
index 30936b6f3..67982d809 100644
--- a/unittest/test_util_file.cpp
+++ b/unittest/test_util_file.cpp
@@ -18,12 +18,12 @@
 
 #include "TestUtil.hpp"
 
-#include <fmtmacros.hpp>
 #include <util/Bytes.hpp>
 #include <util/DirEntry.hpp>
 #include <util/Fd.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/string.hpp>
 
 #include <third_party/doctest.h>
diff --git a/unittest/test_util_path.cpp b/unittest/test_util_path.cpp
index f781ff4e2..12ee2aa25 100644
--- a/unittest/test_util_path.cpp
+++ b/unittest/test_util_path.cpp
@@ -17,7 +17,7 @@
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 #include <Util.hpp>
-#include <fmtmacros.hpp>
+#include <util/fmtmacros.hpp>
 #include <util/path.hpp>
 
 #include <third_party/doctest.h>