diff --git a/Makefile b/Makefile
index 17e88b02a..75a849bbd 100644
--- a/Makefile
+++ b/Makefile
@@ -584,7 +584,7 @@ $(libcppdir)/forwardanalyzer.o: lib/forwardanalyzer.cpp lib/addoninfo.h lib/anal
 $(libcppdir)/fwdanalysis.o: lib/fwdanalysis.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/fwdanalysis.cpp
 
-$(libcppdir)/importproject.o: lib/importproject.cpp externals/picojson/picojson.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/config.h lib/errortypes.h lib/importproject.h lib/json.h lib/library.h lib/mathlib.h lib/path.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
+$(libcppdir)/importproject.o: lib/importproject.cpp externals/picojson/picojson.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/config.h lib/errortypes.h lib/importproject.h lib/json.h lib/library.h lib/mathlib.h lib/path.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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/importproject.cpp
 
 $(libcppdir)/infer.o: lib/infer.cpp lib/calculate.h lib/config.h lib/errortypes.h lib/infer.h lib/mathlib.h lib/valueptr.h lib/vfvalue.h
@@ -620,7 +620,7 @@ $(libcppdir)/programmemory.o: lib/programmemory.cpp lib/addoninfo.h lib/astutils
 $(libcppdir)/reverseanalyzer.o: lib/reverseanalyzer.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/config.h lib/errortypes.h lib/forwardanalyzer.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/reverseanalyzer.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/valueptr.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/reverseanalyzer.cpp
 
-$(libcppdir)/settings.o: lib/settings.cpp externals/picojson/picojson.h lib/addoninfo.h lib/config.h lib/errortypes.h lib/importproject.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/summaries.h lib/suppressions.h lib/timer.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/settings.o: lib/settings.cpp externals/picojson/picojson.h lib/addoninfo.h lib/config.h lib/errortypes.h lib/importproject.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/summaries.h lib/suppressions.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/settings.cpp
 
 $(libcppdir)/summaries.o: lib/summaries.cpp lib/addoninfo.h lib/analyzerinfo.h lib/config.h lib/errortypes.h lib/importproject.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
@@ -647,10 +647,10 @@ $(libcppdir)/utils.o: lib/utils.cpp lib/config.h lib/utils.h
 $(libcppdir)/vfvalue.o: lib/vfvalue.cpp lib/config.h lib/errortypes.h lib/mathlib.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vfvalue.cpp
 
-cli/cmdlineparser.o: cli/cmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h cli/filelister.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
+cli/cmdlineparser.o: cli/cmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cmdlineparser.cpp
 
-cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h cli/cppcheckexecutorseh.h cli/cppcheckexecutorsig.h cli/executor.h cli/filelister.h cli/processexecutor.h cli/singleexecutor.h cli/threadexecutor.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/checkersreport.h lib/checkunusedfunctions.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
+cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h cli/cppcheckexecutorseh.h cli/cppcheckexecutorsig.h cli/executor.h cli/filelister.h cli/processexecutor.h cli/singleexecutor.h cli/threadexecutor.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkersreport.h lib/checkunusedfunctions.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cppcheckexecutor.cpp
 
 cli/cppcheckexecutorseh.o: cli/cppcheckexecutorseh.cpp cli/cppcheckexecutor.h cli/cppcheckexecutorseh.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/utils.h
@@ -668,7 +668,7 @@ cli/filelister.o: cli/filelister.cpp cli/filelister.h lib/config.h lib/path.h li
 cli/main.o: cli/main.cpp cli/cppcheckexecutor.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/main.cpp
 
-cli/processexecutor.o: cli/processexecutor.cpp cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
+cli/processexecutor.o: cli/processexecutor.cpp cli/executor.h cli/processexecutor.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/processexecutor.cpp
 
 cli/singleexecutor.o: cli/singleexecutor.cpp cli/executor.h cli/singleexecutor.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
@@ -677,7 +677,7 @@ cli/singleexecutor.o: cli/singleexecutor.cpp cli/executor.h cli/singleexecutor.h
 cli/stacktrace.o: cli/stacktrace.cpp cli/stacktrace.h lib/config.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/stacktrace.cpp
 
-cli/threadexecutor.o: cli/threadexecutor.cpp cli/cppcheckexecutor.h cli/executor.h cli/threadexecutor.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
+cli/threadexecutor.o: cli/threadexecutor.cpp cli/executor.h cli/threadexecutor.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/threadexecutor.cpp
 
 test/fixture.o: test/fixture.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h test/options.h test/redirect.h
@@ -713,7 +713,7 @@ test/testbool.o: test/testbool.cpp lib/addoninfo.h lib/check.h lib/checkbool.h l
 test/testboost.o: test/testboost.cpp lib/addoninfo.h lib/check.h lib/checkboost.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testboost.cpp
 
