diff --git a/Makefile b/Makefile
index 71b62bab7fc..02482206b9a 100644
--- a/Makefile
+++ b/Makefile
@@ -508,7 +508,7 @@ $(libcppdir)/checkbool.o: lib/checkbool.cpp lib/addoninfo.h lib/astutils.h lib/c
 $(libcppdir)/checkbufferoverrun.o: lib/checkbufferoverrun.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/astutils.h lib/check.h lib/checkbufferoverrun.h lib/checkers.h lib/config.h lib/ctu.h lib/errorlogger.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/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkbufferoverrun.cpp
 
-$(libcppdir)/checkclass.o: lib/checkclass.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/astutils.h lib/check.h lib/checkclass.h lib/checkers.h lib/config.h lib/errorlogger.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/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/checkclass.o: lib/checkclass.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/astutils.h lib/check.h lib/checkclass.h lib/checkers.h lib/config.h lib/errorlogger.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkclass.cpp
 
 $(libcppdir)/checkcondition.o: lib/checkcondition.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkcondition.h lib/checkers.h lib/checkother.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
@@ -583,7 +583,7 @@ $(libcppdir)/color.o: lib/color.cpp lib/color.h lib/config.h
 $(libcppdir)/cppcheck.o: lib/cppcheck.cpp externals/picojson/picojson.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/checkunusedfunctions.h lib/clangimport.h lib/color.h lib/config.h lib/cppcheck.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/regex.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/version.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/cppcheck.cpp
 
-$(libcppdir)/ctu.o: lib/ctu.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/config.h lib/ctu.h lib/errorlogger.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/ctu.o: lib/ctu.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/config.h lib/ctu.h lib/errorlogger.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/ctu.cpp
 
 $(libcppdir)/errorlogger.o: lib/errorlogger.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
@@ -658,7 +658,7 @@ $(libcppdir)/suppressions.o: lib/suppressions.cpp externals/tinyxml2/tinyxml2.h
 $(libcppdir)/templatesimplifier.o: lib/templatesimplifier.cpp lib/addoninfo.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.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)/templatesimplifier.cpp
 
-$(libcppdir)/timer.o: lib/timer.cpp lib/config.h lib/timer.h lib/utils.h
+$(libcppdir)/timer.o: lib/timer.cpp lib/config.h lib/timer.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/timer.cpp
 
 $(libcppdir)/token.o: lib/token.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.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/tokenrange.h lib/utils.h lib/valueflow.h lib/vfvalue.h
@@ -673,7 +673,7 @@ $(libcppdir)/utils.o: lib/utils.cpp lib/config.h lib/utils.h
 $(libcppdir)/vf_analyzers.o: lib/vf_analyzers.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/calculate.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/programmemory.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vf_analyzers.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_analyzers.cpp
 
-$(libcppdir)/vf_common.o: lib/vf_common.cpp 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/utils.h lib/valueflow.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
+$(libcppdir)/vf_common.o: lib/vf_common.cpp 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/utils.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_common.cpp
 
 $(libcppdir)/vf_settokenvalue.o: lib/vf_settokenvalue.cpp lib/addoninfo.h lib/astutils.h lib/calculate.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.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/utils.h lib/valueflow.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
@@ -859,7 +859,7 @@ test/testprogrammemory.o: test/testprogrammemory.cpp lib/addoninfo.h lib/check.h
 test/testregex.o: test/testregex.cpp lib/addoninfo.h lib/check.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/regex.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testregex.cpp
 
-test/testsarifreport.o: test/testsarifreport.cpp externals/picojson/picojson.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/sarifreport.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testsarifreport.o: test/testsarifreport.cpp externals/picojson/picojson.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/json.h lib/library.h lib/mathlib.h lib/platform.h lib/sarifreport.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsarifreport.cpp
 
 test/testsettings.o: test/testsettings.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 38d0ce3e875..4e567e47d9f 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -43,7 +43,6 @@
 
 #include <algorithm>
 #include <cassert>
-#include <climits>
 #include <cstdio>
 #include <cstdlib> // EXIT_FAILURE
 #include <cstring>
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 9603a3ebb97..6926183974b 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -52,6 +52,7 @@
 #include "threadhandler.h"
 #include "threadresult.h"
 #include "translationhandler.h"
+#include "utils.h"
 
 #include "ui_mainwindow.h"
 
diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
index 9a85124e4dc..bfa351722ec 100644
--- a/gui/projectfiledialog.cpp
+++ b/gui/projectfiledialog.cpp
@@ -23,10 +23,12 @@
 #include "importproject.h"
 #include "library.h"
 #include "newsuppressiondialog.h"
+#include "path.h"
 #include "platform.h"
 #include "platforms.h"
 #include "projectfile.h"
 #include "settings.h"
+#include "utils.h"
 
 #include "ui_projectfile.h"
 
diff --git a/gui/resultitem.cpp b/gui/resultitem.cpp
index b68830b90ba..4215115be07 100644
--- a/gui/resultitem.cpp
+++ b/gui/resultitem.cpp
@@ -18,6 +18,8 @@
 
 #include "resultitem.h"
 
+#include <utility>
+
 ResultItem::ResultItem(QSharedPointer<ErrorItem> errorItem, Type type, int errorPathIndex)
     : errorItem(std::move(errorItem)), mType(type), mErrorPathIndex(errorPathIndex)
 {}
diff --git a/gui/resultstree.h b/gui/resultstree.h
index 9537d6d929a..fa7be46242b 100644
--- a/gui/resultstree.h
+++ b/gui/resultstree.h
@@ -36,13 +36,11 @@
 class ApplicationList;
 class Report;
 class ErrorItem;
-class ErrorLine;
 class QModelIndex;
 class QWidget;
 class QItemSelectionModel;
 class ThreadHandler;
 class QSettings;
-class QStandardItem;
 class QStandardItemModel;
 enum class Severity : std::uint8_t;
 
diff --git a/gui/resultsview.h b/gui/resultsview.h
index 7aef3c6d5c2..770f9c0c3fa 100644
--- a/gui/resultsview.h
+++ b/gui/resultsview.h
@@ -35,11 +35,11 @@ class ErrorItem;
 class Settings;
 class ApplicationList;
 class ThreadHandler;
-class QModelIndex;
 class QPrinter;
 class QSettings;
 class CheckStatistics;
 class QPoint;
+class ResultItem;
 enum class ReportType : std::uint8_t;
 namespace Ui {
     class ResultsView;
diff --git a/gui/test/projectfile/testprojectfile.cpp b/gui/test/projectfile/testprojectfile.cpp
index e20b2ab38e2..988d62e8bce 100644
--- a/gui/test/projectfile/testprojectfile.cpp
+++ b/gui/test/projectfile/testprojectfile.cpp
@@ -18,7 +18,6 @@
 
 #include "testprojectfile.h"
 
-#include "importproject.h"
 #include "library.h"
 #include "platform.h"
 #include "projectfile.h"
diff --git a/gui/test/resultstree/testresultstree.cpp b/gui/test/resultstree/testresultstree.cpp
index be09034609f..258fa584098 100644
--- a/gui/test/resultstree/testresultstree.cpp
+++ b/gui/test/resultstree/testresultstree.cpp
@@ -23,6 +23,7 @@
 // headers that declare mocked functions/variables
 #include "applicationlist.h"
 #include "common.h"
+#include "filesettings.h"
 #include "projectfile.h"
 #include "threadhandler.h"
 #include "threadresult.h"
@@ -33,6 +34,7 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "report.h"
+#include "resultitem.h"
 #include "showtypes.h"
 #include "suppressions.h"
 #include "xmlreport.h"
diff --git a/lib/analyzerinfo.cpp b/lib/analyzerinfo.cpp
index 54dbb4496af..9477f2e290d 100644
--- a/lib/analyzerinfo.cpp
+++ b/lib/analyzerinfo.cpp
@@ -27,6 +27,7 @@
 #include <exception>
 #include <map>
 #include <sstream>
+#include <utility>
 
 #include "xml.h"
 
diff --git a/lib/check64bit.cpp b/lib/check64bit.cpp
index aa8a9bcb18a..a106b0afe5f 100644
--- a/lib/check64bit.cpp
+++ b/lib/check64bit.cpp
@@ -23,6 +23,7 @@
 #include "check64bit.h"
 
 #include "errortypes.h"
+#include "platform.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
index 34a734fecaa..2949d3c57a7 100644
--- a/lib/checkclass.cpp
+++ b/lib/checkclass.cpp
@@ -31,7 +31,6 @@
 #include "tokenize.h"
 #include "tokenlist.h"
 #include "utils.h"
-#include "valueflow.h"
 
 #include <algorithm>
 #include <cctype>
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index 6de1ede2bf9..bd9d1bc892f 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -23,7 +23,6 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "library.h"
-#include "mathlib.h"
 #include "platform.h"
 #include "settings.h"
 #include "symboldatabase.h"
@@ -31,6 +30,7 @@
 #include "tokenize.h"
 
 #include <algorithm>
+#include <cstddef>
 #include <utility>
 #include <vector>
 
diff --git a/lib/ctu.cpp b/lib/ctu.cpp
index aadba39d3c7..158c8c1e046 100644
--- a/lib/ctu.cpp
+++ b/lib/ctu.cpp
@@ -22,7 +22,6 @@
 
 #include "astutils.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
diff --git a/lib/mathlib.cpp b/lib/mathlib.cpp
index c23182a5a63..f065d63a935 100644
--- a/lib/mathlib.cpp
+++ b/lib/mathlib.cpp
@@ -26,7 +26,6 @@
 #include <cmath>
 #include <cstdint>
 #include <cstdlib>
-#include <exception>
 #include <limits>
 #include <locale>
 #include <sstream>
diff --git a/lib/platform.cpp b/lib/platform.cpp
index 6a016254589..833c012ab8e 100644
--- a/lib/platform.cpp
+++ b/lib/platform.cpp
@@ -23,6 +23,7 @@
 #include <cstring>
 #include <iostream>
 #include <limits>
+#include <utility>
 #include <vector>
 
 #include "xml.h"
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
index b10ff859ad6..d9788f8ee62 100644
--- a/lib/preprocessor.cpp
+++ b/lib/preprocessor.cpp
@@ -35,6 +35,7 @@
 #include <cstddef>
 #include <iterator>
 #include <memory>
+#include <stdexcept>
 #include <sstream>
 #include <utility>
 
diff --git a/lib/sarifreport.cpp b/lib/sarifreport.cpp
index fc4ff90df72..ce142430f54 100644
--- a/lib/sarifreport.cpp
+++ b/lib/sarifreport.cpp
@@ -17,13 +17,16 @@
  */
 
 #include "sarifreport.h"
+
+#include "cppcheck.h"
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "settings.h"
-#include "cppcheck.h"
 
+#include <cstdint>
 #include <set>
 #include <sstream>
+#include <utility>
 
 static const char sarifVersion[] = "2.1.0";
 static const char sarifSchema[] = "https://docs.oasis-open.org/sarif/sarif/v2.1.0/errata01/os/schemas/sarif-schema-2.1.0.json";
diff --git a/lib/sarifreport.h b/lib/sarifreport.h
index 26953703a51..90667322b2f 100644
--- a/lib/sarifreport.h
+++ b/lib/sarifreport.h
@@ -21,7 +21,6 @@
 
 #include "config.h"
 #include "errorlogger.h"
-#include "errortypes.h"
 
 #include <string>
 #include <vector>
diff --git a/lib/symboldatabase.h b/lib/symboldatabase.h
index db51328c5be..954b31cc05b 100644
--- a/lib/symboldatabase.h
+++ b/lib/symboldatabase.h
@@ -31,6 +31,7 @@
 
 #include <algorithm>
 #include <cctype>
+#include <cstddef>
 #include <cstdint>
 #include <iosfwd>
 #include <list>
@@ -40,7 +41,6 @@
 #include <utility>
 #include <vector>
 
-class Platform;
 class Function;
 class Scope;
 class Settings;
diff --git a/lib/timer.cpp b/lib/timer.cpp
index 5d64258be35..9e2dd901bea 100644
--- a/lib/timer.cpp
+++ b/lib/timer.cpp
@@ -18,9 +18,8 @@
 
 #include "timer.h"
 
-#include "utils.h"
-
 #include <algorithm>
+#include <cstddef>
 #include <iostream>
 #include <utility>
 #include <vector>
diff --git a/lib/timer.h b/lib/timer.h
index 991b334f3aa..f50b3ca3485 100644
--- a/lib/timer.h
+++ b/lib/timer.h
@@ -24,8 +24,6 @@
 
 #include <chrono>
 #include <cstdint>
-#include <ctime>
-#include <functional>
 #include <map>
 #include <mutex>
 #include <string>
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
index e649786fb8f..1f5bffc266d 100644
--- a/lib/valueflow.cpp
+++ b/lib/valueflow.cpp
@@ -112,8 +112,8 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
+#include <chrono>
 #include <cstdint>
-#include <cstdlib>
 #include <cstring>
 #include <functional>
 #include <initializer_list>
@@ -121,7 +121,6 @@
 #include <limits>
 #include <map>
 #include <memory>
-#include <numeric>
 #include <set>
 #include <string>
 #include <unordered_map>
diff --git a/lib/valueflow.h b/lib/valueflow.h
index 6fe4d052fdf..a813ff8d286 100644
--- a/lib/valueflow.h
+++ b/lib/valueflow.h
@@ -25,8 +25,6 @@
 #include "errortypes.h"
 #include "mathlib.h"
 
-#include <cstdint>
-#include <cstdlib>
 #include <functional>
 #include <list>
 #include <string>
@@ -39,7 +37,6 @@ class SymbolDatabase;
 class TimerResultsIntf;
 class Token;
 class TokenList;
-class ValueType;
 class Variable;
 class Scope;
 
diff --git a/lib/vf_common.cpp b/lib/vf_common.cpp
index 56a6b364c44..333f850d07d 100644
--- a/lib/vf_common.cpp
+++ b/lib/vf_common.cpp
@@ -26,7 +26,6 @@
 #include "standards.h"
 #include "symboldatabase.h"
 #include "token.h"
-#include "valueflow.h"
 #include "vfvalue.h"
 
 #include "vf_settokenvalue.h"
diff --git a/lib/vfvalue.cpp b/lib/vfvalue.cpp
index 2d1a82b32c3..4ec1c742ab3 100644
--- a/lib/vfvalue.cpp
+++ b/lib/vfvalue.cpp
@@ -18,9 +18,9 @@
 
 #include "vfvalue.h"
 
-#include "errortypes.h"
 #include "mathlib.h"
 #include "token.h"
+#include "utils.h"
 
 #include <sstream>
 #include <string>
diff --git a/oss-fuzz/Makefile b/oss-fuzz/Makefile
index f949da24e0f..02d2e7fbde2 100644
--- a/oss-fuzz/Makefile
+++ b/oss-fuzz/Makefile
@@ -188,7 +188,7 @@ $(libcppdir)/checkbool.o: ../lib/checkbool.cpp ../lib/addoninfo.h ../lib/astutil
 $(libcppdir)/checkbufferoverrun.o: ../lib/checkbufferoverrun.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkbufferoverrun.h ../lib/checkers.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.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/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkbufferoverrun.cpp
 
-$(libcppdir)/checkclass.o: ../lib/checkclass.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkclass.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.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/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/checkclass.o: ../lib/checkclass.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkclass.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.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/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkclass.cpp
 
 $(libcppdir)/checkcondition.o: ../lib/checkcondition.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkcondition.h ../lib/checkers.h ../lib/checkother.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.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/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
@@ -263,7 +263,7 @@ $(libcppdir)/color.o: ../lib/color.cpp ../lib/color.h ../lib/config.h
 $(libcppdir)/cppcheck.o: ../lib/cppcheck.cpp ../externals/picojson/picojson.h ../externals/simplecpp/simplecpp.h ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/analyzerinfo.h ../lib/check.h ../lib/checkers.h ../lib/checkunusedfunctions.h ../lib/clangimport.h ../lib/color.h ../lib/config.h ../lib/cppcheck.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/preprocessor.h ../lib/regex.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/suppressions.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/timer.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/version.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/cppcheck.cpp
 
-$(libcppdir)/ctu.o: ../lib/ctu.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.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/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/ctu.o: ../lib/ctu.cpp ../externals/tinyxml2/tinyxml2.h ../lib/astutils.h ../lib/check.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.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/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/ctu.cpp
 
 $(libcppdir)/errorlogger.o: ../lib/errorlogger.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/check.h ../lib/checkers.h ../lib/color.h ../lib/config.h ../lib/cppcheck.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/suppressions.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
@@ -338,7 +338,7 @@ $(libcppdir)/suppressions.o: ../lib/suppressions.cpp ../externals/tinyxml2/tinyx
 $(libcppdir)/templatesimplifier.o: ../lib/templatesimplifier.cpp ../lib/addoninfo.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.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)/templatesimplifier.cpp
 
