chore: Juggle some include headers

diff --git a/src/ccache/Config.cpp b/src/ccache/Config.cpp
index dbf89d073dc93f92c2dfe3d760dd17b2dfbb891b..b4974e1e482cce61058185e5b6d32a453cad52d1 100644 (file)
--- a/src/ccache/Config.cpp
+++ b/src/ccache/Config.cpp
@@ -19,9 +19,9 @@
 #include "Config.hpp"
 
 #include <ccache/core/AtomicFile.hpp>
+#include <ccache/core/Sloppiness.hpp>
 #include <ccache/core/common.hpp>
 #include <ccache/core/exceptions.hpp>
-#include <ccache/core/types.hpp>
 #include <ccache/util/DirEntry.hpp>
 #include <ccache/util/PathString.hpp>
 #include <ccache/util/Tokenizer.hpp>
@@ -44,12 +44,16 @@
 #  include <unistd.h>
 #endif
 
+#include <tl/expected.hpp>
+
 #include <algorithm>
-#include <cassert>
+#include <cerrno>
+#include <cstdlib>
+#include <cstring>
 #include <fstream>
-#include <memory>
 #include <string>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 #ifndef environ

diff --git a/src/ccache/argprocessing.cpp b/src/ccache/argprocessing.cpp
index d9ebf84410f78d96087f8d0df20c7c075e87e646..ae74e522dab0a93791f7da8961e0a889fed84384 100644 (file)
--- a/src/ccache/argprocessing.cpp
+++ b/src/ccache/argprocessing.cpp
@@ -18,12 +18,16 @@
 
 #include "argprocessing.hpp"
 
+#include <ccache/Args.hpp>
+#include <ccache/ArgsInfo.hpp>
 #include <ccache/Context.hpp>
 #include <ccache/Depfile.hpp>
 #include <ccache/compopt.hpp>
 #include <ccache/core/common.hpp>
 #include <ccache/language.hpp>
+#include <ccache/util/DirEntry.hpp>
 #include <ccache/util/PathString.hpp>
+#include <ccache/util/Tokenizer.hpp>
 #include <ccache/util/assertions.hpp>
 #include <ccache/util/filesystem.hpp>
 #include <ccache/util/format.hpp>
@@ -36,6 +40,14 @@
 #  include <unistd.h>
 #endif
 
+#include <algorithm>
+#include <cctype>
+#include <cstdint>
+#include <cstdlib>
+#include <iterator>
+#include <optional>
+#include <unordered_map>
+#include <utility>
 #include <vector>
 
 namespace fs = util::filesystem;

diff --git a/src/ccache/ccache.cpp b/src/ccache/ccache.cpp
index 4e651702d94fe8fa11349dd36faa1d358c3a0782..0d8fa4cd5f9b5c70916982bf4bd3651aa4ef9531 100644 (file)
--- a/src/ccache/ccache.cpp
+++ b/src/ccache/ccache.cpp
@@ -32,7 +32,10 @@
 #include <ccache/core/MsvcShowIncludesOutput.hpp>
 #include <ccache/core/Result.hpp>
 #include <ccache/core/ResultRetriever.hpp>
+#include <ccache/core/Sloppiness.hpp>
+#include <ccache/core/Statistic.hpp>
 #include <ccache/core/Statistics.hpp>
+#include <ccache/core/StatisticsCounters.hpp>
 #include <ccache/core/StatsLog.hpp>
 #include <ccache/core/common.hpp>
 #include <ccache/core/exceptions.hpp>
@@ -40,14 +43,20 @@
 #include <ccache/core/types.hpp>
 #include <ccache/execute.hpp>
 #include <ccache/hashutil.hpp>
-#include <ccache/language.hpp>
 #include <ccache/storage/Storage.hpp>
+#include <ccache/util/Bytes.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/Duration.hpp>
 #include <ccache/util/Fd.hpp>
 #include <ccache/util/FileStream.hpp>
 #include <ccache/util/Finalizer.hpp>
 #include <ccache/util/PathString.hpp>
 #include <ccache/util/TemporaryFile.hpp>
+#include <ccache/util/TimePoint.hpp>
+#include <ccache/util/Tokenizer.hpp>
 #include <ccache/util/UmaskScope.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/conversion.hpp>
 #include <ccache/util/environment.hpp>
 #include <ccache/util/expected.hpp>
 #include <ccache/util/file.hpp>
@@ -69,9 +78,20 @@
 #  include <unistd.h>
 #endif
 
+#include <nonstd/span.hpp>
+#include <tl/expected.hpp>
+
 #include <algorithm>
+#include <cerrno>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
 #include <cstring>
+#include <ctime>
+#include <initializer_list>
+#include <tuple>
 #include <unordered_map>
+#include <utility>
 
 namespace fs = util::filesystem;
 

diff --git a/src/ccache/util/expected.hpp b/src/ccache/util/expected.hpp
index b093e1b0b4f6368af0d245b7ce5460e17ee21222..bb23c5ffc6ce54b1aa2abd495ecb8225349b6984 100644 (file)
--- a/src/ccache/util/expected.hpp
+++ b/src/ccache/util/expected.hpp
@@ -20,6 +20,8 @@
 
 #include <ccache/util/format.hpp>
 
+#include <tl/expected.hpp>
+
 #include <string_view>
 #include <utility>