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

firewave · web-flow · commit 2d9f673c44d5 · 2025-02-04T15:50:58.000+01:00
diff --git a/Makefile b/Makefile
@@ -459,7 +459,7 @@ $(libcppdir)/symboldatabase.o: lib/symboldatabase.cpp lib/addoninfo.h lib/astuti
 $(libcppdir)/addoninfo.o: lib/addoninfo.cpp externals/picojson/picojson.h lib/addoninfo.h lib/config.h lib/json.h lib/path.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/addoninfo.cpp
 
-$(libcppdir)/analyzerinfo.o: lib/analyzerinfo.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h lib/utils.h lib/xml.h
+$(libcppdir)/analyzerinfo.o: lib/analyzerinfo.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h lib/utils.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/analyzerinfo.cpp
 
 $(libcppdir)/astutils.o: lib/astutils.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkclass.h lib/checkers.h lib/config.h lib/errortypes.h lib/findtoken.h lib/infer.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
@@ -621,7 +621,7 @@ $(libcppdir)/standards.o: lib/standards.cpp externals/simplecpp/simplecpp.h lib/
 $(libcppdir)/summaries.o: lib/summaries.cpp lib/addoninfo.h lib/analyzerinfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/summaries.cpp
 
-$(libcppdir)/suppressions.o: lib/suppressions.cpp externals/tinyxml2/tinyxml2.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/suppressions.o: lib/suppressions.cpp externals/tinyxml2/tinyxml2.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/suppressions.cpp
 
 $(libcppdir)/templatesimplifier.o: lib/templatesimplifier.cpp lib/addoninfo.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -20,6 +20,7 @@
 
 #include "addoninfo.h"
 #include "check.h"
+#include "checkers.h"
 #include "color.h"
 #include "config.h"
 #include "cppcheck.h"
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -54,6 +54,7 @@
 #include <fstream>
 #include <iostream>
 #include <list>
+#include <map>
 #include <set>
 #include <sstream>
 #include <unordered_set>
diff --git a/cli/filelister.cpp b/cli/filelister.cpp
@@ -25,6 +25,7 @@
 #include "filesettings.h"
 #include "path.h"
 #include "pathmatch.h"
+#include "standards.h"
 #include "utils.h"
 
 #include <cstring>
diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
@@ -26,7 +26,6 @@
 #include "timer.h"
 
 #include <cassert>
-#include <cstdint>
 #include <cstdlib>
 #include <future>
 #include <iostream>
diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
@@ -25,6 +25,7 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "filesettings.h"
+#include "path.h"
 #include "settings.h"
 #include "standards.h"
 #include "threadresult.h"
diff --git a/gui/common.h b/gui/common.h
@@ -52,7 +52,6 @@
 
 // Report type
 #define SETTINGS_REPORT_TYPE            "Report type"
-enum class ReportType : std::uint8_t;
 
 // Show * states
 #define SETTINGS_SHOW_STYLE             "Show style"
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -22,6 +22,7 @@
 #include "applicationlist.h"
 #include "aboutdialog.h"
 #include "analyzerinfo.h"
+#include "checkers.h"
 #include "checkstatistics.h"
 #include "checkthread.h"
 #include "common.h"
diff --git a/gui/newsuppressiondialog.cpp b/gui/newsuppressiondialog.cpp
@@ -24,7 +24,6 @@
 
 #include "ui_newsuppressiondialog.h"
 
-#include <cstdint>
 #include <string>
 
 #include <QComboBox>
diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
@@ -35,7 +35,6 @@
 
 #include <algorithm>
 #include <utility>
-#include <vector>
 
 #include <QAction>
 #include <QApplication>
diff --git a/gui/resultstree.h b/gui/resultstree.h
@@ -20,11 +20,12 @@
 #ifndef RESULTSTREE_H
 #define RESULTSTREE_H
 
-#include "common.h"
 #include "showtypes.h"
 #include "checkers.h"
 
 #include <cstdint>
+#include <map>
+#include <string>
 
 #include <QObject>
 #include <QStandardItemModel>
diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp
@@ -73,6 +73,8 @@
 #include <QVariantMap>
 #include <Qt>
 
+enum class ReportType : std::uint8_t;
+
 ResultsView::ResultsView(QWidget * parent) :
     QWidget(parent),
     mUI(new Ui::ResultsView),
diff --git a/gui/resultsview.h b/gui/resultsview.h
@@ -22,9 +22,6 @@
 
 #include "report.h"
 #include "showtypes.h"
-#include "common.h"
-
-#include <cstdint>
 
 #include <QObject>
 #include <QString>
@@ -40,6 +37,7 @@ class QPrinter;
 class QSettings;
 class CheckStatistics;
 class QPoint;
+enum class ReportType : std::uint8_t;
 namespace Ui {
     class ResultsView;
 }
diff --git a/gui/test/resultstree/testresultstree.cpp b/gui/test/resultstree/testresultstree.cpp
@@ -23,23 +23,21 @@
 // headers that declare mocked functions/variables
 #include "applicationlist.h"
 #include "common.h"
-#include "threadhandler.h"
 #include "projectfile.h"
+#include "threadhandler.h"
+#include "threadresult.h"
 
 #include "application.h"
-#include "cppcheck.h"
+#include "checkers.h"
 #include "erroritem.h"
 #include "errorlogger.h"
 #include "errortypes.h"
-#include "path.h"
 #include "report.h"
-#include "settings.h"
 #include "showtypes.h"
 #include "suppressions.h"
 #include "xmlreport.h"
 
 #include <cstddef>
-#include <set>
 #include <string>
 #include <utility>
 
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
@@ -32,6 +32,7 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
+#include "tokenlist.h"
 #include "utils.h"
 #include "valueflow.h"
 
diff --git a/lib/checkersidmapping.cpp b/lib/checkersidmapping.cpp
@@ -19,6 +19,8 @@
 // Mappings of Cppcheck warning IDs to guidelines
 #include "checkers.h"
 
+#include <vector>
+
 std::vector<checkers::IdMapping> checkers::idMappingAutosar{
     {"m0-1-1", "unreachableCode,duplicateBreak"},
     {"m0-1-2", "unsignedLessThanZero"},
diff --git a/lib/checknullpointer.cpp b/lib/checknullpointer.cpp
@@ -31,6 +31,7 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
+#include "tokenlist.h"
 #include "valueflow.h"
 
 #include <algorithm>
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -29,6 +29,8 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
+#include "tokenlist.h"
+#include "utils.h"
 #include "vfvalue.h"
 
 #include "checknullpointer.h"   // CheckNullPointer::isPointerDeref
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -24,6 +24,7 @@
 #include "check.h"
 #include "config.h"
 #include "settings.h"
+#include "standards.h"
 
 #include <cstdint>
 #include <fstream>
diff --git a/lib/errorlogger.h b/lib/errorlogger.h
@@ -24,7 +24,6 @@
 #include "config.h"
 #include "errortypes.h"
 #include "color.h"
-#include "checkers.h"
 
 #include <cstddef>
 #include <list>
@@ -36,6 +35,7 @@
 
 class Token;
 class TokenList;
+enum class ReportType : std::uint8_t;
 
 namespace tinyxml2 {
     class XMLElement;
diff --git a/lib/findtoken.cpp b/lib/findtoken.cpp
@@ -21,6 +21,8 @@
 #include "astutils.h"
 #include "token.h"
 
+class Library;
+
 template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
 static bool findTokensSkipDeadCodeImpl(const Library& library,
                                        T* start,
diff --git a/lib/findtoken.h b/lib/findtoken.h
@@ -22,18 +22,15 @@
 //---------------------------------------------------------------------------
 
 #include <functional>
-#include <stack>
-#include <string>
 #include <type_traits>
 #include <vector>
 
 #include "config.h"
-#include "errortypes.h"
-#include "library.h"
-#include "smallvector.h"
-#include "symboldatabase.h"
+#include "mathlib.h"
 #include "token.h"
 
+class Library;
+
 inline std::vector<MathLib::bigint> evaluateKnownValues(const Token* tok)
 {
     if (!tok->hasKnownIntValue())
diff --git a/lib/infer.h b/lib/infer.h
@@ -27,6 +27,7 @@
 #include <string>
 #include <vector>
 
+class Token;
 template<class T> class ValuePtr;
 
 struct InferModel {
diff --git a/lib/path.cpp b/lib/path.cpp
@@ -42,6 +42,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 #else
+#include <stdexcept>
+
 #include <direct.h>
 #include <windows.h>
 #endif
diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -20,6 +20,7 @@
 #include "settings.h"
 #include "path.h"
 #include "summaries.h"
+#include "utils.h"
 #include "vfvalue.h"
 
 #include <cctype>
diff --git a/lib/settings.h b/lib/settings.h
@@ -32,7 +32,6 @@
 
 #include <algorithm>
 #include <atomic>
-#include <cstddef>
 #include <cstdint>
 #include <functional>
 #include <list>
diff --git a/lib/token.cpp b/lib/token.cpp
@@ -33,6 +33,7 @@
 #include <cassert>
 #include <cctype>
 #include <climits>
+#include <cmath>
 #include <cstdio>
 #include <cstring>
 #include <functional>
diff --git a/lib/utils.cpp b/lib/utils.cpp
@@ -20,7 +20,6 @@
 
 #include <algorithm>
 #include <cctype>
-#include <cstring>
 #include <iterator>
 #include <stack>
 #include <utility>
diff --git a/lib/utils.h b/lib/utils.h
@@ -33,6 +33,7 @@
 #include <stdexcept>
 #include <string>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 struct SelectMapKeys {
diff --git a/lib/vfvalue.h b/lib/vfvalue.h
@@ -31,6 +31,7 @@
 #include <functional>
 #include <string>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 FORCE_WARNING_CLANG_PUSH("-Wpadded")
diff --git a/oss-fuzz/Makefile b/oss-fuzz/Makefile
@@ -156,7 +156,7 @@ $(libcppdir)/symboldatabase.o: ../lib/symboldatabase.cpp ../lib/addoninfo.h ../l
 $(libcppdir)/addoninfo.o: ../lib/addoninfo.cpp ../externals/picojson/picojson.h ../lib/addoninfo.h ../lib/config.h ../lib/json.h ../lib/path.h ../lib/standards.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/addoninfo.cpp
 
-$(libcppdir)/analyzerinfo.o: ../lib/analyzerinfo.cpp ../externals/tinyxml2/tinyxml2.h ../lib/analyzerinfo.h ../lib/checkers.h ../lib/color.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/standards.h ../lib/utils.h ../lib/xml.h
+$(libcppdir)/analyzerinfo.o: ../lib/analyzerinfo.cpp ../externals/tinyxml2/tinyxml2.h ../lib/analyzerinfo.h ../lib/color.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/standards.h ../lib/utils.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/analyzerinfo.cpp
 
 $(libcppdir)/astutils.o: ../lib/astutils.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkclass.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/findtoken.h ../lib/infer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/suppressions.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vfvalue.h
@@ -318,7 +318,7 @@ $(libcppdir)/standards.o: ../lib/standards.cpp ../externals/simplecpp/simplecpp.
 $(libcppdir)/summaries.o: ../lib/summaries.cpp ../lib/addoninfo.h ../lib/analyzerinfo.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/sourcelocation.h ../lib/standards.h ../lib/summaries.h ../lib/suppressions.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/summaries.cpp
 
-$(libcppdir)/suppressions.o: ../lib/suppressions.cpp ../externals/tinyxml2/tinyxml2.h ../lib/checkers.h ../lib/color.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/standards.h ../lib/suppressions.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/suppressions.o: ../lib/suppressions.cpp ../externals/tinyxml2/tinyxml2.h ../lib/color.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/standards.h ../lib/suppressions.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/suppressions.cpp
 
 $(libcppdir)/templatesimplifier.o: ../lib/templatesimplifier.cpp ../lib/addoninfo.h ../lib/checkers.h ../lib/color.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/standards.h ../lib/suppressions.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "checkers.h"
 #include "cmdlinelogger.h"
 #include "cmdlineparser.h"
 #include "config.h"
diff --git a/test/testcppcheck.cpp b/test/testcppcheck.cpp
@@ -23,6 +23,7 @@
 #include "fixture.h"
 #include "helpers.h"
 #include "settings.h"
+#include "standards.h"
 
 #include "simplecpp.h"
 
diff --git a/test/testerrorlogger.cpp b/test/testerrorlogger.cpp
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "checkers.h"
 #include "cppcheck.h"
 #include "errorlogger.h"
 #include "errortypes.h"
diff --git a/test/testfilelister.cpp b/test/testfilelister.cpp
@@ -18,9 +18,10 @@
 
 #include "filelister.h"
 #include "filesettings.h"
+#include "fixture.h"
 #include "path.h"
 #include "pathmatch.h"
-#include "fixture.h"
+#include "standards.h"
 
 #include <algorithm>
 #include <list>
diff --git a/test/testfilesettings.cpp b/test/testfilesettings.cpp
@@ -18,6 +18,7 @@
 
 #include "filesettings.h"
 #include "fixture.h"
+#include "standards.h"
 
 class TestFileSettings : public TestFixture {
 public:
diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
@@ -20,6 +20,7 @@
 #include "errortypes.h"
 #include "fixture.h"
 #include "helpers.h"
+#include "platform.h"
 #include "settings.h"
 #include "standards.h"
 
diff --git a/test/testpath.cpp b/test/testpath.cpp
@@ -26,6 +26,10 @@
 #include <string>
 #include <vector>
 
+#ifndef _WIN32
+#include <stdexcept>
+#endif
+
 class TestPath : public TestFixture {
 public:
     TestPath() : TestFixture("TestPath") {}
diff --git a/test/testprocessexecutor.cpp b/test/testprocessexecutor.cpp
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
diff --git a/test/testsingleexecutor.cpp b/test/testsingleexecutor.cpp
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