-$(libcppdir)/timer.o: ../lib/timer.cpp ../lib/config.h ../lib/timer.h ../lib/utils.h
+$(libcppdir)/timer.o: ../lib/timer.cpp ../lib/config.h ../lib/timer.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/timer.cpp
 
 $(libcppdir)/token.o: ../lib/token.cpp ../externals/simplecpp/simplecpp.h ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.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/tokenrange.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
@@ -353,7 +353,7 @@ $(libcppdir)/utils.o: ../lib/utils.cpp ../lib/config.h ../lib/utils.h
 $(libcppdir)/vf_analyzers.o: ../lib/vf_analyzers.cpp ../lib/addoninfo.h ../lib/analyzer.h ../lib/astutils.h ../lib/calculate.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/programmemory.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vf_analyzers.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_analyzers.cpp
 
-$(libcppdir)/vf_common.o: ../lib/vf_common.cpp ../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/utils.h ../lib/valueflow.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
+$(libcppdir)/vf_common.o: ../lib/vf_common.cpp ../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/utils.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_common.cpp
 
 $(libcppdir)/vf_settokenvalue.o: ../lib/vf_settokenvalue.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/calculate.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.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/utils.h ../lib/valueflow.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
diff --git a/test/testcppcheck.cpp b/test/testcppcheck.cpp
index ac292a1a057..35b25175023 100644
--- a/test/testcppcheck.cpp
+++ b/test/testcppcheck.cpp
@@ -20,6 +20,7 @@
 #include "color.h"
 #include "cppcheck.h"
 #include "errorlogger.h"
+#include "errortypes.h"
 #include "filesettings.h"
 #include "fixture.h"
 #include "helpers.h"
@@ -31,6 +32,7 @@
 #include "suppressions.h"
 
 #include <algorithm>
+#include <cstdio>
 #include <cstdlib>
 #include <list>
 #include <string>
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
index 781f6b6cf35..254eaa339d4 100644
--- a/test/testpreprocessor.cpp
+++ b/test/testpreprocessor.cpp
@@ -21,6 +21,7 @@
 // the code for a known configuration, it generates the code for each configuration.
 
 #include "errortypes.h"
+#include "library.h"
 #include "path.h"
 #include "platform.h"
 #include "preprocessor.h"
diff --git a/test/testprocessexecutor.cpp b/test/testprocessexecutor.cpp
index 5e5bc3da532..1866234ac78 100644
--- a/test/testprocessexecutor.cpp
+++ b/test/testprocessexecutor.cpp
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
 #include "fixture.h"
 
 #ifdef HAS_THREADING_MODEL_FORK
diff --git a/test/testsarifreport.cpp b/test/testsarifreport.cpp
index 9f00612a932..b4d3056a762 100644
--- a/test/testsarifreport.cpp
+++ b/test/testsarifreport.cpp
@@ -20,12 +20,14 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "fixture.h"
-#include "helpers.h"
 
 #include <cmath>
+#include <set>
 #include <string>
 #include <vector>
 
+#include "json.h"
+
 class TestSarifReport : public TestFixture
 {
 public:
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
index 963ba058b2b..3a2299f51de 100644
--- a/test/testsimplifytemplate.cpp
+++ b/test/testsimplifytemplate.cpp
@@ -32,6 +32,8 @@
 #include <utility>
 #include <vector>
 
+class ErrorLogger;
+
 class TestSimplifyTemplate : public TestFixture {
 public:
     TestSimplifyTemplate() : TestFixture("TestSimplifyTemplate") {}
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
index ed7fbe93a38..a24131dd667 100644
--- a/test/testsimplifytypedef.cpp
+++ b/test/testsimplifytypedef.cpp
@@ -29,6 +29,8 @@
 #include <string>
 #include <utility>
 
+class ErrorLogger;
+
 class TestSimplifyTypedef : public TestFixture {
 public:
     TestSimplifyTypedef() : TestFixture("TestSimplifyTypedef") {}
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
index 77032c50c69..1da06184994 100644
--- a/test/testsuppressions.cpp
+++ b/test/testsuppressions.cpp
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
 #include "cppcheck.h"
 #include "cppcheckexecutor.h"
 #include "errorlogger.h"
diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
index 6b387e0dea1..106a5bc9078 100644
--- a/test/testthreadexecutor.cpp
+++ b/test/testthreadexecutor.cpp
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
 #include "fixture.h"
 
 #ifdef HAS_THREADING_MODEL_THREAD
diff --git a/test/testtimer.cpp b/test/testtimer.cpp
index c9bc570863b..75fead13d2d 100644
--- a/test/testtimer.cpp
+++ b/test/testtimer.cpp
@@ -19,8 +19,7 @@
 #include "fixture.h"
 #include "timer.h"
 
-#include <cmath>
-#include <ctime>
+#include <chrono>
 
 class TestTimer : public TestFixture {
 public:
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 02b4b64a8ed..bc879547e0a 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -39,6 +39,8 @@
 
 #include <simplecpp.h>
 
+class ErrorLogger;
+
 class TestTokenizer : public TestFixture {
 public:
     TestTokenizer() : TestFixture("TestTokenizer") {}
diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
index ef3bba226f4..c1d2b482ae5 100644
--- a/test/testunusedvar.cpp
+++ b/test/testunusedvar.cpp
@@ -27,6 +27,8 @@
 #include <list>
 #include <string>
 
+#include <simplecpp.h>
+
 class TestUnusedVar : public TestFixture {
 public:
     TestUnusedVar() : TestFixture("TestUnusedVar") {}
diff --git a/tools/dmake/dmake.cpp b/tools/dmake/dmake.cpp
index 6b91c7cbe31..100e32b6b5b 100644
--- a/tools/dmake/dmake.cpp
+++ b/tools/dmake/dmake.cpp
@@ -33,6 +33,7 @@
 
 #include "../cli/filelister.h"
 #include "../lib/filesettings.h"
+#include "../lib/path.h"
 #include "../lib/pathmatch.h"
 #include "../lib/utils.h"