-test/testbufferoverrun.o: test/testbufferoverrun.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkbufferoverrun.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.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 test/fixture.h test/helpers.h
+test/testbufferoverrun.o: test/testbufferoverrun.cpp lib/addoninfo.h lib/check.h lib/checkbufferoverrun.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.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 test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testbufferoverrun.cpp
 
 test/testcharvar.o: test/testcharvar.cpp lib/addoninfo.h lib/check.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h
@@ -761,7 +761,7 @@ test/testgarbage.o: test/testgarbage.cpp externals/simplecpp/simplecpp.h lib/add
 test/testimportproject.o: test/testimportproject.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testimportproject.cpp
 
-test/testincompletestatement.o: test/testincompletestatement.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h test/helpers.h
+test/testincompletestatement.o: test/testincompletestatement.cpp lib/addoninfo.h lib/check.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testincompletestatement.cpp
 
 test/testinternal.o: test/testinternal.cpp lib/addoninfo.h lib/check.h lib/checkinternal.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h
@@ -770,7 +770,7 @@ test/testinternal.o: test/testinternal.cpp lib/addoninfo.h lib/check.h lib/check
 test/testio.o: test/testio.cpp lib/addoninfo.h lib/check.h lib/checkio.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testio.cpp
 
-test/testleakautovar.o: test/testleakautovar.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkleakautovar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h test/helpers.h
+test/testleakautovar.o: test/testleakautovar.cpp lib/addoninfo.h lib/check.h lib/checkleakautovar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testleakautovar.cpp
 
 test/testlibrary.o: test/testlibrary.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h test/helpers.h
@@ -782,7 +782,7 @@ test/testmathlib.o: test/testmathlib.cpp lib/addoninfo.h lib/check.h lib/color.h
 test/testmemleak.o: test/testmemleak.cpp lib/addoninfo.h lib/check.h lib/checkmemoryleak.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.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 test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testmemleak.cpp
 
-test/testnullpointer.o: test/testnullpointer.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checknullpointer.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h test/helpers.h
+test/testnullpointer.o: test/testnullpointer.cpp lib/addoninfo.h lib/check.h lib/checknullpointer.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testnullpointer.cpp
 
 test/testoptions.o: test/testoptions.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h test/options.h
@@ -818,16 +818,16 @@ test/testsimplifytemplate.o: test/testsimplifytemplate.cpp lib/addoninfo.h lib/c
 test/testsimplifytokens.o: test/testsimplifytokens.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytokens.cpp
 
-test/testsimplifytypedef.o: test/testsimplifytypedef.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h test/helpers.h
+test/testsimplifytypedef.o: test/testsimplifytypedef.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytypedef.cpp
 
-test/testsimplifyusing.o: test/testsimplifyusing.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h test/helpers.h
+test/testsimplifyusing.o: test/testsimplifyusing.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifyusing.cpp
 
 test/testsingleexecutor.o: test/testsingleexecutor.cpp cli/executor.h cli/singleexecutor.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsingleexecutor.cpp
 
-test/testsizeof.o: test/testsizeof.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checksizeof.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h test/helpers.h
+test/testsizeof.o: test/testsizeof.cpp lib/addoninfo.h lib/check.h lib/checksizeof.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsizeof.cpp
 
 test/teststl.o: test/teststl.cpp lib/addoninfo.h lib/check.h lib/checkstl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h
@@ -872,7 +872,7 @@ test/testuninitvar.o: test/testuninitvar.cpp lib/addoninfo.h lib/check.h lib/che
 test/testunusedfunctions.o: test/testunusedfunctions.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkunusedfunctions.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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 test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedfunctions.cpp
 
-test/testunusedprivfunc.o: test/testunusedprivfunc.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkclass.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.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 test/fixture.h test/helpers.h
+test/testunusedprivfunc.o: test/testunusedprivfunc.cpp lib/addoninfo.h lib/check.h lib/checkclass.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.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 test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedprivfunc.cpp
 
 test/testunusedvar.o: test/testunusedvar.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkunusedvar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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 test/fixture.h test/helpers.h
@@ -884,7 +884,7 @@ test/testutils.o: test/testutils.cpp lib/addoninfo.h lib/check.h lib/color.h lib
 test/testvaarg.o: test/testvaarg.cpp lib/addoninfo.h lib/check.h lib/checkvaarg.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvaarg.cpp
 
-test/testvalueflow.o: test/testvalueflow.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h test/helpers.h
+test/testvalueflow.o: test/testvalueflow.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvalueflow.cpp
 
 test/testvarid.o: test/testvarid.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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 test/fixture.h
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 4754bf4b4..e36e2421c 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -23,7 +23,6 @@
 #include "cppcheckexecutor.h"
 #include "errorlogger.h"
 #include "errortypes.h"
-#include "filelister.h"
 #include "importproject.h"
 #include "path.h"
 #include "platform.h"
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
index c74d22e59..2b78baa0c 100644
--- a/cli/cppcheckexecutor.cpp
+++ b/cli/cppcheckexecutor.cpp
@@ -18,9 +18,10 @@
 
 #include "cppcheckexecutor.h"
 
+#include "addoninfo.h"
 #include "analyzerinfo.h"
-#include "checkers.h"
 #include "checkersreport.h"
+#include "cmdlinelogger.h"
 #include "cmdlineparser.h"
 #include "color.h"
 #include "config.h"
@@ -48,12 +49,11 @@
 #include <cassert>
 #include <cstdio>
 #include <cstdlib> // EXIT_SUCCESS and EXIT_FAILURE
-#include <functional>
 #include <iostream>
 #include <iterator>
 #include <list>
-#include <memory>
 #include <sstream> // IWYU pragma: keep
+#include <unordered_set>
 #include <utility>
 #include <vector>
 
diff --git a/cli/filelister.cpp b/cli/filelister.cpp
index e25e9a6b4..29c416592 100644
--- a/cli/filelister.cpp
+++ b/cli/filelister.cpp
@@ -18,7 +18,6 @@
 
 #include "filelister.h"
 
-#include "config.h"
 #include "path.h"
 #include "pathmatch.h"
 #include "utils.h"
diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
index 2e9409286..09cec0f2d 100644
--- a/cli/processexecutor.cpp
+++ b/cli/processexecutor.cpp
@@ -22,7 +22,6 @@
 
 #include "config.h"
 #include "cppcheck.h"
-#include "cppcheckexecutor.h"
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "importproject.h"
@@ -37,7 +36,6 @@
 #include <csignal>
 #include <cstdlib>
 #include <cstring>
-#include <functional>
 #include <iostream>
 #include <list>
 #include <sstream> // IWYU pragma: keep
diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
index a52b535c7..9cd8dcae1 100644
--- a/cli/threadexecutor.cpp
+++ b/cli/threadexecutor.cpp
@@ -20,7 +20,6 @@
 
 #include "config.h"
 #include "cppcheck.h"
-#include "cppcheckexecutor.h"
 #include "errorlogger.h"
 #include "importproject.h"
 #include "settings.h"
@@ -29,7 +28,6 @@
 #include <algorithm>
 #include <cassert>
 #include <cstdlib>
-#include <functional>
 #include <future>
 #include <iostream>
 #include <list>
diff --git a/gui/checkstatistics.h b/gui/checkstatistics.h
index d53be1288..65fa7783b 100644
--- a/gui/checkstatistics.h
+++ b/gui/checkstatistics.h
@@ -23,12 +23,12 @@
 
 #include <QMap>
 #include <QObject>
-#include <QSet>
 #include <QString>
 #include <QStringList>
 
 #include <set>
 #include <string>
+#include <utility>
 
 /// @addtogroup GUI
 /// @{
diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
index 21b05c854..2f79d1b7b 100644
--- a/gui/checkthread.cpp
+++ b/gui/checkthread.cpp
@@ -31,7 +31,6 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <functional>
 #include <iterator>
 #include <list>
 #include <map>
diff --git a/gui/compliancereportdialog.cpp b/gui/compliancereportdialog.cpp
index bde0a5a0a..c7c654ad3 100644
--- a/gui/compliancereportdialog.cpp
+++ b/gui/compliancereportdialog.cpp
@@ -43,6 +43,7 @@
 #include <QFileInfo>
 #include <QIODevice>
 #include <QLineEdit>
+#include <QList>
 #include <QMessageBox>
 #include <QProcess>
 #include <QRegularExpression>
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index c6a94702a..d9a09da06 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -18,6 +18,7 @@
 
 #include "mainwindow.h"
 
+#include "addoninfo.h"
 #include "applicationlist.h"
 #include "aboutdialog.h"
 #include "analyzerinfo.h"
@@ -48,12 +49,12 @@
 #include "ui_mainwindow.h"
 
 #include <algorithm>
-#include <functional>
 #include <iterator>
 #include <list>
 #include <set>
 #include <string>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 #include <QApplication>
diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
index f0cfdab78..ca4b6ec0b 100644
--- a/gui/resultstree.cpp
+++ b/gui/resultstree.cpp
@@ -49,7 +49,6 @@
 #include <QMenu>
 #include <QMessageBox>
 #include <QModelIndex>
-#include <QModelIndexList>
 #include <QProcess>
 #include <QSet>
 #include <QSettings>
diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp
index 891d80a49..2b5baa5fb 100644
--- a/gui/resultsview.cpp
+++ b/gui/resultsview.cpp
@@ -25,15 +25,21 @@
 #include "common.h"
 #include "csvreport.h"
 #include "erroritem.h"
+#include "errorlogger.h"
+#include "errortypes.h"
 #include "path.h"
 #include "printablereport.h"
 #include "resultstree.h"
+#include "settings.h"
 #include "txtreport.h"
 #include "xmlreport.h"
 #include "xmlreportv2.h"
 
 #include "ui_resultsview.h"
 
+#include <set>
+#include <string>
+
 #include <QAbstractItemModel>
 #include <QApplication>
 #include <QByteArray>
@@ -45,6 +51,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QIODevice>
+#include <QLabel>
 #include <QList>
 #include <QListWidget>
 #include <QListWidgetItem>
diff --git a/gui/statsdialog.cpp b/gui/statsdialog.cpp
index 5dfd8a589..1cb8464ef 100644
--- a/gui/statsdialog.cpp
+++ b/gui/statsdialog.cpp
@@ -29,10 +29,12 @@
 #include <QDate>
 #include <QFileDialog>
 #include <QFileInfo>
+#include <QFont>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMimeData>
 #include <QPageSize>
+#include <QPlainTextEdit>
 #include <QPrinter>
 #include <QPushButton>
 #include <QStringList>
diff --git a/gui/test/projectfile/testprojectfile.cpp b/gui/test/projectfile/testprojectfile.cpp
index 572219710..37624e986 100644
--- a/gui/test/projectfile/testprojectfile.cpp
+++ b/gui/test/projectfile/testprojectfile.cpp
@@ -18,16 +18,13 @@
 
 #include "testprojectfile.h"
 
+#include "addoninfo.h"
 #include "importproject.h"
-#include "library.h"
 #include "platform.h"
 #include "projectfile.h"
 #include "settings.h"
 
-#include <set>
 #include <string>
-#include <utility>
-#include <vector>
 
 #include <QList>
 #include <QStringList>
diff --git a/lib/addoninfo.cpp b/lib/addoninfo.cpp
index f3db25a04..cfe720b81 100644
--- a/lib/addoninfo.cpp
+++ b/lib/addoninfo.cpp
@@ -22,8 +22,8 @@
 #include "utils.h"
 
 #include <fstream>
-#include <sstream>
 #include <string>
+#include <vector>
 
 #include "json.h"
 
diff --git a/lib/astutils.h b/lib/astutils.h
index fb621ea81..111c2a61d 100644
--- a/lib/astutils.h
+++ b/lib/astutils.h
@@ -31,6 +31,7 @@
 #include "config.h"
 #include "errortypes.h"
 #include "library.h"
+#include "mathlib.h"
 #include "smallvector.h"
 #include "symboldatabase.h"
 #include "token.h"
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
index d3a84229a..6d2ba5e41 100644
--- a/lib/checkclass.cpp
+++ b/lib/checkclass.cpp
@@ -26,7 +26,6 @@
 #include "symboldatabase.h"
 #include "errorlogger.h"
 #include "errortypes.h"
-#include "mathlib.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"
diff --git a/lib/checkersreport.cpp b/lib/checkersreport.cpp
index f3649503e..bff22361d 100644
--- a/lib/checkersreport.cpp
+++ b/lib/checkersreport.cpp
@@ -17,8 +17,16 @@
  */
 
 #include "checkersreport.h"
+
 #include "checkers.h"
+#include "errortypes.h"
+#include "settings.h"
+
+#include <map>
 #include <sstream>
+#include <unordered_set>
+#include <utility>
+#include <vector>
 
 static bool isCppcheckPremium(const Settings& settings) {
     return (settings.cppcheckCfgProductName.compare(0, 16, "Cppcheck Premium") == 0);
diff --git a/lib/checkersreport.h b/lib/checkersreport.h
index b6acab880..5353f74b9 100644
--- a/lib/checkersreport.h
+++ b/lib/checkersreport.h
@@ -18,10 +18,13 @@
 
 #pragma once
 
-#include "settings.h"
+#include "config.h"
+
 #include <set>
 #include <string>
 
+class Settings;
+
 class CPPCHECKLIB CheckersReport {
 public:
     CheckersReport(const Settings& settings, const std::set<std::string>& activeCheckers);
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index 2026e18d6..553e91bc1 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -22,6 +22,8 @@
 #include "astutils.h"
 #include "errorlogger.h"
 #include "library.h"
+#include "mathlib.h"
+#include "platform.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
diff --git a/lib/checktype.cpp b/lib/checktype.cpp
index d321cb69c..5ed81eb32 100644
--- a/lib/checktype.cpp
+++ b/lib/checktype.cpp
@@ -30,9 +30,13 @@
 #include "tokenize.h"
 #include "valueflow.h"
 
+#include <algorithm>
 #include <cmath>
+#include <cstddef>
+#include <iterator>
 #include <list>
 #include <sstream>
+#include <utility>
 #include <vector>
 
 //---------------------------------------------------------------------------
diff --git a/lib/checkvaarg.cpp b/lib/checkvaarg.cpp
index 446c8731e..3606a4f34 100644
--- a/lib/checkvaarg.cpp
+++ b/lib/checkvaarg.cpp
@@ -26,6 +26,8 @@
 #include "tokenize.h"
 
 #include <cstddef>
+#include <iterator>
+#include <list>
 #include <vector>
 
 //---------------------------------------------------------------------------
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index 8dbd515ad..35fa7363d 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -26,21 +26,21 @@
 #include "ctu.h"
 #include "errortypes.h"
 #include "library.h"
-#include "mathlib.h"
 #include "path.h"
 #include "platform.h"
-#include "preprocessor.h" // Preprocessor
+#include "preprocessor.h"
 #include "standards.h"
 #include "suppressions.h"
 #include "timer.h"
 #include "token.h"
-#include "tokenize.h" // Tokenizer
+#include "tokenize.h"
 #include "tokenlist.h"
 #include "utils.h"
 #include "valueflow.h"
 #include "version.h"
 
 #include <algorithm>
+#include <cassert>
 #include <cstdio>
 #include <cstdint>
 #include <cstring>
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
index 785c66900..78d40c3aa 100644
--- a/lib/cppcheck.h
+++ b/lib/cppcheck.h
@@ -38,6 +38,7 @@
 #include <vector>
 
 class Tokenizer;
+enum class SHOWTIME_MODES;
 
 /// @addtogroup Core
 /// @{
diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
index c13dee7e7..91be7c24d 100644
--- a/lib/errorlogger.cpp
+++ b/lib/errorlogger.cpp
@@ -20,8 +20,8 @@
 
 #include "color.h"
 #include "cppcheck.h"
-#include "mathlib.h"
 #include "path.h"
+#include "suppressions.h"
 #include "token.h"
 #include "tokenlist.h"
 #include "utils.h"
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
index e212f9dbf..9c4d2783e 100644
--- a/lib/importproject.cpp
+++ b/lib/importproject.cpp
@@ -38,8 +38,6 @@
 
 #include <tinyxml2.h>
 
-#include <simplecpp.h>
-
 #include "json.h"
 
 void ImportProject::ignorePaths(const std::vector<std::string> &ipaths)
diff --git a/lib/library.cpp b/lib/library.cpp
index d87866603..b5699ff41 100644
--- a/lib/library.cpp
+++ b/lib/library.cpp
@@ -31,6 +31,7 @@
 #include <algorithm>
 #include <cctype>
 #include <climits>
+#include <cstddef>
 #include <cstring>
 #include <list>
 #include <memory>
diff --git a/lib/library.h b/lib/library.h
index 11be46e8c..7cd68a8f6 100644
--- a/lib/library.h
+++ b/lib/library.h
@@ -26,7 +26,6 @@
 #include "errortypes.h"
 #include "standards.h"
 
-#include <cstddef>
 #include <map>
 #include <memory>
 #include <set>
diff --git a/lib/path.cpp b/lib/path.cpp
index 74e6f3f46..16e366fec 100644
--- a/lib/path.cpp
+++ b/lib/path.cpp
@@ -25,7 +25,6 @@
 
 #include <algorithm>
 #include <cstdlib>
-#include <fstream>
 #include <sys/stat.h>
 #include <utility>
 
diff --git a/lib/settings.cpp b/lib/settings.cpp
index ef38d6d6d..18519bad2 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -19,7 +19,6 @@
 #include "settings.h"
 #include "path.h"
 #include "summaries.h"
-#include "timer.h"
 #include "vfvalue.h"
 
 #include <fstream>
diff --git a/lib/suppressions.cpp b/lib/suppressions.cpp
index 10b5fa7a0..e86c4ee74 100644
--- a/lib/suppressions.cpp
+++ b/lib/suppressions.cpp
@@ -19,7 +19,7 @@
 #include "suppressions.h"
 
 #include "errorlogger.h"
-#include "mathlib.h"
+#include "errortypes.h"
 #include "path.h"
 #include "utils.h"
 #include "token.h"
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
index 34dbc2e0e..6cfebb455 100644
--- a/lib/tokenlist.cpp
+++ b/lib/tokenlist.cpp
@@ -24,7 +24,6 @@
 #include "errortypes.h"
 #include "keywords.h"
 #include "library.h"
-#include "mathlib.h"
 #include "path.h"
 #include "platform.h"
 #include "settings.h"
diff --git a/test/fixture.cpp b/test/fixture.cpp
index ad7c83714..8b714dd53 100644
--- a/test/fixture.cpp
+++ b/test/fixture.cpp
@@ -23,6 +23,7 @@
 #include "options.h"
 #include "redirect.h"
 
+#include <algorithm>
 #include <cstdio>
 #include <cctype>
 #include <exception>
diff --git a/test/helpers.h b/test/helpers.h
index 36f53c357..65e9d4dfe 100644
--- a/test/helpers.h
+++ b/test/helpers.h
@@ -23,8 +23,10 @@
 #include "tokenize.h"
 #include "tokenlist.h"
 
+#include <cstddef>
 #include <sstream> // IWYU pragma: keep
 #include <string>
+#include <vector>
 
 class Token;
 class Preprocessor;
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
index d4d03dc0f..dd21618fb 100644
--- a/test/testbufferoverrun.cpp
+++ b/test/testbufferoverrun.cpp
@@ -28,15 +28,11 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <map>
 #include <list>
 #include <sstream> // IWYU pragma: keep
 #include <string>
-#include <utility>
 #include <vector>
 
-#include <simplecpp.h>
-
 class TestBufferOverrun : public TestFixture {
 public:
     TestBufferOverrun() : TestFixture("TestBufferOverrun") {}
diff --git a/test/testcheck.cpp b/test/testcheck.cpp
index 192189781..e05c5e865 100644
--- a/test/testcheck.cpp
+++ b/test/testcheck.cpp
@@ -19,6 +19,9 @@
 #include "check.h"
 #include "fixture.h"
 
+#include <list>
+#include <string>
+
 class TestCheck : public TestFixture {
 public:
     TestCheck() : TestFixture("TestCheck") {}
diff --git a/test/testclass.cpp b/test/testclass.cpp
index 1f3962c40..e8ca03ddf 100644
--- a/test/testclass.cpp
+++ b/test/testclass.cpp
@@ -26,14 +26,10 @@
 #include "tokenize.h"
 
 #include <list>
-#include <map>
 #include <sstream> // IWYU pragma: keep
 #include <string>
-#include <utility>
 #include <vector>
 
-#include <simplecpp.h>
-
 class TestClass : public TestFixture {
 public:
     TestClass() : TestFixture("TestClass") {}
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
index a2ba2b15c..3d3c26946 100644
--- a/test/testcmdlineparser.cpp
+++ b/test/testcmdlineparser.cpp
@@ -32,7 +32,6 @@
 
 #include <cstdint>
 #include <cstdio>
-#include <iostream>
 #include <list>
 #include <set>
 #include <string>
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
index 888bc29cb..2ca5b71c0 100644
--- a/test/testcondition.cpp
+++ b/test/testcondition.cpp
@@ -19,21 +19,17 @@
 #include "checkcondition.h"
 #include "errortypes.h"
 #include "helpers.h"
-#include "library.h"
 #include "platform.h"
 #include "preprocessor.h"
 #include "settings.h"
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <map>
+#include <limits>
 #include <sstream> // IWYU pragma: keep
 #include <string>
-#include <utility>
 #include <vector>
 
-#include <simplecpp.h>
-
 class TestCondition : public TestFixture {
 public:
     TestCondition() : TestFixture("TestCondition") {}
diff --git a/test/testerrorlogger.cpp b/test/testerrorlogger.cpp
index 97d94dcd2..78a7ae474 100644
--- a/test/testerrorlogger.cpp
+++ b/test/testerrorlogger.cpp
@@ -20,7 +20,6 @@
 #include "cppcheck.h"
 #include "errorlogger.h"
 #include "errortypes.h"
-#include "suppressions.h"
 #include "fixture.h"
 
 #include <list>
diff --git a/test/testfilelister.cpp b/test/testfilelister.cpp
index d4c5122da..5bd84379d 100644
--- a/test/testfilelister.cpp
+++ b/test/testfilelister.cpp
@@ -23,6 +23,7 @@
 
 #include <cstddef>
 #include <map>
+#include <stdexcept>
 #include <string>
 #include <vector>
 #include <utility>
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
index b4d68c792..88387d4a4 100644
--- a/test/testgarbage.cpp
+++ b/test/testgarbage.cpp
@@ -18,7 +18,6 @@
 
 #include "check.h"
 #include "errortypes.h"
-#include "mathlib.h"
 #include "preprocessor.h"
 #include "settings.h"
 #include "fixture.h"
diff --git a/test/testincompletestatement.cpp b/test/testincompletestatement.cpp
index 51cf3702c..e360c40b9 100644
--- a/test/testincompletestatement.cpp
+++ b/test/testincompletestatement.cpp
@@ -23,14 +23,10 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <map>
 #include <sstream> // IWYU pragma: keep
 #include <string>
-#include <utility>
 #include <vector>
 
-#include <simplecpp.h>
-
 class TestIncompleteStatement : public TestFixture {
 public:
     TestIncompleteStatement() : TestFixture("TestIncompleteStatement") {}
diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
index 167a7bf95..ccb623bdb 100644
--- a/test/testleakautovar.cpp
+++ b/test/testleakautovar.cpp
@@ -20,20 +20,14 @@
 #include "checkleakautovar.h"
 #include "errortypes.h"
 #include "helpers.h"
-#include "library.h"
 #include "settings.h"
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <map>
 #include <sstream> // IWYU pragma: keep
 #include <string>
-#include <unordered_map>
-#include <utility>
 #include <vector>
 
-#include <simplecpp.h>
-
 class TestLeakAutoVarStrcpy;
 class TestLeakAutoVarWindows;
 
diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
index 720214541..71ca37379 100644
--- a/test/testmathlib.cpp
+++ b/test/testmathlib.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
+#include "config.h"
 #include "errortypes.h"
 #include "mathlib.h"
 #include "fixture.h"
@@ -24,8 +24,6 @@
 #include <limits>
 #include <string>
 
-
-
 class TestMathLib : public TestFixture {
 public:
     TestMathLib() : TestFixture("TestMathLib") {}
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
index f6e886c62..645ef3f4e 100644
--- a/test/testnullpointer.cpp
+++ b/test/testnullpointer.cpp
@@ -32,11 +32,8 @@
 #include <sstream> // IWYU pragma: keep
 #include <string>
 #include <unordered_map>
-#include <utility>
 #include <vector>
 
-#include <simplecpp.h>
-
 class TestNullPointer : public TestFixture {
 public:
     TestNullPointer() : TestFixture("TestNullPointer") {}
diff --git a/test/testother.cpp b/test/testother.cpp
index 1802800bb..60ab9c480 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -19,7 +19,6 @@
 #include "checkother.h"
 #include "errortypes.h"
 #include "helpers.h"
-#include "library.h"
 #include "platform.h"
 #include "preprocessor.h"
 #include "settings.h"
@@ -27,16 +26,10 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <map>
 #include <sstream> // IWYU pragma: keep
 #include <string>
-#include <unordered_map>
-#include <utility>
 #include <vector>
 
-#include <simplecpp.h>
-
-
 class TestOther : public TestFixture {
 public:
     TestOther() : TestFixture("TestOther") {}
diff --git a/test/testprocessexecutor.cpp b/test/testprocessexecutor.cpp
index e47938cab..94fe7ee8d 100644
--- a/test/testprocessexecutor.cpp
+++ b/test/testprocessexecutor.cpp
@@ -21,11 +21,14 @@
 #include "settings.h"
 #include "fixture.h"
 #include "helpers.h"
+#include "importproject.h"
 #include "timer.h"
 #include "library.h"
 
 #include <algorithm>
 #include <cstddef>
+#include <cstdlib>
+#include <list>
 #include <map>
 #include <memory>
 #include <set>
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
index 6d65d2d34..68468addd 100644
--- a/test/testsimplifytypedef.cpp
+++ b/test/testsimplifytypedef.cpp
@@ -26,15 +26,10 @@
 #include "tokenize.h"
 #include "tokenlist.h"
 
-#include <map>
 #include <sstream>
 #include <string>
-#include <utility>
 #include <vector>
 
-#include <simplecpp.h>
-
-
 class TestSimplifyTypedef : public TestFixture {
 public:
     TestSimplifyTypedef() : TestFixture("TestSimplifyTypedef") {}
diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
index f4d3e6363..4208b128f 100644
--- a/test/testsimplifyusing.cpp
+++ b/test/testsimplifyusing.cpp
@@ -26,15 +26,10 @@
 #include "tokenize.h"
 #include "utils.h"
 
-#include <simplecpp.h>
-
-#include <map>
 #include <sstream> // IWYU pragma: keep
 #include <string>
-#include <utility>
 #include <vector>
 
-
 class TestSimplifyUsing : public TestFixture {
 public:
     TestSimplifyUsing() : TestFixture("TestSimplifyUsing") {}
diff --git a/test/testsingleexecutor.cpp b/test/testsingleexecutor.cpp
index 01adac877..a5f6a519e 100644
--- a/test/testsingleexecutor.cpp
+++ b/test/testsingleexecutor.cpp
@@ -28,7 +28,7 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <functional>
+#include <cstdlib>
 #include <list>
 #include <map>
 #include <memory>
diff --git a/test/testsizeof.cpp b/test/testsizeof.cpp
index e71ff8d5d..22bd7e7ed 100644
--- a/test/testsizeof.cpp
+++ b/test/testsizeof.cpp
@@ -23,14 +23,10 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <map>
 #include <sstream> // IWYU pragma: keep
 #include <string>
-#include <utility>
 #include <vector>
 
-#include <simplecpp.h>
-
 class TestSizeof : public TestFixture {
 public:
     TestSizeof() : TestFixture("TestSizeof") {}
diff --git a/test/teststring.cpp b/test/teststring.cpp
index 57a8232d2..57cea1b97 100644
--- a/test/teststring.cpp
+++ b/test/teststring.cpp
@@ -24,10 +24,11 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <simplecpp.h>
-
 #include <sstream> // IWYU pragma: keep
+#include <string>
+#include <vector>
 
+#include <simplecpp.h>
 
 class TestString : public TestFixture {
 public:
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
index bfcc121d7..ddb4c6860 100644
--- a/test/testsuppressions.cpp
+++ b/test/testsuppressions.cpp
@@ -31,7 +31,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstring>
-#include <functional>
 #include <list>
 #include <map>
 #include <memory>
diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
index 2c36f274b..49d2160b3 100644
--- a/test/testthreadexecutor.cpp
+++ b/test/testthreadexecutor.cpp
@@ -20,12 +20,15 @@
 #include "settings.h"
 #include "fixture.h"
 #include "helpers.h"
+#include "importproject.h"
 #include "library.h"
 #include "threadexecutor.h"
 #include "timer.h"
 
 #include <algorithm>
 #include <cstddef>
+#include <cstdlib>
+#include <list>
 #include <map>
 #include <memory>
 #include <set>
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index e235a0b76..3ca170c8e 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -30,15 +30,11 @@
 
 #include <cstring>
 #include <list>
-#include <map>
 #include <set>
 #include <sstream>
 #include <string>
-#include <utility>
 #include <vector>
 
-#include <simplecpp.h>
-
 class TestTokenizer : public TestFixture {
 public:
     TestTokenizer() : TestFixture("TestTokenizer") {}
diff --git a/test/testunusedfunctions.cpp b/test/testunusedfunctions.cpp
index 1e7ca4334..c38c453b1 100644
--- a/test/testunusedfunctions.cpp
+++ b/test/testunusedfunctions.cpp
@@ -26,6 +26,7 @@
 #include "tokenize.h"
 
 #include <sstream>
+#include <string>
 
 class TestUnusedFunctions : public TestFixture {
 public:
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
index 8ecdc804f..81936efc5 100644
--- a/test/testunusedprivfunc.cpp
+++ b/test/testunusedprivfunc.cpp
@@ -24,14 +24,10 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <map>
 #include <sstream> // IWYU pragma: keep
 #include <string>
-#include <utility>
 #include <vector>
 
-#include <simplecpp.h>
-
 class TestUnusedPrivateFunction : public TestFixture {
 public:
     TestUnusedPrivateFunction() : TestFixture("TestUnusedPrivateFunction") {}
diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
index 81ba99a54..28a98c3e9 100644
--- a/test/testunusedvar.cpp
+++ b/test/testunusedvar.cpp
@@ -25,14 +25,10 @@
 #include "tokenize.h"
 
 #include <list>
-#include <map>
 #include <sstream> // IWYU pragma: keep
 #include <string>
-#include <utility>
 #include <vector>
 
-#include <simplecpp.h>
-
 class TestUnusedVar : public TestFixture {
 public:
     TestUnusedVar() : TestFixture("TestUnusedVar") {}
diff --git a/test/testutils.cpp b/test/testutils.cpp
index 3c2a7a960..af04a91cb 100644
--- a/test/testutils.cpp
+++ b/test/testutils.cpp
@@ -22,8 +22,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <limits>
-#include <memory>
-#include <sstream>
 #include <stdexcept>
 #include <string>
 
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
index a718c97f3..a316ea101 100644
--- a/test/testvalueflow.cpp
+++ b/test/testvalueflow.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "helpers.h"
-#include "library.h"
 #include "mathlib.h"
 #include "platform.h"
 #include "settings.h"
@@ -33,15 +32,11 @@
 #include <cstring>
 #include <functional>
 #include <list>
-#include <map>
 #include <set>
 #include <sstream>
 #include <string>
-#include <utility>
 #include <vector>
 
-#include <simplecpp.h>
-
 class TestValueFlow : public TestFixture {
 public:
     TestValueFlow() : TestFixture("TestValueFlow") {}
diff --git a/test/testvarid.cpp b/test/testvarid.cpp
index a4d709b69..dd30bf3fe 100644
--- a/test/testvarid.cpp
+++ b/test/testvarid.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "errortypes.h"
-#include "mathlib.h"
 #include "platform.h"
 #include "settings.h"
 #include "standards.h"
@@ -28,7 +27,6 @@
 #include <sstream> // IWYU pragma: keep
 #include <string>
 
-
 class TestVarID : public TestFixture {
 public:
     TestVarID() : TestFixture("TestVarID") {}