Improve several header inclusions based on clangd warnings

Martchus · Martchus · commit e93406e3e49a · 2025-10-08T19:50:46.000+02:00
* Remove unused headers
* Include certain headers only conditionally
* Add explanations about includes that have to stay despite warnings
* Add missing includes
diff --git a/application/commandlineutils.cpp b/application/commandlineutils.cpp
@@ -1,14 +1,16 @@
 #include "./commandlineutils.h"
-#include "./argumentparserprivate.h"
 
+#ifdef PLATFORM_WINDOWS
 #include "../io/ansiescapecodes.h"
+#endif
 
 #include <iostream>
 #include <string>
 
 #include <fcntl.h>
 #ifdef PLATFORM_WINDOWS
 #include <cstring>
+#include <cstdint>
 #include <io.h>
 #include <tchar.h>
 #include <windows.h>
diff --git a/chrono/datetime.cpp b/chrono/datetime.cpp
@@ -5,7 +5,6 @@
 
 #include <iomanip>
 #include <sstream>
-#include <stdexcept>
 
 using namespace std;
 
diff --git a/chrono/timespan.cpp b/chrono/timespan.cpp
@@ -3,7 +3,6 @@
 #include "./timespan.h"
 
 #include "../conversion/stringbuilder.h"
-#include "../conversion/stringconversion.h"
 
 #include <array>
 #include <charconv>
diff --git a/conversion/binaryconversion.h b/conversion/binaryconversion.h
@@ -2,10 +2,10 @@
 #define CONVERSION_UTILITIES_BINARY_CONVERSION_H
 
 #include "../global.h"
-#include "../misc/traits.h"
+#include "../misc/traits.h" // used in binaryconversionprivate.h
 
 #include <cstdint>
-#include <cstring>
+#include <cstring> // used in binaryconversionprivate.h
 
 // use helpers from bits header if available instead of custom code using bit operations
 #if __cplusplus >= 202002L
diff --git a/conversion/stringconversion.cpp b/conversion/stringconversion.cpp
@@ -8,14 +8,17 @@
 #define CPP_UTILITIES_THREAD_LOCAL
 #endif
 
-#include <algorithm>
 #include <cmath>
 #include <cstdlib>
 #include <iomanip>
-#include <limits>
 #include <memory>
 #include <sstream>
 
+#ifdef PLATFORM_WINDOWS
+#include <algorithm> // for std::clamp
+#include <limits>
+#endif
+
 #include <errno.h>
 
 #ifndef CPP_UTILITIES_NO_ICONV
diff --git a/io/archive.cpp b/io/archive.cpp
@@ -1,7 +1,6 @@
 #include "./archive.h"
 
 #include "../conversion/stringbuilder.h"
-#include "../io/misc.h"
 
 #include <archive.h>
 #include <archive_entry.h>
diff --git a/io/binaryreader.cpp b/io/binaryreader.cpp
@@ -3,7 +3,6 @@
 #include "../conversion/conversionexception.h"
 
 #include <cstring>
-#include <memory>
 #include <sstream>
 
 using namespace std;
diff --git a/io/binarywriter.cpp b/io/binarywriter.cpp
@@ -2,9 +2,6 @@
 
 #include "../conversion/conversionexception.h"
 
-#include <cstring>
-#include <memory>
-
 using namespace std;
 
 namespace CppUtilities {
diff --git a/io/buffersearch.h b/io/buffersearch.h
@@ -2,7 +2,6 @@
 #define IOUTILITIES_BUFFER_SEARCH_H
 
 #include "../global.h"
-#include "../misc/traits.h"
 
 #include <array>
 #include <functional>
diff --git a/io/copy.h b/io/copy.h
@@ -13,6 +13,7 @@
 #include <sys/sendfile.h>
 #endif
 
+#include <cstdint>
 #include <functional>
 #include <iostream>
 #ifdef CPP_UTILITIES_USE_SEND_FILE
diff --git a/io/inifile.cpp b/io/inifile.cpp
@@ -1,7 +1,5 @@
 #include "./inifile.h"
 
-#include "../conversion/stringconversion.h"
-
 #include <iostream>
 
 using namespace std;
diff --git a/io/misc.cpp b/io/misc.cpp
@@ -3,7 +3,7 @@
 #include "./misc.h"
 #include "./nativefilestream.h"
 
-#include <streambuf>
+#include <iterator>
 
 using namespace std;
 
diff --git a/io/nativefilestream.cpp b/io/nativefilestream.cpp
@@ -36,7 +36,6 @@ just "open failed: iostream error".
 
 // include platform specific header
 #if defined(PLATFORM_UNIX)
-#include <cstdio>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/io/nativefilestream.h b/io/nativefilestream.h
@@ -8,9 +8,12 @@
 #include <memory>
 #include <streambuf>
 #include <string>
+#ifdef PLATFORM_WINDOWS
 #include <string_view>
 #endif
+#else
 #include <fstream>
+#endif
 
 namespace CppUtilities {
 
diff --git a/io/path.cpp b/io/path.cpp
@@ -3,8 +3,6 @@
 #include "./path.h"
 
 #include <cstdlib>
-#include <fstream>
-#include <sstream>
 #include <string>
 
 using namespace std;
diff --git a/io/path.h b/io/path.h
@@ -7,7 +7,6 @@
 #include "../conversion/stringconversion.h"
 #endif
 
-#include <list>
 #include <string>
 #include <string_view>
 #ifdef CPP_UTILITIES_USE_STANDARD_FILESYSTEM
diff --git a/misc/levenshtein.cpp b/misc/levenshtein.cpp
@@ -3,9 +3,7 @@
 #include "./math.h"
 #include "./multiarray.h"
 
-#include <iostream>
 #include <limits>
-#include <memory>
 
 using namespace std;
 
diff --git a/misc/math.h b/misc/math.h
@@ -1,12 +1,8 @@
 #ifndef MATHUTILITIES_H
 #define MATHUTILITIES_H
 
-#include "../global.h"
 #include "./traits.h"
 
-#include <cstdint>
-#include <limits>
-
 namespace CppUtilities {
 
 /*!
diff --git a/tests/testutils.cpp b/tests/testutils.cpp
@@ -5,7 +5,6 @@
 #include "../io/ansiescapecodes.h"
 #include "../io/misc.h"
 #include "../io/nativefilestream.h"
-#include "../io/path.h"
 #include "../misc/parseerror.h"
 
 #include <cerrno>
@@ -15,7 +14,6 @@
 #include <fstream>
 #include <initializer_list>
 #include <iostream>
-#include <limits>
 
 #ifdef PLATFORM_UNIX
 #ifdef CPP_UTILITIES_USE_STANDARD_FILESYSTEM
