diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 842d597b0a4..268c8d08d8a 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -52,7 +52,6 @@
 #include <list>
 #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/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 3ed37eb7b25..1ab655d1a76 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -62,9 +62,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 abb7b343ec1..cde1206ace2 100644
--- a/gui/projectfiledialog.cpp
+++ b/gui/projectfiledialog.cpp
@@ -32,7 +32,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 31c8d2e0e2d..cda4d59c341 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 578763124ac..97fcbf8017b 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 174237eef5a..83a54c9a691 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 de70772a279..74edec5d70c 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 3d36c9936a1..31353cbe2a4 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>
 //---------------------------------------------------------------------------
 
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
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 29342fb4dbc..f796fdfe65a 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 0c5101750a6..9a4adff4234 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 93b10210404..098df580f8e 100644
--- a/lib/checkinternal.cpp
+++ b/lib/checkinternal.cpp
@@ -29,7 +29,6 @@
 
 #include <cstring>
 #include <set>
-#include <vector>
 
 void CheckInternalImpl::checkTokenMatchPatterns()
 {
diff --git a/lib/checkio.cpp b/lib/checkio.cpp
index 4fff7d46282..e6ea7c8e1f3 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 f15fa293c49..51e26cab25d 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 2d9012078a6..144356fe7a7 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 447a8924360..60ba1d2ffb9 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 3a5ddcb1ac0..42bd639d0f3 100644
--- a/lib/checkuninitvar.cpp
+++ b/lib/checkuninitvar.cpp
@@ -44,7 +44,6 @@
 #include <map>
 #include <unordered_set>
 #include <utility>
-#include <vector>
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
index 26368064c63..99c6e489bae 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 ae8b1626ba6..aed446f44ff 100644
--- a/lib/checkvaarg.cpp
+++ b/lib/checkvaarg.cpp
@@ -27,8 +27,6 @@
 
 #include <cstddef>
 #include <iterator>
-#include <list>
-#include <vector>
 
 //---------------------------------------------------------------------------
 // Ensure that correct parameter is passed to va_start()
diff --git a/lib/forwardanalyzer.cpp b/lib/forwardanalyzer.cpp
index 3398d2fe723..c086543a8c0 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 07ba7cc2e59..8b013da3e0c 100644
--- a/lib/fwdanalysis.cpp
+++ b/lib/fwdanalysis.cpp
@@ -27,7 +27,6 @@
 #include "vfvalue.h"
 
 #include <deque>
-#include <list>
 #include <string>
 #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 142385ac641..7b52a5eafcc 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 1a4d17aa849..cde7d7f3f7a 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 f9eecc20fb9..da9e8cc49f2 100644
--- a/lib/vf_common.cpp
+++ b/lib/vf_common.cpp
@@ -37,7 +37,6 @@
 #include <exception>
 #include <limits>
 #include <utility>
-#include <vector>
 
 namespace ValueFlow
 {
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/testcheck.cpp b/test/testcheck.cpp
index 254519da2eb..7bac3f032a1 100644
--- a/test/testcheck.cpp
+++ b/test/testcheck.cpp
@@ -20,7 +20,6 @@
 #include "checks.h"
 #include "fixture.h"
 
-#include <list>
 #include <string>
 
 class TestCheck : public TestFixture {
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
index 6f963e07212..32c9d447cfa 100644
--- a/test/testcmdlineparser.cpp
+++ b/test/testcmdlineparser.cpp
@@ -41,10 +41,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 c798950b8e3..ec23a68cfa0 100644
--- a/test/testgarbage.cpp
+++ b/test/testgarbage.cpp
@@ -25,7 +25,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 9f781a29f73..748246f782b 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/testmemleak.cpp b/test/testmemleak.cpp
index e05698ae23e..9c8650fd82f 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 9aad97b2c99..76add3da7ee 100644
--- a/test/testpreprocessor.cpp
+++ b/test/testpreprocessor.cpp
@@ -35,7 +35,6 @@
 #include <algorithm>
 #include <cstring>
 #include <iterator>
-#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 0367c993951..285321d50a4 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 910567ac084..7b2afaf4050 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 09623db97c5..1c77c74b208 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: