diff --git a/.github/workflows/selfcheck.yml b/.github/workflows/selfcheck.yml
index ff112927598..73247afc8d4 100644
--- a/.github/workflows/selfcheck.yml
+++ b/.github/workflows/selfcheck.yml
@@ -121,7 +121,7 @@ jobs:
 
       - name: Self check (unusedFunction / no test / no gui)
         run: |
-          supprs="--suppress=unusedFunction:lib/errorlogger.h:197 --suppress=unusedFunction:lib/importproject.cpp:1584 --suppress=unusedFunction:lib/importproject.cpp:1608"
+          supprs="--suppress=unusedFunction:lib/errorlogger.h:197 --suppress=unusedFunction:lib/importproject.cpp:1583 --suppress=unusedFunction:lib/importproject.cpp:1607"
           ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib -D__CPPCHECK__ -D__GNUC__ --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest_nogui/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr $supprs
         env:
           DISABLE_VALUEFLOW: 1
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 00eee88c66e..b7bb4c60da7 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -53,7 +53,6 @@
 #include <memory>
 #include <set>
 #include <sstream>
-#include <unordered_set>
 #include <utility>
 
 #ifdef HAVE_RULES
diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
index 07ca4e77ed2..83319ac0280 100644
--- a/gui/checkthread.cpp
+++ b/gui/checkthread.cpp
@@ -34,7 +34,6 @@
 #include <fstream>
 #include <iterator>
 #include <list>
-#include <set>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/gui/compliancereportdialog.cpp b/gui/compliancereportdialog.cpp
index c61299e6e3c..ada7ee49aea 100644
--- a/gui/compliancereportdialog.cpp
+++ b/gui/compliancereportdialog.cpp
@@ -29,7 +29,6 @@
 
 #include <algorithm>
 #include <iterator>
-#include <list>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/gui/cppchecklibrarydata.cpp b/gui/cppchecklibrarydata.cpp
index 637ad841580..437799a30da 100644
--- a/gui/cppchecklibrarydata.cpp
+++ b/gui/cppchecklibrarydata.cpp
@@ -21,7 +21,6 @@
 #include "utils.h"
 
 #include <stdexcept>
-#include <string>
 #include <utility>
 
 #include <QObject>
diff --git a/gui/erroritem.cpp b/gui/erroritem.cpp
index 77693f26a81..408b4b1e099 100644
--- a/gui/erroritem.cpp
+++ b/gui/erroritem.cpp
@@ -20,8 +20,6 @@
 
 #include "common.h"
 
-#include <list>
-
 QErrorPathItem::QErrorPathItem(const ErrorMessage::FileLocation &loc)
     : file(QString::fromStdString(loc.getfile(false)))
     , line(loc.line)
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 161eec381b3..2299831e93f 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -65,9 +65,7 @@
 #include <iterator>
 #include <list>
 #include <memory>
-#include <set>
 #include <string>
-#include <unordered_set>
 #include <utility>
 #include <vector>
 
diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
index d46eb5c3489..be258f57c9c 100644
--- a/gui/projectfiledialog.cpp
+++ b/gui/projectfiledialog.cpp
@@ -33,7 +33,6 @@
 #include "ui_projectfile.h"
 
 #include <array>
-#include <list>
 #include <string>
 #include <utility>
 
diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp
index 3f89d58b558..a07c38fa8e2 100644
--- a/gui/threadhandler.cpp
+++ b/gui/threadhandler.cpp
@@ -27,7 +27,6 @@
 
 #include <algorithm>
 #include <string>
-#include <unordered_set>
 #include <utility>
 
 #include <QDebug>
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
index f16144310ac..a7b1ecf2bf8 100644
--- a/lib/astutils.cpp
+++ b/lib/astutils.cpp
@@ -41,10 +41,8 @@
 #include <functional>
 #include <initializer_list>
 #include <iterator>
-#include <list>
 #include <set>
 #include <type_traits>
-#include <unordered_map>
 #include <utility>
 
 const Token* findExpression(const nonneg int exprid,
diff --git a/lib/astutils.h b/lib/astutils.h
index 5b6b878f3ae..79e87e06ba2 100644
--- a/lib/astutils.h
+++ b/lib/astutils.h
@@ -24,7 +24,6 @@
 
 #include <cstdint>
 #include <functional>
-#include <list>
 #include <string>
 #include <type_traits>
 #include <utility>
diff --git a/lib/check64bit.cpp b/lib/check64bit.cpp
index d203eb5f279..a21ab74ca98 100644
--- a/lib/check64bit.cpp
+++ b/lib/check64bit.cpp
@@ -29,8 +29,6 @@
 #include "token.h"
 #include "tokenize.h"
 
-#include <vector>
-
 //---------------------------------------------------------------------------
 
 // CWE ids used
diff --git a/lib/checkautovariables.cpp b/lib/checkautovariables.cpp
index 387e3fd3c2d..c0a2b45c7f3 100644
--- a/lib/checkautovariables.cpp
+++ b/lib/checkautovariables.cpp
@@ -32,10 +32,8 @@
 #include "vfvalue.h"
 
 #include <algorithm>
-#include <list>
 #include <unordered_set>
 #include <utility>
-#include <vector>
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/checkbool.cpp b/lib/checkbool.cpp
index 93e501416aa..a6651e75798 100644
--- a/lib/checkbool.cpp
+++ b/lib/checkbool.cpp
@@ -27,9 +27,6 @@
 #include "token.h"
 #include "tokenize.h"
 #include "vfvalue.h"
-
-#include <list>
-#include <vector>
 //---------------------------------------------------------------------------
 
 // Register this check class (by creating a static instance of it)
diff --git a/lib/checkersreport.cpp b/lib/checkersreport.cpp
index f2c4a84653f..31c8f3b2de9 100644
--- a/lib/checkersreport.cpp
+++ b/lib/checkersreport.cpp
@@ -25,10 +25,7 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <map>
 #include <sstream>
-#include <unordered_set>
-#include <vector>
 
 static int getMisraCVersion(const Settings& settings) {
     if (settings.premiumArgs.find("misra-c-2025") != std::string::npos)
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
index 34303cc0f4a..d56389cf9eb 100644
--- a/lib/checkexceptionsafety.cpp
+++ b/lib/checkexceptionsafety.cpp
@@ -30,7 +30,6 @@
 #include <list>
 #include <set>
 #include <utility>
-#include <vector>
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/checkfunctions.cpp b/lib/checkfunctions.cpp
index f6799d199e7..e290db50581 100644
--- a/lib/checkfunctions.cpp
+++ b/lib/checkfunctions.cpp
@@ -36,10 +36,7 @@
 #include "vfvalue.h"
 
 #include <iomanip>
-#include <list>
-#include <map>
 #include <sstream>
-#include <unordered_map>
 #include <vector>
 
 //---------------------------------------------------------------------------
diff --git a/lib/checkinternal.cpp b/lib/checkinternal.cpp
index f289044b102..2395e2b29d0 100644
--- a/lib/checkinternal.cpp
+++ b/lib/checkinternal.cpp
@@ -29,7 +29,6 @@
 
 #include <cstring>
 #include <set>
-#include <vector>
 
 // Register this check class (by creating a static instance of it).
 // Disabled in release builds
diff --git a/lib/checkio.cpp b/lib/checkio.cpp
index ee1b4e36c73..102fe02471b 100644
--- a/lib/checkio.cpp
+++ b/lib/checkio.cpp
@@ -35,7 +35,6 @@
 #include <cctype>
 #include <cstdlib>
 #include <functional>
-#include <list>
 #include <map>
 #include <set>
 #include <sstream>
diff --git a/lib/checkpostfixoperator.cpp b/lib/checkpostfixoperator.cpp
index c6c9ccba77b..34fb50b058e 100644
--- a/lib/checkpostfixoperator.cpp
+++ b/lib/checkpostfixoperator.cpp
@@ -29,8 +29,6 @@
 #include "token.h"
 #include "tokenize.h"
 
-#include <vector>
-
 //---------------------------------------------------------------------------
 
 
diff --git a/lib/checksizeof.cpp b/lib/checksizeof.cpp
index f7c0d44d399..18a63ee3f82 100644
--- a/lib/checksizeof.cpp
+++ b/lib/checksizeof.cpp
@@ -29,8 +29,6 @@
 
 #include <algorithm>
 #include <iterator>
-#include <map>
-#include <vector>
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/checktype.cpp b/lib/checktype.cpp
index 3f42bf075ef..835d073ad54 100644
--- a/lib/checktype.cpp
+++ b/lib/checktype.cpp
@@ -40,7 +40,6 @@
 #include <list>
 #include <sstream>
 #include <utility>
-#include <vector>
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
index ecaed652c5e..3e84f03278c 100644
--- a/lib/checkuninitvar.cpp
+++ b/lib/checkuninitvar.cpp
@@ -43,7 +43,6 @@
 #include <map>
 #include <unordered_set>
 #include <utility>
-#include <vector>
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
index 6e9381657b0..8ba3d841056 100644
--- a/lib/checkunusedvar.cpp
+++ b/lib/checkunusedvar.cpp
@@ -34,7 +34,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
-#include <list>
 #include <set>
 #include <utility>
 #include <vector>
diff --git a/lib/checkvaarg.cpp b/lib/checkvaarg.cpp
index 96c65ea41a2..cd70897818b 100644
--- a/lib/checkvaarg.cpp
+++ b/lib/checkvaarg.cpp
@@ -27,8 +27,6 @@
 
 #include <cstddef>
 #include <iterator>
-#include <list>
-#include <vector>
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/forwardanalyzer.cpp b/lib/forwardanalyzer.cpp
index 5c97528372b..1e6ee511f03 100644
--- a/lib/forwardanalyzer.cpp
+++ b/lib/forwardanalyzer.cpp
@@ -36,7 +36,6 @@
 #include <cstdio>
 #include <cstdint>
 #include <functional>
-#include <list>
 #include <string>
 #include <tuple>
 #include <type_traits>
diff --git a/lib/fwdanalysis.cpp b/lib/fwdanalysis.cpp
index b30b928cfae..f36e4516499 100644
--- a/lib/fwdanalysis.cpp
+++ b/lib/fwdanalysis.cpp
@@ -27,7 +27,6 @@
 #include "vfvalue.h"
 
 #include <deque>
-#include <list>
 #include <string>
 #include <utility>
 
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
index 4033b678d02..8c1ee10ea20 100644
--- a/lib/importproject.cpp
+++ b/lib/importproject.cpp
@@ -35,7 +35,6 @@
 #include <iostream>
 #include <iterator>
 #include <stack>
-#include <unordered_set>
 #include <utility>
 #include <vector>
 
diff --git a/lib/pathanalysis.cpp b/lib/pathanalysis.cpp
index 8b2e1b61cbb..64765dd0bf0 100644
--- a/lib/pathanalysis.cpp
+++ b/lib/pathanalysis.cpp
@@ -24,7 +24,6 @@
 #include "vfvalue.h"
 
 #include <algorithm>
-#include <string>
 #include <tuple>
 
 const Scope* PathAnalysis::findOuterScope(const Scope * scope)
diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
index eb0b290ac6c..63e7ccccf89 100644
--- a/lib/programmemory.cpp
+++ b/lib/programmemory.cpp
@@ -37,7 +37,6 @@
 #include <cmath>
 #include <functional>
 #include <iterator>
-#include <list>
 #include <memory>
 #include <stack>
 #include <stdexcept>
diff --git a/lib/vf_analyzers.cpp b/lib/vf_analyzers.cpp
index 58fbe0b6d61..b0bb18a7ba8 100644
--- a/lib/vf_analyzers.cpp
+++ b/lib/vf_analyzers.cpp
@@ -43,7 +43,6 @@
 #include <functional>
 #include <initializer_list>
 #include <iterator>
-#include <list>
 #include <set>
 #include <type_traits>
 
diff --git a/lib/vf_common.cpp b/lib/vf_common.cpp
index ab01acc0f16..48cb8545e3c 100644
--- a/lib/vf_common.cpp
+++ b/lib/vf_common.cpp
@@ -36,7 +36,6 @@
 #include <exception>
 #include <limits>
 #include <utility>
-#include <vector>
 
 namespace ValueFlow
 {
diff --git a/lib/vf_settokenvalue.cpp b/lib/vf_settokenvalue.cpp
index 602d87e159d..fed2cda2bcb 100644
--- a/lib/vf_settokenvalue.cpp
+++ b/lib/vf_settokenvalue.cpp
@@ -39,7 +39,6 @@
 #include <cstdint>
 #include <functional>
 #include <list>
-#include <string>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
diff --git a/test/cfg/cppunit.cpp b/test/cfg/cppunit.cpp
index b5e9826a25d..494adfb1d6b 100644
--- a/test/cfg/cppunit.cpp
+++ b/test/cfg/cppunit.cpp
@@ -8,8 +8,6 @@
 
 // cppcheck-suppress-file valueFlowBailout
 
-#include <string>
-
 #include <cppunit/Exception.h>
 #include <cppunit/Portability.h>
 #include <cppunit/TestAssert.h>
diff --git a/test/fixture.h b/test/fixture.h
index 35239f0797c..fd8c8072449 100644
--- a/test/fixture.h
+++ b/test/fixture.h
@@ -32,7 +32,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <exception>
-#include <list>
 #include <memory>
 #include <set>
 #include <sstream>
diff --git a/test/testcheck.cpp b/test/testcheck.cpp
index 8ea4cef38d8..82fa45ccc9b 100644
--- a/test/testcheck.cpp
+++ b/test/testcheck.cpp
@@ -19,7 +19,6 @@
 #include "check.h"
 #include "fixture.h"
 
-#include <list>
 #include <string>
 
 class TestCheck : public TestFixture {
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
index 870e0ac341c..16ec1fb46d3 100644
--- a/test/testcmdlineparser.cpp
+++ b/test/testcmdlineparser.cpp
@@ -37,10 +37,8 @@
 #include <cstdio>
 #include <list>
 #include <memory>
-#include <set>
 #include <stdexcept>
 #include <string>
-#include <unordered_set>
 #include <vector>
 
 class TestCmdlineParser : public TestFixture {
diff --git a/test/testexecutor.cpp b/test/testexecutor.cpp
index 30b2b834834..5270fc81177 100644
--- a/test/testexecutor.cpp
+++ b/test/testexecutor.cpp
@@ -29,7 +29,6 @@
 
 #include <list>
 #include <stdexcept>
-#include <string>
 #include <utility>
 
 class DummyExecutor : public Executor
diff --git a/test/testfrontend.cpp b/test/testfrontend.cpp
index ef6b774181a..5c6628695ff 100644
--- a/test/testfrontend.cpp
+++ b/test/testfrontend.cpp
@@ -24,7 +24,6 @@
 #include "standards.h"
 
 #include <list>
-#include <string>
 
 class TestFrontend : public TestFixture {
 public:
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
index 5f6b67867f7..6b5a96c0991 100644
--- a/test/testgarbage.cpp
+++ b/test/testgarbage.cpp
@@ -24,7 +24,6 @@
 #include "token.h"
 
 #include <cstddef>
-#include <list>
 #include <string>
 
 class TestGarbage : public TestFixture {
diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp
index a531ac4cba9..86574a84370 100644
--- a/test/testlibrary.cpp
+++ b/test/testlibrary.cpp
@@ -27,9 +27,7 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <map>
 #include <string>
-#include <unordered_map>
 #include <vector>
 
 #define ASSERT_EQ(expected, actual)   ASSERT(expected == actual)
diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
index 8cbe5b50019..baa2e66e05c 100644
--- a/test/testmathlib.cpp
+++ b/test/testmathlib.cpp
@@ -24,7 +24,6 @@
 
 #include <limits>
 #include <memory>
-#include <string>
 #include <utility>
 
 class TestMathLib : public TestFixture {
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index 39f298fa923..e085bd5282e 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -25,7 +25,6 @@
 #include "token.h"
 
 #include <cstddef>
-#include <list>
 
 class TestMemleak : public TestFixture {
 public:
diff --git a/test/testpathmatch.cpp b/test/testpathmatch.cpp
index 7e721502a11..65e27ae04c9 100644
--- a/test/testpathmatch.cpp
+++ b/test/testpathmatch.cpp
@@ -20,7 +20,6 @@
 #include "fixture.h"
 
 #include <string>
-#include <vector>
 
 
 class TestPathMatch : public TestFixture {
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
index d072ebbf2e3..b84ecd127ee 100644
--- a/test/testpreprocessor.cpp
+++ b/test/testpreprocessor.cpp
@@ -33,7 +33,6 @@
 #include "helpers.h"
 
 #include <cstring>
-#include <list>
 #include <map>
 #include <set>
 #include <stdexcept>
diff --git a/test/testsarifreport.cpp b/test/testsarifreport.cpp
index e9fc56d736d..5cb2c979811 100644
--- a/test/testsarifreport.cpp
+++ b/test/testsarifreport.cpp
@@ -24,7 +24,6 @@
 #include <cmath>
 #include <set>
 #include <string>
-#include <vector>
 
 #include "json.h"
 
diff --git a/test/testsizeof.cpp b/test/testsizeof.cpp
index ad8aa3192af..84cb556f485 100644
--- a/test/testsizeof.cpp
+++ b/test/testsizeof.cpp
@@ -23,7 +23,6 @@
 #include "settings.h"
 
 #include <cstddef>
-#include <string>
 
 class TestSizeof : public TestFixture {
 public:
diff --git a/test/testtokenrange.cpp b/test/testtokenrange.cpp
index e27e6c5b038..f9fa41405bb 100644
--- a/test/testtokenrange.cpp
+++ b/test/testtokenrange.cpp
@@ -24,7 +24,6 @@
 
 #include <algorithm>
 #include <iterator>
-#include <list>
 #include <sstream>
 #include <string>
 
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
index 5a364347163..3fb2e1bc5dc 100644
--- a/test/testunusedprivfunc.cpp
+++ b/test/testunusedprivfunc.cpp
@@ -24,7 +24,6 @@
 #include "fixture.h"
 
 #include <cstddef>
-#include <string>
 
 class TestUnusedPrivateFunction : public TestFixture {
 public: