cleaned up includes based on include-what-you-use (#7638)

firewave · web-flow · commit dfa16af8921e · 2025-06-30T19:43:56.000+02:00
also cleaned up some `externals` includes and the order.
diff --git a/Makefile b/Makefile
@@ -594,7 +594,7 @@ $(libcppdir)/infer.o: lib/infer.cpp lib/calculate.h lib/config.h lib/errortypes.
 $(libcppdir)/keywords.o: lib/keywords.cpp lib/config.h lib/keywords.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/keywords.cpp
 
-$(libcppdir)/library.o: lib/library.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/library.o: lib/library.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/library.cpp
 
 $(libcppdir)/mathlib.o: lib/mathlib.cpp externals/simplecpp/simplecpp.h lib/config.h lib/errortypes.h lib/mathlib.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
diff --git a/gui/resultsview.h b/gui/resultsview.h
@@ -23,6 +23,8 @@
 #include "report.h"
 #include "showtypes.h"
 
+#include <cstdint>
+
 #include <QObject>
 #include <QString>
 #include <QStringList>
diff --git a/gui/threadresult.cpp b/gui/threadresult.cpp
@@ -23,7 +23,11 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "importproject.h"
+#include "path.h"
 
+#include <algorithm>
+#include <cstddef>
+#include <iterator>
 #include <numeric>
 #include <utility>
 
diff --git a/lib/analyzerinfo.cpp b/lib/analyzerinfo.cpp
@@ -24,6 +24,7 @@
 #include "utils.h"
 
 #include <cstring>
+#include <exception>
 #include <map>
 #include <sstream>
 
diff --git a/lib/checknullpointer.cpp b/lib/checknullpointer.cpp
@@ -38,6 +38,7 @@
 #include <cctype>
 #include <map>
 #include <set>
+#include <utility>
 #include <vector>
 
 //---------------------------------------------------------------------------
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -42,6 +42,7 @@
 #include <list>
 #include <map>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 //---------------------------------------------------------------------------
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -24,6 +24,7 @@
 #include "check.h"
 #include "config.h"
 
+#include <cstddef>
 #include <cstdint>
 #include <fstream>
 #include <functional>
diff --git a/lib/errorlogger.h b/lib/errorlogger.h
@@ -29,7 +29,6 @@
 #include <list>
 #include <set>
 #include <string>
-#include <utility>
 #include <vector>
 #include <map>
 
diff --git a/lib/importproject.h b/lib/importproject.h
@@ -36,6 +36,9 @@
 
 class Settings;
 struct Suppressions;
+namespace tinyxml2 {
+    class XMLDocument;
+}
 
 /// @addtogroup Core
 /// @{
diff --git a/lib/library.cpp b/lib/library.cpp
@@ -22,7 +22,6 @@
 #include "errortypes.h"
 #include "mathlib.h"
 #include "path.h"
-#include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenlist.h"
diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -27,7 +27,7 @@
 #include <cctype>
 #include <fstream>
 #include <iostream>
-#include <sstream>
+#include <map>
 #include <utility>
 
 #include "json.h"
diff --git a/lib/settings.h b/lib/settings.h
@@ -32,9 +32,7 @@
 #include <algorithm>
 #include <atomic>
 #include <cstdint>
-#include <functional>
 #include <list>
-#include <map>
 #include <set>
 #include <string>
 #include <tuple>
diff --git a/lib/symboldatabase.h b/lib/symboldatabase.h
@@ -47,6 +47,7 @@ class Settings;
 class SymbolDatabase;
 class Tokenizer;
 class ValueType;
+class ErrorLogger;
 
 enum class Reference : std::uint8_t {
     None,
diff --git a/lib/token.cpp b/lib/token.cpp
@@ -23,7 +23,6 @@
 #include "library.h"
 #include "mathlib.h"
 #include "settings.h"
-#include "simplecpp.h"
 #include "symboldatabase.h"
 #include "tokenlist.h"
 #include "utils.h"
@@ -48,6 +47,8 @@
 #include <unordered_set>
 #include <utility>
 
+#include <simplecpp.h>
+
 namespace {
     struct less {
         template<class T, class U>
diff --git a/lib/valueflow.h b/lib/valueflow.h
@@ -25,6 +25,7 @@
 #include "errortypes.h"
 #include "mathlib.h"
 
+#include <cstdint>
 #include <cstdlib>
 #include <functional>
 #include <list>
diff --git a/oss-fuzz/Makefile b/oss-fuzz/Makefile
@@ -282,7 +282,7 @@ $(libcppdir)/infer.o: ../lib/infer.cpp ../lib/calculate.h ../lib/config.h ../lib
 $(libcppdir)/keywords.o: ../lib/keywords.cpp ../lib/config.h ../lib/keywords.h ../lib/standards.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/keywords.cpp
 
-$(libcppdir)/library.o: ../lib/library.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/library.o: ../lib/library.cpp ../externals/tinyxml2/tinyxml2.h ../lib/astutils.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/library.cpp
 
 $(libcppdir)/mathlib.o: ../lib/mathlib.cpp ../externals/simplecpp/simplecpp.h ../lib/config.h ../lib/errortypes.h ../lib/mathlib.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
diff --git a/test/seh/test-sehwrapper.cpp b/test/seh/test-sehwrapper.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
+#include "config.h" // IWYU pragma: keep
 
 #if defined(USE_WINDOWS_SEH)
 #include "sehwrapper.h"
diff --git a/test/testanalyzerinformation.cpp b/test/testanalyzerinformation.cpp
@@ -18,12 +18,15 @@
 
 
 #include "analyzerinfo.h"
+#include "errorlogger.h"
 #include "filesettings.h"
 #include "fixture.h"
-#include "xml.h"
+#include "standards.h"
 
+#include <list>
 #include <sstream>
-#include <tinyxml2.h>
+
+#include "xml.h"
 
 class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation {
 public:
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
@@ -29,7 +29,6 @@
 #include <cstddef>
 #include <list>
 #include <string>
-#include <vector>
 
 class TestBufferOverrun : public TestFixture {
 public:
diff --git a/test/testclangimport.cpp b/test/testclangimport.cpp
@@ -15,12 +15,14 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "clangimport.h"
+#include "fixture.h"
 #include "platform.h"
 #include "settings.h"
+#include "standards.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
-#include "fixture.h"
+#include "tokenlist.h"
 
 #include <cstdint>
 #include <list>
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
@@ -22,14 +22,15 @@
 #include "config.h"
 #include "errorlogger.h"
 #include "errortypes.h"
+#include "filesettings.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "path.h"
 #include "platform.h"
 #include "redirect.h"
 #include "settings.h"
 #include "standards.h"
 #include "suppressions.h"
-#include "fixture.h"
 #include "timer.h"
 #include "utils.h"
 
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
@@ -26,7 +26,6 @@
 #include <cstddef>
 #include <limits>
 #include <string>
-#include <vector>
 
 class TestCondition : public TestFixture {
 public:
diff --git a/test/testcppcheck.cpp b/test/testcppcheck.cpp
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "addoninfo.h"
 #include "color.h"
 #include "cppcheck.h"
 #include "errorlogger.h"
@@ -25,15 +26,18 @@
 #include "path.h"
 #include "preprocessor.h"
 #include "settings.h"
+#include "standards.h"
 #include "suppressions.h"
 
-#include "simplecpp.h"
-
 #include <algorithm>
+#include <cstddef>
 #include <list>
+#include <sstream>
 #include <string>
 #include <vector>
 
+#include <simplecpp.h>
+
 class TestCppcheck : public TestFixture {
 public:
     TestCppcheck() : TestFixture("TestCppcheck") {}
diff --git a/test/testexecutor.cpp b/test/testexecutor.cpp
@@ -23,6 +23,7 @@
 #include "fixture.h"
 #include "helpers.h"
 #include "settings.h"
+#include "standards.h"
 #include "suppressions.h"
 
 #include <list>
diff --git a/test/testimportproject.cpp b/test/testimportproject.cpp
@@ -21,6 +21,7 @@
 #include "importproject.h"
 #include "redirect.h"
 #include "settings.h"
+#include "standards.h"
 #include "suppressions.h"
 #include "xml.h"
 
diff --git a/test/testincompletestatement.cpp b/test/testincompletestatement.cpp
@@ -23,7 +23,6 @@
 #include "fixture.h"
 
 #include <string>
-#include <vector>
 
 class TestIncompleteStatement : public TestFixture {
 public:
diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
@@ -23,7 +23,6 @@
 
 #include <cstddef>
 #include <string>
-#include <vector>
 
 class TestLeakAutoVar : public TestFixture {
 public:
diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
@@ -19,6 +19,7 @@
 #include "config.h"
 #include "fixture.h"
 #include "mathlib.h"
+#include "standards.h"
 #include "token.h"
 #include "tokenlist.h"
 
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
@@ -24,12 +24,12 @@
 #include "helpers.h"
 #include "library.h"
 #include "settings.h"
+#include "standards.h"
 #include "token.h"
 
 #include <cstddef>
 #include <list>
 #include <string>
-#include <vector>
 
 class TestNullPointer : public TestFixture {
 public:
diff --git a/test/testoptions.cpp b/test/testoptions.cpp
@@ -20,7 +20,6 @@
 #include "options.h"
 #include "utils.h"
 
-#include <functional>
 #include <set>
 #include <string>
 
diff --git a/test/testother.cpp b/test/testother.cpp
@@ -26,7 +26,6 @@
 
 #include <cstddef>
 #include <string>
-#include <vector>
 
 class TestOther : public TestFixture {
 public:
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
@@ -19,8 +19,8 @@
 #include "errortypes.h"
 #include "fixture.h"
 #include "helpers.h"
-#include "path.h"
 #include "settings.h"
+#include "standards.h"
 #include "templatesimplifier.h"
 #include "token.h"
 #include "tokenize.h"
diff --git a/test/testsizeof.cpp b/test/testsizeof.cpp
@@ -24,7 +24,6 @@
 
 #include <cstddef>
 #include <string>
-#include <vector>
 
 class TestSizeof : public TestFixture {
 public:
diff --git a/test/teststring.cpp b/test/teststring.cpp
@@ -24,7 +24,6 @@
 #include "fixture.h"
 
 #include <string>
-#include <vector>
 
 class TestString : public TestFixture {
 public:
diff --git a/test/testtype.cpp b/test/testtype.cpp
@@ -26,7 +26,6 @@
 
 #include <cstddef>
 #include <string>
-#include <vector>
 
 class TestType : public TestFixture {
 public:
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
@@ -24,7 +24,6 @@
 #include "fixture.h"
 
 #include <string>
-#include <vector>
 
 class TestUnusedPrivateFunction : public TestFixture {
 public:
diff --git a/test/testvarid.cpp b/test/testvarid.cpp
@@ -25,7 +25,6 @@
 
 #include <cstddef>
 #include <string>
-#include <vector>
 
 class TestVarID : public TestFixture {
 public:
