diff --git a/Makefile b/Makefile
index a720612033f8..b59a07726240 100644
--- a/Makefile
+++ b/Makefile
@@ -693,31 +693,31 @@ test/main.o: test/main.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/c
 test/options.o: test/options.cpp test/options.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/options.cpp
 
-test/test64bit.o: test/test64bit.cpp lib/addoninfo.h lib/check.h lib/check64bit.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+test/test64bit.o: test/test64bit.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/check64bit.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/test64bit.cpp
 
 test/testanalyzerinformation.o: test/testanalyzerinformation.cpp lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testanalyzerinformation.cpp
 
-test/testassert.o: test/testassert.cpp lib/addoninfo.h lib/check.h lib/checkassert.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+test/testassert.o: test/testassert.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkassert.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testassert.cpp
 
-test/testastutils.o: test/testastutils.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.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/testastutils.o: test/testastutils.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/astutils.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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/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/testastutils.cpp
 
-test/testautovariables.o: test/testautovariables.cpp lib/addoninfo.h lib/check.h lib/checkautovariables.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+test/testautovariables.o: test/testautovariables.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkautovariables.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testautovariables.cpp
 
-test/testbool.o: test/testbool.cpp lib/addoninfo.h lib/check.h lib/checkbool.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+test/testbool.o: test/testbool.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkbool.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testbool.cpp
 
-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/library.h lib/mathlib.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/testboost.o: test/testboost.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkboost.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testboost.cpp
 
-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/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 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/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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/library.h lib/mathlib.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/testcharvar.o: test/testcharvar.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/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcharvar.cpp
 
 test/testcheck.o: test/testcheck.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
@@ -729,7 +729,7 @@ test/testclangimport.o: test/testclangimport.cpp lib/addoninfo.h lib/check.h lib
 test/testclass.o: test/testclass.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/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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/testclass.cpp
 
-test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
+test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcmdlineparser.cpp
 
 test/testcolor.o: test/testcolor.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
@@ -738,52 +738,52 @@ test/testcolor.o: test/testcolor.cpp lib/addoninfo.h lib/check.h lib/color.h lib
 test/testcondition.o: test/testcondition.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkcondition.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcondition.cpp
 
-test/testconstructors.o: test/testconstructors.cpp lib/addoninfo.h lib/check.h lib/checkclass.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/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/testconstructors.o: test/testconstructors.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/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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/testconstructors.cpp
 
-test/testcppcheck.o: test/testcppcheck.cpp 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/filesettings.h lib/library.h lib/mathlib.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
+test/testcppcheck.o: test/testcppcheck.cpp externals/simplecpp/simplecpp.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/filesettings.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcppcheck.cpp
 
 test/testerrorlogger.o: test/testerrorlogger.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/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h lib/xml.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testerrorlogger.cpp
 
-test/testexceptionsafety.o: test/testexceptionsafety.cpp lib/addoninfo.h lib/check.h lib/checkexceptionsafety.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+test/testexceptionsafety.o: test/testexceptionsafety.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkexceptionsafety.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testexceptionsafety.cpp
 
 test/testfilelister.o: test/testfilelister.cpp cli/filelister.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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 test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfilelister.cpp
 
-test/testfunctions.o: test/testfunctions.cpp lib/addoninfo.h lib/check.h lib/checkfunctions.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testfunctions.o: test/testfunctions.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkfunctions.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfunctions.cpp
 
-test/testgarbage.o: test/testgarbage.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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/testgarbage.o: test/testgarbage.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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/testgarbage.cpp
 
 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/filesettings.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/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testimportproject.cpp
 
-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/library.h lib/mathlib.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
+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/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(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/library.h lib/mathlib.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/testinternal.o: test/testinternal.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkinternal.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testinternal.cpp
 
-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/library.h lib/mathlib.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
+test/testio.o: test/testio.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkio.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testio.cpp
 
-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/library.h lib/mathlib.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
+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/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(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/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 lib/xml.h test/fixture.h test/helpers.h
+test/testlibrary.o: test/testlibrary.cpp externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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 lib/xml.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testlibrary.cpp
 
 test/testmathlib.o: test/testmathlib.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testmathlib.cpp
 
-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/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/testmemleak.o: test/testmemleak.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkmemoryleak.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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/testmemleak.cpp
 
-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/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 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/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/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/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
@@ -792,7 +792,7 @@ test/testoptions.o: test/testoptions.cpp lib/addoninfo.h lib/check.h lib/color.h
 test/testother.o: test/testother.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/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testother.cpp
 
-test/testpath.o: test/testpath.cpp lib/addoninfo.h lib/check.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
+test/testpath.o: test/testpath.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.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/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpath.cpp
 
 test/testpathmatch.o: test/testpathmatch.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
@@ -801,79 +801,79 @@ test/testpathmatch.o: test/testpathmatch.cpp lib/addoninfo.h lib/check.h lib/col
 test/testplatform.o: test/testplatform.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h lib/xml.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testplatform.cpp
 
-test/testpostfixoperator.o: test/testpostfixoperator.cpp lib/addoninfo.h lib/check.h lib/checkpostfixoperator.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+test/testpostfixoperator.o: test/testpostfixoperator.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkpostfixoperator.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpostfixoperator.cpp
 
 test/testpreprocessor.o: test/testpreprocessor.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.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/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpreprocessor.cpp
 
-test/testprocessexecutor.o: test/testprocessexecutor.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/filesettings.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
+test/testprocessexecutor.o: test/testprocessexecutor.cpp cli/executor.h cli/processexecutor.h externals/simplecpp/simplecpp.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/filesettings.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testprocessexecutor.cpp
 
-test/testsettings.o: test/testsettings.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testsettings.o: test/testsettings.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsettings.cpp
 
-test/testsimplifytemplate.o: test/testsimplifytemplate.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
+test/testsimplifytemplate.o: test/testsimplifytemplate.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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/testsimplifytemplate.cpp
 
-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/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/testsimplifytokens.o: test/testsimplifytokens.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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/testsimplifytokens.cpp
 
-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/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 externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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/testsimplifytypedef.cpp
 
-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/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 externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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/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/filesettings.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
+test/testsingleexecutor.o: test/testsingleexecutor.cpp cli/executor.h cli/singleexecutor.h externals/simplecpp/simplecpp.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/filesettings.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.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 lib/addoninfo.h lib/check.h lib/checksizeof.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+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/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(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/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
+test/teststl.o: test/teststl.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkstl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.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/teststl.cpp
 
-test/teststring.o: test/teststring.cpp lib/addoninfo.h lib/check.h lib/checkstring.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/teststring.o: test/teststring.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkstring.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststring.cpp
 
-test/testsummaries.o: test/testsummaries.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/summaries.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+test/testsummaries.o: test/testsummaries.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/summaries.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsummaries.cpp
 
-test/testsuppressions.o: test/testsuppressions.cpp cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h cli/singleexecutor.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/filesettings.h lib/library.h lib/mathlib.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
+test/testsuppressions.o: test/testsuppressions.cpp cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h cli/singleexecutor.h cli/threadexecutor.h externals/simplecpp/simplecpp.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/filesettings.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsuppressions.cpp
 
-test/testsymboldatabase.o: test/testsymboldatabase.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/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/testsymboldatabase.o: test/testsymboldatabase.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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/testsymboldatabase.cpp
 
-test/testthreadexecutor.o: test/testthreadexecutor.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/filesettings.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
+test/testthreadexecutor.o: test/testthreadexecutor.cpp cli/executor.h cli/threadexecutor.h externals/simplecpp/simplecpp.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/filesettings.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testthreadexecutor.cpp
 
 test/testtimer.o: test/testtimer.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtimer.cpp
 
-test/testtoken.o: test/testtoken.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testtoken.o: test/testtoken.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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/testtoken.cpp
 
 test/testtokenize.o: test/testtokenize.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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/testtokenize.cpp
 
-test/testtokenlist.o: test/testtokenlist.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testtokenlist.o: test/testtokenlist.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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/testtokenlist.cpp
 
-test/testtokenrange.o: test/testtokenrange.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/tokenrange.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+test/testtokenrange.o: test/testtokenrange.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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/tokenrange.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtokenrange.cpp
 
 test/testtype.o: test/testtype.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checktype.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.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/testtype.cpp
 
-test/testuninitvar.o: test/testuninitvar.cpp lib/addoninfo.h lib/check.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
+test/testuninitvar.o: test/testuninitvar.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.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/testuninitvar.cpp
 
 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/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedfunctions.cpp
 
-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/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 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/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
@@ -882,13 +882,13 @@ test/testunusedvar.o: test/testunusedvar.cpp externals/simplecpp/simplecpp.h lib
 test/testutils.o: test/testutils.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testutils.cpp
 
-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/library.h lib/mathlib.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/testvaarg.o: test/testvaarg.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkvaarg.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvaarg.cpp
 
-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/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 externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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/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/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/testvarid.o: test/testvarid.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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/testvarid.cpp
 
 externals/simplecpp/simplecpp.o: externals/simplecpp/simplecpp.cpp externals/simplecpp/simplecpp.h
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index c99d75114d51..56498b0d7869 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -3439,16 +3439,6 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration)
     return true;
 }
 
-// cppcheck-suppress unusedFunction - used in tests only
-bool Tokenizer::tokenize(std::istream &code,
-                         const char FileName[],
-                         const std::string &configuration)
-{
-    if (!list.createTokens(code, FileName))
-        return false;
-
-    return simplifyTokens1(configuration);
-}
 //---------------------------------------------------------------------------
 
 void Tokenizer::findComplicatedSyntaxErrorsInTemplates()
@@ -10659,6 +10649,7 @@ void Tokenizer::simplifyNamespaceAliases()
     }
 }
 
+// TODO: how to move the Preprocessor dependency out of here?
 bool Tokenizer::hasIfdef(const Token *start, const Token *end) const
 {
     assert(mPreprocessor);
diff --git a/lib/tokenize.h b/lib/tokenize.h
index a82490242157..304f66f92eff 100644
--- a/lib/tokenize.h
+++ b/lib/tokenize.h
@@ -79,30 +79,6 @@ class CPPCHECKLIB Tokenizer {
     bool isScopeNoReturn(const Token *endScopeToken, bool *unknown = nullptr) const;
 
     bool simplifyTokens1(const std::string &configuration);
-    /**
-     * Tokenize code
-     * @param code input stream for code, e.g.
-     * \code
-     * #file "p.h"
-     * class Foo
-     * {
-     * private:
-     * void Bar();
-     * };
-     *
-     * #endfile
-     * void Foo::Bar()
-     * {
-     * }
-     * \endcode
-     *
-     * @param FileName The filename
-     * @param configuration E.g. "A" for code where "#ifdef A" is true
-     * @return false if source code contains syntax errors
-     */
-    bool tokenize(std::istream &code,
-                  const char FileName[],
-                  const std::string &configuration = emptyString);
 
 private:
     /** Set variable id */
diff --git a/test/helpers.cpp b/test/helpers.cpp
index 4f5014585cfd..43117a7a3a8b 100644
--- a/test/helpers.cpp
+++ b/test/helpers.cpp
@@ -44,6 +44,9 @@
 
 class SuppressionList;
 
+const Settings SimpleTokenizer::s_settings;
+const Preprocessor SimpleTokenizer::s_preprocessor{s_settings, nullptr}; // TODO: provide ErrorLogger
+
 // TODO: better path-only usage
 ScopedFile::ScopedFile(std::string name, const std::string &content, std::string path)
     : mName(std::move(name))
diff --git a/test/helpers.h b/test/helpers.h
index b451b4a4597f..c6a202f7e342 100644
--- a/test/helpers.h
+++ b/test/helpers.h
@@ -19,6 +19,7 @@
 #ifndef helpersH
 #define helpersH
 
+#include "preprocessor.h"
 #include "settings.h"
 #include "standards.h"
 #include "tokenize.h"
@@ -31,34 +32,60 @@
 #include <vector>
 
 class Token;
-class Preprocessor;
 class SuppressionList;
 class ErrorLogger;
 namespace simplecpp {
     struct DUI;
 }
 
-class SimpleTokenizer {
+// TODO: make Tokenizer private
+class SimpleTokenizer : public Tokenizer {
 public:
-    SimpleTokenizer(ErrorLogger& errorlogger, const char sample[], bool cpp = true)
-        : tokenizer{settings, &errorlogger}
+    SimpleTokenizer(ErrorLogger& errorlogger, const char code[], bool cpp = true)
+        : Tokenizer{s_settings, &errorlogger, &s_preprocessor}
     {
-        std::istringstream iss(sample);
-        if (!tokenizer.tokenize(iss, cpp ? "test.cpp" : "test.c"))
+        if (!tokenize(code, cpp))
             throw std::runtime_error("creating tokens failed");
     }
 
+    SimpleTokenizer(const Settings& settings, ErrorLogger& errorlogger)
+        : Tokenizer{settings, &errorlogger, &s_preprocessor}
+    {}
+
+    SimpleTokenizer(const Settings& settings, ErrorLogger& errorlogger, const Preprocessor* preprocessor)
+        : Tokenizer{settings, &errorlogger, preprocessor}
+    {}
+
     Token* tokens() {
-        return tokenizer.tokens();
+        return Tokenizer::tokens();
     }
 
     const Token* tokens() const {
-        return tokenizer.tokens();
+        return Tokenizer::tokens();
+    }
+
+    /**
+     * Tokenize code
+     * @param code The code
+     * @param cpp Indicates if the code is C++
+     * @param configuration E.g. "A" for code where "#ifdef A" is true
+     * @return false if source code contains syntax errors
+     */
+    bool tokenize(const char code[],
+                  bool cpp = true,
+                  const std::string &configuration = emptyString)
+    {
+        std::istringstream istr(code);
+        if (!list.createTokens(istr, cpp ? "test.cpp" : "test.c"))
+            return false;
+
+        return simplifyTokens1(configuration);
     }
 
 private:
-    const Settings settings;
-    Tokenizer tokenizer;
+    // TODO. find a better solution
+    static const Settings s_settings;
+    static const Preprocessor s_preprocessor;
 };
 
 class SimpleTokenList
diff --git a/test/test64bit.cpp b/test/test64bit.cpp
index 97ba363c01d5..58bef23b9c70 100644
--- a/test/test64bit.cpp
+++ b/test/test64bit.cpp
@@ -16,14 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "check64bit.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
-
-#include <sstream>
+#include "helpers.h"
+#include "settings.h"
 
 class Test64BitPortability : public TestFixture {
 public:
@@ -45,9 +42,8 @@ class Test64BitPortability : public TestFixture {
 #define check(code) check_(code, __FILE__, __LINE__)
     void check_(const char code[], const char* file, int line) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check char variable usage..
         Check64BitPortability check64BitPortability(&tokenizer, &settings, this);
diff --git a/test/testassert.cpp b/test/testassert.cpp
index e6beeb33a053..50f0ca1a60b3 100644
--- a/test/testassert.cpp
+++ b/test/testassert.cpp
@@ -19,12 +19,9 @@
 
 #include "checkassert.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
-
-#include <sstream>
-
+#include "helpers.h"
+#include "settings.h"
 
 class TestAssert : public TestFixture {
 public:
@@ -34,11 +31,10 @@ class TestAssert : public TestFixture {
     const Settings settings = settingsBuilder().severity(Severity::warning).build();
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const char *filename = "test.cpp") {
+    void check_(const char* file, int line, const char code[]) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         runChecks<CheckAssert>(tokenizer, this);
diff --git a/test/testastutils.cpp b/test/testastutils.cpp
index 9140b16e5610..baa8357d09c9 100644
--- a/test/testastutils.cpp
+++ b/test/testastutils.cpp
@@ -16,18 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "astutils.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "library.h"
 #include "settings.h"
-#include "fixture.h"
 #include "symboldatabase.h"
 #include "token.h"
-#include "tokenize.h"
 #include "tokenlist.h"
 
 #include <cstring>
-#include <sstream>
 
 class TestAstUtils : public TestFixture {
 public:
@@ -54,9 +52,8 @@ class TestAstUtils : public TestFixture {
 #define findLambdaEndToken(...) findLambdaEndToken_(__FILE__, __LINE__, __VA_ARGS__)
     bool findLambdaEndToken_(const char* file, int line, const char code[], const char pattern[] = nullptr, bool checkNext = true) {
         const Settings settings;
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token* const tokStart = pattern ? Token::findsimplematch(tokenizer.tokens(), pattern, strlen(pattern)) : tokenizer.tokens();
         const Token * const tokEnd = (::findLambdaEndToken)(tokStart);
         return tokEnd && (!checkNext || tokEnd->next() == nullptr);
@@ -92,9 +89,8 @@ class TestAstUtils : public TestFixture {
 
 #define findLambdaStartToken(code) findLambdaStartToken_(code, __FILE__, __LINE__)
     bool findLambdaStartToken_(const char code[], const char* file, int line) {
-        Tokenizer tokenizer(settingsDefault, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token * const tokStart = (::findLambdaStartToken)(tokenizer.list.back());
         return tokStart && tokStart == tokenizer.list.front();
     }
@@ -124,9 +120,8 @@ class TestAstUtils : public TestFixture {
 
 #define isNullOperand(code) isNullOperand_(code, __FILE__, __LINE__)
     bool isNullOperand_(const char code[], const char* file, int line) {
-        Tokenizer tokenizer(settingsDefault, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         return (::isNullOperand)(tokenizer.tokens());
     }
 
@@ -145,9 +140,8 @@ class TestAstUtils : public TestFixture {
 
 #define isReturnScope(code, offset) isReturnScope_(code, offset, __FILE__, __LINE__)
     bool isReturnScope_(const char code[], int offset, const char* file, int line) {
-        Tokenizer tokenizer(settingsDefault, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token * const tok = (offset < 0)
                                   ? tokenizer.list.back()->tokAt(1+offset)
                                   : tokenizer.tokens()->tokAt(offset);
@@ -176,9 +170,8 @@ class TestAstUtils : public TestFixture {
 #define isSameExpression(...) isSameExpression_(__FILE__, __LINE__, __VA_ARGS__)
     bool isSameExpression_(const char* file, int line, const char code[], const char tokStr1[], const char tokStr2[], bool cpp) {
         Library library;
-        Tokenizer tokenizer(settingsDefault, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, cpp ? "test.cpp" : "test.c"), file, line);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
         const Token * const tok1 = Token::findsimplematch(tokenizer.tokens(), tokStr1, strlen(tokStr1));
         const Token * const tok2 = Token::findsimplematch(tok1->next(), tokStr2, strlen(tokStr2));
         return (isSameExpression)(false, tok1, tok2, library, false, true, nullptr);
@@ -224,9 +217,8 @@ class TestAstUtils : public TestFixture {
 
 #define isVariableChanged(code, startPattern, endPattern) isVariableChanged_(code, startPattern, endPattern, __FILE__, __LINE__)
     bool isVariableChanged_(const char code[], const char startPattern[], const char endPattern[], const char* file, int line) {
-        Tokenizer tokenizer(settingsDefault, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token * const tok1 = Token::findsimplematch(tokenizer.tokens(), startPattern, strlen(startPattern));
         const Token * const tok2 = Token::findsimplematch(tokenizer.tokens(), endPattern, strlen(endPattern));
         return (isVariableChanged)(tok1, tok2, 1, false, &settingsDefault);
@@ -258,9 +250,8 @@ class TestAstUtils : public TestFixture {
 
 #define isVariableChangedByFunctionCall(code, pattern, inconclusive) isVariableChangedByFunctionCall_(code, pattern, inconclusive, __FILE__, __LINE__)
     bool isVariableChangedByFunctionCall_(const char code[], const char pattern[], bool *inconclusive, const char* file, int line) {
-        Tokenizer tokenizer(settingsDefault, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token * const argtok = Token::findmatch(tokenizer.tokens(), pattern);
         ASSERT_LOC(argtok, file, line);
         int indirect = (argtok->variable() && argtok->variable()->isArray());
@@ -401,9 +392,8 @@ class TestAstUtils : public TestFixture {
                               int line)
     {
         const Settings settings = settingsBuilder().library("std.cfg").build();
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token* const start = Token::findsimplematch(tokenizer.tokens(), startPattern, strlen(startPattern));
         const Token* const end = Token::findsimplematch(start, endPattern, strlen(endPattern));
         const Token* const expr = Token::findsimplematch(tokenizer.tokens(), var, strlen(var));
@@ -432,9 +422,8 @@ class TestAstUtils : public TestFixture {
 
 #define nextAfterAstRightmostLeaf(code, parentPattern, rightPattern) nextAfterAstRightmostLeaf_(code, parentPattern, rightPattern, __FILE__, __LINE__)
     bool nextAfterAstRightmostLeaf_(const char code[], const char parentPattern[], const char rightPattern[], const char* file, int line) {
-        Tokenizer tokenizer(settingsDefault, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token * tok = Token::findsimplematch(tokenizer.tokens(), parentPattern, strlen(parentPattern));
         return Token::simpleMatch((::nextAfterAstRightmostLeaf)(tok), rightPattern, strlen(rightPattern));
     }
@@ -456,9 +445,8 @@ class TestAstUtils : public TestFixture {
     enum class Result {False, True, Fail};
 
     Result isUsedAsBool(const char code[], const char pattern[]) {
-        Tokenizer tokenizer(settingsDefault, this);
-        std::istringstream istr(code);
-        if (!tokenizer.tokenize(istr, "test.cpp"))
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        if (!tokenizer.tokenize(code))
             return Result::Fail;
         const Token * const argtok = Token::findmatch(tokenizer.tokens(), pattern);
         if (!argtok)
diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
index 198f6be8b578..b6d491b39745 100644
--- a/test/testautovariables.cpp
+++ b/test/testautovariables.cpp
@@ -16,14 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkautovariables.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
-
-#include <sstream>
+#include "helpers.h"
+#include "settings.h"
 
 class TestAutoVariables : public TestFixture {
 public:
@@ -33,13 +30,12 @@ class TestAutoVariables : public TestFixture {
     const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::style).library("std.cfg").library("qt.cfg").build();
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], bool inconclusive = true, const char* filename = "test.cpp") {
+    void check_(const char* file, int line, const char code[], bool inconclusive = true, bool cpp = true) {
         const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, inconclusive).build();
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         runChecks<CheckAutoVariables>(tokenizer, this);
     }
@@ -916,7 +912,7 @@ class TestAutoVariables : public TestFixture {
         check("void svn_repos_dir_delta2() {\n"
               "  struct context c;\n"
               "      SVN_ERR(delete(&c, root_baton, src_entry, pool));\n"
-              "}\n", false, "test.c");
+              "}\n", false, /* cpp= */false);
         ASSERT_EQUALS("", errout_str());
     }
 
diff --git a/test/testbool.cpp b/test/testbool.cpp
index b8fb09558815..d6f79a3285e8 100644
--- a/test/testbool.cpp
+++ b/test/testbool.cpp
@@ -16,14 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkbool.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
-
-#include <sstream>
+#include "helpers.h"
+#include "settings.h"
 
 class TestBool : public TestFixture {
 public:
@@ -77,11 +74,10 @@ class TestBool : public TestFixture {
     }
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
+    void check_(const char* file, int line, const char code[], bool cpp = true) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         // Check...
         runChecks<CheckBool>(tokenizer, this);
@@ -147,7 +143,7 @@ class TestBool : public TestFixture {
               "  const int *rmat = n < 4 ? " /* OK */
               "                       ctx->q_intra_matrix :"
               "                       ctx->q_chroma_intra_matrix;\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("[test.c:3]: (error) Boolean value assigned to pointer.\n", errout_str());
 
         // ticket #6588 (c++ mode)
@@ -166,7 +162,7 @@ class TestBool : public TestFixture {
               "  char* m1 = compare(a, b) < 0\n"
               "      ? (compare(b, c) < 0 ? b : (compare(a, c) < 0 ? c : a))\n"
               "      : (compare(a, c) < 0 ? a : (compare(b, c) < 0 ? c : b));\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("", errout_str());
 
         // #7381
diff --git a/test/testboost.cpp b/test/testboost.cpp
index af09069eb706..554c0e043991 100644
--- a/test/testboost.cpp
+++ b/test/testboost.cpp
@@ -16,14 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkboost.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
-
-#include <sstream>
+#include "helpers.h"
+#include "settings.h"
 
 class TestBoost : public TestFixture {
 public:
@@ -39,9 +36,8 @@ class TestBoost : public TestFixture {
 #define check(code) check_(code, __FILE__, __LINE__)
     void check_(const char code[], const char* file, int line) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         runChecks<CheckBoost>(tokenizer, this);
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
index d462f44638dd..5a7a6e981772 100644
--- a/test/testbufferoverrun.cpp
+++ b/test/testbufferoverrun.cpp
@@ -29,7 +29,6 @@
 #include "tokenize.h"
 
 #include <list>
-#include <sstream>
 #include <string>
 #include <vector>
 
@@ -41,22 +40,20 @@ class TestBufferOverrun : public TestFixture {
     /*const*/ Settings settings0 = settingsBuilder().library("std.cfg").severity(Severity::warning).severity(Severity::style).severity(Severity::portability).build();
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
+    void check_(const char* file, int line, const char code[], bool cpp = true) {
         const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).build();
 
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         // Check for buffer overruns..
         runChecks<CheckBufferOverrun>(tokenizer, this);
     }
 
-    void check_(const char* file, int line, const char code[], const Settings &settings, const char filename[] = "test.cpp") {
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+    void check_(const char* file, int line, const char code[], const Settings &settings, bool cpp = true) {
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         // Check for buffer overruns..
         runChecks<CheckBufferOverrun>(tokenizer, this);
@@ -2474,7 +2471,7 @@ class TestBufferOverrun : public TestFixture {
               "            c++;\n"
               "     }\n"
               "    return c;\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2680,7 +2677,7 @@ class TestBufferOverrun : public TestFixture {
               "    char str[6] = \"\\0\";\n"
               "    unsigned short port = 65535;\n"
               "    snprintf(str, sizeof(str), \"%hu\", port);\n"
-              "}", settings0, "test.c");
+              "}", settings0, false);
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int x) {\n" // #11020
@@ -2737,13 +2734,13 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    char str[3];\n"
               "    str[((unsigned char)3) - 1] = 0;\n"
-              "}", "test.cpp");
+              "}");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"  // #5416 FP
               "    char *str[3];\n"
               "    do_something(&str[0][5]);\n"
-              "}", "test.cpp");
+              "}");
         ASSERT_EQUALS("", errout_str());
 
         check("class X { static const int x[100]; };\n" // #6070
@@ -3698,7 +3695,7 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n" // #6350 - fp when there is cast of buffer
               "  wchar_t buf[64];\n"
               "  p = (unsigned char *) buf + sizeof (buf);\n"
-              "}", "6350.c");
+              "}", false);
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
@@ -5163,9 +5160,8 @@ class TestBufferOverrun : public TestFixture {
 #define ctu(code) ctu_(code, __FILE__, __LINE__)
     void ctu_(const char code[], const char* file, int line) {
         // Tokenize..
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         CTU::FileInfo *ctu = CTU::getFileInfo(&tokenizer);
 
@@ -5522,7 +5518,7 @@ class TestBufferOverrun : public TestFixture {
               "        (*str)[applen] = '\\0';\n"
               "    }\n"
               "    free(*str);\n"
-              "}\n", "test.c");
+              "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         check("template <typename T, unsigned N>\n"
diff --git a/test/testcharvar.cpp b/test/testcharvar.cpp
index 15198feb2247..5e939051908c 100644
--- a/test/testcharvar.cpp
+++ b/test/testcharvar.cpp
@@ -16,15 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkother.h"
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "platform.h"
 #include "settings.h"
-#include "fixture.h"
-#include "tokenize.h"
-
-#include <sstream>
 
 class TestCharVar : public TestFixture {
 public:
@@ -42,9 +39,8 @@ class TestCharVar : public TestFixture {
 #define check(code) check_(code, __FILE__, __LINE__)
     void check_(const char code[], const char* file, int line) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check char variable usage..
         CheckOther checkOther(&tokenizer, &settings, this);
diff --git a/test/testclass.cpp b/test/testclass.cpp
index 7b628149e634..875e1114909d 100644
--- a/test/testclass.cpp
+++ b/test/testclass.cpp
@@ -19,14 +19,13 @@
 #include "check.h"
 #include "checkclass.h"
 #include "errortypes.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "preprocessor.h"
 #include "settings.h"
-#include "fixture.h"
 #include "tokenize.h"
 
 #include <list>
-#include <sstream>
 #include <string>
 #include <vector>
 
@@ -252,9 +251,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings);
 
         // Tokenize..
-        Tokenizer tokenizer(settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings, this);
@@ -355,9 +353,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings0);
 
         // Tokenize..
-        Tokenizer tokenizer(settings0, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings0, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings0, this);
@@ -506,9 +503,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings1);
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings1, this);
@@ -725,9 +721,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings3);
 
         // Tokenize..
-        Tokenizer tokenizer(settings3, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings3, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings3, this);
@@ -1171,9 +1166,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings0);
 
         // Tokenize..
-        Tokenizer tokenizer(settings0, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings0, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings0, this);
@@ -1644,9 +1638,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings1);
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings1, this);
@@ -2604,9 +2597,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(s);
 
         // Tokenize..
-        Tokenizer tokenizer(s, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(s, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &s, this);
@@ -2943,9 +2935,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings);
 
         // Tokenize..
-        Tokenizer tokenizer(settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings, this);
@@ -3591,9 +3582,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings1);
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings1, this);
@@ -3625,9 +3615,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings);
 
         // Tokenize..
-        Tokenizer tokenizer(settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         CheckClass checkClass(&tokenizer, &settings, this);
         (checkClass.checkConst)();
@@ -7547,9 +7536,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings2);
 
         // Tokenize..
-        Tokenizer tokenizer(settings2, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings2, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         CheckClass checkClass(&tokenizer, &settings2, this);
         checkClass.initializerListOrder();
@@ -7678,9 +7666,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings);
 
         // Tokenize..
-        Tokenizer tokenizer(settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         CheckClass checkClass(&tokenizer, &settings, this);
         checkClass.initializationListUsage();
@@ -7889,9 +7876,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings0);
 
         // Tokenize..
-        Tokenizer tokenizer(settings0, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings0, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         CheckClass checkClass(&tokenizer, &settings0, this);
         (checkClass.checkSelfInitialization)();
@@ -8002,9 +7988,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings);
 
         // Tokenize..
-        Tokenizer tokenizer(settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         CheckClass checkClass(&tokenizer, &settings, this);
         checkClass.checkVirtualFunctionCallInConstructor();
@@ -8348,9 +8333,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings);
 
         // Tokenize..
-        Tokenizer tokenizer(settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings, this);
@@ -8723,9 +8707,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings);
 
         // Tokenize..
-        Tokenizer tokenizer(settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings, this);
@@ -8743,9 +8726,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings1);
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings1, this);
@@ -8901,7 +8883,9 @@ class TestClass : public TestFixture {
         for (const std::string& c: code) {
             Tokenizer tokenizer(settingsDefault, this);
             std::istringstream istr(c);
-            ASSERT(tokenizer.tokenize(istr, (std::to_string(fileInfo.size()) + ".cpp").c_str()));
+            const std::string filename = std::to_string(fileInfo.size()) + ".cpp";
+            ASSERT(tokenizer.list.createTokens(istr, filename.c_str()));
+            ASSERT(tokenizer.simplifyTokens1(""));
             fileInfo.push_back(check.getFileInfo(&tokenizer, &settingsDefault));
         }
 
@@ -8943,9 +8927,8 @@ class TestClass : public TestFixture {
         Preprocessor preprocessor(settings1);
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         const Check& c = getCheck<CheckClass>();
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
index 115fbe4b84c8..7ae5338448fe 100644
--- a/test/testcondition.cpp
+++ b/test/testcondition.cpp
@@ -18,15 +18,14 @@
 
 #include "checkcondition.h"
 #include "errortypes.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "platform.h"
 #include "preprocessor.h"
 #include "settings.h"
-#include "fixture.h"
 #include "tokenize.h"
 
 #include <limits>
-#include <sstream>
 #include <string>
 #include <vector>
 
@@ -543,9 +542,8 @@ class TestCondition : public TestFixture {
 
     void checkPureFunction_(const char code[], const char* file, int line) {
         // Tokenize..
-        Tokenizer tokenizer(settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         runChecks<CheckCondition>(tokenizer, this);
     }
diff --git a/test/testconstructors.cpp b/test/testconstructors.cpp
index 4b25cc52b0c0..2ab939c177d3 100644
--- a/test/testconstructors.cpp
+++ b/test/testconstructors.cpp
@@ -16,16 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkclass.h"
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "standards.h"
 #include "settings.h"
-#include "fixture.h"
-#include "tokenize.h"
-
-#include <sstream>
-
 
 class TestConstructors : public TestFixture {
 public:
@@ -39,9 +35,8 @@ class TestConstructors : public TestFixture {
         const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, inconclusive).build();
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check class constructors..
         CheckClass checkClass(&tokenizer, &settings1, this);
@@ -50,9 +45,8 @@ class TestConstructors : public TestFixture {
 
     void check_(const char* file, int line, const char code[], const Settings &s) {
         // Tokenize..
-        Tokenizer tokenizer(s, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(s, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check class constructors..
         CheckClass checkClass(&tokenizer, &s, this);
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
index 4c1f099d8972..eaf2108a098c 100644
--- a/test/testexceptionsafety.cpp
+++ b/test/testexceptionsafety.cpp
@@ -16,14 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkexceptionsafety.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
-
-#include <sstream>
+#include "helpers.h"
+#include "settings.h"
 
 class TestExceptionSafety : public TestFixture {
 public:
@@ -63,9 +60,8 @@ class TestExceptionSafety : public TestFixture {
         const Settings settings1 = settingsBuilder(s ? *s : settings).certainty(Certainty::inconclusive, inconclusive).build();
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check char variable usage..
         runChecks<CheckExceptionSafety>(tokenizer, this);
diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
index d907c9ae40ab..3e682a375c6f 100644
--- a/test/testfunctions.cpp
+++ b/test/testfunctions.cpp
@@ -18,11 +18,10 @@
 
 #include "checkfunctions.h"
 #include "errortypes.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "settings.h"
 #include "standards.h"
-#include "fixture.h"
-#include "tokenize.h"
 
 #include <sstream>
 #include <string>
@@ -106,14 +105,13 @@ class TestFunctions : public TestFixture {
     }
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const char filename[] = "test.cpp", const Settings* settings_ = nullptr) {
+    void check_(const char* file, int line, const char code[], bool cpp = true, const Settings* settings_ = nullptr) {
         if (!settings_)
             settings_ = &settings;
 
         // Tokenize..
-        Tokenizer tokenizer(*settings_, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(*settings_, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         runChecks<CheckFunctions>(tokenizer, this);
     }
@@ -252,32 +250,32 @@ class TestFunctions : public TestFixture {
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", "test.cpp");  // #4382 - there are no VLAs in C++
+              "}");  // #4382 - there are no VLAs in C++
         ASSERT_EQUALS("[test.cpp:3]: (warning) Obsolete function 'alloca' called.\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("[test.c:3]: (warning) Obsolete function 'alloca' called. In C99 and later it is recommended to use a variable length array instead.\n", errout_str());
 
         const Settings s = settingsBuilder(settings).c(Standards::C89).cpp(Standards::CPP03).build();
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", "test.cpp", &s);  // #4382 - there are no VLAs in C++
+              "}", true, &s);  // #4382 - there are no VLAs in C++
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", "test.c", &s); // #7558 - no alternative to alloca in C89
+              "}", false, &s); // #7558 - no alternative to alloca in C89
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", "test.c", &s);
+              "}", false, &s);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -445,7 +443,7 @@ class TestFunctions : public TestFixture {
         check("void record(char* buf, int n) {\n"
               "  memset(buf, 0, n < 255);\n"           /* KO */
               "  memset(buf, 0, n < 255 ? n : 255);\n" /* OK */
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("[test.c:2]: (error) Invalid memset() argument nr 3. A non-boolean value is required.\n", errout_str());
 
         // Ticket #6588 (c++ mode)
@@ -747,7 +745,7 @@ class TestFunctions : public TestFixture {
         check("size_t f() { wchar_t x = L'x'; return wcslen(&x); }");
         ASSERT_EQUALS("[test.cpp:1]: (error) Invalid wcslen() argument nr 1. A nul-terminated string is required.\n", errout_str());
 
-        check("void f() { char a[10] = \"1234567890\"; puts(a); }", "test.c"); // #1770
+        check("void f() { char a[10] = \"1234567890\"; puts(a); }", false); // #1770
         ASSERT_EQUALS("[test.c:1]: (error) Invalid puts() argument nr 1. A nul-terminated string is required.\n", errout_str());
     }
 
@@ -1299,67 +1297,67 @@ class TestFunctions : public TestFixture {
 
         check("void foo() {\n"
               "  mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("[test.cpp:2]: (warning) Return value of function mystrcmp() is not used.\n", errout_str());
 
         check("void foo() {\n"
               "  foo::mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("[test.cpp:2]: (warning) Return value of function foo::mystrcmp() is not used.\n", errout_str());
 
         check("void f() {\n"
               "  foo x;\n"
               "  x.mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("[test.cpp:3]: (warning) Return value of function x.mystrcmp() is not used.\n", errout_str());
 
         check("bool mystrcmp(char* a, char* b);\n" // cppcheck sees a custom strcmp definition, but it returns a value. Assume it is the one specified in the library.
               "void foo() {\n"
               "    mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("[test.cpp:3]: (warning) Return value of function mystrcmp() is not used.\n", errout_str());
 
         check("void mystrcmp(char* a, char* b);\n" // cppcheck sees a custom strcmp definition which returns void!
               "void foo() {\n"
               "    mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    class mystrcmp { mystrcmp() {} };\n" // strcmp is a constructor definition here
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    return mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    return foo::mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if(mystrcmp(a, b));\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    bool b = mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("", errout_str());
 
         // #6194
         check("void foo() {\n"
               "    MyStrCmp mystrcmp(x, y);\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("", errout_str());
 
         // #6197
         check("void foo() {\n"
               "    abc::def.mystrcmp(a,b);\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("", errout_str());
 
         // #6233
@@ -1382,18 +1380,18 @@ class TestFunctions : public TestFixture {
         // #7447
         check("void foo() {\n"
               "   int x{mystrcmp(a,b)};\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("", errout_str());
 
         // #7905
         check("void foo() {\n"
               "   int x({mystrcmp(a,b)});\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // don't crash
               "  DEBUG(123)(mystrcmp(a,b))(fd);\n"
-              "}", "test.c", &settings2);
+              "}", false, &settings2);
         check("struct teststruct {\n"
               "    int testfunc1() __attribute__ ((warn_unused_result)) { return 1; }\n"
               "    [[nodiscard]] int testfunc2() { return 1; }\n"
@@ -1404,7 +1402,7 @@ class TestFunctions : public TestFixture {
               "    TestStruct1.testfunc1();\n"
               "    TestStruct1.testfunc2();\n"
               "    return 0;\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("[test.cpp:4]: (warning) Return value of function testfunc1() is not used.\n"
                       "[test.cpp:4]: (warning) Return value of function testfunc2() is not used.\n"
                       "[test.cpp:8]: (warning) Return value of function TestStruct1.testfunc1() is not used.\n"
@@ -1428,7 +1426,7 @@ class TestFunctions : public TestFixture {
         // #8412 - unused operator result
         check("void foo() {\n"
               "  !mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("[test.cpp:2]: (warning) Return value of function mystrcmp() is not used.\n", errout_str());
 
         check("void f(std::vector<int*> v) {\n"
@@ -1450,7 +1448,7 @@ class TestFunctions : public TestFixture {
 
         check("void foo() {\n"
               "  mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
+              "}", true, &settings2);
         ASSERT_EQUALS("[test.cpp:2]: (style) Error code from the return value of function mystrcmp() is not used.\n", errout_str());
     }
 
@@ -1556,16 +1554,16 @@ class TestFunctions : public TestFixture {
             {
                 const Settings s = settingsBuilder().c(Standards::C89).build();
 
-                check(code, "test.c", &s); // c code (c89)
+                check(code, false, &s); // c code (c89)
                 ASSERT_EQUALS("[test.c:1]: (error) Found an exit path from function with non-void return type that has missing return statement\n", errout_str());
             }
 
             {
                 const Settings s = settingsBuilder().c(Standards::C99).build();
-                check(code, "test.c", &s); // c code (c99)
+                check(code, false, &s); // c code (c99)
                 ASSERT_EQUALS("", errout_str());
 
-                check(code, "test.cpp", &s); // c++ code
+                check(code, true, &s); // c++ code
                 ASSERT_EQUALS("", errout_str());
             }
         }
@@ -1830,12 +1828,12 @@ class TestFunctions : public TestFixture {
 
         check("void f() {\n"
               "    lib_func();"
-              "}", "test.cpp", &s);
+              "}", true, &s);
         ASSERT_EQUALS("[test.cpp:2]: (information) --check-library: There is no matching configuration for function lib_func()\n", errout_str());
 
         check("void f(void* v) {\n"
               "    lib_func(v);"
-              "}", "test.cpp", &s);
+              "}", true, &s);
         ASSERT_EQUALS("[test.cpp:2]: (information) --check-library: There is no matching configuration for function lib_func()\n", errout_str());
 
         // #10105
@@ -1851,7 +1849,7 @@ class TestFunctions : public TestFixture {
               "\n"
               "        void testFunctionReturnType() {\n"
               "        }\n"
-              "};", "test.cpp", &s);
+              "};", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         // #11183
@@ -1861,7 +1859,7 @@ class TestFunctions : public TestFixture {
               "\n"
               "void f() {\n"
               "    cb(std::string(\"\"));\n"
-              "}", "test.cpp", &s);
+              "}", true, &s);
         TODO_ASSERT_EQUALS("", "[test.cpp:6]: (information) --check-library: There is no matching configuration for function cb()\n", errout_str());
 
         // #7375
@@ -1869,38 +1867,38 @@ class TestFunctions : public TestFixture {
               "    struct S { int i; char c; };\n"
               "    size_t s = sizeof(S);\n"
               "    static_assert(s == 9);\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char) {}\n"
               "void g() {\n"
               "    f(int8_t(1));\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::uint64_t& u) {\n"
               "    u = std::uint32_t(u) * std::uint64_t(100);\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { throw(1); }\n", "test.cpp", &s); // #8958
+        check("void f() { throw(1); }\n", true, &s); // #8958
         ASSERT_EQUALS("", errout_str());
 
         check("using namespace std;\n"
-              "void f() { throw range_error(\"abc\"); }\n", "test.cpp", &s);
+              "void f() { throw range_error(\"abc\"); }\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         check("class C {\n" // #9002
               "public:\n"
               "    static int f() { return 1; }\n"
               "};\n"
-              "void g() { C::f(); }\n", "test.cpp", &s);
+              "void g() { C::f(); }\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::vector<std::string>& v) {\n" // #11223
               "    for (const auto& s : v)\n"
               "        s.find(\"\");\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("[test.cpp:3]: (warning) Return value of function s.find() is not used.\n", errout_str());
 
         check("void f() {\n"
@@ -1910,19 +1908,19 @@ class TestFunctions : public TestFixture {
               "    q->push_back(1);\n"
               "    auto* r = new std::vector<int>;\n"
               "    r->push_back(1);\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    auto p = std::make_shared<std::vector<int>>();\n"
               "    p->push_back(1);\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<std::vector<int>>& v) {\n"
               "    auto it = v.begin();\n"
               "    it->push_back(1);\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1932,7 +1930,7 @@ class TestFunctions : public TestFixture {
               "    w.push_back(1);\n"
               "    auto x = std::vector<int>(1);\n"
               "    x.push_back(1);\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1940,7 +1938,7 @@ class TestFunctions : public TestFixture {
               "    p->push_back(1);\n"
               "    auto q{ std::make_shared<std::vector<int>>{} };\n"
               "    q->push_back(1);\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         TODO_ASSERT_EQUALS("",
                            "[test.cpp:2]: (debug) auto token with no type.\n"
                            "[test.cpp:4]: (debug) auto token with no type.\n"
@@ -1953,12 +1951,12 @@ class TestFunctions : public TestFixture {
               "    std::list<F>::iterator it;\n"
               "    for (it = l.begin(); it != l.end(); ++it)\n"
               "        it->g(0);\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         check("auto f() {\n"
               "    return std::runtime_error(\"abc\");\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         TODO_ASSERT_EQUALS("",
                            "[test.cpp:1]: (debug) auto token with no type.\n",
                            errout_str());
@@ -1971,7 +1969,7 @@ class TestFunctions : public TestFixture {
               "void S::f(int i) const {\n"
               "    for (const std::shared_ptr<S>& c : v)\n"
               "        c->f(i);\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         check("namespace N {\n"
@@ -1980,29 +1978,29 @@ class TestFunctions : public TestFixture {
               "void f() {\n"
               "    const auto& t = N::S::s;\n"
               "    if (t.find(\"abc\") != t.end()) {}\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         check("void f(std::vector<std::unordered_map<int, std::unordered_set<int>>>& v, int i, int j) {\n"
               "    auto& s = v[i][j];\n"
               "    s.insert(0);\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         check("int f(const std::vector<std::string>& v, int i, char c) {\n"
               "    const auto& s = v[i];\n"
               "    return s.find(c);\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #11604
               "    int (*g)() = nullptr;\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    INT (*g)() = nullptr;\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         check("struct T;\n"
@@ -2011,13 +2009,13 @@ class TestFunctions : public TestFixture {
               "    auto p = get();\n"
               "    p->h(i);\n"
               "    p.reset(nullptr);\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("[test.cpp:5]: (information) --check-library: There is no matching configuration for function T::h()\n",
                       errout_str());
 
         check("struct S : std::vector<int> {\n"
               "    void f(int i) { push_back(i); }\n"
-              "};\n", "test.cpp", &s);
+              "};\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -2027,18 +2025,18 @@ class TestFunctions : public TestFixture {
               "    auto h{ []() -> std::string { return \"xyz\"; } };\n"
               "    auto t = h();\n"
               "    if (t.at(0)) {}\n"
-              "};\n", "test.cpp", &s);
+              "};\n", true, &s);
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         check("::std::string f(const char* c) {\n" // #12365
               "    return ::std::string(c);\n"
-              "}\n", "test.cpp", &s);
+              "}\n", true, &s);
         ASSERT_EQUALS("", errout_str());
 
         check("template <typename T>\n"
               "struct S : public std::vector<T> {\n"
               "    void resize(size_t n) { std::vector<T>::resize(n); }\n"
-              "};\n", "test.cpp", &s);
+              "};\n", true, &s);
         ASSERT_EQUALS("", errout_str());
     }
 
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
index 86757545194d..8972da28463f 100644
--- a/test/testgarbage.cpp
+++ b/test/testgarbage.cpp
@@ -18,17 +18,16 @@
 
 #include "check.h"
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "preprocessor.h"
 #include "settings.h"
-#include "fixture.h"
 #include "token.h"
-#include "tokenize.h"
 
 #include <list>
 #include <sstream>
 #include <string>
 
-
 class TestGarbage : public TestFixture {
 public:
     TestGarbage() : TestFixture("TestGarbage") {}
@@ -272,26 +271,23 @@ class TestGarbage : public TestFixture {
     }
 
 #define checkCodeInternal(code, filename) checkCodeInternal_(code, filename, __FILE__, __LINE__)
-    std::string checkCode(const std::string &code, bool cpp = true) {
+    std::string checkCode(const char code[], bool cpp = true) {
         // double the tests - run each example as C as well as C++
-        const char* const filename = cpp ? "test.cpp" : "test.c";
-        const char* const alternatefilename = cpp ? "test.c" : "test.cpp";
 
         // run alternate check first. It should only ensure stability - so we catch exceptions here.
         try {
-            checkCodeInternal(code, alternatefilename);
+            checkCodeInternal(code, !cpp);
         } catch (const InternalError&) {}
 
-        return checkCodeInternal(code, filename);
+        return checkCodeInternal(code, cpp);
     }
 
-    std::string checkCodeInternal_(const std::string &code, const char* filename, const char* file, int line) {
+    std::string checkCodeInternal_(const char code[], bool cpp, const char* file, int line) {
         Preprocessor preprocessor(settings);
 
         // tokenize..
-        Tokenizer tokenizer(settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         // call all "runChecks" in all registered Check classes
         for (std::list<Check *>::const_iterator it = Check::instances().cbegin(); it != Check::instances().cend(); ++it) {
@@ -303,10 +299,9 @@ class TestGarbage : public TestFixture {
 
 #define getSyntaxError(code) getSyntaxError_(code, __FILE__, __LINE__)
     std::string getSyntaxError_(const char code[], const char* file, int line) {
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
+        SimpleTokenizer tokenizer(settings, *this);
         try {
-            ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+            ASSERT_LOC(tokenizer.tokenize(code), file, line);
         } catch (InternalError& e) {
             if (e.id != "syntaxError")
                 return "";
@@ -319,12 +314,9 @@ class TestGarbage : public TestFixture {
     void final_class_x() {
 
         const char code[] = "class __declspec(dllexport) x final { };";
-        {
-            Tokenizer tokenizer(settings, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
-            ASSERT_EQUALS("", errout_str());
-        }
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT(tokenizer.tokenize(code));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void wrong_syntax1() {
@@ -368,10 +360,9 @@ class TestGarbage : public TestFixture {
                             " )\n"
                             "}";
 
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
+        SimpleTokenizer tokenizer(settings, *this);
         try {
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            ASSERT(tokenizer.tokenize(code));
             assertThrowFail(__FILE__, __LINE__);
         } catch (InternalError& e) {
             ASSERT_EQUALS("syntax error", e.errorMessage);
@@ -402,15 +393,13 @@ class TestGarbage : public TestFixture {
         const char code[] = "class x y { };";
 
         {
-            Tokenizer tokenizer(settings, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.c"));
+            SimpleTokenizer tokenizer(settings, *this);
+            ASSERT(tokenizer.tokenize(code, false));
             ASSERT_EQUALS("", errout_str());
         }
         {
-            Tokenizer tokenizer(settings, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT_EQUALS("[test.cpp:1]: (information) The code 'class x y {' is not handled. You can use -I or --include to add handling of this code.\n", errout_str());
         }
     }
@@ -1536,7 +1525,7 @@ class TestGarbage : public TestFixture {
     }
 
     void garbageCode187() { // # 8152 - segfault in handling
-        const std::string inp("0|\0|0>;\n", 8);
+        const char inp[] = "0|\0|0>;\n";
         ASSERT_THROW_INTERNAL(checkCode(inp), SYNTAX);
 
         checkCode("template<class T> struct S : A< B<T> || C<T> > {};"); // No syntax error: #8390
diff --git a/test/testinternal.cpp b/test/testinternal.cpp
index 90369a6efed9..445044636b5a 100644
--- a/test/testinternal.cpp
+++ b/test/testinternal.cpp
@@ -18,13 +18,11 @@
 
 #ifdef CHECK_INTERNAL
 
-#include "tokenize.h"
 #include "checkinternal.h"
 #include "fixture.h"
+#include "helpers.h"
 #include "settings.h"
 
-#include <sstream>
-
 class TestInternal : public TestFixture {
 public:
     TestInternal() : TestFixture("TestInternal") {}
@@ -51,9 +49,8 @@ class TestInternal : public TestFixture {
 #define check(code) check_(code, __FILE__, __LINE__)
     void check_(const char code[], const char* file, int line) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         runChecks<CheckInternal>(tokenizer, this);
diff --git a/test/testio.cpp b/test/testio.cpp
index ad07c82f02c1..e815be969821 100644
--- a/test/testio.cpp
+++ b/test/testio.cpp
@@ -16,17 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkio.h"
 #include "config.h"
 #include "errortypes.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "platform.h"
 #include "settings.h"
-#include "fixture.h"
-#include "tokenize.h"
 
-#include <sstream>
 #include <string>
 
 class TestIO : public TestFixture {
@@ -99,10 +96,8 @@ class TestIO : public TestFixture {
         PLATFORM(settings1.platform, options.platform);
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this);
-        std::istringstream istr(code);
-        const std::string file_in = options.cpp ? "test.cpp" : "test.c";
-        ASSERT_LOC(tokenizer.tokenize(istr, file_in.c_str()), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, options.cpp), file, line);
 
         // Check..
         if (options.onlyFormatStr) {
diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
index 2a7e6ed6d7ce..1c788ece2b94 100644
--- a/test/testleakautovar.cpp
+++ b/test/testleakautovar.cpp
@@ -16,15 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkleakautovar.h"
 #include "errortypes.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "settings.h"
-#include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream>
 #include <string>
 #include <vector>
 
@@ -234,9 +232,8 @@ class TestLeakAutoVar : public TestFixture {
         const Settings settings1 = settingsBuilder(s ? *s : settings).checkLibrary().build();
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, cpp ? "test.cpp" : "test.c"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         // Check for leaks..
         runChecks<CheckLeakAutoVar>(tokenizer, this);
@@ -246,9 +243,8 @@ class TestLeakAutoVar : public TestFixture {
         const Settings settings0 = settingsBuilder(s).checkLibrary().build();
 
         // Tokenize..
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for leaks..
         runChecks<CheckLeakAutoVar>(tokenizer, this);
@@ -3123,9 +3119,8 @@ class TestLeakAutoVarStrcpy : public TestFixture {
 
     void check_(const char* file, int line, const char code[]) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for leaks..
         runChecks<CheckLeakAutoVar>(tokenizer, this);
@@ -3227,9 +3222,8 @@ class TestLeakAutoVarWindows : public TestFixture {
 
     void check_(const char* file, int line, const char code[]) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.c"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, false), file, line);
 
         // Check for leaks..
         runChecks<CheckLeakAutoVar>(tokenizer, this);
@@ -3299,9 +3293,8 @@ class TestLeakAutoVarPosix : public TestFixture {
 
     void check_(const char* file, int line, const char code[]) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for leaks..
         runChecks<CheckLeakAutoVar>(tokenizer, this);
diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp
index c9e2a9b8c833..7739877d78d0 100644
--- a/test/testlibrary.cpp
+++ b/test/testlibrary.cpp
@@ -17,13 +17,12 @@
  */
 
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "library.h"
 #include "settings.h"
 #include "standards.h"
-#include "fixture.h"
-#include "helpers.h"
 #include "token.h"
-#include "tokenize.h"
 #include "tokenlist.h"
 
 #include <cstddef>
@@ -571,16 +570,16 @@ class TestLibrary : public TestFixture {
         ASSERT_EQUALS(library.functions.size(), 1U);
 
         {
-            Tokenizer tokenizer(settings, this);
-            std::istringstream istr("CString str; str.Format();");
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings, *this);
+            const char code[] = "CString str; str.Format();";
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(library.isnotnoreturn(Token::findsimplematch(tokenizer.tokens(), "Format")));
         }
 
         {
-            Tokenizer tokenizer(settings, this);
-            std::istringstream istr("HardDrive hd; hd.Format();");
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings, *this);
+            const char code[] = "HardDrive hd; hd.Format();";
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(!library.isnotnoreturn(Token::findsimplematch(tokenizer.tokens(), "Format")));
         }
     }
@@ -597,16 +596,16 @@ class TestLibrary : public TestFixture {
         ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
 
         {
-            Tokenizer tokenizer(settings, this);
-            std::istringstream istr("struct X : public Base { void dostuff() { f(0); } };");
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings, *this);
+            const char code[] = "struct X : public Base { void dostuff() { f(0); } };";
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(library.isnullargbad(Token::findsimplematch(tokenizer.tokens(), "f"),1));
         }
 
         {
-            Tokenizer tokenizer(settings, this);
-            std::istringstream istr("struct X : public Base { void dostuff() { f(1,2); } };");
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings, *this);
+            const char code[] = "struct X : public Base { void dostuff() { f(1,2); } };";
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(!library.isnullargbad(Token::findsimplematch(tokenizer.tokens(), "f"),1));
         }
     }
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index 8659865c82f3..db73d5ca665a 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -18,14 +18,13 @@
 
 #include "checkmemoryleak.h"
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "settings.h"
 #include "symboldatabase.h"
-#include "fixture.h"
 #include "token.h"
-#include "tokenize.h"
 
 #include <list>
-#include <sstream>
 
 class TestMemleak : private TestFixture {
 public:
@@ -42,9 +41,8 @@ class TestMemleak : private TestFixture {
 #define functionReturnType(code) functionReturnType_(code, __FILE__, __LINE__)
     CheckMemoryLeak::AllocType functionReturnType_(const char code[], const char* file, int line) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         const CheckMemoryLeak c(&tokenizer, this, &settings);
 
@@ -91,9 +89,8 @@ class TestMemleak : private TestFixture {
                             "  }\n"
                             "};\n";
 
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         // there is no allocation
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), "ret =");
@@ -118,9 +115,8 @@ class TestMemleakInFunction : public TestFixture {
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     void check_(const char* file, int line, const char code[]) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for memory leaks..
         CheckMemoryLeakInFunction checkMemoryLeak(&tokenizer, &settings, this);
@@ -444,9 +440,8 @@ class TestMemleakInClass : public TestFixture {
      */
     void check_(const char* file, int line, const char code[]) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for memory leaks..
         CheckMemoryLeakInClass checkMemoryLeak(&tokenizer, &settings, this);
@@ -1646,11 +1641,10 @@ class TestMemleakStructMember : public TestFixture {
 private:
     const Settings settings = settingsBuilder().library("std.cfg").library("posix.cfg").build();
 
-    void check_(const char* file, int line, const char code[], bool isCPP = true) {
+    void check_(const char* file, int line, const char code[], bool cpp = true) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, isCPP ? "test.cpp" : "test.c"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         // Check for memory leaks..
         CheckMemoryLeakStructMember checkMemoryLeakStructMember(&tokenizer, &settings, this);
@@ -2258,9 +2252,8 @@ class TestMemleakNoVar : public TestFixture {
 
     void check_(const char* file, int line, const char code[]) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for memory leaks..
         CheckMemoryLeakNoVar checkMemoryLeakNoVar(&tokenizer, &settings, this);
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
index df309274172e..b950af682756 100644
--- a/test/testnullpointer.cpp
+++ b/test/testnullpointer.cpp
@@ -20,16 +20,15 @@
 #include "checknullpointer.h"
 #include "ctu.h"
 #include "errortypes.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "library.h"
 #include "settings.h"
-#include "fixture.h"
 #include "token.h"
 #include "tokenize.h"
 
 #include <list>
 #include <map>
-#include <sstream>
 #include <string>
 #include <unordered_map>
 #include <vector>
@@ -177,13 +176,12 @@ class TestNullPointer : public TestFixture {
     }
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], bool inconclusive = false, const char filename[] = "test.cpp") {
+    void check_(const char* file, int line, const char code[], bool inconclusive = false, bool cpp = true) {
         const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, inconclusive).build();
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         // Check for null pointer dereferences..
         runChecks<CheckNullPointer>(tokenizer, this);
@@ -1320,10 +1318,10 @@ class TestNullPointer : public TestFixture {
                             "  return *i;\n"
                             "}\n";
 
-        check(code, false, "test.cpp"); // C++ file => nullptr means NULL
+        check(code, false, true); // C++ file => nullptr means NULL
         ASSERT_EQUALS("[test.cpp:4]: (error) Null pointer dereference: i\n", errout_str());
 
-        check(code, false, "test.c"); // C file => nullptr does not mean NULL
+        check(code, false, false); // C file => nullptr does not mean NULL
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2634,7 +2632,7 @@ class TestNullPointer : public TestFixture {
               "    s->ppc = NULL;\n"
               "    if (alloc(s))\n"
               "        s->ppc[0] = \"\";\n"
-              "}\n", /*inconclusive*/ false, "test.c");
+              "}\n", /*inconclusive*/ false, false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4141,9 +4139,9 @@ class TestNullPointer : public TestFixture {
     }
 
     void functioncalllibrary() {
-        Tokenizer tokenizer(settingsDefault,this);
-        std::istringstream code("void f() { int a,b,c; x(a,b,c); }");
-        ASSERT_EQUALS(true, tokenizer.tokenize(code, "test.c"));
+        SimpleTokenizer tokenizer(settingsDefault,*this);
+        const char code[] = "void f() { int a,b,c; x(a,b,c); }";
+        ASSERT_EQUALS(true, tokenizer.tokenize(code, false));
         const Token *xtok = Token::findsimplematch(tokenizer.tokens(), "x");
 
         // nothing bad..
@@ -4376,7 +4374,7 @@ class TestNullPointer : public TestFixture {
               "}\n"
               "void bar() {\n"
               "  foo(0);\n"
-              "}\n", true, "test.c");
+              "}\n", true, false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4482,9 +4480,8 @@ class TestNullPointer : public TestFixture {
 #define ctu(code) ctu_(code, __FILE__, __LINE__)
     void ctu_(const char code[], const char* file, int line) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         CTU::FileInfo *ctu = CTU::getFileInfo(&tokenizer);
 
diff --git a/test/testother.cpp b/test/testother.cpp
index 94e7f66e4218..eaddae272c6b 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -18,15 +18,14 @@
 
 #include "checkother.h"
 #include "errortypes.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "platform.h"
 #include "preprocessor.h"
 #include "settings.h"
 #include "standards.h"
-#include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream>
 #include <string>
 #include <vector>
 
@@ -294,7 +293,7 @@ class TestOther : public TestFixture {
     }
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const char *filename = nullptr, bool inconclusive = true, bool runSimpleChecks=true, bool verbose=false, Settings* settings = nullptr) {
+    void check_(const char* file, int line, const char code[], bool cpp = true, bool inconclusive = true, bool runSimpleChecks=true, bool verbose=false, Settings* settings = nullptr) {
         if (!settings) {
             settings = &_settings;
         }
@@ -310,9 +309,8 @@ class TestOther : public TestFixture {
         Preprocessor preprocessor(*settings);
 
         // Tokenize..
-        Tokenizer tokenizer(*settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename ? filename : "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(*settings, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         // Check..
         runChecks<CheckOther>(tokenizer, this);
@@ -321,7 +319,7 @@ class TestOther : public TestFixture {
     }
 
     void check_(const char* file, int line, const char code[], Settings *s) {
-        check_(file, line, code, "test.cpp", true, true, false, s);
+        check_(file, line, code, true, true, true, false, s);
     }
 
 #define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
@@ -350,7 +348,7 @@ class TestOther : public TestFixture {
     void checkInterlockedDecrement(const char code[]) {
         /*const*/ Settings settings = settingsBuilder().platform(Platform::Type::Win32A).build();
 
-        check(code, nullptr, false, true, false, &settings);
+        check(code, true, false, true, false, &settings);
     }
 
     void emptyBrackets() {
@@ -1146,7 +1144,7 @@ class TestOther : public TestFixture {
               "    else if(b);\n"
               "    else if(c);\n"
               "    else;\n"
-              "}", nullptr, false);
+              "}", true, false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1358,7 +1356,7 @@ class TestOther : public TestFixture {
               "        currtime = time(&dummy);\n"
               "        if (currtime > t) {}\n"
               "    }\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("[test.c:2]: (style) The scope of the variable 'currtime' can be reduced.\n", errout_str());
     }
 
@@ -1411,7 +1409,7 @@ class TestOther : public TestFixture {
               "        s.i = 0;\n"
               "        g(e, s);\n"
               "    }\n"
-              "}\n", "test.c");
+              "}\n", false);
         ASSERT_EQUALS("[test.c:4]: (style) The scope of the variable 'e' can be reduced.\n"
                       "[test.c:5]: (style) The scope of the variable 's' can be reduced.\n",
                       errout_str());
@@ -1670,7 +1668,7 @@ class TestOther : public TestFixture {
               "    else{\n"
               "         for( i = 0U; i < 5U; i++ ) {}\n"
               "    }\n"
-              "}\n", nullptr, false);
+              "}\n", true, false);
         ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 'i' can be reduced.\n", errout_str());
     }
 
@@ -1685,7 +1683,7 @@ class TestOther : public TestFixture {
               "            for( i = 0U; i < 5U; i++ ) {}\n"
               "        }\n"
               "    }\n"
-              "}\n", nullptr, false);
+              "}\n", true, false);
         ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 'i' can be reduced.\n", errout_str());
     }
 
@@ -1708,9 +1706,8 @@ class TestOther : public TestFixture {
         Preprocessor preprocessor(settings);
 
         // Tokenize..
-        Tokenizer tokenizerCpp(settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizerCpp.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizerCpp(settings, *this, &preprocessor);
+        ASSERT_LOC(tokenizerCpp.tokenize(code), file, line);
 
         CheckOther checkOtherCpp(&tokenizerCpp, &settings, this);
         checkOtherCpp.warningOldStylePointerCast();
@@ -1930,9 +1927,8 @@ class TestOther : public TestFixture {
         Preprocessor preprocessor(settings);
 
         // Tokenize..
-        Tokenizer tokenizer(settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         CheckOther checkOtherCpp(&tokenizer, &settings, this);
         checkOtherCpp.invalidPointerCast();
@@ -2240,7 +2236,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void f(S s) {\n"
               "    if (s.x > s.y) {}\n"
-              "}\n", /*filename*/ nullptr, /*inconclusive*/ true, /*runSimpleChecks*/ true, /*verbose*/ false, &settings0);
+              "}\n", /*cpp*/ true, /*inconclusive*/ true, /*runSimpleChecks*/ true, /*verbose*/ false, &settings0);
         ASSERT_EQUALS("", errout_str());
 
         check("struct S { std::list<int> l; };\n" // #12147
@@ -2274,7 +2270,7 @@ class TestOther : public TestFixture {
         /*const*/ Settings settings1 = settingsBuilder().platform(Platform::Type::Win64).build();
         check("using ui64 = unsigned __int64;\n"
               "ui64 Test(ui64 one, ui64 two) { return one + two; }\n",
-              /*filename*/ nullptr, /*inconclusive*/ true, /*runSimpleChecks*/ true, /*verbose*/ false, &settings1);
+              /*cpp*/ true, /*inconclusive*/ true, /*runSimpleChecks*/ true, /*verbose*/ false, &settings1);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4312,7 +4308,7 @@ class TestOther : public TestFixture {
               "    case 3:\n"
               "      strcpy(str, \"b'\");\n"
               "    }\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         TODO_ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:8]: (style) Buffer 'str' is being written before its old content has been used. 'break;' missing?\n",
                            "",
                            errout_str());
@@ -4343,7 +4339,7 @@ class TestOther : public TestFixture {
               "      strcpy(str, \"b'\");\n"
               "      z++;\n"
               "    }\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         TODO_ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:10]: (style) Buffer 'str' is being written before its old content has been used. 'break;' missing?\n",
                            "",
                            errout_str());
@@ -4372,7 +4368,7 @@ class TestOther : public TestFixture {
               "    case 3:\n"
               "      strcpy(str, \"b'\");\n"
               "    }\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #5158 "segmentation fault (valid code)"
@@ -4386,7 +4382,7 @@ class TestOther : public TestFixture {
               "} deflate_state;\n"
               "void f(deflate_state *s) {\n"
               "    s->dyn_ltree[0].fc.freq++;\n"
-              "}\n", nullptr, false, false);
+              "}\n", true, false, false);
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #6132 "crash: daca: kvirc CheckOther::checkRedundantAssignment()"
@@ -4396,7 +4392,7 @@ class TestOther : public TestFixture {
               "} else {\n"
               "KviKvsScript :: run ( m_szCompletionCallback , out ? out : ( g_pApp . activeConsole ( ) ) , & vParams ) ;\n"
               "}\n"
-              "}\n", nullptr, false, true);
+              "}\n", true, false, true);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -4557,7 +4553,7 @@ class TestOther : public TestFixture {
               "        y++;\n"
               "    }\n"
               "    bar(y);\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4611,7 +4607,7 @@ class TestOther : public TestFixture {
               "        y--;\n"
               "    }\n"
               "    bar(y);\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4967,20 +4963,20 @@ class TestOther : public TestFixture {
               "            continue;\n"
               "        }\n"
               "    }\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("[test.cpp:5]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout_str());
 
         check("int foo(int a) {\n"
               "    return 0;\n"
               "    return(a-1);\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("[test.cpp:3]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout_str());
 
         check("int foo(int a) {\n"
               "  A:"
               "    return(0);\n"
               "    goto A;\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("[test.cpp:3]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout_str());
 
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
@@ -4995,7 +4991,7 @@ class TestOther : public TestFixture {
         check("void foo() {\n"
               "    exit(0);\n"
               "    break;\n"
-              "}", nullptr, false, false, false, &settings);
+              "}", true, false, false, false, &settings);
         ASSERT_EQUALS("[test.cpp:3]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout_str());
 
         check("class NeonSession {\n"
@@ -5004,16 +5000,16 @@ class TestOther : public TestFixture {
               "void NeonSession::exit()\n"
               "{\n"
               "    SAL_INFO(\"ucb.ucp.webdav\", \"neon commands cannot be aborted\");\n"
-              "}", nullptr, false, false, false, &settings);
+              "}", true, false, false, false, &settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void NeonSession::exit()\n"
               "{\n"
               "    SAL_INFO(\"ucb.ucp.webdav\", \"neon commands cannot be aborted\");\n"
-              "}", nullptr, false, false, false, &settings);
+              "}", true, false, false, false, &settings);
         ASSERT_EQUALS("", errout_str());
 
-        check("void foo() { xResAccess->exit(); }", nullptr, false, false, false, &settings);
+        check("void foo() { xResAccess->exit(); }", true, false, false, false, &settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5027,7 +5023,7 @@ class TestOther : public TestFixture {
               "            c++;\n"
               "            break;\n"
               "         }\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("[test.cpp:7]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5051,7 +5047,7 @@ class TestOther : public TestFixture {
               "            break;\n"
               "          }\n"
               "       }\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("[test.cpp:6]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5063,7 +5059,7 @@ class TestOther : public TestFixture {
               "          }\n"
               "          a+=2;\n"
               "       }\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("[test.cpp:6]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5080,44 +5076,44 @@ class TestOther : public TestFixture {
         check("int foo() {\n"
               "    throw 0;\n"
               "    return 1;\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("[test.cpp:3]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout_str());
 
         check("void foo() {\n"
               "    throw 0;\n"
               "    return;\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("[test.cpp:3]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout_str());
 
         check("int foo() {\n"
               "    throw = 0;\n"
               "    return 1;\n"
-              "}", "test.c", false, false);
+              "}", false, false, false);
         ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
               "    return 0;\n"
               "    return 1;\n"
-              "}", nullptr, false, false, false);
+              "}", true, false, false, false);
         ASSERT_EQUALS("[test.cpp:3]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout_str());
 
         check("int foo() {\n"
               "    return 0;\n"
               "    foo();\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("[test.cpp:3]: (style) Statements following 'return' will never be executed.\n", errout_str());
 
         check("int foo(int unused) {\n"
               "    return 0;\n"
               "    (void)unused;\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int unused1, int unused2) {\n"
               "    return 0;\n"
               "    (void)unused1;\n"
               "    (void)unused2;\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int unused1, int unused2) {\n"
@@ -5125,7 +5121,7 @@ class TestOther : public TestFixture {
               "    (void)unused1;\n"
               "    (void)unused2;\n"
               "    foo();\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("[test.cpp:5]: (style) Statements following 'return' will never be executed.\n", errout_str());
 
         check("int foo() {\n"
@@ -5143,7 +5139,7 @@ class TestOther : public TestFixture {
               "        return 0;\n"
               "    }\n"
               "    return 124;\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("[test.cpp:4]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout_str());
 
         check("void foo() {\n"
@@ -5151,7 +5147,7 @@ class TestOther : public TestFixture {
               "        return;\n"
               "        break;\n"
               "    }\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("[test.cpp:4]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout_str());
 
         // #5707
@@ -5162,14 +5158,14 @@ class TestOther : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "    j=2;\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("[test.cpp:7]: (style) Statements following 'return' will never be executed.\n", errout_str());
 
         check("int foo() {\n"
               "    return 0;\n"
               "  label:\n"
               "    throw 0;\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("[test.cpp:3]: (style) Label 'label' is not used.\n", errout_str());
 
         check("struct A {\n"
@@ -5211,21 +5207,21 @@ class TestOther : public TestFixture {
               "    return 0;\n"
               "\n" // #endif
               "    return 1;\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("", errout_str());
         check("int foo() {\n"
               "\n" // #ifdef A
               "    return 0;\n"
               "\n" // #endif
               "    return 1;\n"
-              "}", nullptr, true, false);
+              "}", true, true, false);
         ASSERT_EQUALS("[test.cpp:5]: (style, inconclusive) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout_str());
 
         // #4711 lambda functions
         check("int f() {\n"
               "    return g([](int x){(void)x+1; return x;});\n"
               "}",
-              nullptr,
+              true,
               false,
               false);
         ASSERT_EQUALS("", errout_str());
@@ -5241,7 +5237,7 @@ class TestOther : public TestFixture {
               "             __asm__ (\"rorw $8, %w0\" : \"=r\" (__v) : \"0\" (__x) : \"cc\");\n"
               "         (void)__v;\n"
               "     }));\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("", errout_str());
 
         // #6008
@@ -5250,7 +5246,7 @@ class TestOther : public TestFixture {
               "        int sum = a_ + b_;\n"
               "        return sum;\n"
               "    };\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("", errout_str());
 
         // #5789
@@ -5258,20 +5254,20 @@ class TestOther : public TestFixture {
               "    uint64_t enter, exit;\n"
               "    uint64_t events;\n"
               "    per_state_info() : enter(0), exit(0), events(0) {}\n"
-              "};", nullptr, false, false);
+              "};", true, false, false);
         ASSERT_EQUALS("", errout_str());
 
         // #6664
         check("void foo() {\n"
               "    (beat < 100) ? (void)0 : exit(0);\n"
               "    bar();\n"
-              "}", nullptr, false, false, false, &settings);
+              "}", true, false, false, false, &settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    (beat < 100) ? exit(0) : (void)0;\n"
               "    bar();\n"
-              "}", nullptr, false, false, false, &settings);
+              "}", true, false, false, false, &settings);
         ASSERT_EQUALS("", errout_str());
 
         // #8261
@@ -5279,7 +5275,7 @@ class TestOther : public TestFixture {
         TODO_ASSERT_THROW(check("void foo() {\n"
                                 "    (beat < 100) ? (void)0 : throw(0);\n"
                                 "    bar();\n"
-                                "}", nullptr, false, false, false, &settings), InternalError);
+                                "}", true, false, false, false, &settings), InternalError);
         //ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
@@ -5718,7 +5714,7 @@ class TestOther : public TestFixture {
               "    b = 300\n"
               "  };\n"
               "};\n"
-              "const int DFLT_TIMEOUT = A::b % 1000000 ;\n", nullptr, false, false);
+              "const int DFLT_TIMEOUT = A::b % 1000000 ;\n", true, false, false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5843,10 +5839,10 @@ class TestOther : public TestFixture {
                             "    do_something();\n"
                             "}\n";
 
-        check(code, "test.cpp");
+        check(code, true);
         ASSERT_EQUALS("[test.cpp:7]: (style) Instance of 'cb_watch_bool' object is destroyed immediately.\n", errout_str());
 
-        check(code, "test.c");
+        check(code, false);
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #2639
@@ -5888,7 +5884,7 @@ class TestOther : public TestFixture {
                             "  do_something();\n"
                             "}\n";
 
-        check(code, "test.cpp");
+        check(code, true);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5901,7 +5897,7 @@ class TestOther : public TestFixture {
                             "  }\n"
                             "  Foo(char x, int y) { }\n"
                             "};\n";
-        check(code, "test.cpp");
+        check(code, true);
         ASSERT_EQUALS("[test.cpp:4]: (style) Instance of 'Foo' object is destroyed immediately.\n", errout_str());
     }
 
@@ -5916,7 +5912,7 @@ class TestOther : public TestFixture {
               "    int{ i };\n"
               "    int{ g() };\n" // don't warn
               "    g();\n"
-              "}\n", "test.cpp");
+              "}\n", true);
         ASSERT_EQUALS("[test.cpp:3]: (style) Instance of 'int' object is destroyed immediately.\n"
                       "[test.cpp:4]: (style) Instance of 'int' object is destroyed immediately.\n"
                       "[test.cpp:6]: (style) Instance of 'int' object is destroyed immediately.\n"
@@ -5926,19 +5922,19 @@ class TestOther : public TestFixture {
 
         check("void f(int j) {\n"
               "    for (; bool(j); ) {}\n"
-              "}\n", "test.cpp");
+              "}\n", true);
         ASSERT_EQUALS("", errout_str());
 
         check("void g() {\n"
               "    float (f);\n"
               "    float (*p);\n"
-              "}\n", "test.cpp");
+              "}\n", true);
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int i) {\n"
               "    void();\n"
               "    return i;\n"
-              "}\n", "test.cpp");
+              "}\n", true);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5951,7 +5947,7 @@ class TestOther : public TestFixture {
               "int f() {\n"
               "    M::N::S();\n"
               "    return 0;\n"
-              "}\n", "test.cpp");
+              "}\n", true);
         ASSERT_EQUALS("[test.cpp:7]: (style) Instance of 'M::N::S' object is destroyed immediately.\n", errout_str());
 
         check("void f() {\n" // #10057
@@ -5959,7 +5955,7 @@ class TestOther : public TestFixture {
               "    std::string{ \"abc\" };\n"
               "    std::pair<int, int>(1, 2);\n"
               "    (void)0;\n"
-              "}\n", "test.cpp");
+              "}\n", true);
         ASSERT_EQUALS("[test.cpp:2]: (style) Instance of 'std::string' object is destroyed immediately.\n"
                       "[test.cpp:3]: (style) Instance of 'std::string' object is destroyed immediately.\n"
                       "[test.cpp:4]: (style) Instance of 'std::pair' object is destroyed immediately.\n",
@@ -5976,7 +5972,7 @@ class TestOther : public TestFixture {
               "        std::scoped_lock(m);\n"
               "    }\n"
               "    std::mutex m;\n"
-              "}\n", "test.cpp");
+              "}\n", true);
         ASSERT_EQUALS("[test.cpp:3]: (style) Instance of 'std::lock_guard' object is destroyed immediately.\n"
                       "[test.cpp:6]: (style) Instance of 'std::scoped_lock' object is destroyed immediately.\n"
                       "[test.cpp:9]: (style) Instance of 'std::scoped_lock' object is destroyed immediately.\n",
@@ -5985,7 +5981,7 @@ class TestOther : public TestFixture {
         check("struct S { int i; };\n"
               "namespace {\n"
               "    S s() { return ::S{42}; }\n"
-              "}\n", "test.cpp");
+              "}\n", true);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5998,7 +5994,7 @@ class TestOther : public TestFixture {
               "void t0() { f() = {}; }\n"
               "void t1() { g() = {}; }\n"
               "void t2() { h() = {}; }\n"
-              "void t3() { *i() = {}; }\n", "test.cpp");
+              "void t3() { *i() = {}; }\n", true);
         ASSERT_EQUALS("[test.cpp:6]: (style) Instance of 'S' object is destroyed immediately, assignment has no effect.\n", errout_str());
     }
 
@@ -6042,7 +6038,7 @@ class TestOther : public TestFixture {
 
         check("void f(char c) {\n"
               "    printf(\"%i\", a + b ? 1 : 2);\n"
-              "}",nullptr,false,false);
+              "}",true,false,false);
         ASSERT_EQUALS("[test.cpp:2]: (style) Clarify calculation precedence for '+' and '?'.\n", errout_str());
 
         check("void f() {\n"
@@ -6236,7 +6232,7 @@ class TestOther : public TestFixture {
               "    else\n"
               "        ret = (unsigned char)value;\n"
               "    return ret;\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -6545,7 +6541,7 @@ class TestOther : public TestFixture {
 
         // make sure there are not "same expression" fp when there are different casts
         check("void f(long x) { if ((int32_t)x == (int64_t)x) {} }",
-              nullptr,  // filename
+              true,  // filename
               false, // inconclusive
               false, // runSimpleChecks
               false, // verbose
@@ -6604,7 +6600,7 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    enum { Four = 4 };\n"
               "    if (Four == 4) {}"
-              "}", nullptr, true, false);
+              "}", true, true, false);
         ASSERT_EQUALS("[test.cpp:3]: (style) The comparison 'Four == 4' is always true.\n",
                       errout_str());
 
@@ -6624,7 +6620,7 @@ class TestOther : public TestFixture {
               "    enum { FourInEnumOne = 4 };\n"
               "    enum { FourInEnumTwo = 4 };\n"
               "    if (FourInEnumOne == FourInEnumTwo) {}\n"
-              "}", nullptr, true, false);
+              "}", true, true, false);
         ASSERT_EQUALS("[test.cpp:4]: (style) The comparison 'FourInEnumOne == FourInEnumTwo' is always true because 'FourInEnumOne' and 'FourInEnumTwo' represent the same value.\n",
                       errout_str());
 
@@ -6663,7 +6659,7 @@ class TestOther : public TestFixture {
         check("float f(float x) { return x-x; }"); // ticket #4485 (Inf)
         ASSERT_EQUALS("", errout_str());
 
-        check("float f(float x) { return (X double)x == (X double)x; }", nullptr, false, false);
+        check("float f(float x) { return (X double)x == (X double)x; }", true, false, false);
         ASSERT_EQUALS("", errout_str());
 
         check("struct X { float f; };\n"
@@ -6737,7 +6733,7 @@ class TestOther : public TestFixture {
 
         check("void foo() {\n"
               "    if ((mystrcmp(a, b) == 0) || (mystrcmp(a, b) == 0)) {}\n"
-              "}", "test.cpp", false, true, false, &settings);
+              "}", true, false, true, false, &settings);
         ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '||'.\n", errout_str());
 
         check("void GetValue() { return rand(); }\n"
@@ -6778,7 +6774,7 @@ class TestOther : public TestFixture {
 
         check("void f(A *src) {\n"
               "    if (dynamic_cast<B*>(src) || dynamic_cast<B*>(src)) {}\n"
-              "}\n", "test.cpp", false, false); // don't run simplifications
+              "}\n", true, false, false); // don't run simplifications
         ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '||'.\n", errout_str());
 
         // #5819
@@ -8083,9 +8079,9 @@ class TestOther : public TestFixture {
             const char code[] = "void foo(unsigned int x) {\n"
                                 "  if (x < 0) {}\n"
                                 "}";
-            check(code, nullptr, false, true, false);
+            check(code, true, false, true, false);
             ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout_str());
-            check(code, nullptr, false, true, true);
+            check(code, true, false, true, true);
             ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout_str());
         }
 
@@ -8104,9 +8100,9 @@ class TestOther : public TestFixture {
                                 "  int y = 0;\n"
                                 "  if (x < y) {}\n"
                                 "}";
-            check(code, nullptr, false, true, false);
+            check(code, true, false, true, false);
             ASSERT_EQUALS("[test.cpp:3]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout_str());
-            check(code, nullptr, false, true, true);
+            check(code, true, false, true, true);
             ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout_str());
         }
         check("void foo(unsigned x) {\n"
@@ -8265,9 +8261,9 @@ class TestOther : public TestFixture {
                                 "  if (x <= n);\n"
                                 "}\n"
                                 "foo<0>();";
-            check(code, nullptr, false);
+            check(code, true, false);
             ASSERT_EQUALS("", errout_str());
-            check(code, nullptr, true);
+            check(code, true, true);
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -8329,9 +8325,9 @@ class TestOther : public TestFixture {
                                 "  int y = 0;\n"
                                 "  if (x >= y) {}\n"
                                 "}";
-            check(code, nullptr, false, true, false);
+            check(code, true, false, true, false);
             ASSERT_EQUALS("[test.cpp:3]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not.\n", errout_str());
-            check(code, nullptr, false, true, true);
+            check(code, true, false, true, true);
             ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not.\n", errout_str());
         }
         check("void foo(const int* x) {\n"
@@ -8350,9 +8346,9 @@ class TestOther : public TestFixture {
                                 "  if (x < y) {}\n"
                                 "}";
 
-            check(code, nullptr, false, true, false);
+            check(code, true, false, true, false);
             ASSERT_EQUALS("[test.cpp:3]: (style) A pointer can not be negative so it is either pointless or an error to check if it is.\n", errout_str());
-            check(code, nullptr, false, true, true);
+            check(code, true, false, true, true);
             ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) A pointer can not be negative so it is either pointless or an error to check if it is.\n", errout_str());
         }
 
@@ -8826,9 +8822,9 @@ class TestOther : public TestFixture {
                                "        tok->str(tok->strAt(2));\n"
                                "    }\n"
                                "}";
-        check(code5618, nullptr, true);
+        check(code5618, true, true);
         ASSERT_EQUALS("", errout_str());
-        check(code5618, nullptr, false);
+        check(code5618, true, false);
         ASSERT_EQUALS("", errout_str());
 
         // #5890 - crash: wesnoth desktop_util.cpp / unicode.hpp
@@ -8848,7 +8844,7 @@ class TestOther : public TestFixture {
               " \n"
               "void foo() {\n"
               "  const CD cd(CD::getOne());\n"
-              "}", nullptr, true);
+              "}", true, true);
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #10545
@@ -8861,7 +8857,7 @@ class TestOther : public TestFixture {
               "    if (i != 0)\n"
               "        return old;\n"
               "    return {};\n"
-              "}", nullptr, /*inconclusive*/ true);
+              "}", true, /*inconclusive*/ true);
         ASSERT_EQUALS("", errout_str());
 
         check("struct X { int x; };\n" // #10191
@@ -8879,7 +8875,7 @@ class TestOther : public TestFixture {
               "        modify();\n"
               "        return x.x;\n"
               "    }\n"
-              "};\n", nullptr, /*inconclusive*/ true);
+              "};\n", true, /*inconclusive*/ true);
         ASSERT_EQUALS("", errout_str());
 
         // #10704
@@ -9595,7 +9591,7 @@ class TestOther : public TestFixture {
               "   }\n"
               "   catch (const uno::Exception&)  {\n"
               "   }\n"
-              "}", "test.cpp", true);
+              "}", true, true);
         ASSERT_EQUALS("", errout_str());
 
         check("void ConvertBitmapData(sal_uInt16 nDestBits) {\n"
@@ -9604,7 +9600,7 @@ class TestOther : public TestFixture {
               "    BitmapBuffer aDstBuf;\n"
               "    aSrcBuf.mnBitCount = nDestBits;\n"
               "    bConverted = ::ImplFastBitmapConversion( aDstBuf, aSrcBuf, aTwoRects );\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("[test.c:3] -> [test.c:5]: (style) Variable 'aSrcBuf.mnBitCount' is reassigned a value before the old one has been used.\n", errout_str());
         check("void ConvertBitmapData(sal_uInt16 nDestBits) {\n"
               "    BitmapBuffer aSrcBuf;\n"
@@ -10165,32 +10161,32 @@ class TestOther : public TestFixture {
               "  if (a < 0)\n"
               "    return a++,\n"
               "  do_something();\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Comma is used in return statement. The comma can easily be misread as a ';'.\n", "", errout_str());
 
         check("int fun(int a) {\n"
               "  if (a < 0)\n"
               "    return a++, do_something();\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("", errout_str());
 
         check("int fun(int a) {\n"
               "  if (a < 0)\n"
               "    return a+5,\n"
               "  do_something();\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Comma is used in return statement. The comma can easily be misread as a ';'.\n", "", errout_str());
 
         check("int fun(int a) {\n"
               "  if (a < 0)\n"
               "    return a+5, do_something();\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("", errout_str());
 
         check("int fun(int a) {\n"
               "  if (a < 0)\n"
               "    return c<int,\nint>::b;\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("", errout_str());
 
         // #4943 take care of C++11 initializer lists
@@ -10201,7 +10197,7 @@ class TestOther : public TestFixture {
               "        { \"2\" },\n"
               "        { \"3\" }\n"
               "    };\n"
-              "}", nullptr, false, false);
+              "}", true, false, false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -10217,7 +10213,7 @@ class TestOther : public TestFixture {
               "    explicit B(A a) : a(std::move(a)) {}\n"
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
-              "};", nullptr, false, true);
+              "};", true, false, true);
         ASSERT_EQUALS("", errout_str());
 
         check("struct A\n"
@@ -10230,7 +10226,7 @@ class TestOther : public TestFixture {
               "    explicit B(A a) : a{std::move(a)} {}\n"
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
-              "};", nullptr, false, true);
+              "};", true, false, true);
         ASSERT_EQUALS("", errout_str());
 
         check("struct A\n"
@@ -10244,7 +10240,7 @@ class TestOther : public TestFixture {
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
               "    A a2;"
-              "};", nullptr, false, true);
+              "};", true, false, true);
         ASSERT_EQUALS("", errout_str());
 
         check("struct A\n"
@@ -10258,7 +10254,7 @@ class TestOther : public TestFixture {
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
               "    A a2;"
-              "};", nullptr, false, true);
+              "};", true, false, true);
         ASSERT_EQUALS("[test.cpp:8]: (performance) Function parameter 'a2' should be passed by const reference.\n", errout_str());
 
         check("struct A\n"
@@ -10272,7 +10268,7 @@ class TestOther : public TestFixture {
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
               "    A a2;"
-              "};", nullptr, false, true);
+              "};", true, false, true);
         ASSERT_EQUALS("[test.cpp:8]: (performance) Function parameter 'a2' should be passed by const reference.\n", errout_str());
 
         check("std::map<int, int> m;\n" // #10817
@@ -10335,12 +10331,12 @@ class TestOther : public TestFixture {
     void redundantPointerOp() {
         check("int *f(int *x) {\n"
               "    return &*x;\n"
-              "}\n", nullptr, true);
+              "}\n", true, true);
         ASSERT_EQUALS("[test.cpp:2]: (style) Redundant pointer operation on 'x' - it's already a pointer.\n", errout_str());
 
         check("int *f(int *y) {\n"
               "    return &(*y);\n"
-              "}\n", nullptr, true);
+              "}\n", true, true);
         ASSERT_EQUALS("[test.cpp:2]: (style) Redundant pointer operation on 'y' - it's already a pointer.\n", errout_str());
 
         check("int f() {\n" // #10991
@@ -10348,18 +10344,18 @@ class TestOther : public TestFixture {
               "    int result1 = *(&value);\n"
               "    int result2 = *&value;\n"
               "    return result1 + result2;\n"
-              "}\n", nullptr, true);
+              "}\n", true, true);
         ASSERT_EQUALS("[test.cpp:3]: (style) Redundant pointer operation on 'value' - it's already a variable.\n"
                       "[test.cpp:4]: (style) Redundant pointer operation on 'value' - it's already a variable.\n",
                       errout_str());
 
         check("void f(int& a, int b) {\n"
               "    *(&a) = b;\n"
-              "}\n", nullptr, true);
+              "}\n", true, true);
         ASSERT_EQUALS("[test.cpp:2]: (style) Redundant pointer operation on 'a' - it's already a variable.\n",
                       errout_str());
 
-        check("void f(int**& p) {}\n", nullptr, true);
+        check("void f(int**& p) {}\n", true, true);
         ASSERT_EQUALS("", errout_str());
 
         checkP("#define	RESTORE(ORIG, COPY) { *ORIG = *COPY; }\n"
@@ -10371,38 +10367,38 @@ class TestOther : public TestFixture {
         // no warning for bitwise AND
         check("void f(const int *b) {\n"
               "    int x = 0x20 & *b;\n"
-              "}\n", nullptr, true);
+              "}\n", true, true);
         ASSERT_EQUALS("", errout_str());
 
         // No message for double pointers to structs
         check("void f(struct foo **my_struct) {\n"
               "    char **pass_to_func = &(*my_struct)->buf;\n"
-              "}\n", nullptr, true);
+              "}\n", true, true);
         ASSERT_EQUALS("", errout_str());
 
         // another double pointer to struct - with an array
         check("void f(struct foo **my_struct) {\n"
               "    char **pass_to_func = &(*my_struct)->buf[10];\n"
-              "}\n", nullptr, true);
+              "}\n", true, true);
         ASSERT_EQUALS("", errout_str());
 
         // double pointer to array
         check("void f(char **ptr) {\n"
               "    int *x = &(*ptr)[10];\n"
-              "}\n", nullptr, true);
+              "}\n", true, true);
         ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'x' can be declared as pointer to const\n", errout_str());
 
         // function calls
         check("void f(Mutex *mut) {\n"
               "    pthread_mutex_lock(&*mut);\n"
-              "}\n", nullptr, false);
+              "}\n", true, false);
         ASSERT_EQUALS("[test.cpp:2]: (style) Redundant pointer operation on 'mut' - it's already a pointer.\n", errout_str());
 
         // make sure we got the AST match for "(" right
         check("void f(char *ptr) {\n"
               "    if (&*ptr == NULL)\n"
               "        return;\n"
-              "}\n", nullptr, true);
+              "}\n", true, true);
         ASSERT_EQUALS("[test.cpp:2]: (style) Redundant pointer operation on 'ptr' - it's already a pointer.\n", errout_str());
 
         // no warning for macros
@@ -10423,7 +10419,7 @@ class TestOther : public TestFixture {
     void test_isSameExpression() { // see #5738
         check("bool isInUnoIncludeFile(StringRef name) {"
               "   return  name.startswith(SRCDIR \"/com/\") || name.startswith(SRCDIR \"/uno/\");\n"
-              "};", "test.cpp", false);
+              "};", true, false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -10742,24 +10738,24 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "  int x = dostuff();\n"
               "  return x + x++;\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("[test.c:3]: (error) Expression 'x+x++' depends on order of evaluation of side effects\n", errout_str());
 
         // #7226
         check("long int f1(const char *exp) {\n"
               "  return strtol(++exp, (char **)&exp, 10);\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("", errout_str());
 
         check("long int f1(const char *exp) {\n"
               "  return dostuff(++exp, exp, 10);\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("[test.c:2]: (error) Expression '++exp,exp' depends on order of evaluation of side effects\n", errout_str());
 
         check("void f() {\n"
               "  int a;\n"
               "  while (a=x(), a==123) {}\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("", errout_str());
 
         // # 8717
@@ -10767,19 +10763,19 @@ class TestOther : public TestFixture {
               "    char **local_argv = safe_malloc(sizeof (*local_argv));\n"
               "    int local_argc = 0;\n"
               "    local_argv[local_argc++] = argv[0];\n"
-              "}\n", "test.c");
+              "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int x = 0;\n"
               "  return 0 + x++;\n"
-              "}\n", "test.c");
+              "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "  int a[10];\n"
               "  a[x+y] = a[y+x]++;;\n"
-              "}\n", "test.c");
+              "}\n", false);
         ASSERT_EQUALS("[test.c:3]: (error) Expression 'a[x+y]=a[y+x]++' depends on order of evaluation of side effects\n", errout_str());
     }
 
@@ -10787,7 +10783,7 @@ class TestOther : public TestFixture {
         // self assignment
         check("void f() {\n"
               "  int x = x = y + 1;\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS(
             "[test.c:2]: (style) Redundant assignment of 'x' to itself.\n"
             "[test.c:2]: (style) Redundant assignment of 'x' to itself.\n",   // duplicate
@@ -10807,13 +10803,13 @@ class TestOther : public TestFixture {
         // FP
         check("void f(int id) {\n"
               "  id = dostuff(id += 42);\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("", errout_str());
 
         // FN
         check("void f(int id) {\n"
               "  id = id + dostuff(id += 42);\n"
-              "}", "test.c");
+              "}", false);
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -10821,19 +10817,19 @@ class TestOther : public TestFixture {
         check("int f(void) {\n"
               "  int t;\n"
               "  return (unsigned char)(t=1,t^c);\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void) {\n"
               "  int t;\n"
               "  dostuff(t=1,t^c);\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("[test.c:3]: (error) Expression 't=1,t^c' depends on order of evaluation of side effects\n", errout_str());
 
         check("void f(void) {\n"
               "  int t;\n"
               "  dostuff((t=1,t),2);\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("", errout_str());
 
         // #8230
@@ -10841,28 +10837,28 @@ class TestOther : public TestFixture {
               "    do\n"
               "        ;\n"
               "    while (++fp, (*fp) <= 0177);\n"
-              "}\n", "test.c");
+              "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         check("void hprf(const char* fp) {\n"
               "    do\n"
               "        ;\n"
               "    while (i++, ++fp, (*fp) <= 0177);\n"
-              "}\n", "test.c");
+              "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const char* fp) {\n"
               "    do\n"
               "        ;\n"
               "    while (f(++fp, (*fp) <= 7));\n"
-              "}\n", "test.c");
+              "}\n", false);
         ASSERT_EQUALS("[test.c:4]: (error) Expression '++fp,(*fp)<=7' depends on order of evaluation of side effects\n", errout_str());
     }
 
     void testEvaluationOrderSizeof() {
         check("void f(char *buf) {\n"
               "  dostuff(buf++, sizeof(*buf));"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -10881,7 +10877,7 @@ class TestOther : public TestFixture {
               "  if (0 > d.n) {\n"
               "    return;\n"
               "  }\n"
-              "}", "test.c");
+              "}", false);
         ASSERT_EQUALS("[test.c:8]: (style) Checking if unsigned expression 'd.n' is less than zero.\n"
                       "[test.c:12]: (style) Checking if unsigned expression 'd.n' is less than zero.\n",
                       errout_str());
@@ -11278,7 +11274,7 @@ class TestOther : public TestFixture {
               "void Fred::func2(int c, int b, int a) { }\n"
               "void Fred::func3(int c, int b, int a) { }\n"
               "void Fred::func4(int c, int b, int a) { }\n",
-              nullptr, false);
+              true, false);
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Function 'func2' argument order different: declaration 'a, b, c' definition 'c, b, a'\n"
                       "[test.cpp:5] -> [test.cpp:6]: (warning) Function 'func3' argument order different: declaration ', b, c' definition 'c, b, a'\n"
                       "[test.cpp:9] -> [test.cpp:14]: (warning) Function 'func2' argument order different: declaration 'a, b, c' definition 'c, b, a'\n"
@@ -11382,7 +11378,7 @@ class TestOther : public TestFixture {
               "static int f(void) {\n"
               "    int a;\n"
               "    return 0;\n"
-              "}\n", "test.c");
+              "}\n", false);
         ASSERT_EQUALS("[test.c:1] -> [test.c:4]: (style) Local variable 'a' shadows outer variable\n", errout_str());
 
         check("int f() {\n" // #12591
diff --git a/test/testpostfixoperator.cpp b/test/testpostfixoperator.cpp
index 31588a31f81b..56a2b479d6be 100644
--- a/test/testpostfixoperator.cpp
+++ b/test/testpostfixoperator.cpp
@@ -16,14 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkpostfixoperator.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
-
-#include <sstream>
+#include "helpers.h"
+#include "settings.h"
 
 class TestPostfixOperator : public TestFixture {
 public:
@@ -35,9 +32,8 @@ class TestPostfixOperator : public TestFixture {
 #define check(code) check_(code, __FILE__, __LINE__)
     void check_(const char code[], const char* file, int line) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for postfix operators..
         CheckPostfixOperator checkPostfixOperator(&tokenizer, &settings, this);
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
index bc7ee1095fc3..1be4c3619509 100644
--- a/test/testsimplifytemplate.cpp
+++ b/test/testsimplifytemplate.cpp
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "platform.h"
 #include "settings.h"
 #include "templatesimplifier.h"
-#include "fixture.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"
@@ -31,7 +31,6 @@
 #include <string>
 #include <vector>
 
-
 class TestSimplifyTemplate : public TestFixture {
 public:
     TestSimplifyTemplate() : TestFixture("TestSimplifyTemplate") {}
@@ -311,10 +310,9 @@ class TestSimplifyTemplate : public TestFixture {
 #define tok(...) tok_(__FILE__, __LINE__, __VA_ARGS__)
     std::string tok_(const char* file, int line, const char code[], bool debugwarnings = false, Platform::Type type = Platform::Type::Native) {
         const Settings settings1 = settingsBuilder(settings).library("std.cfg").debugwarnings(debugwarnings).platform(type).build();
-        Tokenizer tokenizer(settings1, this);
+        SimpleTokenizer tokenizer(settings1, *this);
 
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         return tokenizer.tokens()->stringifyList(nullptr, true);
     }
@@ -5777,10 +5775,9 @@ class TestSimplifyTemplate : public TestFixture {
 
 #define instantiateMatch(code, numberOfArguments, patternAfter) instantiateMatch_(code, numberOfArguments, patternAfter, __FILE__, __LINE__)
     bool instantiateMatch_(const char code[], const std::size_t numberOfArguments, const char patternAfter[], const char* file, int line) {
-        Tokenizer tokenizer(settings, this);
+        SimpleTokenizer tokenizer(settings, *this);
 
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp", ""), file, line);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         return (TemplateSimplifier::instantiateMatch)(tokenizer.tokens(), numberOfArguments, false, patternAfter);
     }
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
index a4fc279427ff..3f4aff098859 100644
--- a/test/testsimplifytokens.cpp
+++ b/test/testsimplifytokens.cpp
@@ -166,33 +166,22 @@ class TestSimplifyTokens : public TestFixture {
     }
 
 #define tok(...) tok_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tok_(const char* file, int line, const char code[], Platform::Type type = Platform::Type::Native) {
+    std::string tok_(const char* file, int line, const char code[], bool cpp = true, Platform::Type type = Platform::Type::Native) {
         const Settings settings = settingsBuilder(settings0).platform(type).build();
-        Tokenizer tokenizer(settings, this);
+        SimpleTokenizer tokenizer(settings, *this);
 
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
-
-        return tokenizer.tokens()->stringifyList(nullptr, false);
-    }
-
-    std::string tok_(const char* file, int line, const char code[], const char filename[]) {
-        Tokenizer tokenizer(settings0, this);
-
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         return tokenizer.tokens()->stringifyList(nullptr, false);
     }
 
 #define tokenizeAndStringify(...) tokenizeAndStringify_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tokenizeAndStringify_(const char* file, int linenr, const char code[], bool expand = true, Platform::Type platform = Platform::Type::Native, const char* filename = "test.cpp", bool cpp11 = true) {
+    std::string tokenizeAndStringify_(const char* file, int linenr, const char code[], bool expand = true, Platform::Type platform = Platform::Type::Native, bool cpp = true, bool cpp11 = true) {
         const Settings settings = settingsBuilder(settings1).debugwarnings().platform(platform).cpp(cpp11 ? Standards::CPP11 : Standards::CPP03).build();
 
         // tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, linenr);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, linenr);
 
         if (tokenizer.tokens())
             return tokenizer.tokens()->stringifyList(false, expand, false, true, false, nullptr, nullptr);
@@ -200,10 +189,9 @@ class TestSimplifyTokens : public TestFixture {
     }
 
 #define tokenizeDebugListing(...) tokenizeDebugListing_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tokenizeDebugListing_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+    std::string tokenizeDebugListing_(const char* file, int line, const char code[], bool cpp = true) {
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         // result..
         return tokenizer.tokens()->stringifyList(true);
@@ -231,10 +219,10 @@ class TestSimplifyTokens : public TestFixture {
         ASSERT_EQUALS(tok(code2), tok(code1));
 
         const char code3[] = "x = L\"1\" TEXT(\"2\") L\"3\";";
-        ASSERT_EQUALS("x = L\"123\" ;", tok(code3, Platform::Type::Win64));
+        ASSERT_EQUALS("x = L\"123\" ;", tok(code3, true, Platform::Type::Win64));
 
         const char code4[] = "x = TEXT(\"1\") L\"2\";";
-        ASSERT_EQUALS("x = L\"1\" L\"2\" ;", tok(code4, Platform::Type::Win64));
+        ASSERT_EQUALS("x = L\"1\" L\"2\" ;", tok(code4, true, Platform::Type::Win64));
     }
 
     void combine_wstrings() {
@@ -242,9 +230,8 @@ class TestSimplifyTokens : public TestFixture {
 
         const char expected[] =  "a = L\"hello world\" ;";
 
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
     }
@@ -254,9 +241,8 @@ class TestSimplifyTokens : public TestFixture {
 
         const char expected[] =  "abcd = u\"abcd\" ;";
 
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
     }
@@ -266,9 +252,8 @@ class TestSimplifyTokens : public TestFixture {
 
         const char expected[] =  "abcd = U\"abcd\" ;";
 
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
     }
@@ -278,9 +263,8 @@ class TestSimplifyTokens : public TestFixture {
 
         const char expected[] =  "abcd = u8\"abcd\" ;";
 
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
     }
@@ -290,9 +274,8 @@ class TestSimplifyTokens : public TestFixture {
 
         const char expected[] =  "abcdef = L\"abcdef\" ;";
 
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
     }
@@ -609,71 +592,71 @@ class TestSimplifyTokens : public TestFixture {
     }
 
     void not1() {
-        ASSERT_EQUALS("void f ( ) { if ( ! p ) { ; } }", tok("void f() { if (not p); }", "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( p && ! q ) { ; } }", tok("void f() { if (p && not q); }", "test.c"));
-        ASSERT_EQUALS("void f ( ) { a = ! ( p && q ) ; }", tok("void f() { a = not(p && q); }", "test.c"));
+        ASSERT_EQUALS("void f ( ) { if ( ! p ) { ; } }", tok("void f() { if (not p); }", false));
+        ASSERT_EQUALS("void f ( ) { if ( p && ! q ) { ; } }", tok("void f() { if (p && not q); }", false));
+        ASSERT_EQUALS("void f ( ) { a = ! ( p && q ) ; }", tok("void f() { a = not(p && q); }", false));
         // Don't simplify 'not' or 'compl' if they are defined as a type;
         // in variable declaration and in function declaration/definition
-        ASSERT_EQUALS("struct not { int x ; } ;", tok("struct not { int x; };", "test.c"));
-        ASSERT_EQUALS("void f ( ) { not p ; compl c ; }", tok(" void f() { not p; compl c; }", "test.c"));
-        ASSERT_EQUALS("void foo ( not i ) ;", tok("void foo(not i);", "test.c"));
-        ASSERT_EQUALS("int foo ( not i ) { return g ( i ) ; }", tok("int foo(not i) { return g(i); }", "test.c"));
+        ASSERT_EQUALS("struct not { int x ; } ;", tok("struct not { int x; };", false));
+        ASSERT_EQUALS("void f ( ) { not p ; compl c ; }", tok(" void f() { not p; compl c; }", false));
+        ASSERT_EQUALS("void foo ( not i ) ;", tok("void foo(not i);", false));
+        ASSERT_EQUALS("int foo ( not i ) { return g ( i ) ; }", tok("int foo(not i) { return g(i); }", false));
     }
 
     void and1() {
         ASSERT_EQUALS("void f ( ) { if ( p && q ) { ; } }",
-                      tok("void f() { if (p and q) ; }", "test.c"));
+                      tok("void f() { if (p and q) ; }", false));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) && q ) { ; } }",
-                      tok("void f() { if (foo() and q) ; }", "test.c"));
+                      tok("void f() { if (foo() and q) ; }", false));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) && bar ( ) ) { ; } }",
-                      tok("void f() { if (foo() and bar()) ; }", "test.c"));
+                      tok("void f() { if (foo() and bar()) ; }", false));
 
         ASSERT_EQUALS("void f ( ) { if ( p && bar ( ) ) { ; } }",
-                      tok("void f() { if (p and bar()) ; }", "test.c"));
+                      tok("void f() { if (p and bar()) ; }", false));
 
         ASSERT_EQUALS("void f ( ) { if ( p && ! q ) { ; } }",
-                      tok("void f() { if (p and not q) ; }", "test.c"));
+                      tok("void f() { if (p and not q) ; }", false));
 
         ASSERT_EQUALS("void f ( ) { r = a && b ; }",
-                      tok("void f() { r = a and b; }", "test.c"));
+                      tok("void f() { r = a and b; }", false));
 
         ASSERT_EQUALS("void f ( ) { r = ( a || b ) && ( c || d ) ; }",
-                      tok("void f() { r = (a || b) and (c || d); }", "test.c"));
+                      tok("void f() { r = (a || b) and (c || d); }", false));
 
         ASSERT_EQUALS("void f ( ) { if ( test1 [ i ] == 'A' && test2 [ i ] == 'C' ) { } }",
-                      tok("void f() { if (test1[i] == 'A' and test2[i] == 'C') {} }", "test.c"));
+                      tok("void f() { if (test1[i] == 'A' and test2[i] == 'C') {} }", false));
     }
 
     void or1() {
         ASSERT_EQUALS("void f ( ) { if ( p || q ) { ; } }",
-                      tok("void f() { if (p or q) ; }", "test.c"));
+                      tok("void f() { if (p or q) ; }", false));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) || q ) { ; } }",
-                      tok("void f() { if (foo() or q) ; }", "test.c"));
+                      tok("void f() { if (foo() or q) ; }", false));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) || bar ( ) ) { ; } }",
-                      tok("void f() { if (foo() or bar()) ; }", "test.c"));
+                      tok("void f() { if (foo() or bar()) ; }", false));
 
         ASSERT_EQUALS("void f ( ) { if ( p || bar ( ) ) { ; } }",
-                      tok("void f() { if (p or bar()) ; }", "test.c"));
+                      tok("void f() { if (p or bar()) ; }", false));
 
         ASSERT_EQUALS("void f ( ) { if ( p || ! q ) { ; } }",
-                      tok("void f() { if (p or not q) ; }", "test.c"));
+                      tok("void f() { if (p or not q) ; }", false));
 
         ASSERT_EQUALS("void f ( ) { r = a || b ; }",
-                      tok("void f() { r = a or b; }", "test.c"));
+                      tok("void f() { r = a or b; }", false));
 
         ASSERT_EQUALS("void f ( ) { r = ( a && b ) || ( c && d ) ; }",
-                      tok("void f() { r = (a && b) or (c && d); }", "test.c"));
+                      tok("void f() { r = (a && b) or (c && d); }", false));
     }
 
     void cAlternativeTokens() {
         ASSERT_EQUALS("void f ( ) { err |= ( ( r & s ) && ! t ) ; }",
-                      tok("void f() { err or_eq ((r bitand s) and not t); }", "test.c"));
+                      tok("void f() { err or_eq ((r bitand s) and not t); }", false));
         ASSERT_EQUALS("void f ( ) const { r = f ( a [ 4 ] | 0x0F , ~ c , ! d ) ; }",
-                      tok("void f() const { r = f(a[4] bitor 0x0F, compl c, not d) ; }", "test.c"));
+                      tok("void f() const { r = f(a[4] bitor 0x0F, compl c, not d) ; }", false));
 
     }
 
@@ -1297,20 +1280,20 @@ class TestSimplifyTokens : public TestFixture {
         ASSERT_EQUALS("constexpr int foo ( ) { }", tok("consteval int foo() { }"));
         ASSERT_EQUALS("int x ; x = 0 ;", tok("constinit int x = 0;"));
         ASSERT_EQUALS("void f ( ) { int final [ 10 ] ; }", tok("void f() { int final[10]; }"));
-        ASSERT_EQUALS("int * p ;", tok("int * __restrict p;", "test.c"));
-        ASSERT_EQUALS("int * * p ;", tok("int * __restrict__ * p;", "test.c"));
-        ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * __restrict__ a, float * __restrict__ b);", "test.c"));
-        ASSERT_EQUALS("int * p ;", tok("int * restrict p;", "test.c"));
-        ASSERT_EQUALS("int * * p ;", tok("int * restrict * p;", "test.c"));
-        ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * restrict a, float * restrict b);", "test.c"));
+        ASSERT_EQUALS("int * p ;", tok("int * __restrict p;", false));
+        ASSERT_EQUALS("int * * p ;", tok("int * __restrict__ * p;", false));
+        ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * __restrict__ a, float * __restrict__ b);", false));
+        ASSERT_EQUALS("int * p ;", tok("int * restrict p;", false));
+        ASSERT_EQUALS("int * * p ;", tok("int * restrict * p;", false));
+        ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * restrict a, float * restrict b);", false));
         ASSERT_EQUALS("void foo ( int restrict ) ;", tok("void foo(int restrict);"));
-        ASSERT_EQUALS("int * p ;", tok("typedef int * __restrict__ rint; rint p;", "test.c"));
+        ASSERT_EQUALS("int * p ;", tok("typedef int * __restrict__ rint; rint p;", false));
 
         // don't remove struct members:
         ASSERT_EQUALS("a = b . _inline ;", tok("a = b._inline;"));
 
-        ASSERT_EQUALS("int i ; i = 0 ;", tok("auto int i = 0;", "test.c"));
-        ASSERT_EQUALS("auto i ; i = 0 ;", tok("auto i = 0;", "test.cpp"));
+        ASSERT_EQUALS("int i ; i = 0 ;", tok("auto int i = 0;", false));
+        ASSERT_EQUALS("auto i ; i = 0 ;", tok("auto i = 0;", true));
     }
 
     void simplifyCallingConvention() {
@@ -1330,12 +1313,12 @@ class TestSimplifyTokens : public TestFixture {
         ASSERT_EQUALS("int f ( ) ;", tok("int __far __syscall f();"));
         ASSERT_EQUALS("int f ( ) ;", tok("int __far __pascal f();"));
         ASSERT_EQUALS("int f ( ) ;", tok("int __far __fortran f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int WINAPI f();", Platform::Type::Win32A));
-        ASSERT_EQUALS("int f ( ) ;", tok("int APIENTRY f();", Platform::Type::Win32A));
-        ASSERT_EQUALS("int f ( ) ;", tok("int CALLBACK f();", Platform::Type::Win32A));
+        ASSERT_EQUALS("int f ( ) ;", tok("int WINAPI f();", true, Platform::Type::Win32A));
+        ASSERT_EQUALS("int f ( ) ;", tok("int APIENTRY f();", true, Platform::Type::Win32A));
+        ASSERT_EQUALS("int f ( ) ;", tok("int CALLBACK f();", true, Platform::Type::Win32A));
 
         // don't simplify Microsoft defines in unix code (#7554)
-        ASSERT_EQUALS("enum E { CALLBACK } ;", tok("enum E { CALLBACK } ;", Platform::Type::Unix32));
+        ASSERT_EQUALS("enum E { CALLBACK } ;", tok("enum E { CALLBACK } ;", true, Platform::Type::Unix32));
     }
 
     void simplifyAttribute() {
@@ -1531,9 +1514,8 @@ class TestSimplifyTokens : public TestFixture {
 
 #define simplifyKnownVariables(code) simplifyKnownVariables_(code, __FILE__, __LINE__)
     std::string simplifyKnownVariables_(const char code[], const char* file, int line) {
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         return tokenizer.tokens()->stringifyList(nullptr, false);
     }
@@ -2074,7 +2056,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "strcpy ( a , \"hello\" ) ;\n"
                                     "strcat ( a , \"!\" ) ;\n"
                                     "}";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Type::Native, "test.c"));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Type::Native, false));
         }
 
         {
@@ -2171,7 +2153,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "cin >> x ;\n"
                                     "return x ;\n"
                                     "}";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Type::Native, "test.cpp"));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Type::Native, true));
         }
     }
 
@@ -2185,7 +2167,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "int x ; x = 0 ;\n"
                                 "cin >> std :: hex >> x ;\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Type::Native, "test.cpp"));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Type::Native, true));
     }
 
     void simplifyKnownVariables48() {
@@ -2198,7 +2180,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "int i ;\n"
                                 "for ( i = 0 ; ( i < sz ) && ( sz > 3 ) ; ++ i ) { }\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Type::Native, false));
     }
 
     void simplifyKnownVariables49() { // #3691
@@ -2214,7 +2196,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "case 2 : ; x = sz ; break ;\n"
                                 "}\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Type::Native, false));
     }
 
     void simplifyKnownVariables50() { // #4066
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
index aa2ceb669379..4f3fc5e47d30 100644
--- a/test/testsimplifytypedef.cpp
+++ b/test/testsimplifytypedef.cpp
@@ -16,12 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "errortypes.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "platform.h"
 #include "settings.h"
-#include "fixture.h"
 #include "standards.h"
 #include "token.h"
 #include "tokenize.h"
@@ -240,10 +239,9 @@ class TestSimplifyTypedef : public TestFixture {
     std::string tok_(const char* file, int line, const char code[], bool simplify = true, Platform::Type type = Platform::Type::Native, bool debugwarnings = true) {
         // show warnings about unhandled typedef
         const Settings settings = settingsBuilder(settings0).exhaustive().certainty(Certainty::inconclusive).debugwarnings(debugwarnings).platform(type).build();
-        Tokenizer tokenizer(settings, this);
+        SimpleTokenizer tokenizer(settings, *this);
 
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         return tokenizer.tokens()->stringifyList(nullptr, !simplify);
     }
@@ -278,9 +276,8 @@ class TestSimplifyTypedef : public TestFixture {
         // Tokenize..
         // show warnings about unhandled typedef
         const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).debugwarnings().build();
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
     }
 
 
diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
index a5714103a71f..fbeb0c8de15e 100644
--- a/test/testsimplifyusing.cpp
+++ b/test/testsimplifyusing.cpp
@@ -16,12 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "errortypes.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "platform.h"
 #include "settings.h"
-#include "fixture.h"
 #include "token.h"
 #include "tokenize.h"
 #include "utils.h"
@@ -98,15 +97,18 @@ class TestSimplifyUsing : public TestFixture {
     std::string tok_(const char* file, int line, const char code[], Platform::Type type = Platform::Type::Native, bool debugwarnings = true, bool preprocess = false) {
         const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).debugwarnings(debugwarnings).platform(type).build();
 
-        Tokenizer tokenizer(settings, this);
-
         if (preprocess) {
+            Tokenizer tokenizer(settings, this);
             std::vector<std::string> files(1, "test.cpp");
             PreprocessorHelper::preprocess(code, files, tokenizer);
+            std::istringstream istr(code);
+            ASSERT_LOC(tokenizer.list.createTokens(istr, "test.cpp"), file, line); // TODO: this creates the tokens a second time
+            ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
+            return tokenizer.tokens()->stringifyList(nullptr);
         }
 
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         return tokenizer.tokens()->stringifyList(nullptr);
     }
diff --git a/test/testsizeof.cpp b/test/testsizeof.cpp
index 9a2d4366269c..9a576629c50b 100644
--- a/test/testsizeof.cpp
+++ b/test/testsizeof.cpp
@@ -18,12 +18,11 @@
 
 #include "checksizeof.h"
 #include "errortypes.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "settings.h"
-#include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream>
 #include <string>
 #include <vector>
 
@@ -51,9 +50,8 @@ class TestSizeof : public TestFixture {
 #define check(code) check_(code, __FILE__, __LINE__)
     void check_(const char code[], const char* file, int line) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check...
         runChecks<CheckSizeof>(tokenizer, this);
diff --git a/test/teststl.cpp b/test/teststl.cpp
index 4a39b9a1fa21..2cd9adc43f79 100644
--- a/test/teststl.cpp
+++ b/test/teststl.cpp
@@ -18,17 +18,16 @@
 
 #include "checkstl.h"
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "settings.h"
 #include "standards.h"
-#include "fixture.h"
 #include "tokenize.h"
 #include "utils.h"
 
 #include <cstddef>
-#include <sstream>
 #include <string>
 
-
 class TestStl : public TestFixture {
 public:
     TestStl() : TestFixture("TestStl") {}
@@ -182,10 +181,9 @@ class TestStl : public TestFixture {
         const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, inconclusive).cpp(cppstandard).build();
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this);
-        std::istringstream istr(code);
+        SimpleTokenizer tokenizer(settings1, *this);
 
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         runChecks<CheckStl>(tokenizer, this);
     }
@@ -197,9 +195,8 @@ class TestStl : public TestFixture {
 #define checkNormal(code) checkNormal_(code, __FILE__, __LINE__)
     void checkNormal_(const char code[], const char* file, int line) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         runChecks<CheckStl>(tokenizer, this);
diff --git a/test/testsummaries.cpp b/test/testsummaries.cpp
index 454131c38c5d..26b9782825ea 100644
--- a/test/testsummaries.cpp
+++ b/test/testsummaries.cpp
@@ -16,16 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
+#include "fixture.h"
+#include "helpers.h"
 #include "settings.h"
 #include "summaries.h"
-#include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream>
 #include <string>
 
-
 class TestSummaries : public TestFixture {
 public:
     TestSummaries() : TestFixture("TestSummaries") {}
@@ -39,11 +37,10 @@ class TestSummaries : public TestFixture {
     }
 
 #define createSummaries(...) createSummaries_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string createSummaries_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
+    std::string createSummaries_(const char* file, int line, const char code[], bool cpp = true) {
         // tokenize..
-        Tokenizer tokenizer(settingsDefault, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
         return Summaries::create(&tokenizer, "");
     }
 
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
index ebe28bdb9f97..3b66387caffd 100644
--- a/test/testsymboldatabase.cpp
+++ b/test/testsymboldatabase.cpp
@@ -42,19 +42,19 @@
 class TestSymbolDatabase;
 
 #define GET_SYMBOL_DB(code) \
-    Tokenizer tokenizer(settings1, this); \
-    const SymbolDatabase *db = getSymbolDB_inner(tokenizer, code, "test.cpp"); \
+    SimpleTokenizer tokenizer(settings1, *this); \
+    const SymbolDatabase *db = getSymbolDB_inner(tokenizer, code, true); \
     ASSERT(db); \
     do {} while (false)
 
 #define GET_SYMBOL_DB_C(code) \
-    Tokenizer tokenizer(settings1, this); \
-    const SymbolDatabase *db = getSymbolDB_inner(tokenizer, code, "test.c"); \
+    SimpleTokenizer tokenizer(settings1, *this); \
+    const SymbolDatabase *db = getSymbolDB_inner(tokenizer, code, false); \
     do {} while (false)
 
 #define GET_SYMBOL_DB_DBG(code) \
-    Tokenizer tokenizer(settingsDbg, this); \
-    const SymbolDatabase *db = getSymbolDB_inner(tokenizer, code, "test.cpp"); \
+    SimpleTokenizer tokenizer(settingsDbg, *this); \
+    const SymbolDatabase *db = getSymbolDB_inner(tokenizer, code, true); \
     ASSERT(db); \
     do {} while (false)
 
@@ -74,9 +74,8 @@ class TestSymbolDatabase : public TestFixture {
         typetok = nullptr;
     }
 
-    static const SymbolDatabase* getSymbolDB_inner(Tokenizer& tokenizer, const char* code, const char* filename) {
-        std::istringstream istr(code);
-        return tokenizer.tokenize(istr, filename) ? tokenizer.getSymbolDatabase() : nullptr;
+    static const SymbolDatabase* getSymbolDB_inner(SimpleTokenizer& tokenizer, const char* code, bool cpp) {
+        return tokenizer.tokenize(code, cpp) ? tokenizer.getSymbolDatabase() : nullptr;
     }
 
     static const Token* findToken(Tokenizer& tokenizer, const std::string& expr, unsigned int exprline)
@@ -101,9 +100,8 @@ class TestSymbolDatabase : public TestFixture {
                                 unsigned int exprline2,
                                 SourceLocation loc = SourceLocation::current())
     {
-        Tokenizer tokenizer(settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), loc.file_name(), loc.line());
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), loc.file_name(), loc.line());
 
         const Token* tok1 = findToken(tokenizer, expr1, exprline1);
         const Token* tok2 = findToken(tokenizer, expr2, exprline2);
@@ -2580,14 +2578,13 @@ class TestSymbolDatabase : public TestFixture {
     }
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], bool debug = true, const char filename[] = "test.cpp", const Settings* pSettings = nullptr) {
+    void check_(const char* file, int line, const char code[], bool debug = true, bool cpp = true, const Settings* pSettings = nullptr) {
         // Check..
         const Settings settings = settingsBuilder(pSettings ? *pSettings : settings1).debugwarnings(debug).exhaustive().build();
 
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         // force symbol database creation
         tokenizer.createSymbolDatabase();
@@ -3222,11 +3219,11 @@ class TestSymbolDatabase : public TestFixture {
               "static void function_declaration_after(void) __attribute__((__used__));");
         ASSERT_EQUALS("", errout_str());
 
-        check("main(int argc, char *argv[]) { }", true, "test.c");
+        check("main(int argc, char *argv[]) { }", true, false);
         ASSERT_EQUALS("", errout_str());
 
         const Settings s = settingsBuilder(settings1).severity(Severity::portability).build();
-        check("main(int argc, char *argv[]) { }", false, "test.c", &s);
+        check("main(int argc, char *argv[]) { }", false, false, &s);
         ASSERT_EQUALS("[test.c:1]: (portability) Omitted return type of function 'main' defaults to int, this is not supported by ISO C99 and later standards.\n",
                       errout_str());
 
@@ -8721,10 +8718,9 @@ class TestSymbolDatabase : public TestFixture {
         }
     }
 #define typeOf(...) typeOf_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string typeOf_(const char* file, int line, const char code[], const char pattern[], const char filename[] = "test.cpp", const Settings *settings = nullptr) {
-        Tokenizer tokenizer(settings ? *settings : settings2, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+    std::string typeOf_(const char* file, int line, const char code[], const char pattern[], bool cpp = true, const Settings *settings = nullptr) {
+        SimpleTokenizer tokenizer(settings ? *settings : settings2, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
         const Token* tok;
         for (tok = tokenizer.list.back(); tok; tok = tok->previous())
             if (Token::simpleMatch(tok, pattern, strlen(pattern)))
@@ -8747,30 +8743,30 @@ class TestSymbolDatabase : public TestFixture {
         sSameSize.platform.long_long_bit = 64;
 
         // numbers
-        ASSERT_EQUALS("signed int", typeOf("1;", "1", "test.c", &s));
-        ASSERT_EQUALS("signed int", typeOf("(-1);", "-1", "test.c", &s));
-        ASSERT_EQUALS("signed int", typeOf("32767;", "32767", "test.c", &s));
-        ASSERT_EQUALS("signed int", typeOf("(-32767);", "-32767", "test.c", &s));
-        ASSERT_EQUALS("signed long", typeOf("32768;", "32768", "test.c", &s));
-        ASSERT_EQUALS("signed long", typeOf("(-32768);", "-32768", "test.c", &s));
-        ASSERT_EQUALS("signed long", typeOf("32768l;", "32768l", "test.c", &s));
-        ASSERT_EQUALS("unsigned int", typeOf("32768U;", "32768U", "test.c", &s));
-        ASSERT_EQUALS("signed long long", typeOf("2147483648;", "2147483648", "test.c", &s));
-        ASSERT_EQUALS("unsigned long", typeOf("2147483648u;", "2147483648u", "test.c", &s));
-        ASSERT_EQUALS("signed long long", typeOf("2147483648L;", "2147483648L", "test.c", &s));
-        ASSERT_EQUALS("unsigned long long", typeOf("18446744069414584320;", "18446744069414584320", "test.c", &s));
-        ASSERT_EQUALS("signed int", typeOf("0xFF;", "0xFF", "test.c", &s));
-        ASSERT_EQUALS("unsigned int", typeOf("0xFFU;", "0xFFU", "test.c", &s));
-        ASSERT_EQUALS("unsigned int", typeOf("0xFFFF;", "0xFFFF", "test.c", &s));
-        ASSERT_EQUALS("signed long", typeOf("0xFFFFFF;", "0xFFFFFF", "test.c", &s));
-        ASSERT_EQUALS("unsigned long", typeOf("0xFFFFFFU;", "0xFFFFFFU", "test.c", &s));
-        ASSERT_EQUALS("unsigned long", typeOf("0xFFFFFFFF;", "0xFFFFFFFF", "test.c", &s));
-        ASSERT_EQUALS("signed long long", typeOf("0xFFFFFFFFFFFF;", "0xFFFFFFFFFFFF", "test.c", &s));
-        ASSERT_EQUALS("unsigned long long", typeOf("0xFFFFFFFFFFFFU;", "0xFFFFFFFFFFFFU", "test.c", &s));
-        ASSERT_EQUALS("unsigned long long", typeOf("0xFFFFFFFF00000000;", "0xFFFFFFFF00000000", "test.c", &s));
-
-        ASSERT_EQUALS("signed long", typeOf("2147483648;", "2147483648", "test.c", &sSameSize));
-        ASSERT_EQUALS("unsigned long", typeOf("0xc000000000000000;", "0xc000000000000000", "test.c", &sSameSize));
+        ASSERT_EQUALS("signed int", typeOf("1;", "1", false, &s));
+        ASSERT_EQUALS("signed int", typeOf("(-1);", "-1", false, &s));
+        ASSERT_EQUALS("signed int", typeOf("32767;", "32767", false, &s));
+        ASSERT_EQUALS("signed int", typeOf("(-32767);", "-32767", false, &s));
+        ASSERT_EQUALS("signed long", typeOf("32768;", "32768", false, &s));
+        ASSERT_EQUALS("signed long", typeOf("(-32768);", "-32768", false, &s));
+        ASSERT_EQUALS("signed long", typeOf("32768l;", "32768l", false, &s));
+        ASSERT_EQUALS("unsigned int", typeOf("32768U;", "32768U", false, &s));
+        ASSERT_EQUALS("signed long long", typeOf("2147483648;", "2147483648", false, &s));
+        ASSERT_EQUALS("unsigned long", typeOf("2147483648u;", "2147483648u", false, &s));
+        ASSERT_EQUALS("signed long long", typeOf("2147483648L;", "2147483648L", false, &s));
+        ASSERT_EQUALS("unsigned long long", typeOf("18446744069414584320;", "18446744069414584320", false, &s));
+        ASSERT_EQUALS("signed int", typeOf("0xFF;", "0xFF", false, &s));
+        ASSERT_EQUALS("unsigned int", typeOf("0xFFU;", "0xFFU", false, &s));
+        ASSERT_EQUALS("unsigned int", typeOf("0xFFFF;", "0xFFFF", false, &s));
+        ASSERT_EQUALS("signed long", typeOf("0xFFFFFF;", "0xFFFFFF", false, &s));
+        ASSERT_EQUALS("unsigned long", typeOf("0xFFFFFFU;", "0xFFFFFFU", false, &s));
+        ASSERT_EQUALS("unsigned long", typeOf("0xFFFFFFFF;", "0xFFFFFFFF", false, &s));
+        ASSERT_EQUALS("signed long long", typeOf("0xFFFFFFFFFFFF;", "0xFFFFFFFFFFFF", false, &s));
+        ASSERT_EQUALS("unsigned long long", typeOf("0xFFFFFFFFFFFFU;", "0xFFFFFFFFFFFFU", false, &s));
+        ASSERT_EQUALS("unsigned long long", typeOf("0xFFFFFFFF00000000;", "0xFFFFFFFF00000000", false, &s));
+
+        ASSERT_EQUALS("signed long", typeOf("2147483648;", "2147483648", false, &sSameSize));
+        ASSERT_EQUALS("unsigned long", typeOf("0xc000000000000000;", "0xc000000000000000", false, &sSameSize));
 
         ASSERT_EQUALS("unsigned int", typeOf("1U;", "1U"));
         ASSERT_EQUALS("signed long", typeOf("1L;", "1L"));
@@ -8827,12 +8823,12 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS("unsigned long", typeOf("(unsigned long)1 + (signed int)2;", "+"));
 
         // char
-        ASSERT_EQUALS("char", typeOf("'a';", "'a'", "test.cpp"));
-        ASSERT_EQUALS("signed int", typeOf("'a';", "'a'", "test.c"));
-        ASSERT_EQUALS("wchar_t", typeOf("L'a';", "L'a'", "test.cpp"));
-        ASSERT_EQUALS("wchar_t", typeOf("L'a';", "L'a'", "test.c"));
-        ASSERT_EQUALS("signed int", typeOf("'aaa';", "'aaa'", "test.cpp"));
-        ASSERT_EQUALS("signed int", typeOf("'aaa';", "'aaa'", "test.c"));
+        ASSERT_EQUALS("char", typeOf("'a';", "'a'", true));
+        ASSERT_EQUALS("signed int", typeOf("'a';", "'a'", false));
+        ASSERT_EQUALS("wchar_t", typeOf("L'a';", "L'a'", true));
+        ASSERT_EQUALS("wchar_t", typeOf("L'a';", "L'a'", false));
+        ASSERT_EQUALS("signed int", typeOf("'aaa';", "'aaa'", true));
+        ASSERT_EQUALS("signed int", typeOf("'aaa';", "'aaa'", false));
 
         // char *
         ASSERT_EQUALS("const char *", typeOf("\"hello\" + 1;", "+"));
@@ -8893,10 +8889,10 @@ class TestSymbolDatabase : public TestFixture {
         // shift => result has same type as lhs
         ASSERT_EQUALS("signed int", typeOf("int x; a = x << 1U;", "<<"));
         ASSERT_EQUALS("signed int", typeOf("int x; a = x >> 1U;", ">>"));
-        ASSERT_EQUALS("",           typeOf("a = 12 >> x;", ">>", "test.cpp")); // >> might be overloaded
-        ASSERT_EQUALS("signed int", typeOf("a = 12 >> x;", ">>", "test.c"));
-        ASSERT_EQUALS("",           typeOf("a = 12 << x;", "<<", "test.cpp")); // << might be overloaded
-        ASSERT_EQUALS("signed int", typeOf("a = 12 << x;", "<<", "test.c"));
+        ASSERT_EQUALS("",           typeOf("a = 12 >> x;", ">>", true)); // >> might be overloaded
+        ASSERT_EQUALS("signed int", typeOf("a = 12 >> x;", ">>", false));
+        ASSERT_EQUALS("",           typeOf("a = 12 << x;", "<<", true)); // << might be overloaded
+        ASSERT_EQUALS("signed int", typeOf("a = 12 << x;", "<<", false));
         ASSERT_EQUALS("signed int", typeOf("a = true << 1U;", "<<"));
 
         // assignment => result has same type as lhs
@@ -8906,8 +8902,8 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS("void * *", typeOf("void * x[10]; a = x + 0;", "+"));
         ASSERT_EQUALS("signed int *", typeOf("int x[10]; a = x + 1;", "+"));
         ASSERT_EQUALS("signed int",  typeOf("int x[10]; a = x[0] + 1;", "+"));
-        ASSERT_EQUALS("",            typeOf("a = x[\"hello\"];", "[", "test.cpp"));
-        ASSERT_EQUALS("const char",  typeOf("a = x[\"hello\"];", "[", "test.c"));
+        ASSERT_EQUALS("",            typeOf("a = x[\"hello\"];", "[", true));
+        ASSERT_EQUALS("const char",  typeOf("a = x[\"hello\"];", "[", false));
         ASSERT_EQUALS("signed int *", typeOf("int x[10]; a = &x;", "&"));
         ASSERT_EQUALS("signed int *", typeOf("int x[10]; a = &x[1];", "&"));
 
@@ -8977,7 +8973,7 @@ class TestSymbolDatabase : public TestFixture {
                                "</function>\n" \
                                "</def>";              \
         const Settings sF = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build(); \
-        ASSERT_EQUALS(#type, typeOf("void f() { auto x = g(); }", "x", "test.cpp", &sF)); \
+        ASSERT_EQUALS(#type, typeOf("void f() { auto x = g(); }", "x", true, &sF)); \
 } while (false)
         // *INDENT-OFF*
         CHECK_LIBRARY_FUNCTION_RETURN_TYPE(bool);
@@ -9010,12 +9006,12 @@ class TestSymbolDatabase : public TestFixture {
             settings.platform.sizeof_short = 2;
             settings.platform.sizeof_int = 4;
 
-            ASSERT_EQUALS("unsigned char", typeOf("u8'a';", "u8'a'", "test.cpp", &settings));
-            ASSERT_EQUALS("unsigned short", typeOf("u'a';", "u'a'", "test.cpp", &settings));
-            ASSERT_EQUALS("unsigned int", typeOf("U'a';", "U'a'", "test.cpp", &settings));
-            ASSERT_EQUALS("const unsigned char *", typeOf("u8\"a\";", "u8\"a\"", "test.cpp", &settings));
-            ASSERT_EQUALS("const unsigned short *", typeOf("u\"a\";", "u\"a\"", "test.cpp", &settings));
-            ASSERT_EQUALS("const unsigned int *", typeOf("U\"a\";", "U\"a\"", "test.cpp", &settings));
+            ASSERT_EQUALS("unsigned char", typeOf("u8'a';", "u8'a'", true, &settings));
+            ASSERT_EQUALS("unsigned short", typeOf("u'a';", "u'a'", true, &settings));
+            ASSERT_EQUALS("unsigned int", typeOf("U'a';", "U'a'", true, &settings));
+            ASSERT_EQUALS("const unsigned char *", typeOf("u8\"a\";", "u8\"a\"", true, &settings));
+            ASSERT_EQUALS("const unsigned short *", typeOf("u\"a\";", "u\"a\"", true, &settings));
+            ASSERT_EQUALS("const unsigned int *", typeOf("U\"a\";", "U\"a\"", true, &settings));
         }
         {
             // PodType
@@ -9033,11 +9029,11 @@ class TestSymbolDatabase : public TestFixture {
             ValueType vt2;
             ASSERT_EQUALS(true, vt2.fromLibraryType("podtype2", settingsWin64));
             ASSERT_EQUALS(ValueType::Type::INT, vt2.type);
-            ASSERT_EQUALS("unsigned int *", typeOf(";void *data = new u32[10];", "new", "test.cpp", &settingsWin64));
-            ASSERT_EQUALS("unsigned int *", typeOf(";void *data = new xyz::x[10];", "new", "test.cpp", &settingsWin64));
-            ASSERT_EQUALS("unsigned int", typeOf("; x = (xyz::x)12;", "(", "test.cpp", &settingsWin64));
-            ASSERT_EQUALS("unsigned int", typeOf(";u32(12);", "(", "test.cpp", &settingsWin64));
-            ASSERT_EQUALS("unsigned int", typeOf("x = u32(y[i]);", "(", "test.cpp", &settingsWin64));
+            ASSERT_EQUALS("unsigned int *", typeOf(";void *data = new u32[10];", "new", true, &settingsWin64));
+            ASSERT_EQUALS("unsigned int *", typeOf(";void *data = new xyz::x[10];", "new", true, &settingsWin64));
+            ASSERT_EQUALS("unsigned int", typeOf("; x = (xyz::x)12;", "(", true, &settingsWin64));
+            ASSERT_EQUALS("unsigned int", typeOf(";u32(12);", "(", true, &settingsWin64));
+            ASSERT_EQUALS("unsigned int", typeOf("x = u32(y[i]);", "(", true, &settingsWin64));
         }
         {
             // PlatformType
@@ -9072,9 +9068,9 @@ class TestSymbolDatabase : public TestFixture {
                                        "  <container id=\"C\" startPattern=\"C\"/>\n"
                                        "</def>";
             const Settings sC = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
-            ASSERT_EQUALS("container(C) *", typeOf("C*c=new C;","new","test.cpp",&sC));
-            ASSERT_EQUALS("container(C) *", typeOf("x=(C*)c;","(","test.cpp",&sC));
-            ASSERT_EQUALS("container(C)", typeOf("C c = C();","(","test.cpp",&sC));
+            ASSERT_EQUALS("container(C) *", typeOf("C*c=new C;","new",true,&sC));
+            ASSERT_EQUALS("container(C) *", typeOf("x=(C*)c;","(",true,&sC));
+            ASSERT_EQUALS("container(C)", typeOf("C c = C();","(",true,&sC));
         }
         {
             // Container (vector)
@@ -9094,31 +9090,31 @@ class TestSymbolDatabase : public TestFixture {
                                        "  </container>\n"
                                        "</def>";
             const Settings set = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
-            ASSERT_EQUALS("signed int", typeOf("Vector<int> v; v[0]=3;", "[", "test.cpp", &set));
-            ASSERT_EQUALS("container(test :: string)", typeOf("{return test::string();}", "(", "test.cpp", &set));
+            ASSERT_EQUALS("signed int", typeOf("Vector<int> v; v[0]=3;", "[", true, &set));
+            ASSERT_EQUALS("container(test :: string)", typeOf("{return test::string();}", "(", true, &set));
             ASSERT_EQUALS(
                 "container(test :: string)",
-                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "s", "test.cpp", &set));
+                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "s", true, &set));
             ASSERT_EQUALS(
                 "container(test :: string)",
-                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "+", "test.cpp", &set));
+                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "+", true, &set));
             ASSERT_EQUALS("container(test :: string) &",
-                          typeOf("Vector<test::string> v; x = v.front();", "(", "test.cpp", &set));
+                          typeOf("Vector<test::string> v; x = v.front();", "(", true, &set));
             ASSERT_EQUALS("container(test :: string) *",
-                          typeOf("Vector<test::string> v; x = v.data();", "(", "test.cpp", &set));
-            ASSERT_EQUALS("signed int &", typeOf("Vector<int> v; x = v.front();", "(", "test.cpp", &set));
-            ASSERT_EQUALS("signed int *", typeOf("Vector<int> v; x = v.data();", "(", "test.cpp", &set));
-            ASSERT_EQUALS("signed int * *", typeOf("Vector<int*> v; x = v.data();", "(", "test.cpp", &set));
-            ASSERT_EQUALS("iterator(Vector <)", typeOf("Vector<int> v; x = v.begin();", "(", "test.cpp", &set));
-            ASSERT_EQUALS("signed int &", typeOf("Vector<int> v; x = *v.begin();", "*", "test.cpp", &set));
+                          typeOf("Vector<test::string> v; x = v.data();", "(", true, &set));
+            ASSERT_EQUALS("signed int &", typeOf("Vector<int> v; x = v.front();", "(", true, &set));
+            ASSERT_EQUALS("signed int *", typeOf("Vector<int> v; x = v.data();", "(", true, &set));
+            ASSERT_EQUALS("signed int * *", typeOf("Vector<int*> v; x = v.data();", "(", true, &set));
+            ASSERT_EQUALS("iterator(Vector <)", typeOf("Vector<int> v; x = v.begin();", "(", true, &set));
+            ASSERT_EQUALS("signed int &", typeOf("Vector<int> v; x = *v.begin();", "*", true, &set));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return \"x\"+s;}", "+", "test.cpp", &set));
+                          typeOf("void foo(){test::string s; return \"x\"+s;}", "+", true, &set));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return s+\"x\";}", "+", "test.cpp", &set));
+                          typeOf("void foo(){test::string s; return s+\"x\";}", "+", true, &set));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return 'x'+s;}", "+", "test.cpp", &set));
+                          typeOf("void foo(){test::string s; return 'x'+s;}", "+", true, &set));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return s+'x';}", "+", "test.cpp", &set));
+                          typeOf("void foo(){test::string s; return s+'x';}", "+", true, &set));
         }
 
         // new
@@ -9161,7 +9157,7 @@ class TestSymbolDatabase : public TestFixture {
                                        "</def>";
             const Settings set = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
             ASSERT_EQUALS("smart-pointer(std::shared_ptr)",
-                          typeOf("class C {}; x = std::make_shared<C>();", "(", "test.cpp", &set));
+                          typeOf("class C {}; x = std::make_shared<C>();", "(", true, &set));
         }
 
         // return
@@ -9172,7 +9168,7 @@ class TestSymbolDatabase : public TestFixture {
                                        "  <container id=\"C\" startPattern=\"C\"/>\n"
                                        "</def>";
             const Settings sC = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
-            ASSERT_EQUALS("container(C)", typeOf("C f(char *p) { char data[10]; return data; }", "return", "test.cpp", &sC));
+            ASSERT_EQUALS("container(C)", typeOf("C f(char *p) { char data[10]; return data; }", "return", true, &sC));
         }
         // Smart pointer
         {
@@ -9182,9 +9178,9 @@ class TestSymbolDatabase : public TestFixture {
                                        "</def>";
             const Settings set = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
             ASSERT_EQUALS("smart-pointer(MyPtr)",
-                          typeOf("void f() { MyPtr<int> p; return p; }", "p ;", "test.cpp", &set));
-            ASSERT_EQUALS("signed int", typeOf("void f() { MyPtr<int> p; return *p; }", "* p ;", "test.cpp", &set));
-            ASSERT_EQUALS("smart-pointer(MyPtr)", typeOf("void f() {return MyPtr<int>();}", "(", "test.cpp", &set));
+                          typeOf("void f() { MyPtr<int> p; return p; }", "p ;", true, &set));
+            ASSERT_EQUALS("signed int", typeOf("void f() { MyPtr<int> p; return *p; }", "* p ;", true, &set));
+            ASSERT_EQUALS("smart-pointer(MyPtr)", typeOf("void f() {return MyPtr<int>();}", "(", true, &set));
         }
     }
 
diff --git a/test/testtoken.cpp b/test/testtoken.cpp
index 273d04984f60..cba7f7c7367e 100644
--- a/test/testtoken.cpp
+++ b/test/testtoken.cpp
@@ -16,18 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "settings.h"
 #include "errortypes.h"
 #include "fixture.h"
 #include "helpers.h"
+#include "settings.h"
 #include "standards.h"
 #include "token.h"
-#include "tokenize.h"
 #include "tokenlist.h"
 #include "vfvalue.h"
 
 #include <algorithm>
-#include <sstream>
 #include <string>
 #include <vector>
 
@@ -142,10 +140,10 @@ class TestToken : public TestFixture {
 
 #define MatchCheck(...) MatchCheck_(__FILE__, __LINE__, __VA_ARGS__)
     bool MatchCheck_(const char* file, int line, const std::string& code, const std::string& pattern, unsigned int varid = 0) {
-        Tokenizer tokenizer(settingsDefault, this);
-        std::istringstream istr(";" + code + ";");
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        const std::string code2 = ";" + code + ";";
         try {
-            ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+            ASSERT_LOC(tokenizer.tokenize(code2.c_str()), file, line);
         } catch (...) {}
         return Token::Match(tokenizer.tokens()->next(), pattern.c_str(), varid);
     }
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 559ab5779397..3331ccc31998 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -18,12 +18,12 @@
 
 #include "config.h"
 #include "errortypes.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "platform.h"
 #include "preprocessor.h" // usually tests here should not use preprocessor...
 #include "settings.h"
 #include "standards.h"
-#include "fixture.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"
@@ -452,13 +452,12 @@ class TestTokenizer : public TestFixture {
     }
 
 #define tokenizeAndStringify(...) tokenizeAndStringify_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tokenizeAndStringify_(const char* file, int linenr, const char code[], bool expand = true, Platform::Type platform = Platform::Type::Native, const char* filename = "test.cpp", Standards::cppstd_t std = Standards::CPP11) {
+    std::string tokenizeAndStringify_(const char* file, int linenr, const char code[], bool expand = true, Platform::Type platform = Platform::Type::Native, bool cpp = true, Standards::cppstd_t std = Standards::CPP11) {
         const Settings settings = settingsBuilder(settings1).debugwarnings().cpp(std).platform(platform).build();
 
         // tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, linenr);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, linenr);
 
         if (tokenizer.tokens())
             return tokenizer.tokens()->stringifyList(false, expand, false, true, false, nullptr, nullptr);
@@ -466,36 +465,33 @@ class TestTokenizer : public TestFixture {
     }
 
 #define tokenizeAndStringifyWindows(...) tokenizeAndStringifyWindows_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tokenizeAndStringifyWindows_(const char* file, int linenr, const char code[], bool expand = true, Platform::Type platform = Platform::Type::Native, const char* filename = "test.cpp", bool cpp11 = true) {
+    std::string tokenizeAndStringifyWindows_(const char* file, int linenr, const char code[], bool expand = true, Platform::Type platform = Platform::Type::Native, bool cpp = true, bool cpp11 = true) {
         const Settings settings = settingsBuilder(settings_windows).debugwarnings().cpp(cpp11 ? Standards::CPP11 : Standards::CPP03).platform(platform).build();
 
         // tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, linenr);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, linenr);
 
         if (tokenizer.tokens())
             return tokenizer.tokens()->stringifyList(false, expand, false, true, false, nullptr, nullptr);
         return "";
     }
 
-    std::string tokenizeAndStringify_(const char* file, int line, const char code[], const Settings &settings, const char filename[] = "test.cpp") {
+    std::string tokenizeAndStringify_(const char* file, int line, const char code[], const Settings &settings, bool cpp = true) {
         // tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
         if (!tokenizer.tokens())
             return "";
         return tokenizer.tokens()->stringifyList(false, true, false, true, false, nullptr, nullptr);
     }
 
 #define tokenizeDebugListing(...) tokenizeDebugListing_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tokenizeDebugListing_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
+    std::string tokenizeDebugListing_(const char* file, int line, const char code[], bool cpp = true) {
         const Settings settings = settingsBuilder(settings0).c(Standards::C89).cpp(Standards::CPP03).build();
 
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         // result..
         return tokenizer.tokens()->stringifyList(true,true,true,true,false);
@@ -783,11 +779,17 @@ class TestTokenizer : public TestFixture {
 
     void validate() {
         // C++ code in C file
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";using namespace std;",false,Platform::Type::Native,"test.c"), SYNTAX);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";std::map<int,int> m;",false,Platform::Type::Native,"test.c"), SYNTAX);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";template<class T> class X { };",false,Platform::Type::Native,"test.c"), SYNTAX);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int X<Y>() {};",false,Platform::Type::Native,"test.c"), SYNTAX);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo(int i) { reinterpret_cast<char>(i) };",false,Platform::Type::Native,"test.h"), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";using namespace std;",false,Platform::Type::Native,false), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";std::map<int,int> m;",false,Platform::Type::Native,false), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";template<class T> class X { };",false,Platform::Type::Native,false), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int X<Y>() {};",false,Platform::Type::Native,false), SYNTAX);
+        {
+            Tokenizer tokenizer(settings1, this);
+            const char code[] = "void foo(int i) { reinterpret_cast<char>(i) };";
+            std::istringstream istr(code);
+            ASSERT(tokenizer.list.createTokens(istr, "test.h"));
+            ASSERT_THROW_INTERNAL(tokenizer.simplifyTokens1(""), SYNTAX);
+        }
     }
 
     void objectiveC() {
@@ -838,14 +840,14 @@ class TestTokenizer : public TestFixture {
     void removePragma() {
         const char code[] = "_Pragma(\"abc\") int x;";
         const Settings s_c89 = settingsBuilder().c(Standards::C89).build();
-        ASSERT_EQUALS("_Pragma ( \"abc\" ) int x ;", tokenizeAndStringify(code, s_c89, "test.c"));
+        ASSERT_EQUALS("_Pragma ( \"abc\" ) int x ;", tokenizeAndStringify(code, s_c89, false));
         const Settings s_clatest = settingsBuilder().c(Standards::CLatest).build();
-        ASSERT_EQUALS("int x ;", tokenizeAndStringify(code, s_clatest, "test.c"));
+        ASSERT_EQUALS("int x ;", tokenizeAndStringify(code, s_clatest, false));
 
         const Settings s_cpp03 = settingsBuilder().cpp(Standards::CPP03).build();
-        ASSERT_EQUALS("_Pragma ( \"abc\" ) int x ;", tokenizeAndStringify(code, s_cpp03, "test.cpp"));
+        ASSERT_EQUALS("_Pragma ( \"abc\" ) int x ;", tokenizeAndStringify(code, s_cpp03, true));
         const Settings s_cpplatest = settingsBuilder().cpp(Standards::CPPLatest).build();
-        ASSERT_EQUALS("int x ;", tokenizeAndStringify(code, s_cpplatest, "test.cpp"));
+        ASSERT_EQUALS("int x ;", tokenizeAndStringify(code, s_cpplatest, true));
     }
 
     void foreach () {
@@ -1530,9 +1532,8 @@ class TestTokenizer : public TestFixture {
         {
             const char code[] = "extern \"C\" int foo();";
             // tokenize..
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             // Expected result..
             ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
             ASSERT(tokenizer.tokens()->next()->isExternC());
@@ -1540,9 +1541,8 @@ class TestTokenizer : public TestFixture {
         {
             const char code[] = "extern \"C\" { int foo(); }";
             // tokenize..
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             // Expected result..
             ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
             ASSERT(tokenizer.tokens()->next()->isExternC());
@@ -1550,9 +1550,8 @@ class TestTokenizer : public TestFixture {
         {
             const char code[] = "extern \"C++\" int foo();";
             // tokenize..
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             // Expected result..
             ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
             ASSERT(!tokenizer.tokens()->next()->isExternC());
@@ -1560,9 +1559,8 @@ class TestTokenizer : public TestFixture {
         {
             const char code[] = "extern \"C++\" { int foo(); }";
             // tokenize..
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             // Expected result..
             ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
             ASSERT(!tokenizer.tokens()->next()->isExternC());
@@ -2303,7 +2301,7 @@ class TestTokenizer : public TestFixture {
 
     void vardecl14() {
         const char code[] = "::std::tr1::shared_ptr<int> pNum1, pNum2;\n";
-        ASSERT_EQUALS(":: std :: tr1 :: shared_ptr < int > pNum1 ; :: std :: tr1 :: shared_ptr < int > pNum2 ;", tokenizeAndStringify(code, false, Platform::Type::Native, "test.cpp", Standards::CPP03));
+        ASSERT_EQUALS(":: std :: tr1 :: shared_ptr < int > pNum1 ; :: std :: tr1 :: shared_ptr < int > pNum2 ;", tokenizeAndStringify(code, false, Platform::Type::Native, true, Standards::CPP03));
     }
 
     void vardecl15() {
@@ -2510,7 +2508,7 @@ class TestTokenizer : public TestFixture {
     void vardecl26() { // #5907
         const char code[] = "extern int *new, obj, player;";
         const char expected[] = "extern int * new ; extern int obj ; extern int player ;";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Type::Native, false));
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS("[test.cpp:1]: (debug) Scope::checkVariable found variable 'new' with varid 0.\n", errout_str());
     }
@@ -2522,7 +2520,7 @@ class TestTokenizer : public TestFixture {
                             "    return 0;\n"
                             "  return 0;\n"
                             "}";
-        tokenizeAndStringify(code, /*expand=*/ true, Platform::Type::Native, "test.c");
+        tokenizeAndStringify(code, /*expand=*/ true, Platform::Type::Native, false);
     }
 
     void vardecl28() {
@@ -2534,7 +2532,7 @@ class TestTokenizer : public TestFixture {
                       "const unsigned short x ; x = 1 ;\n"
                       "return x ;\n"
                       "}",
-                      tokenizeAndStringify(code, /*expand=*/ true, Platform::Type::Native, "test.c"));
+                      tokenizeAndStringify(code, /*expand=*/ true, Platform::Type::Native, false));
     }
 
     void vardecl29() { // #9282
@@ -2554,9 +2552,9 @@ class TestTokenizer : public TestFixture {
     void vardecl30() {
         const char code[] = "struct D {} const d;";
         ASSERT_EQUALS("struct D { } ; struct D const d ;",
-                      tokenizeAndStringify(code, true, Platform::Type::Native, "test.cpp"));
+                      tokenizeAndStringify(code, true, Platform::Type::Native, true));
         ASSERT_EQUALS("struct D { } ; struct D const d ;",
-                      tokenizeAndStringify(code, true, Platform::Type::Native, "test.c"));
+                      tokenizeAndStringify(code, true, Platform::Type::Native, false));
     }
 
     void vardecl31() {
@@ -2627,15 +2625,15 @@ class TestTokenizer : public TestFixture {
     }
 
     void implicitIntConst() {
-        ASSERT_EQUALS("const int x ;", tokenizeAndStringify("const x;", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("const int * x ;", tokenizeAndStringify("const *x;", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();", true, Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS("const int x ;", tokenizeAndStringify("const x;", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("const int * x ;", tokenizeAndStringify("const *x;", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();", true, Platform::Type::Native, false));
     }
 
     void implicitIntExtern() {
-        ASSERT_EQUALS("extern int x ;", tokenizeAndStringify("extern x;", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("extern int * x ;", tokenizeAndStringify("extern *x;", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();", true, Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS("extern int x ;", tokenizeAndStringify("extern x;", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("extern int * x ;", tokenizeAndStringify("extern *x;", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();", true, Platform::Type::Native, false));
     }
 
     /**
@@ -2869,27 +2867,27 @@ class TestTokenizer : public TestFixture {
         {
             const char code[] = "float complex x;";
             const char expected[] = "_Complex float x ;";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Native, "test.c"));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Native, false));
         }
         {
             const char code[] = "complex float x;";
             const char expected[] = "_Complex float x ;";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Native, "test.c"));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Native, false));
         }
         {
             const char code[] = "complex long double x;";
             const char expected[] = "_Complex long double x ;";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Native, "test.c"));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Native, false));
         }
         {
             const char code[] = "long double complex x;";
             const char expected[] = "_Complex long double x ;";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Native, "test.c"));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Native, false));
         }
         {
             const char code[] = "double complex;";
             const char expected[] = "double complex ;";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Native, "test.c"));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Native, false));
         }
     }
 
@@ -2898,9 +2896,8 @@ class TestTokenizer : public TestFixture {
             const char code[] = "class A{\n"
                                 " void f() {}\n"
                                 "};";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // A body {}
             ASSERT_EQUALS(true, tok->linkAt(2) == tok->tokAt(9));
@@ -2922,9 +2919,8 @@ class TestTokenizer : public TestFixture {
                                 " char a[10];\n"
                                 " char *b ; b = new char[a[0]];\n"
                                 "};";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // a[10]
             ASSERT_EQUALS(true, tok->linkAt(7) == tok->tokAt(9));
@@ -2945,9 +2941,8 @@ class TestTokenizer : public TestFixture {
             const char code[] = "void f(){\n"
                                 " foo(g());\n"
                                 "};";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // foo(
             ASSERT_EQUALS(true, tok->linkAt(6) == tok->tokAt(10));
@@ -2964,9 +2959,8 @@ class TestTokenizer : public TestFixture {
             const char code[] = "bool foo(C<z> a, bar<int, x<float>>& f, int b) {\n"
                                 "    return(a<b && b>f);\n"
                                 "}";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // template<
             ASSERT_EQUALS(true, tok->tokAt(6) == tok->linkAt(4));
@@ -2991,9 +2985,8 @@ class TestTokenizer : public TestFixture {
             const char code[] = "void foo() {\n"
                                 "    return static_cast<bar>(a);\n"
                                 "}";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             // static_cast<
@@ -3007,9 +3000,8 @@ class TestTokenizer : public TestFixture {
             const char code[] = "void foo() {\n"
                                 "    nvwa<(x > y)> ERROR_nnn;\n"
                                 "}";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             // nvwa<(x > y)>
@@ -3022,9 +3014,8 @@ class TestTokenizer : public TestFixture {
         {
             // #4860
             const char code[] = "class A : public B<int> {};";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             // B<..>
@@ -3037,9 +3028,8 @@ class TestTokenizer : public TestFixture {
         {
             // #4860
             const char code[] = "Bar<Typelist< int, Typelist< int, Typelist< int, FooNullType>>>>::set(1, 2, 3);";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->tokAt(1) == tok->linkAt(18));
@@ -3053,9 +3043,8 @@ class TestTokenizer : public TestFixture {
         {
             // #5627
             const char code[] = "new Foo<Bar>[10];";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->tokAt(2) == tok->linkAt(4));
@@ -3068,9 +3057,8 @@ class TestTokenizer : public TestFixture {
         {
             // #6242
             const char code[] = "func = integral_<uchar, int, double>;";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->tokAt(3) == tok->linkAt(9));
@@ -3082,9 +3070,8 @@ class TestTokenizer : public TestFixture {
         {
             // if (a < b || c > d) { }
             const char code[] = "{ if (a < b || c > d); }";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->linkAt(3) == nullptr);
@@ -3093,9 +3080,8 @@ class TestTokenizer : public TestFixture {
         {
             // bool f = a < b || c > d
             const char code[] = "bool f = a < b || c > d;";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->linkAt(4) == nullptr);
@@ -3104,9 +3090,8 @@ class TestTokenizer : public TestFixture {
         {
             // template
             const char code[] = "a < b || c > d;";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(5));
@@ -3115,9 +3100,8 @@ class TestTokenizer : public TestFixture {
         {
             // if (a < ... > d) { }
             const char code[] = "{ if (a < b || c == 3 || d > e); }";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->linkAt(3) == nullptr);
@@ -3126,9 +3110,8 @@ class TestTokenizer : public TestFixture {
         {
             // template
             const char code[] = "a<b==3 || c> d;";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(7));
         }
@@ -3136,18 +3119,16 @@ class TestTokenizer : public TestFixture {
         {
             // template
             const char code[] = "a<b || c==4> d;";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(7));
         }
 
         {
             const char code[] = "template < f = b || c > struct S;";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(7));
             ASSERT_EQUALS(true, tok->tokAt(1) == tok->linkAt(7));
@@ -3155,9 +3136,8 @@ class TestTokenizer : public TestFixture {
 
         {
             const char code[] = "struct A : B<c&&d> {};";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(4) == tok->tokAt(8));
             ASSERT_EQUALS(true, tok->tokAt(4) == tok->linkAt(8));
@@ -3165,9 +3145,8 @@ class TestTokenizer : public TestFixture {
 
         {
             const char code[] = "Data<T&&>;";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(4));
             ASSERT_EQUALS(true, tok->tokAt(1) == tok->linkAt(4));
@@ -3176,9 +3155,8 @@ class TestTokenizer : public TestFixture {
         {
             // #6601
             const char code[] = "template<class R> struct FuncType<R(&)()> : FuncType<R()> { };";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(4)); // <class R>
@@ -3195,9 +3173,8 @@ class TestTokenizer : public TestFixture {
         {
             // #7158
             const char code[] = "enum { value = boost::mpl::at_c<B, C> };";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = Token::findsimplematch(tokenizer.tokens(), "<");
             ASSERT_EQUALS(true, tok->link() == tok->tokAt(4));
             ASSERT_EQUALS(true, tok->linkAt(4) == tok);
@@ -3208,9 +3185,8 @@ class TestTokenizer : public TestFixture {
             const char code[] = "template <typename T, typename U>\n"
                                 "struct CheckedDivOp< T, U, typename std::enable_if<std::is_floating_point<T>::value || std::is_floating_point<U>::value>::type> {\n"
                                 "};\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "struct")->tokAt(2);
             const Token *tok2 = Token::findsimplematch(tokenizer.tokens(), "{")->previous();
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3220,9 +3196,8 @@ class TestTokenizer : public TestFixture {
         {
             // #7975
             const char code[] = "template <class C> X<Y&&Z, C*> copy() {};\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "< Y");
             const Token *tok2 = Token::findsimplematch(tok1, "> copy");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3232,9 +3207,8 @@ class TestTokenizer : public TestFixture {
         {
             // #8006
             const char code[] = "C<int> && a = b;";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = tokenizer.tokens()->next();
             const Token *tok2 = tok1->tokAt(2);
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3244,9 +3218,8 @@ class TestTokenizer : public TestFixture {
         {
             // #8115
             const char code[] = "void Test(C<int> && c);";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "<");
             const Token *tok2 = tok1->tokAt(2);
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3256,9 +3229,8 @@ class TestTokenizer : public TestFixture {
             // #8654
             const char code[] = "template<int N> struct A {}; "
                                 "template<int... Ns> struct foo : A<Ns>... {};";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *A = Token::findsimplematch(tokenizer.tokens(), "A <");
             ASSERT_EQUALS(true, A->next()->link() == A->tokAt(3));
         }
@@ -3266,18 +3238,16 @@ class TestTokenizer : public TestFixture {
             // #8851
             const char code[] = "template<typename std::enable_if<!(std::value1) && std::value2>::type>"
                                 "void basic_json() {}";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT_EQUALS(true, Token::simpleMatch(tokenizer.tokens()->next()->link(), "> void"));
         }
 
         {
             // #9094 - template usage or comparison?
             const char code[] = "a = f(x%x<--a==x>x);";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr == Token::findsimplematch(tokenizer.tokens(), "<")->link());
         }
 
@@ -3286,9 +3256,8 @@ class TestTokenizer : public TestFixture {
             const char code[] = "using std::same_as;\n"
                                 "template<same_as<int> T>\n"
                                 "void f();";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "template <");
             const Token *tok2 = Token ::findsimplematch(tokenizer.tokens(), "same_as <");
             ASSERT(tok1->next()->link() == tok1->tokAt(7));
@@ -3298,9 +3267,8 @@ class TestTokenizer : public TestFixture {
         {
             // #9131 - template usage or comparison?
             const char code[] = "using std::list; list<t *> l;";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "<")->link());
         }
 
@@ -3310,9 +3278,8 @@ class TestTokenizer : public TestFixture {
                                 "{\n"
                                 "    for (set<ParticleSource*>::iterator i = sources.begin(); i != sources.end(); ++i) {}\n"
                                 "}";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "<")->link());
         }
 
@@ -3322,9 +3289,8 @@ class TestTokenizer : public TestFixture {
                                 "  a<> b;\n"
                                 "  b.a<>::c();\n"
                                 "}\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> ::")->link());
         }
 
@@ -3334,9 +3300,8 @@ class TestTokenizer : public TestFixture {
                                 "template <char... b> struct c {\n"
                                 "  void d() { a<b...>[0]; }\n"
                                 "};\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> [")->link());
         }
 
@@ -3347,9 +3312,8 @@ class TestTokenizer : public TestFixture {
                                 "template <typename e> using f = c<e() && sizeof(int), int>;\n"
                                 "template <typename e, typename = f<e>> struct g {};\n"
                                 "template <typename e> using baz = g<e>;\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> ;")->link());
         }
 
@@ -3362,9 +3326,8 @@ class TestTokenizer : public TestFixture {
                                 "template <int> using c = a;\n"
                                 "template <int d> c<d> e;\n"
                                 "auto f = -e<1> == 0;\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> ==")->link());
         }
 
@@ -3381,18 +3344,16 @@ class TestTokenizer : public TestFixture {
                                 "constexpr void b<a, d>::operator()(c &&) const {\n"
                                 "  i<3>.f([] {});\n"
                                 "}\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> . f (")->link());
         }
 
         {
             // #10491
             const char code[] = "template <template <class> class> struct a;\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< class");
             const Token* tok2 = Token::findsimplematch(tok1, "> class");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3402,9 +3363,8 @@ class TestTokenizer : public TestFixture {
         {
             // #10491
             const char code[] = "template <template <class> class> struct a;\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< template");
             const Token* tok2 = Token::findsimplematch(tok1, "> struct");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3414,9 +3374,8 @@ class TestTokenizer : public TestFixture {
         {
             // #10552
             const char code[] = "v.value<QPair<int, int>>()\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< QPair");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3426,9 +3385,8 @@ class TestTokenizer : public TestFixture {
         {
             // #10552
             const char code[] = "v.value<QPair<int, int>>()\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< int");
             const Token* tok2 = Token::findsimplematch(tok1, "> > (");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3438,9 +3396,8 @@ class TestTokenizer : public TestFixture {
         {
             // #10615
             const char code[] = "struct A : public B<__is_constructible()>{};\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< >");
             const Token* tok2 = Token::findsimplematch(tok1, "> { } >");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3450,9 +3407,8 @@ class TestTokenizer : public TestFixture {
         {
             // #10664
             const char code[] = "class C1 : public T1<D2<C2>const> {};\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< C2");
             const Token* tok2 = Token::findsimplematch(tok1, "> const");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3466,9 +3422,8 @@ class TestTokenizer : public TestFixture {
                                 "void f() {\n"
                                 "    if (a<int>[0]) {}\n"
                                 "}\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< int");
             const Token* tok2 = Token::findsimplematch(tok1, "> [");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3481,9 +3436,8 @@ class TestTokenizer : public TestFixture {
                                 "    int b[2] = {};\n"
                                 "    if (b[idx<1>]) {}\n"
                                 "}\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< 1");
             const Token* tok2 = Token::findsimplematch(tok1, "> ]");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3494,9 +3448,8 @@ class TestTokenizer : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    []<typename T>() {};\n"
                                 "}\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< T");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3507,9 +3460,8 @@ class TestTokenizer : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    auto g = [] <typename A, typename B> (A a, B&& b) { return a < b; };\n"
                                 "}\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< A");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3522,9 +3474,8 @@ class TestTokenizer : public TestFixture {
                                 "        return [] <typename T> () {};\n"
                                 "    };\n"
                                 "}\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< T");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3540,9 +3491,8 @@ class TestTokenizer : public TestFixture {
                                 "    S s;\n"
                                 "    s.operator()<int, int>(1);\n"
                                 "}\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< int");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3557,9 +3507,8 @@ class TestTokenizer : public TestFixture {
                                 "        std::is_same<typename T::size_type, std::size_t>::value && std::is_same<typename T::size_type, std::size_t>::value\n"
                                 "        >();\n"
                                 "}\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< bool");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3570,9 +3519,8 @@ class TestTokenizer : public TestFixture {
             const char code[] = "double f() {\n"
                                 "    return std::is_same_v<int, double> ? 1e-7 : 1e-3;\n"
                                 "}\n";
-            Tokenizer tokenizer(settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< int");
             const Token* tok2 = Token::findsimplematch(tok1, "> ?");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3671,17 +3619,17 @@ class TestTokenizer : public TestFixture {
         // Pointer to standard type
         ASSERT_EQUALS("char buf [ 100 ] ; readlink ( path , buf , 99 ) ;",
                       tokenizeAndStringify("char buf[100] ; readlink(path, &buf[0], 99);",
-                                           true, Platform::Type::Native, "test.c"));
+                                           true, Platform::Type::Native, false));
         ASSERT_EQUALS("", errout_str());
 
         ASSERT_EQUALS("void foo ( char * c ) { if ( 1 == ( 1 & c [ 0 ] ) ) { } }",
                       tokenizeAndStringify("void foo(char *c) { if (1==(1 & c[0])) {} }",
-                                           true, Platform::Type::Native, "test.c"));
+                                           true, Platform::Type::Native, false));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         // Simplification of unknown type - C only
         ASSERT_EQUALS("foo data [ 100 ] ; something ( foo ) ;",
-                      tokenizeAndStringify("foo data[100]; something(&foo[0]);", true, Platform::Type::Native, "test.c"));
+                      tokenizeAndStringify("foo data[100]; something(&foo[0]);", true, Platform::Type::Native, false));
         ASSERT_EQUALS("", errout_str());
 
         // C++: No pointer simplification
@@ -3809,9 +3757,8 @@ class TestTokenizer : public TestFixture {
         const char expected[] = "void func1 ( ) ; void func2 ( ) ; void func3 ( ) ; void func4 ( ) ; void func5 ( ) ; void func6 ( ) ;";
 
         // tokenize..
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -3836,9 +3783,8 @@ class TestTokenizer : public TestFixture {
         const char expected[] = "extern vas_f * VAS_Fail ;";
 
         // tokenize..
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
 
         const Token * VAS_Fail = Token::findsimplematch(tokenizer.tokens(), "VAS_Fail");
@@ -3850,9 +3796,8 @@ class TestTokenizer : public TestFixture {
         const char expected[] = "void ( * func_notret ) ( void ) ;";
 
         // tokenize..
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
 
         const Token* func_notret = Token::findsimplematch(tokenizer.tokens(), "func_notret");
@@ -3864,9 +3809,8 @@ class TestTokenizer : public TestFixture {
         const char expected[] = "int & foo ( ) ;";
 
         // tokenize..
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
 
         const Token* foo = Token::findsimplematch(tokenizer.tokens(), "foo");
@@ -3878,9 +3822,8 @@ class TestTokenizer : public TestFixture {
         const char expected[] = "void func1 ( ) ;";
 
         // tokenize..
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -3899,9 +3842,8 @@ class TestTokenizer : public TestFixture {
         const char expected[] = "void func1 ( ) ; void func2 ( ) ; void func3 ( ) ; void func4 ( ) ; void func5 ( ) ;";
 
         // tokenize..
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -3927,9 +3869,8 @@ class TestTokenizer : public TestFixture {
         const char expected[] = "class foo { public: bool operator== ( const foo & ) ; } ;";
 
         // tokenize..
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -3951,9 +3892,8 @@ class TestTokenizer : public TestFixture {
                                 "void func6 ( ) ; void func7 ( ) ; void func8 ( ) ;";
 
         // tokenize..
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -3990,9 +3930,8 @@ class TestTokenizer : public TestFixture {
                                 "void func6 ( ) ; void func7 ( ) ; void func8 ( ) ;";
 
         // tokenize..
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -4645,9 +4584,8 @@ class TestTokenizer : public TestFixture {
     void bitfields16() {
         const char code[] = "struct A { unsigned int x : 1; };";
 
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
         const Token *x = Token::findsimplematch(tokenizer.tokens(), "x");
         ASSERT_EQUALS(1, x->bits());
     }
@@ -4893,42 +4831,42 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyCAlternativeTokens() {
-        ASSERT_EQUALS("void or ( ) ;", tokenizeAndStringify("void or(void);", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }", true, Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }", true, Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }", true, Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }", true, Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }", true, Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }", true, Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }", true, Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) const { if ( ! b ) { ; } }", tokenizeAndStringify("void f() const { if (not b); }", true, Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }", true, Platform::Type::Native, "test.cpp"));
+        ASSERT_EQUALS("void or ( ) ;", tokenizeAndStringify("void or(void);", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }", true, Platform::Type::Native, true));
+        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }", true, Platform::Type::Native, true));
+        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }", true, Platform::Type::Native, true));
+        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }", true, Platform::Type::Native, true));
+        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }", true, Platform::Type::Native, true));
+        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }", true, Platform::Type::Native, true));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }", true, Platform::Type::Native, true));
+        ASSERT_EQUALS("void f ( ) const { if ( ! b ) { ; } }", tokenizeAndStringify("void f() const { if (not b); }", true, Platform::Type::Native, true));
+        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }", true, Platform::Type::Native, true));
         // #6201
-        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }", true, Platform::Type::Native, "test.cpp"));
+        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }", true, Platform::Type::Native, true));
         // #6029
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }", true, Platform::Type::Native, "test.cpp"));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }", true, Platform::Type::Native, true));
         // #6207
-        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }", true, Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }", true, Platform::Type::Native, "test.cpp"));
+        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }", true, Platform::Type::Native, true));
         // #8029
-        ASSERT_EQUALS("void f ( struct S * s ) { x = s . and + 1 ; }", tokenizeAndStringify("void f(struct S *s) { x = s->and + 1; }", true, Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS("void f ( struct S * s ) { x = s . and + 1 ; }", tokenizeAndStringify("void f(struct S *s) { x = s->and + 1; }", true, Platform::Type::Native, false));
         // #8745
         ASSERT_EQUALS("void f ( ) { if ( x ) { or = 0 ; } }", tokenizeAndStringify("void f() { if (x) or = 0; }"));
         // #9324
         ASSERT_EQUALS("void f ( const char * str ) { while ( * str == '!' || * str == '[' ) { } }",
                       tokenizeAndStringify("void f(const char *str) { while (*str=='!' or *str=='['){} }"));
         // #9920
-        ASSERT_EQUALS("result = ch != s . end ( ) && * ch == ':' ;", tokenizeAndStringify("result = ch != s.end() and *ch == ':';", true, Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS("result = ch != s . end ( ) && * ch == ':' ;", tokenizeAndStringify("result = ch != s.end() and *ch == ':';", true, Platform::Type::Native, false));
 
         // #8975
         ASSERT_EQUALS("void foo ( ) {\n"
@@ -4939,9 +4877,9 @@ class TestTokenizer : public TestFixture {
                           "void foo() {\n"
                           "  char *or;\n"
                           "  while ((*or != 0) && (*or != '|')) or++;\n"
-                          "}", true, Platform::Type::Native, "test.c"));
+                          "}", true, Platform::Type::Native, false));
         // #10013
-        ASSERT_EQUALS("void f ( ) { x = ! 123 ; }", tokenizeAndStringify("void f() { x = not 123; }", true, Platform::Type::Native, "test.cpp"));
+        ASSERT_EQUALS("void f ( ) { x = ! 123 ; }", tokenizeAndStringify("void f() { x = not 123; }", true, Platform::Type::Native, true));
 
         { // #12476
             const char code[] = "struct S { int a, b; };"
@@ -4949,7 +4887,7 @@ class TestTokenizer : public TestFixture {
                                 "    compl->a = compl->b;"
                                 "}";
             const char exp[] = "struct S { int a ; int b ; } ; void f ( struct S * compl ) { compl . a = compl . b ; }";
-            ASSERT_EQUALS(exp, tokenizeAndStringify(code, true, Platform::Type::Native, "test.c"));
+            ASSERT_EQUALS(exp, tokenizeAndStringify(code, true, Platform::Type::Native, false));
         }
 
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
@@ -4974,7 +4912,7 @@ class TestTokenizer : public TestFixture {
                               "operator ( ) ; "
                               "}";
 
-        ASSERT_EQUALS(result, tokenizeAndStringify(code, /*expand=*/ true, /*platform=*/ Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS(result, tokenizeAndStringify(code, /*expand=*/ true, /*platform=*/ Platform::Type::Native, false));
     }
 
     void simplifyOperatorName2() {
@@ -5833,10 +5771,10 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("[[deprecated]] int f();"));
 
         ASSERT_EQUALS("[ [ deprecated ] ] int f ( ) ;",
-                      tokenizeAndStringify("[[deprecated]] int f();", true, Platform::Type::Native, "test.cpp", Standards::CPP03));
+                      tokenizeAndStringify("[[deprecated]] int f();", true, Platform::Type::Native, true, Standards::CPP03));
 
         ASSERT_EQUALS("[ [ deprecated ] ] int f ( ) ;",
-                      tokenizeAndStringify("[[deprecated]] int f();", true, Platform::Type::Native, "test.c"));
+                      tokenizeAndStringify("[[deprecated]] int f();", true, Platform::Type::Native, false));
 
         ASSERT_EQUALS("template < class T > int f ( ) { }",
                       tokenizeAndStringify("template <class T> [[noreturn]] int f(){}"));
@@ -5845,7 +5783,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("[[maybe_unused]] int f([[maybe_unused]] int i);"));
 
         ASSERT_EQUALS("[ [ maybe_unused ] ] int f ( [ [ maybe_unused ] ] int i ) ;",
-                      tokenizeAndStringify("[[maybe_unused]] int f([[maybe_unused]] int i);", true, Platform::Type::Native, "test.cpp", Standards::CPP03));
+                      tokenizeAndStringify("[[maybe_unused]] int f([[maybe_unused]] int i);", true, Platform::Type::Native, true, Standards::CPP03));
 
         ASSERT_EQUALS("struct a ;",
                       tokenizeAndStringify("struct [[]] a;"));
@@ -6765,7 +6703,7 @@ class TestTokenizer : public TestFixture {
                                              "        return y;\n"
                                              "    else\n"
                                              "        return z;\n"
-                                             "}\n", true, Platform::Type::Native, "test.cpp", Standards::CPP17));
+                                             "}\n", true, Platform::Type::Native, true, Standards::CPP17));
         ignore_errout();
 
         // #10079 - createInnerAST bug..
@@ -6899,9 +6837,8 @@ class TestTokenizer : public TestFixture {
 
 #define isStartOfExecutableScope(offset, code) isStartOfExecutableScope_(offset, code, __FILE__, __LINE__)
     bool isStartOfExecutableScope_(int offset, const char code[], const char* file, int line) {
-        Tokenizer tokenizer(settings0, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         return Tokenizer::startOfExecutableScope(tokenizer.tokens()->tokAt(offset)) != nullptr;
     }
@@ -6934,7 +6871,7 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("class Fred : Base { } ;", tokenizeAndStringify("class Fred FINAL : Base { } ;"));
         ASSERT_EQUALS("class Fred : Base { } ;", tokenizeAndStringify("class DLLEXPORT Fred final : Base { } ;")); // #11422
         // Regression for C code:
-        ASSERT_EQUALS("struct Fred { } ;", tokenizeAndStringify("struct DLLEXPORT Fred { } ;", true, Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS("struct Fred { } ;", tokenizeAndStringify("struct DLLEXPORT Fred { } ;", true, Platform::Type::Native, false));
     }
 
     void sizeofAddParentheses() {
@@ -6992,17 +6929,17 @@ class TestTokenizer : public TestFixture {
 
         ASSERT_NO_THROW(tokenizeAndStringify("void f(void* q) {\n"
                                              "    g(&(S) { .p = (int*)q });\n"
-                                             "}\n", /*expand*/ true, Platform::Type::Native, "test.c"));
+                                             "}\n", /*expand*/ true, Platform::Type::Native, false));
 
         ASSERT_NO_THROW(tokenizeAndStringify("typedef struct { int i; } S;\n"
                                              "void f(float a) {\n"
                                              "S s = (S){ .i = (int)a };\n"
-                                             "}\n", /*expand*/ true, Platform::Type::Native, "test.c"));
+                                             "}\n", /*expand*/ true, Platform::Type::Native, false));
 
         ASSERT_THROW_INTERNAL(tokenizeAndStringify("std::string g();\n"
-                                                   "std::string f() {\n"
-                                                   "    return std::string{ g() + \"abc\" MACRO \"def\" };\n"
-                                                   "}\n", /*expand*/ true, Platform::Type::Native, "test.cpp"), UNKNOWN_MACRO);
+                                          "std::string f() {\n"
+                                          "    return std::string{ g() + \"abc\" MACRO \"def\" };\n"
+                                          "}\n", /*expand*/ true, Platform::Type::Native, true), UNKNOWN_MACRO);
     }
 
     void findGarbageCode() { // Test Tokenizer::findGarbageCode()
@@ -7090,7 +7027,7 @@ class TestTokenizer : public TestFixture {
         ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { assert(a+()); }"), SYNTAX, "syntax error: +()");
 
         // #9445 - typeof is not a keyword in C
-        ASSERT_NO_THROW(tokenizeAndStringify("void foo() { char *typeof, *value; }", false, Platform::Type::Native, "test.c"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void foo() { char *typeof, *value; }", false, Platform::Type::Native, false));
 
         ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("enum : { };"), SYNTAX, "syntax error: Unexpected token '{'");
         ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("enum : 3 { };"), SYNTAX, "syntax error: Unexpected token '3'");
@@ -7667,9 +7604,8 @@ class TestTokenizer : public TestFixture {
         const Settings s = settingsBuilder().checkConfiguration().build();
 
         // tokenize..
-        Tokenizer tokenizer(s, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(s, *this);
+        ASSERT(tokenizer.tokenize(code));
     }
 
     void checkConfiguration() {
@@ -7689,9 +7625,8 @@ class TestTokenizer : public TestFixture {
                       "V::Type value;";
 
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         tokenizer.printUnknownTypes();
 
@@ -7708,9 +7643,8 @@ class TestTokenizer : public TestFixture {
                             "a = reinterpret_cast<int>(x);\n"
                             "a = static_cast<int>(x);\n";
 
-        Tokenizer tokenizer(settingsDefault, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             ASSERT_EQUALS(tok->str() == "(", tok->isCast());
@@ -7843,9 +7777,8 @@ class TestTokenizer : public TestFixture {
     void cpp11init() {
         #define testIsCpp11init(...) testIsCpp11init_(__FILE__, __LINE__, __VA_ARGS__)
         auto testIsCpp11init_ = [this](const char* file, int line, const char* code, const char* find, TokenImpl::Cpp11init expected) {
-            Tokenizer tokenizer(settingsDefault, this);
-            std::istringstream istr(code);
-            ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
+            ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
             const Token* tok = Token::findsimplematch(tokenizer.tokens(), find, strlen(find));
             ASSERT_LOC(tok, file, line);
diff --git a/test/testtokenrange.cpp b/test/testtokenrange.cpp
index 63c4173c1f72..641f9b3344fe 100644
--- a/test/testtokenrange.cpp
+++ b/test/testtokenrange.cpp
@@ -98,18 +98,18 @@ class TestTokenRange : public TestFixture {
     }
 
     void scopeExample() {
-        Tokenizer tokenizer(settingsDefault, this);
-        std::istringstream sample("void a(){} void main(){ if(true){a();} }");
-        ASSERT(tokenizer.tokenize(sample, "test.cpp"));
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        ASSERT(tokenizer.tokenize(code));
 
         const SymbolDatabase* sd = tokenizer.getSymbolDatabase();
         const Scope& scope = *std::next(sd->scopeList.cbegin(), 3); //The scope of the if block
 
-        std::ostringstream contents;
+        std::string contents;
         for (const Token* t : ConstTokenRange{ scope.bodyStart->next(), scope.bodyEnd }) {
-            contents << t->str();
+            contents += t->str();
         }
-        ASSERT_EQUALS("a();", contents.str());
+        ASSERT_EQUALS("a();", contents);
     }
 
     void exampleAlgorithms() const {
diff --git a/test/testtype.cpp b/test/testtype.cpp
index 785131a6b6db..17eebb60c9ba 100644
--- a/test/testtype.cpp
+++ b/test/testtype.cpp
@@ -18,16 +18,15 @@
 
 #include "checktype.h"
 #include "errortypes.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "platform.h"
 #include "preprocessor.h"
 #include "settings.h"
 #include "standards.h"
-#include "fixture.h"
 #include "tokenize.h"
 
 #include <list>
-#include <sstream>
 #include <string>
 #include <vector>
 
@@ -51,13 +50,12 @@ class TestType : public TestFixture {
     }
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const Settings& settings, const char filename[] = "test.cpp", Standards::cppstd_t standard = Standards::cppstd_t::CPP11) {
+    void check_(const char* file, int line, const char code[], const Settings& settings, bool cpp = true, Standards::cppstd_t standard = Standards::cppstd_t::CPP11) {
         const Settings settings1 = settingsBuilder(settings).severity(Severity::warning).severity(Severity::portability).cpp(standard).build();
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         // Check..
         runChecks<CheckType>(tokenizer, this);
@@ -113,9 +111,9 @@ class TestType : public TestFixture {
                 ASSERT_EQUALS("", errout_str());
 
                 // c++14
-                check((type + " foo(" + type + " x) { return x << 31; }").c_str(), settings, "test.cpp", Standards::cppstd_t::CPP14);
+                check((type + " foo(" + type + " x) { return x << 31; }").c_str(), settings, true, Standards::cppstd_t::CPP14);
                 ASSERT_EQUALS("[test.cpp:1]: (portability) Shifting signed 32-bit value by 31 bits is implementation-defined behaviour\n", errout_str());
-                check((type + " f(int x) { return (x = (" + type + ")x << 32); }").c_str(), settings, "test.cpp", Standards::cppstd_t::CPP14);
+                check((type + " f(int x) { return (x = (" + type + ")x << 32); }").c_str(), settings, true, Standards::cppstd_t::CPP14);
                 ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 32-bit value by 32 bits is undefined behaviour\n", errout_str());
             }
         }
@@ -148,11 +146,11 @@ class TestType : public TestFixture {
             ASSERT_EQUALS("", errout_str());
 
             // c++14
-            check("signed long long foo(signed long long x) { return x << 64; }",settings, "test.cpp", Standards::cppstd_t::CPP14);
+            check("signed long long foo(signed long long x) { return x << 64; }",settings, true, Standards::cppstd_t::CPP14);
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("signed long long f(long long x) { return (x = (signed long long)x << 64); }",settings, "test.cpp", Standards::cppstd_t::CPP14);
+            check("signed long long f(long long x) { return (x = (signed long long)x << 64); }",settings, true, Standards::cppstd_t::CPP14);
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("signed long long f(signed long long x) { return x << 63; }",settings, "test.cpp", Standards::cppstd_t::CPP14);
+            check("signed long long f(signed long long x) { return x << 63; }",settings, true, Standards::cppstd_t::CPP14);
             ASSERT_EQUALS("[test.cpp:1]: (portability) Shifting signed 64-bit value by 63 bits is implementation-defined behaviour\n", errout_str());
             check("signed long long f(signed long long x) { return x << 62; }",settings);
             ASSERT_EQUALS("", errout_str());
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
index 5bf5e615ebc3..66faadff3fdc 100644
--- a/test/testuninitvar.cpp
+++ b/test/testuninitvar.cpp
@@ -20,15 +20,14 @@
 #include "checkuninitvar.h"
 #include "ctu.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
+#include "helpers.h"
+#include "settings.h"
 #include "tokenize.h"
 
 #include <list>
-#include <sstream>
 #include <string>
 
-
 class TestUninitVar : public TestFixture {
 public:
     TestUninitVar() : TestFixture("TestUninitVar") {}
@@ -107,13 +106,12 @@ class TestUninitVar : public TestFixture {
     }
 
 #define checkUninitVar(...) checkUninitVar_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkUninitVar_(const char* file, int line, const char code[], const char fname[] = "test.cpp", bool debugwarnings = false, const Settings *s = nullptr) {
+    void checkUninitVar_(const char* file, int line, const char code[], bool cpp = true, bool debugwarnings = false, const Settings *s = nullptr) {
         const Settings settings1 = settingsBuilder(s ? *s : settings).debugwarnings(debugwarnings).build();
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, fname), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         // Check for redundant code..
         CheckUninitVar checkuninitvar(&tokenizer, &settings1, this);
@@ -323,7 +321,7 @@ class TestUninitVar : public TestFixture {
                        "    int x, y;\n"
                        "    x = (y = 10);\n"
                        "    int z = y * 2;\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void foo() {\n"
@@ -343,7 +341,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("int f() {\n"
                        "    int a,b,c;\n"
                        "    a = b = c;\n"
-                       "}", "test.cpp", /*debugwarnings=*/ false);
+                       "}", true, /*debugwarnings=*/ false);
         ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: c\n", errout_str());
 
         checkUninitVar("static void foo()\n"
@@ -375,7 +373,7 @@ class TestUninitVar : public TestFixture {
                            "    A ret;\n"
                            "    return ret;\n"
                            "}\n",
-                           "test.c");
+                           false);
             ASSERT_EQUALS("[test.c:4]: (error) Uninitialized variable: ret\n", errout_str());
         }
         // extracttests.enable
@@ -385,7 +383,7 @@ class TestUninitVar : public TestFixture {
                        "  union lf { long l; float f; } u_lf;\n"
                        "  float hx = (u_lf.f = (x), u_lf.l);\n"
                        "}",
-                       "test.c", false);
+                       false, false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a()\n"
@@ -401,7 +399,7 @@ class TestUninitVar : public TestFixture {
                        "    int *y = &x;\n"
                        "    *y = 0;\n"
                        "    x++;\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a()\n"
@@ -410,7 +408,7 @@ class TestUninitVar : public TestFixture {
                        "    char *z = x;\n"
                        "    memset(z, 0, sizeof(x));\n"
                        "    memcpy(y, x, sizeof(x));\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
 
         // Handling >> and <<
@@ -445,7 +443,7 @@ class TestUninitVar : public TestFixture {
                            "    int ret;\n"
                            "    int a = value >> ret;\n"
                            "}\n",
-                           "test.c");
+                           false);
             ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: ret\n", errout_str());
 
             checkUninitVar("void foo() {\n"   // #3707
@@ -466,7 +464,7 @@ class TestUninitVar : public TestFixture {
                            "    int ret;\n"
                            "    a = value << ret;\n"
                            "}\n",
-                           "test.c");
+                           false);
             ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: ret\n", errout_str());
 
             // #4320 says this is a FP. << is overloaded.
@@ -665,7 +663,7 @@ class TestUninitVar : public TestFixture {
                        "\n"
                        "found:\n"
                        "    int a = b;\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
@@ -700,7 +698,7 @@ class TestUninitVar : public TestFixture {
                        "    goto exit;\n"
                        "    i++;\n"
                        "exit:\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
@@ -710,7 +708,7 @@ class TestUninitVar : public TestFixture {
                        "    x = a;\n"
                        "    y = 1;\n"
                        "    goto again;\n"
-                       "}", "test.c", false);
+                       "}", false, false);
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #3873 (false positive)
@@ -735,7 +733,7 @@ class TestUninitVar : public TestFixture {
                        "        iter = x;\n"
                        "    }\n"
                        "    return 1 + iter;\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
 
         // C++11 style initialization
@@ -797,11 +795,11 @@ class TestUninitVar : public TestFixture {
                             "}";
 
         // Assume dfs is a non POD type if file is C++
-        checkUninitVar(code, "test.cpp");
+        checkUninitVar(code, true);
         ASSERT_EQUALS("", errout_str());
 
         // Assume dfs is a POD type if file is C
-        checkUninitVar(code, "test.c");
+        checkUninitVar(code, false);
         ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: a\n", errout_str());
 
         const char code2[] = "struct AB { int a,b; };\n"
@@ -809,10 +807,10 @@ class TestUninitVar : public TestFixture {
                              "    struct AB ab;\n"
                              "    return ab;\n"
                              "}";
-        checkUninitVar(code2, "test.cpp");
+        checkUninitVar(code2, true);
         ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized struct member: ab.a\n"
                       "[test.cpp:4]: (error) Uninitialized struct member: ab.b\n", errout_str());
-        checkUninitVar(code2, "test.c");
+        checkUninitVar(code2, false);
         ASSERT_EQUALS("[test.c:4]: (error) Uninitialized variable: ab\n", errout_str());
 
         // Ticket #3890 - False positive for std::map
@@ -826,7 +824,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f() {\n"
                        "    std::vector<int> *x = NULL;\n"
                        "    return x;\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -839,7 +837,7 @@ class TestUninitVar : public TestFixture {
             checkUninitVar("void f() {\n"
                            "  Fred _tm;\n"
                            "  _tm.dostuff();\n"
-                           "}", "test.cpp", false, &s);
+                           "}", true, false, &s);
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -848,7 +846,7 @@ class TestUninitVar : public TestFixture {
                        "    A a,b;\n"
                        "    b[0] = 0;"
                        "    return a;\n"
-                       "}", "test.c", false);
+                       "}", false, false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -973,7 +971,7 @@ class TestUninitVar : public TestFixture {
                        "        i = 33;\n"
                        "    }\n"
                        "    return i;\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void foo(int x)\n"
@@ -1217,7 +1215,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f() {\n"
                        "  X var;\n"
                        "  memset(var, 0, sizeof(var));\n"
-                       "}", "test.c");
+                       "}", false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f() {\n" // #8692
@@ -1579,7 +1577,7 @@ class TestUninitVar : public TestFixture {
                        "        break;\n"
                        "    };\n"
                        "    })\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1772,7 +1770,7 @@ class TestUninitVar : public TestFixture {
                        "   char *buffer=(char*)malloc(128*sizeof(char));\n"
                        "   strcpy(strMsg,buffer);\n"
                        "   free(buffer);\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("[test.cpp:4]: (error) Memory is allocated but not initialized: buffer\n", errout_str());
 
         checkUninitVar("void f(){\n"
@@ -1780,7 +1778,7 @@ class TestUninitVar : public TestFixture {
                        "   char *buffer=static_cast<char*>(malloc(128*sizeof(char)));\n"
                        "   strcpy(strMsg,buffer);\n"
                        "   free(buffer);\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("[test.cpp:4]: (error) Memory is allocated but not initialized: buffer\n", errout_str());
 
         // #3845
@@ -1835,7 +1833,7 @@ class TestUninitVar : public TestFixture {
                        "void f() {\n"
                        "  struct Fred fred[10];\n"
                        "  fred[1].x = 0;\n"
-                       "}", "test.c");
+                       "}", false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("char f() {\n"
@@ -2075,7 +2073,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("int main() {\n"
                        "    char * pBuf = new(10);\n"
                        "    a = *pBuf;\n"
-                       "}", "test.c");
+                       "}", false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("class A {};\n" // #10698
@@ -2149,7 +2147,7 @@ class TestUninitVar : public TestFixture {
                        "        int a,b;\n"
                        "        int get_a() { return a; }"
                        "    } = { 0, 0 };\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
@@ -2162,7 +2160,7 @@ class TestUninitVar : public TestFixture {
                        "        i = 0;\n"
                        "    }\n"
                        "    return i;\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
@@ -2191,7 +2189,7 @@ class TestUninitVar : public TestFixture {
                        "    int &b = a;\n"
                        "    b = 0;\n"
                        "    int x = a;\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(struct blame_entry *ent)\n"
@@ -2250,7 +2248,7 @@ class TestUninitVar : public TestFixture {
             checkUninitVar("static int foo() {\n"
                            "    int ret;\n"
                            "    return cin >> ret;\n"
-                           "}\n", "test.c");
+                           "}\n", false);
             ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: ret\n", errout_str());
         }
 
@@ -2388,7 +2386,7 @@ class TestUninitVar : public TestFixture {
                        "    char a[100];\n"
                        "    strncpy(a, \"hello\", sizeof(a));\n"
                        "    strncat(a, \"world\", 20);\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
 
         // #3245 - false positive
@@ -2421,7 +2419,7 @@ class TestUninitVar : public TestFixture {
                        "  const char* source = \"You\";\n"
                        "  strncpy(dst, source, sizeof(dst));\n"
                        "  char value = dst[2];\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2487,7 +2485,7 @@ class TestUninitVar : public TestFixture {
 
         checkUninitVar("void f() {\n"
                        "    int *n = ({ typeof(*n) z;  (typeof(*n)*)z; })\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2584,7 +2582,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f() {\n"  // #3926 - weird cast.
                        "    int x;\n"
                        "    *(((char *)&x) + 0) = 0;\n"
-                       "}", "test.c", false);
+                       "}", false, false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n" // #4737 - weird cast.
@@ -2596,7 +2594,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    char *p = (char*)&x + 1;\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -2645,10 +2643,10 @@ class TestUninitVar : public TestFixture {
                                 "    int x;\n"
                                 "    if (i >> x) { }\n"
                                 "}";
-            checkUninitVar(code, "test.cpp");
+            checkUninitVar(code, true);
             ASSERT_EQUALS("", errout_str());
 
-            checkUninitVar(code, "test.c");
+            checkUninitVar(code, false);
             ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: x\n", errout_str());
         }
 
@@ -2727,7 +2725,7 @@ class TestUninitVar : public TestFixture {
                        "out1:\n"
                        "out2:\n"
                        "    return ret;\n"
-                       "}", "test.c");
+                       "}", false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -2789,7 +2787,7 @@ class TestUninitVar : public TestFixture {
                        "    int i;\n"
                        "    ({ if (0); });\n"
                        "    for_each(i) { }\n"
-                       "}", "test.c", false);
+                       "}", false, false);
 
         // if, if
         checkUninitVar("void f(int a) {\n"
@@ -2836,7 +2834,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("static void f(int x, int y) {\n"
                        "    int a;\n"
                        "    if (x == 0 && (a == 1)) { }\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -2859,7 +2857,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x) ab = getAB();\n"
                        "    else ab.a = 0;\n"
                        "    if (ab.a == 1) b = ab.b;\n"
-                       "}", "test.c");
+                       "}", false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(void) {\n"
@@ -3043,7 +3041,7 @@ class TestUninitVar : public TestFixture {
 
         checkUninitVar("void f() {\n" // #4717 - ({})
                        "    int a = ({ long b = (long)(123); 2 + b; });\n"
-                       "}", "test.c");
+                       "}", false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3086,7 +3084,7 @@ class TestUninitVar : public TestFixture {
                             "    int syncpos, len;\n"
                             "    Sync(syncpos, type, len);\n"
                             "}";
-        checkUninitVar(code, "test.cpp");
+        checkUninitVar(code, true);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3095,7 +3093,7 @@ class TestUninitVar : public TestFixture {
                             "void f1() { char *p; *p = 0; }\n"
                             "class Ns::C* p;\n"
                             "void f2() { char *p; *p = 0; }";
-        checkUninitVar(code, "test.cpp");
+        checkUninitVar(code, true);
         ASSERT_EQUALS("[test.cpp:2]: (error) Uninitialized variable: p\n"
                       "[test.cpp:4]: (error) Uninitialized variable: p\n", errout_str());
     }
@@ -3115,7 +3113,7 @@ class TestUninitVar : public TestFixture {
                             "    int bar = 1;\n"
                             "    return bar;\n"
                             "}";
-        checkUninitVar(code, "test.cpp");
+        checkUninitVar(code, true);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3125,7 +3123,7 @@ class TestUninitVar : public TestFixture {
                             "    int x;\n"
                             "    x = get(x) && x;\n"
                             "}";
-        checkUninitVar(code, "test.cpp");
+        checkUninitVar(code, true);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3411,19 +3409,19 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void write_packet() {\n"
                        "    time_t now0;\n"
                        "    time(&now0);\n"
-                       "}", "test.c");
+                       "}", false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void write_packet() {\n"
                        "    time_t* now0;\n"
                        "    time(now0);\n"
-                       "}", "test.c");
+                       "}", false);
         ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: now0\n", errout_str());
 
         checkUninitVar("void write_packet() {\n"
                        "    char now0;\n"
                        "    strcmp(&now0, sth);\n"
-                       "}", "test.c");
+                       "}", false);
         ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: now0\n", errout_str());
 
         // #2775 - uninitialized struct pointer in subfunction
@@ -3465,7 +3463,7 @@ class TestUninitVar : public TestFixture {
                        "        if (y != 0) return;\n"
                        "        i++;\n"
                        "    }\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -3475,7 +3473,7 @@ class TestUninitVar : public TestFixture {
                        "        if (y != 0) return;\n"
                        "        i++;\n"
                        "    }\n"
-                       "}", "test.cpp", false);
+                       "}", true, false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -3579,7 +3577,7 @@ class TestUninitVar : public TestFixture {
                         "        i++;\n"
                         "    }\n"
                         "}",
-                        "test.cpp");
+                        true);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -3590,7 +3588,7 @@ class TestUninitVar : public TestFixture {
                         "        i++;\n"
                         "    }\n"
                         "}",
-                        "test.cpp");
+                        true);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -3714,7 +3712,7 @@ class TestUninitVar : public TestFixture {
                         "        break;\n"
                         "    }\n"
                         "    ++c;\n"
-                        "}", "test.c");
+                        "}", false);
         ASSERT_EQUALS("", errout_str());
 
         // #12030
@@ -3847,7 +3845,7 @@ class TestUninitVar : public TestFixture {
                         "    int x;\n"
                         "    *(((char *)&x) + 0) = 0;\n"
                         "}",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #4737 - weird cast.
@@ -3860,7 +3858,7 @@ class TestUninitVar : public TestFixture {
                         "    int x;\n"
                         "    char *p = (char*)&x + 1;\n"
                         "}",
-                        "test.cpp");
+                        true);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -3909,10 +3907,10 @@ class TestUninitVar : public TestFixture {
                                 "    int x;\n"
                                 "    if (i >> x) { }\n"
                                 "}";
-            valueFlowUninit(code, "test.cpp");
+            valueFlowUninit(code, true);
             ASSERT_EQUALS("", errout_str());
 
-            valueFlowUninit(code, "test.c");
+            valueFlowUninit(code, false);
             ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: x\n", errout_str());
         }
 
@@ -3992,7 +3990,7 @@ class TestUninitVar : public TestFixture {
                         "out2:\n"
                         "    return ret;\n"
                         "}",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -4055,7 +4053,7 @@ class TestUninitVar : public TestFixture {
                         "    ({ if (0); });\n"
                         "    for_each(i) { }\n"
                         "}",
-                        "test.c");
+                        false);
 
         // if, if
         valueFlowUninit("void f(int a) {\n"
@@ -4103,7 +4101,7 @@ class TestUninitVar : public TestFixture {
                         "    int a;\n"
                         "    if (x == 0 && (a == 1)) { }\n"
                         "}",
-                        "test.cpp");
+                        true);
         ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -4127,7 +4125,7 @@ class TestUninitVar : public TestFixture {
                         "    else ab.a = 0;\n"
                         "    if (ab.a == 1) b = ab.b;\n"
                         "}",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(void) {\n"
@@ -4313,7 +4311,7 @@ class TestUninitVar : public TestFixture {
         valueFlowUninit("void f() {\n" // #4717 - ({})
                         "    int a = ({ long b = (long)(123); 2 + b; });\n"
                         "}",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4325,7 +4323,7 @@ class TestUninitVar : public TestFixture {
                         "void foo() {\n"
                         "  struct myst item;\n"
                         "  bar(&item);\n"
-                        "}", "test.c");
+                        "}", false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct myst { int a; };\n"
@@ -4334,7 +4332,7 @@ class TestUninitVar : public TestFixture {
                         "  struct myst item;\n"
                         "  bar(&item);\n"
                         "  a = item.a;\n" // <- item.a is not initialized
-                        "}", "test.c");
+                        "}", false);
         ASSERT_EQUALS("[test.c:6]: (error) Uninitialized variable: item.a\n", errout_str());
 
         valueFlowUninit("struct myst { int a; };\n"
@@ -4343,7 +4341,7 @@ class TestUninitVar : public TestFixture {
                         "  struct myst item;\n"
                         "  bar(&item);\n"
                         "  a = item.a;\n"
-                        "}", "test.c");
+                        "}", false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int& r) {}\n" // #12536
@@ -4382,7 +4380,7 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    ab.a = 0;\n"
                        "    do_something(ab);\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("[test.c:6]: (error) Uninitialized struct member: ab.b\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n" // #4760
@@ -4390,7 +4388,7 @@ class TestUninitVar : public TestFixture {
                        "void f(void) {\n"
                        "    struct AB ab;\n"
                        "    do_something(ab.a);\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("[test.c:5]: (error) Uninitialized struct member: ab.a\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4406,7 +4404,7 @@ class TestUninitVar : public TestFixture {
                        "void f(void) {\n"
                        "    struct AB ab;\n"
                        "    int a = ab.a;\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("[test.c:4]: (error) Uninitialized struct member: ab.a\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4420,7 +4418,7 @@ class TestUninitVar : public TestFixture {
                        "void f(void) {\n"
                        "    struct AB ab;\n"
                        "    buf[ab.a] = 0;\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("[test.c:4]: (error) Uninitialized struct member: ab.a\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4428,7 +4426,7 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    ab.a = 1;\n"
                        "    x = ab;\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("[test.c:5]: (error) Uninitialized struct member: ab.b\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4436,7 +4434,7 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    ab.a = 1;\n"
                        "    x = *(&ab);\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("[test.c:5]: (error) Uninitialized struct member: ab.b\n", errout_str());
 
         checkUninitVar("void f(void) {\n"
@@ -4444,7 +4442,7 @@ class TestUninitVar : public TestFixture {
                        "    int x;\n"
                        "    ab.a = (addr)&x;\n"
                        "    dostuff(&ab,0);\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct Element {\n"
@@ -4515,7 +4513,7 @@ class TestUninitVar : public TestFixture {
                        "void f(void) {\n"
                        "    struct AB ab;\n"
                        "    assign(&ab.a, 0);\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct Cstring { char *text; int size, alloc; };\n"
@@ -4544,7 +4542,7 @@ class TestUninitVar : public TestFixture {
                            "    struct AB ab;\n"
                            "    uninitvar_funcArgInTest(&ab);\n"
                            "    x = ab;\n"
-                           "}\n", "test.c", false, &s);
+                           "}\n", false, false, &s);
             ASSERT_EQUALS("[test.c:5]: (error) Uninitialized struct member: ab.a\n", errout_str());
 
             checkUninitVar("struct AB { int a; };\n"
@@ -4552,7 +4550,7 @@ class TestUninitVar : public TestFixture {
                            "    struct AB ab;\n"
                            "    uninitvar_funcArgOutTest(&ab);\n"
                            "    x = ab;\n"
-                           "}\n", "test.c", false, &s);
+                           "}\n", false, false, &s);
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -4563,7 +4561,7 @@ class TestUninitVar : public TestFixture {
                        "    ab.a = 0;\n"
                        "    ab.b = 0;\n"
                        "    do_something(ab);\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -4571,28 +4569,28 @@ class TestUninitVar : public TestFixture {
                            "void f(void) {\n"
                            "    struct AB ab;\n"
                            "    strcpy(ab.a, STR);\n"
-                           "}\n", "test.c");
+                           "}\n", false);
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("struct AB { unsigned char a[10]; };\n" // #8999 - cast
                            "void f(void) {\n"
                            "    struct AB ab;\n"
                            "    strcpy((char *)ab.a, STR);\n"
-                           "}\n", "test.c");
+                           "}\n", false);
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("struct AB { char a[10]; };\n"
                            "void f(void) {\n"
                            "    struct AB ab;\n"
                            "    strcpy(x, ab.a);\n"
-                           "}\n", "test.c");
+                           "}\n", false);
             TODO_ASSERT_EQUALS("[test.c:4]: (error) Uninitialized variable: ab.a\n", "", errout_str());
 
             checkUninitVar("struct AB { int a; };\n"
                            "void f(void) {\n"
                            "    struct AB ab;\n"
                            "    dosomething(ab.a);\n"
-                           "}\n", "test.c");
+                           "}\n", false);
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -4602,7 +4600,7 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    ab = getAB();\n"
                        "    do_something(ab);\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -4640,7 +4638,7 @@ class TestUninitVar : public TestFixture {
                        "    ab.s.b = 2;\n"
                        "    ab.s.c = 3;\n"
                        "    do_something(ab);\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct conf {\n"
@@ -4653,7 +4651,7 @@ class TestUninitVar : public TestFixture {
                        "   struct conf c;\n"
                        "   initdata(&c);\n"
                        "   do_something(c);\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct PIXEL {\n"
@@ -4731,7 +4729,7 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    ab.a = 0;\n"
                        "    return ab.b;\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("[test.c:5]: (error) Uninitialized struct member: ab.b\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4739,7 +4737,7 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    ab.a = 0;\n"
                        "    return ab.a;\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct S { int a; int b; };\n" // #8299
@@ -4767,7 +4765,7 @@ class TestUninitVar : public TestFixture {
                        "   struct FRED fred;\n"
                        "   fred.a = do_something();\n"
                        "   if (fred.a == 0) { }\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct FRED {\n"
@@ -4779,21 +4777,21 @@ class TestUninitVar : public TestFixture {
                        "   struct FRED fred;\n"
                        "   fred.a = do_something();\n"
                        "   if (fred.b == 0) { }\n"
-                       "}\n", "test.c", false);
+                       "}\n", false, false);
         ASSERT_EQUALS("[test.c:9]: (error) Uninitialized struct member: fred.b\n", errout_str());
 
         checkUninitVar("struct Fred { int a; };\n"
                        "void f() {\n"
                        "    struct Fred fred;\n"
                        "    if (fred.a==1) {}\n"
-                       "}", "test.c");
+                       "}", false);
         ASSERT_EQUALS("[test.c:4]: (error) Uninitialized struct member: fred.a\n", errout_str());
 
         checkUninitVar("struct S { int n; int m; };\n"
                        "void f(void) {\n"
                        " struct S s;\n"
                        " for (s.n = 0; s.n <= 10; s.n++) { }\n"
-                       "}", "test.c");
+                       "}", false);
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void test2() {\n"
@@ -4870,7 +4868,7 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "    A a;\n"
                        "    x = a.m;\n"
-                       "}", "test.cpp");
+                       "}", true);
         ASSERT_EQUALS("", errout_str());
 
         // Unknown type (C)
@@ -4881,7 +4879,7 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "    A a;\n"
                        "    x = a.m;\n"
-                       "}", "test.c");
+                       "}", false);
         ASSERT_EQUALS("[test.c:7]: (error) Uninitialized struct member: a.m\n", errout_str());
 
         // Type with constructor
@@ -5063,7 +5061,7 @@ class TestUninitVar : public TestFixture {
                        "       int a = 1+ab.a;\n"
                        "       do_something(a);\n"
                        "   }\n"
-                       "}\n", "test.c");
+                       "}\n", false);
         ASSERT_EQUALS("[test.c:5]: (error) Uninitialized struct member: ab.a\n", errout_str());
 
         checkUninitVar("void f(int i) {\n" // #4569 fp
@@ -5362,7 +5360,7 @@ class TestUninitVar : public TestFixture {
                        "        i = 0;\n"
                        "        return i;\n"
                        "    } while (0);\n"
-                       "}\n", "test.cpp", false, &s);
+                       "}\n", true, false, &s);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5410,19 +5408,18 @@ class TestUninitVar : public TestFixture {
                        "  char *dp;\n"
                        "  dp=(char *)d;\n"
                        "  init(dp);\n"
-                       "}", "test.c");
+                       "}", false);
         // Unknown type
         TODO_ASSERT_EQUALS("", "[test.c:4]: (error) Uninitialized variable: d\n", errout_str());
     }
 
-    void valueFlowUninit_(const char* file, int line, const char code[], const char fname[] = "test.cpp")
+    void valueFlowUninit_(const char* file, int line, const char code[], bool cpp = true)
     {
         // Tokenize..
         const Settings s = settingsBuilder(settings).debugwarnings(false).build();
 
-        Tokenizer tokenizer(s, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, fname), file, line);
+        SimpleTokenizer tokenizer(s, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         // Check for redundant code..
         CheckUninitVar checkuninitvar(&tokenizer, &s, this);
@@ -6257,7 +6254,7 @@ class TestUninitVar : public TestFixture {
                         "            t[n++] = s->t[i];\n"
                         "    for (int i = 0; i < n; i++)\n"
                         "        t[i];\n"
-                        "}\n", "test.c");
+                        "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("bool g();\n"
@@ -6773,7 +6770,7 @@ class TestUninitVar : public TestFixture {
                         "    struct AB ab;\n"
                         "    int a = ab.a;\n"
                         "}\n",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("[test.c:4]: (error) Uninitialized variable: ab.a\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -6788,7 +6785,7 @@ class TestUninitVar : public TestFixture {
                         "    struct AB ab;\n"
                         "    buf[ab.a] = 0;\n"
                         "}\n",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("[test.c:4]: (error) Uninitialized variable: ab.a\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -6797,7 +6794,7 @@ class TestUninitVar : public TestFixture {
                         "    ab.a = 1;\n"
                         "    x = ab;\n"
                         "}\n",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("[test.c:5]: (error) Uninitialized variable: ab.b\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -6806,7 +6803,7 @@ class TestUninitVar : public TestFixture {
                         "    ab.a = 1;\n"
                         "    x = *(&ab);\n"
                         "}\n",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("[test.c:5]: (error) Uninitialized variable: *(&ab).b\n", errout_str());
 
         valueFlowUninit("void f(void) {\n"
@@ -6815,7 +6812,7 @@ class TestUninitVar : public TestFixture {
                         "    ab.a = (void*)&x;\n"
                         "    dostuff(&ab,0);\n"
                         "}\n",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct Element {\n"
@@ -6887,7 +6884,7 @@ class TestUninitVar : public TestFixture {
                         "    struct AB ab;\n"
                         "    assign(&ab.a, 0);\n"
                         "}\n",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit(
@@ -6908,7 +6905,7 @@ class TestUninitVar : public TestFixture {
                         "    ab.b = 0;\n"
                         "    do_something(ab);\n"
                         "}\n",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -6917,7 +6914,7 @@ class TestUninitVar : public TestFixture {
                             "    struct AB ab;\n"
                             "    strcpy(ab.a, STR);\n"
                             "}\n",
-                            "test.c");
+                            false);
             ASSERT_EQUALS("", errout_str());
 
             valueFlowUninit("struct AB { unsigned char a[10]; };\n" // #8999 - cast
@@ -6925,7 +6922,7 @@ class TestUninitVar : public TestFixture {
                             "    struct AB ab;\n"
                             "    strcpy((char *)ab.a, STR);\n"
                             "}\n",
-                            "test.c");
+                            false);
             ASSERT_EQUALS("", errout_str());
 
             valueFlowUninit("struct AB { char a[10]; };\n"
@@ -6933,7 +6930,7 @@ class TestUninitVar : public TestFixture {
                             "    struct AB ab;\n"
                             "    strcpy(x, ab.a);\n"
                             "}\n",
-                            "test.c");
+                            false);
             TODO_ASSERT_EQUALS("[test.c:4]: (error) Uninitialized variable: ab.a\n", "", errout_str());
 
             valueFlowUninit("struct AB { int a; };\n"
@@ -6941,7 +6938,7 @@ class TestUninitVar : public TestFixture {
                             "    struct AB ab;\n"
                             "    dosomething(ab.a);\n"
                             "}\n",
-                            "test.c");
+                            false);
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -6952,7 +6949,7 @@ class TestUninitVar : public TestFixture {
                         "    ab = getAB();\n"
                         "    do_something(ab);\n"
                         "}\n",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -6991,7 +6988,7 @@ class TestUninitVar : public TestFixture {
                         "    ab.s.c = 3;\n"
                         "    do_something(ab);\n"
                         "}\n",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct conf {\n"
@@ -7005,7 +7002,7 @@ class TestUninitVar : public TestFixture {
                         "   initdata(&c);\n"
                         "   do_something(c);\n"
                         "}\n",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct PIXEL {\n"
@@ -7080,7 +7077,7 @@ class TestUninitVar : public TestFixture {
                         "    ab.a = 0;\n"
                         "    return ab.b;\n"
                         "}\n",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("[test.c:5]: (error) Uninitialized variable: ab.b\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -7089,7 +7086,7 @@ class TestUninitVar : public TestFixture {
                         "    ab.a = 0;\n"
                         "    return ab.a;\n"
                         "}\n",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct S { int a; int b; };\n" // #8299
@@ -7118,7 +7115,7 @@ class TestUninitVar : public TestFixture {
                         "   fred.a = do_something();\n"
                         "   if (fred.a == 0) { }\n"
                         "}\n",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct FRED {\n"
@@ -7131,7 +7128,7 @@ class TestUninitVar : public TestFixture {
                         "   fred.a = do_something();\n"
                         "   if (fred.b == 0) { }\n"
                         "}\n",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("[test.c:9]: (error) Uninitialized variable: fred.b\n", errout_str());
 
         valueFlowUninit("struct Fred { int a; };\n"
@@ -7139,7 +7136,7 @@ class TestUninitVar : public TestFixture {
                         "    struct Fred fred;\n"
                         "    if (fred.a==1) {}\n"
                         "}",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("[test.c:4]: (error) Uninitialized variable: fred.a\n", errout_str());
 
         valueFlowUninit("struct S { int n; int m; };\n"
@@ -7147,7 +7144,7 @@ class TestUninitVar : public TestFixture {
                         " struct S s;\n"
                         " for (s.n = 0; s.n <= 10; s.n++) { }\n"
                         "}",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void test2() {\n"
@@ -7225,7 +7222,7 @@ class TestUninitVar : public TestFixture {
                         "    A a;\n"
                         "    x = a.m;\n"
                         "}",
-                        "test.cpp");
+                        true);
         ASSERT_EQUALS("", errout_str());
 
         // Unknown type (C)
@@ -7237,7 +7234,7 @@ class TestUninitVar : public TestFixture {
                         "    A a;\n"
                         "    x = a.m;\n"
                         "}",
-                        "test.c");
+                        false);
         ASSERT_EQUALS("[test.c:7]: (error) Uninitialized variable: a.m\n", errout_str());
 
         // Type with constructor
@@ -7632,7 +7629,7 @@ class TestUninitVar : public TestFixture {
         valueFlowUninit("void f() {\n" // #11305
                         "    type_t a;\n"
                         "    a[0] = 0;\n"
-                        "}\n", "test.c");
+                        "}\n", false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7733,9 +7730,8 @@ class TestUninitVar : public TestFixture {
 
     void ctu_(const char* file, int line, const char code[]) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         CTU::FileInfo *ctu = CTU::getFileInfo(&tokenizer);
 
diff --git a/test/testunusedfunctions.cpp b/test/testunusedfunctions.cpp
index 68def8f12e1e..5b785204231c 100644
--- a/test/testunusedfunctions.cpp
+++ b/test/testunusedfunctions.cpp
@@ -18,14 +18,13 @@
 
 #include "checkunusedfunctions.h"
 #include "errortypes.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "platform.h"
 #include "preprocessor.h"
 #include "settings.h"
-#include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream>
 #include <string>
 
 class TestUnusedFunctions : public TestFixture {
@@ -87,9 +86,8 @@ class TestUnusedFunctions : public TestFixture {
         const Settings settings1 = settingsBuilder(s ? *s : settings).platform(platform).build();
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for unused functions..
         CheckUnusedFunctions checkUnusedFunctions;
@@ -529,20 +527,19 @@ class TestUnusedFunctions : public TestFixture {
     }
 
     void multipleFiles() {
-        Tokenizer tokenizer(settings, this);
         CheckUnusedFunctions c;
 
         const char code[] = "static void f() { }";
 
         for (int i = 1; i <= 2; ++i) {
-            std::ostringstream fname;
-            fname << "test" << i << ".cpp";
+            const std::string fname = "test" + std::to_string(i) + ".cpp";
 
-            Tokenizer tokenizer2(settings, this);
+            Tokenizer tokenizer(settings, this);
             std::istringstream istr(code);
-            ASSERT(tokenizer2.tokenize(istr, fname.str().c_str()));
+            ASSERT(tokenizer.list.createTokens(istr, fname.c_str()));
+            ASSERT(tokenizer.simplifyTokens1(""));
 
-            c.parseTokens(tokenizer2, settings);
+            c.parseTokens(tokenizer, settings);
         }
 
         // Check for unused functions..
diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
index 8844926619d5..24639cb97bec 100644
--- a/test/testunusedvar.cpp
+++ b/test/testunusedvar.cpp
@@ -18,15 +18,14 @@
 
 #include "checkunusedvar.h"
 #include "errortypes.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "preprocessor.h"
 #include "settings.h"
-#include "fixture.h"
 #include "standards.h"
 #include "tokenize.h"
 
 #include <list>
-#include <sstream>
 #include <string>
 #include <vector>
 
@@ -268,9 +267,8 @@ class TestUnusedVar : public TestFixture {
         const Settings *settings1 = s ? s : &settings;
 
         // Tokenize..
-        Tokenizer tokenizer(*settings1, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(*settings1, *this, &preprocessor);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for unused variables..
         CheckUnusedVar checkUnusedVar(&tokenizer, settings1, this);
@@ -2008,11 +2006,10 @@ class TestUnusedVar : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
-    void functionVariableUsage_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
+    void functionVariableUsage_(const char* file, int line, const char code[], bool cpp = true) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code, cpp), file, line);
 
         // Check for unused variables..
         CheckUnusedVar checkUnusedVar(&tokenizer, &settings, this);
@@ -2134,7 +2131,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    undefined i = 0;\n"
                               "}\n",
-                              "test.c");
+                              false);
         ASSERT_EQUALS(
             "[test.c:3]: (style) Variable 'i' is assigned a value that is never used.\n"
             "[test.c:3]: (style) Variable 'i' is assigned a value that is never used.\n", // duplicate
@@ -2530,7 +2527,7 @@ class TestUnusedVar : public TestFixture {
                               "    undefined i;\n"
                               "    return i;\n"
                               "}\n",
-                              "test.c");
+                              false);
         ASSERT_EQUALS("[test.c:3]: (style) Variable 'i' is not assigned a value.\n", errout_str());
 
         functionVariableUsage("undefined *foo()\n"
@@ -3297,7 +3294,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f(int x) {\n"
                               "    C c;\n"
                               "    if (c >>= x) {}\n"
-                              "}", "test.c");
+                              "}", false);
         ASSERT_EQUALS("[test.c:3]: (style) Variable 'c' is assigned a value that is never used.\n", errout_str());
 
         functionVariableUsage("void f() {\n"
@@ -5078,7 +5075,7 @@ class TestUnusedVar : public TestFixture {
                               "  int x;\n"
                               "  unknown_type p = &x;\n"
                               "  *p = 9;\n"
-                              "}", "test.c");
+                              "}", false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5233,7 +5230,7 @@ class TestUnusedVar : public TestFixture {
                               "    A a;\n"
                               "    return 0;\n"
                               "}\n",
-                              "test.c");
+                              false);
         ASSERT_EQUALS("[test.c:2]: (style) Unused variable: a\n", errout_str());
         // extracttests.enable
 
@@ -7042,7 +7039,7 @@ class TestUnusedVar : public TestFixture {
                 "void fun(Date result) {"
                 "  result.x = 12;\n"
                 "}",
-                "test.c"
+                false
                 );
             ASSERT_EQUALS("[test.c:1]: (style) Variable 'result.x' is assigned a value that is never used.\n", errout_str());
 
diff --git a/test/testvaarg.cpp b/test/testvaarg.cpp
index f2e598c7c7b8..353e0fc256cf 100644
--- a/test/testvaarg.cpp
+++ b/test/testvaarg.cpp
@@ -16,14 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkvaarg.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
-
-#include <sstream>
+#include "helpers.h"
+#include "settings.h"
 
 class TestVaarg : public TestFixture {
 public:
@@ -35,9 +32,8 @@ class TestVaarg : public TestFixture {
 #define check(code) check_(code, __FILE__, __LINE__)
     void check_(const char code[], const char* file, int line) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         runChecks<CheckVaarg>(tokenizer, this);
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
index 9d014ef279e3..5bac755589f7 100644
--- a/test/testvalueflow.cpp
+++ b/test/testvalueflow.cpp
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "fixture.h"
 #include "helpers.h"
 #include "mathlib.h"
 #include "platform.h"
 #include "settings.h"
-#include "fixture.h"
 #include "token.h"
 #include "tokenize.h"
 #include "vfvalue.h"
@@ -197,9 +197,8 @@ class TestValueFlow : public TestFixture {
 #define testValueOfXKnown(...) testValueOfXKnown_(__FILE__, __LINE__, __VA_ARGS__)
     bool testValueOfXKnown_(const char* file, int line, const char code[], unsigned int linenr, int value) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -219,9 +218,8 @@ class TestValueFlow : public TestFixture {
 
     bool testValueOfXKnown_(const char* file, int line, const char code[], unsigned int linenr, const std::string& expr, int value) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token* tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -242,9 +240,8 @@ class TestValueFlow : public TestFixture {
 #define testValueOfXImpossible(...) testValueOfXImpossible_(__FILE__, __LINE__, __VA_ARGS__)
     bool testValueOfXImpossible_(const char* file, int line, const char code[], unsigned int linenr, int value) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -265,9 +262,8 @@ class TestValueFlow : public TestFixture {
     bool testValueOfXImpossible_(const char* file, int line, const char code[], unsigned int linenr, const std::string& expr, int value)
     {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token* tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -288,9 +284,8 @@ class TestValueFlow : public TestFixture {
 #define testValueOfXInconclusive(code, linenr, value) testValueOfXInconclusive_(code, linenr, value, __FILE__, __LINE__)
     bool testValueOfXInconclusive_(const char code[], unsigned int linenr, int value, const char* file, int line) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -313,9 +308,8 @@ class TestValueFlow : public TestFixture {
         const Settings *settings1 = s ? s : &settings;
 
         // Tokenize..
-        Tokenizer tokenizer(*settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(*settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -332,9 +326,8 @@ class TestValueFlow : public TestFixture {
     bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, const std::string& expr, int value)
     {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token* tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -350,9 +343,8 @@ class TestValueFlow : public TestFixture {
 
     bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, double value, double diff) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -369,9 +361,8 @@ class TestValueFlow : public TestFixture {
 #define getErrorPathForX(code, linenr) getErrorPathForX_(code, linenr, __FILE__, __LINE__)
     std::string getErrorPathForX_(const char code[], unsigned int linenr, const char* file, int line) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() != "x" || tok->linenr() != linenr)
@@ -393,9 +384,8 @@ class TestValueFlow : public TestFixture {
 
     bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, const char value[], ValueFlow::Value::ValueType type) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         const std::size_t len = strlen(value);
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
@@ -413,9 +403,8 @@ class TestValueFlow : public TestFixture {
 #define testLifetimeOfX(...) testLifetimeOfX_(__FILE__, __LINE__, __VA_ARGS__)
     bool testLifetimeOfX_(const char* file, int line, const char code[], unsigned int linenr, const char value[], ValueFlow::Value::LifetimeScope lifetimeScope = ValueFlow::Value::LifetimeScope::Local) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         const std::size_t len = strlen(value);
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
@@ -432,9 +421,8 @@ class TestValueFlow : public TestFixture {
 
     bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, int value, ValueFlow::Value::ValueType type) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -450,9 +438,8 @@ class TestValueFlow : public TestFixture {
 
     bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, ValueFlow::Value::MoveKind moveKind) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -469,9 +456,8 @@ class TestValueFlow : public TestFixture {
 #define testConditionalValueOfX(code, linenr, value) testConditionalValueOfX_(code, linenr, value, __FILE__, __LINE__)
     bool testConditionalValueOfX_(const char code[], unsigned int linenr, int value, const char* file, int line) {
         // Tokenize..
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -499,9 +485,8 @@ class TestValueFlow : public TestFixture {
 
 #define tokenValues(...) tokenValues_(__FILE__, __LINE__, __VA_ARGS__)
     std::list<ValueFlow::Value> tokenValues_(const char* file, int line, const char code[], const char tokstr[], const Settings *s = nullptr) {
-        Tokenizer tokenizer(s ? *s : settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(s ? *s : settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token *tok = Token::findmatch(tokenizer.tokens(), tokstr);
         return tok ? tok->values() : std::list<ValueFlow::Value>();
     }
@@ -517,9 +502,8 @@ class TestValueFlow : public TestFixture {
 #define lifetimeValues(...) lifetimeValues_(__FILE__, __LINE__, __VA_ARGS__)
     std::vector<std::string> lifetimeValues_(const char* file, int line, const char code[], const char tokstr[], const Settings *s = nullptr) {
         std::vector<std::string> result;
-        Tokenizer tokenizer(s ? *s : settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(s ? *s : settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token *tok = Token::findmatch(tokenizer.tokens(), tokstr);
         if (!tok)
             return result;
diff --git a/test/testvarid.cpp b/test/testvarid.cpp
index 55899d383579..635f26d6f6bc 100644
--- a/test/testvarid.cpp
+++ b/test/testvarid.cpp
@@ -251,12 +251,24 @@ class TestVarID : public TestFixture {
     }
 
 #define tokenize(...) tokenize_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tokenize_(const char* file, int line, const char code[], const char filename[] = "test.cpp", const Settings *s = nullptr) {
+    std::string tokenize_(const char* file, int line, const char code[], bool cpp = true, const Settings *s = nullptr) {
         const Settings *settings1 = s ? s : &settings;
 
-        Tokenizer tokenizer(*settings1, this);
+        SimpleTokenizer tokenizer(*settings1, *this);
+        ASSERT_LOC((tokenizer.tokenize)(code, cpp), file, line);
+
+        // result..
+        Token::stringifyOptions options = Token::stringifyOptions::forDebugVarId();
+        options.files = false;
+        return tokenizer.tokens()->stringifyList(options);
+    }
+
+#define tokenizeHeader(...) tokenizeHeader_(__FILE__, __LINE__, __VA_ARGS__)
+    std::string tokenizeHeader_(const char* file, int line, const char code[], const char filename[]) {
+        Tokenizer tokenizer(settings, this);
         std::istringstream istr(code);
-        ASSERT_LOC((tokenizer.tokenize)(istr, filename), file, line);
+        ASSERT_LOC(tokenizer.list.createTokens(istr, filename), file, line);
+        EXPECT_EQ(true, tokenizer.simplifyTokens1(""));
 
         // result..
         Token::stringifyOptions options = Token::stringifyOptions::forDebugVarId();
@@ -279,10 +291,9 @@ class TestVarID : public TestFixture {
     }
 
 #define compareVaridsForVariable(...) compareVaridsForVariable_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string compareVaridsForVariable_(const char* file, int line, const char code[], const char varname[], const char filename[] = "test.cpp") {
-        Tokenizer tokenizer(settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC((tokenizer.tokenize)(istr, filename), file, line);
+    std::string compareVaridsForVariable_(const char* file, int line, const char code[], const char varname[], bool cpp = true) {
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC((tokenizer.tokenize)(code, cpp), file, line);
 
         unsigned int varid = ~0U;
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
@@ -307,7 +318,7 @@ class TestVarID : public TestFixture {
                 "    for (int i = 0; i < 10; ++i)\n"
                 "        i = 3;\n"
                 "    i = 4;\n"
-                "}\n", "test.c");
+                "}\n", false);
 
             const char expected[] = "1: static int i@1 = 1 ;\n"
                                     "2: void f ( )\n"
@@ -332,7 +343,7 @@ class TestVarID : public TestFixture {
                 "      i = 3;\n"
                 "    }\n"
                 "    i = 4;\n"
-                "}\n", "test.c");
+                "}\n", false);
 
             const char expected[] = "1: static int i@1 = 1 ;\n"
                                     "2: void f ( )\n"
@@ -356,7 +367,7 @@ class TestVarID : public TestFixture {
             "    struct ABC abc;\n"
             "    abc.a = 3;\n"
             "    i = abc.a;\n"
-            "}\n", "test.c");
+            "}\n", false);
 
         const char expected[] = "1: void f ( )\n"
                                 "2: {\n"
@@ -375,7 +386,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    char str[10];\n"
             "    str[0] = 0;\n"
-            "}\n", "test.c");
+            "}\n", false);
 
         const char expected[] = "1: static char str@1 [ 4 ] ;\n"
                                 "2: void f ( )\n"
@@ -392,7 +403,7 @@ class TestVarID : public TestFixture {
             "void f(const unsigned int a[])\n"
             "{\n"
             "    int i = *(a+10);\n"
-            "}\n", "test.c");
+            "}\n", false);
 
         const char expected[] = "1: void f ( const unsigned int a@1 [ ] )\n"
                                 "2: {\n"
@@ -407,7 +418,7 @@ class TestVarID : public TestFixture {
             "void f()\n"
             "{\n"
             "    int a,b;\n"
-            "}\n", "test.c");
+            "}\n", false);
 
         const char expected[] = "1: void f ( )\n"
                                 "2: {\n"
@@ -423,7 +434,7 @@ class TestVarID : public TestFixture {
             "int f(int a, int b)\n"
             "{\n"
             "    return a+b;\n"
-            "}\n", "test.c");
+            "}\n", false);
 
         const char expected[] = "1: int f ( int a@1 , int b@2 )\n"
                                 "2: {\n"
@@ -441,7 +452,7 @@ class TestVarID : public TestFixture {
             "    {\n"
             "        char b[256] = \"test\";\n"
             "    }\n"
-            "}\n", "test.c");
+            "}\n", false);
 
         const char expected[] = "1: void func ( ) {\n"
                                 "2: char a@1 [ 256 ] = \"test\" ;\n"
@@ -459,7 +470,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    int a;\n"
             "    return a;\n"
-            "}\n", "test.c");
+            "}\n", false);
 
         const char expected[] = "1: int f ( )\n"
                                 "2: {\n"
@@ -476,7 +487,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    unsigned long mask = (1UL << size_) - 1;\n"
             "    return (abits_val_ & mask);\n"
-            "}\n", "test.c");
+            "}\n", false);
 
         const char expected[] = "1: void foo ( )\n"
                                 "2: {\n"
@@ -506,7 +517,7 @@ class TestVarID : public TestFixture {
 
     void varid9() {
         const std::string actual = tokenize(
-            "typedef int INT32;\n", "test.c");
+            "typedef int INT32;\n", false);
 
         const char expected[] = "1: ;\n";
 
@@ -519,7 +530,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    int abc;\n"
             "    struct abc abc1;\n"
-            "}", "test.c");
+            "}", false);
 
         const char expected[] = "1: void foo ( )\n"
                                 "2: {\n"
@@ -559,7 +570,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    int a; int b;\n"
             "    a = a;\n"
-            "}\n", "test.c");
+            "}\n", false);
 
         const char expected[] = "1: void f ( )\n"
                                 "2: {\n"
@@ -578,7 +589,7 @@ class TestVarID : public TestFixture {
             "A a;\n"
             "B b;\n"
             "b * a;\n"
-            "}", "test.c");
+            "}", false);
 
         const char expected[] = "1: void foo ( )\n"
                                 "2: {\n"
@@ -596,7 +607,7 @@ class TestVarID : public TestFixture {
                 "struct S {\n"
                 "    struct T {\n"
                 "    } t;\n"
-                "} s;", "test.c");
+                "} s;", false);
 
             const char expected[] = "1: struct S {\n"
                                     "2: struct T {\n"
@@ -611,7 +622,7 @@ class TestVarID : public TestFixture {
                 "struct S {\n"
                 "    struct T {\n"
                 "    } t;\n"
-                "};", "test.c");
+                "};", false);
 
             const char expected[] = "1: struct S {\n"
                                     "2: struct T {\n"
@@ -635,7 +646,7 @@ class TestVarID : public TestFixture {
                                 "4: y = z * x@1 ;\n"
                                 "5: }\n";
 
-        ASSERT_EQUALS(expected, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected, tokenize(code, false));
     }
 
     void varid17() { // ticket #1810
@@ -651,7 +662,7 @@ class TestVarID : public TestFixture {
                                 "4: return c@1 ;\n"
                                 "5: }\n";
 
-        ASSERT_EQUALS(expected, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected, tokenize(code, false));
     }
 
     void varid18() {
@@ -775,7 +786,7 @@ class TestVarID : public TestFixture {
                                  "3: EventPtr event@3 ; event@3 = * eventP@1 ;\n"
                                  "4: * actionsP@2 = & event@3 . actions@4 ;\n"
                                  "5: }\n";
-        ASSERT_EQUALS(expected1, tokenize(code1, "test.c"));
+        ASSERT_EQUALS(expected1, tokenize(code1, false));
 
         const char code2[] = "void f(int b, int c) {\n"
                              "    x(a*b*c,10);\n"
@@ -783,7 +794,7 @@ class TestVarID : public TestFixture {
         const char expected2[] = "1: void f ( int b@1 , int c@2 ) {\n"
                                  "2: x ( a * b@1 * c@2 , 10 ) ;\n"
                                  "3: }\n";
-        ASSERT_EQUALS(expected2, tokenize(code2, "test.c"));
+        ASSERT_EQUALS(expected2, tokenize(code2, false));
 
         const char code3[] = "class Nullpointer : public ExecutionPath\n"
                              " {\n"
@@ -894,7 +905,7 @@ class TestVarID : public TestFixture {
         {
             const char code[] = "static int const SZ = 22;\n";
             ASSERT_EQUALS("1: static const int SZ@1 = 22 ;\n",
-                          tokenize(code, "test.c"));
+                          tokenize(code, false));
         }
     }
 
@@ -908,12 +919,12 @@ class TestVarID : public TestFixture {
         const char code1[] = "union evt; void f(const evt & event);";
         ASSERT_EQUALS("1: union evt ; void f ( const evt & event@1 ) ;\n",
                       tokenize(code1));
-        ASSERT_THROW_INTERNAL(tokenize(code1, "test.c"), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenize(code1, false), SYNTAX);
 
         const char code2[] = "struct evt; void f(const evt & event);";
         ASSERT_EQUALS("1: struct evt ; void f ( const evt & event@1 ) ;\n",
                       tokenize(code2));
-        ASSERT_THROW_INTERNAL(tokenize(code2, "test.c"), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenize(code2, false), SYNTAX);
     }
 
     void varid42() {
@@ -933,7 +944,7 @@ class TestVarID : public TestFixture {
     void varid43() {
         const char code[] ="int main(int flag) { if(a & flag) { return 1; } }";
         ASSERT_EQUALS("1: int main ( int flag@1 ) { if ( a & flag@1 ) { return 1 ; } }\n",
-                      tokenize(code, "test.c"));
+                      tokenize(code, false));
     }
 
     void varid44() {
@@ -951,7 +962,7 @@ class TestVarID : public TestFixture {
     void varid46() { // #3756
         const char code[] ="void foo() { int t; x = (struct t *)malloc(); f(t); }";
         ASSERT_EQUALS("1: void foo ( ) { int t@1 ; x = ( struct t * ) malloc ( ) ; f ( t@1 ) ; }\n",
-                      tokenize(code, "test.c"));
+                      tokenize(code, false));
     }
 
     void varid47() { // function parameters
@@ -959,7 +970,7 @@ class TestVarID : public TestFixture {
         {
             const char code[] ="void f(std::string &string, std::string &len) {}";
             ASSERT_EQUALS("1: void f ( std :: string & string@1 , std :: string & len@2 ) { }\n",
-                          tokenize(code, "test.cpp"));
+                          tokenize(code, true));
         }
 
         // #4729
@@ -983,19 +994,19 @@ class TestVarID : public TestFixture {
     void varid49() {  // #3799 - void f(std::vector<int>)
         const char code[] ="void f(std::vector<int>)";
         ASSERT_EQUALS("1: void f ( std :: vector < int > )\n",
-                      tokenize(code, "test.cpp"));
+                      tokenize(code, true));
     }
 
     void varid50() {  // #3760 - explicit
         const char code[] ="class A { explicit A(const A&); };";
         ASSERT_EQUALS("1: class A { explicit A ( const A & ) ; } ;\n",
-                      tokenize(code, "test.cpp"));
+                      tokenize(code, true));
     }
 
     void varid51() {  // don't set varid on template function
         const char code[] ="T t; t.x<0>();";
         ASSERT_EQUALS("1: T t@1 ; t@1 . x < 0 > ( ) ;\n",
-                      tokenize(code, "test.cpp"));
+                      tokenize(code, true));
     }
 
     void varid52() {
@@ -1005,12 +1016,12 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS("1: A < B < C > :: D > e@1 ;\n"
                       "2: B < C < > > b@2 [ 10 ] ;\n"
                       "3: B < C < > > c@3 [ 10 ] ;\n",
-                      tokenize(code, "test.cpp"));
+                      tokenize(code, true));
     }
 
     void varid53() { // #4172 - Template instantiation: T<&functionName> list[4];
         ASSERT_EQUALS("1: A < & f > list@1 [ 4 ] ;\n",
-                      tokenize("A<&f> list[4];", "test.cpp"));
+                      tokenize("A<&f> list[4];", true));
     }
 
     void varid54() { // hang
@@ -1034,7 +1045,7 @@ class TestVarID : public TestFixture {
                                 "void baz2 ( struct foo & foo@4 ) { } "
                                 "void bar3 ( struct foo * foo@5 ) { } "
                                 "void baz3 ( struct foo * foo@6 ) { }\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp"));
+        ASSERT_EQUALS(expected, tokenize(code, true));
     }
 
     void varid56() { // Ticket #6548 - function with a throw()
@@ -1043,42 +1054,42 @@ class TestVarID : public TestFixture {
         const char expected1[] = "1: "
                                  "void fred ( int x@1 ) throw ( ) { } "
                                  "void wilma ( ) { x ++ ; }\n";
-        ASSERT_EQUALS(expected1, tokenize(code1, "test.cpp"));
+        ASSERT_EQUALS(expected1, tokenize(code1, true));
 
         const char code2[] = "void fred(int x) const throw(EXCEPT) {}"
                              "void wilma() { x++; }";
         const char expected2[] = "1: "
                                  "void fred ( int x@1 ) const throw ( EXCEPT ) { } "
                                  "void wilma ( ) { x ++ ; }\n";
-        ASSERT_EQUALS(expected2, tokenize(code2, "test.cpp"));
+        ASSERT_EQUALS(expected2, tokenize(code2, true));
 
         const char code3[] = "void fred(int x) throw() ABCD {}"
                              "void wilma() { x++; }";
         const char expected3[] = "1: "
                                  "void fred ( int x@1 ) throw ( ) { } "
                                  "void wilma ( ) { x ++ ; }\n";
-        ASSERT_EQUALS(expected3, tokenize(code3, "test.cpp"));
+        ASSERT_EQUALS(expected3, tokenize(code3, true));
 
         const char code4[] = "void fred(int x) noexcept() {}"
                              "void wilma() { x++; }";
         const char expected4[] = "1: "
                                  "void fred ( int x@1 ) noexcept ( ) { } "
                                  "void wilma ( ) { x ++ ; }\n";
-        ASSERT_EQUALS(expected4, tokenize(code4, "test.cpp"));
+        ASSERT_EQUALS(expected4, tokenize(code4, true));
 
         const char code5[] = "void fred(int x) noexcept {}"
                              "void wilma() { x++; }";
         const char expected5[] = "1: "
                                  "void fred ( int x@1 ) noexcept ( true ) { } "
                                  "void wilma ( ) { x ++ ; }\n";
-        ASSERT_EQUALS(expected5, tokenize(code5, "test.cpp"));
+        ASSERT_EQUALS(expected5, tokenize(code5, true));
 
         const char code6[] = "void fred(int x) noexcept ( false ) {}"
                              "void wilma() { x++; }";
         const char expected6[] = "1: "
                                  "void fred ( int x@1 ) noexcept ( false ) { } "
                                  "void wilma ( ) { x ++ ; }\n";
-        ASSERT_EQUALS(expected6, tokenize(code6, "test.cpp"));
+        ASSERT_EQUALS(expected6, tokenize(code6, true));
     }
 
     void varid57() { // #6636: new scope by {}
@@ -1108,7 +1119,7 @@ class TestVarID : public TestFixture {
                                  "11: }\n"
                                  "12:\n"
                                  "13: }\n";
-        ASSERT_EQUALS(expected1, tokenize(code1, "test.cpp"));
+        ASSERT_EQUALS(expected1, tokenize(code1, true));
     }
 
     void varid58() { // #6638: for loop in for condition
@@ -1126,7 +1137,7 @@ class TestVarID : public TestFixture {
                                  "5: i@1 ++ ;\n"
                                  "6: }\n"
                                  "7: }\n";
-        ASSERT_EQUALS(expected1, tokenize(code1, "test.cpp"));
+        ASSERT_EQUALS(expected1, tokenize(code1, true));
     }
 
     void varid59() { // #6696
@@ -1142,7 +1153,7 @@ class TestVarID : public TestFixture {
                               "2: struct B {\n"
                               "3: ~ B ( ) { }\n"
                               "4: } ;\n";
-        TODO_ASSERT_EQUALS(wanted, expected, tokenize(code, "test.cpp"));
+        TODO_ASSERT_EQUALS(wanted, expected, tokenize(code, true));
     }
 
     void varid60() { // #7267 - cast
@@ -1231,7 +1242,7 @@ class TestVarID : public TestFixture {
                              "_Generic(*x, int: foo, default: bar)();";
         const char expected1[] = "1: int * x@1 ;\n"
                                  "2: _Generic ( * x@1 , int : foo , default : bar ) ( ) ;\n";
-        ASSERT_EQUALS(expected1, tokenize(code1, "test.c"));
+        ASSERT_EQUALS(expected1, tokenize(code1, false));
     }
 
     void varid68() { // #11740
@@ -1245,8 +1256,8 @@ class TestVarID : public TestFixture {
                                  "3: void f ( struct S strOut@2 ) {\n"
                                  "4: switch ( str_chars ( & strOut@2 ) [ 0 ] ) { }\n"
                                  "5: }\n";
-        ASSERT_EQUALS(expected1, tokenize(code1, "test.c"));
-        ASSERT_EQUALS(expected1, tokenize(code1, "test.cpp"));
+        ASSERT_EQUALS(expected1, tokenize(code1, false));
+        ASSERT_EQUALS(expected1, tokenize(code1, true));
     }
 
     void varid69() {
@@ -1256,7 +1267,7 @@ class TestVarID : public TestFixture {
         const char expected1[] = "1: void f ( ) {\n"
                                  "2: auto g@1 ; g@1 = [ ] ( int & , int & r@2 , int i@3 ) { } ;\n"
                                  "3: }\n";
-        ASSERT_EQUALS(expected1, tokenize(code1, "test.cpp"));
+        ASSERT_EQUALS(expected1, tokenize(code1, true));
     }
 
     void varid_for_1() {
@@ -1290,7 +1301,7 @@ class TestVarID : public TestFixture {
                                 "3: throw t@2 ;\n"
                                 "4: }\n";
 
-        ASSERT_EQUALS(expected, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected, tokenize(code, false));
     }
 
     void varid_cpp_keywords_in_c_code2() { // #5373
@@ -1303,13 +1314,13 @@ class TestVarID : public TestFixture {
                             "  return clear_extent_bit(tree, start, end, EXTENT_DIRTY | EXTENT_DELALLOC | "
                             "                          EXTENT_DO_ACCOUNTING, 0, 0, NULL, mask);\n"
                             "}";
-        tokenize(code, "test.c");
+        tokenize(code, false);
     }
 
     void varid_cpp_keywords_in_c_code3() { // #12120
         const char code[] = "const struct class *p;";
         const char expected[] = "1: const struct class * p@1 ;\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected, tokenize(code, false));
     }
 
     void varidFunctionCall1() {
@@ -1321,7 +1332,7 @@ class TestVarID : public TestFixture {
                                 "2: int x@1 ;\n"
                                 "3: x@1 = a ( y * x@1 , 10 ) ;\n"
                                 "4: }\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected, tokenize(code, false));
     }
 
     void varidFunctionCall2() {
@@ -1333,7 +1344,7 @@ class TestVarID : public TestFixture {
                                     "2: x ( a * b");
         const std::string expected2(" , 10 ) ;\n"
                                     "3: }\n");
-        ASSERT_EQUALS(expected1+"@1"+expected2, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected1+"@1"+expected2, tokenize(code, false));
     }
 
     void varidFunctionCall3() {
@@ -1355,16 +1366,16 @@ class TestVarID : public TestFixture {
         // Ticket #3280
         const char code1[] = "void f() { int x; fun(a,b*x); }";
         ASSERT_EQUALS("1: void f ( ) { int x@1 ; fun ( a , b * x@1 ) ; }\n",
-                      tokenize(code1, "test.c"));
+                      tokenize(code1, false));
         const char code2[] = "void f(int a) { int x; fun(a,b*x); }";
         ASSERT_EQUALS("1: void f ( int a@1 ) { int x@2 ; fun ( a@1 , b * x@2 ) ; }\n",
-                      tokenize(code2, "test.c"));
+                      tokenize(code2, false));
     }
 
     void varidFunctionCall5() {
         const char code[] = "void foo() { (f(x[2]))(x[2]); }";
         ASSERT_EQUALS("1: void foo ( ) { f ( x [ 2 ] ) ( x [ 2 ] ) ; }\n",
-                      tokenize(code, "test.c"));
+                      tokenize(code, false));
     }
 
     void varidStl() {
@@ -1426,7 +1437,7 @@ class TestVarID : public TestFixture {
         {
             const std::string actual = tokenize(
                 "void f();\n"
-                "void f(){}\n", "test.c");
+                "void f(){}\n", false);
 
             const char expected[] = "1: void f ( ) ;\n"
                                     "2: void f ( ) { }\n";
@@ -1439,7 +1450,7 @@ class TestVarID : public TestFixture {
                 "A f(3);\n"
                 "A f2(true);\n"
                 "A g();\n"
-                "A e(int c);\n", "test.c");
+                "A e(int c);\n", false);
 
             const char expected[] = "1: A f@1 ( 3 ) ;\n"
                                     "2: A f2@2 ( true ) ;\n"
@@ -1481,13 +1492,13 @@ class TestVarID : public TestFixture {
         }
 
         {
-            const std::string actual = tokenize("void f(struct foobar);", "test.c");
+            const std::string actual = tokenize("void f(struct foobar);", false);
             const char expected[] = "1: void f ( struct foobar ) ;\n";
             ASSERT_EQUALS(expected, actual);
         }
 
         {
-            const std::string actual = tokenize("bool f(X x, int=3);", "test.cpp");
+            const std::string actual = tokenize("bool f(X x, int=3);", true);
             const char expected[] = "1: bool f ( X x@1 , int = 3 ) ;\n";
             ASSERT_EQUALS(expected, actual);
         }
@@ -1498,7 +1509,7 @@ class TestVarID : public TestFixture {
                                                 "    extern void f(int a[2]);\n"
                                                 "    f(a);\n"
                                                 "    a[0] = 0;\n"
-                                                "}\n", "test.cpp");
+                                                "}\n", true);
             const char expected[] = "1: int main ( ) {\n"
                                     "2: int a@1 [ 2 ] ;\n"
                                     "3: extern void f ( int a [ 2 ] ) ;\n"
@@ -1513,7 +1524,7 @@ class TestVarID : public TestFixture {
                                                 "    int n1;\n"
                                                 "    void g(int is, int n1);\n"
                                                 "    n1 = n - 1;\n"
-                                                "}\n", "test.cpp");
+                                                "}\n", true);
             const char expected[] = "1: void f ( int n@1 ) {\n"
                                     "2: int n1@2 ;\n"
                                     "3: void g ( int is , int n1 ) ;\n"
@@ -1526,7 +1537,7 @@ class TestVarID : public TestFixture {
     void varid_sizeof() {
         const char code[] = "x = sizeof(a*b);";
         const char expected[] = "1: x = sizeof ( a * b ) ;\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected, tokenize(code, false));
     }
 
     void varid_reference_to_containers() {
@@ -1840,15 +1851,15 @@ class TestVarID : public TestFixture {
     void varid_in_class13() {
         const char code1[] = "struct a { char typename; };";
         ASSERT_EQUALS("1: struct a { char typename@1 ; } ;\n",
-                      tokenize(code1, "test.c"));
+                      tokenize(code1, false));
         ASSERT_EQUALS("1: struct a { char typename ; } ;\n",  // not valid C++ code
-                      tokenize(code1, "test.cpp"));
+                      tokenize(code1, true));
 
         const char code2[] = "struct a { char typename[2]; };";
         ASSERT_EQUALS("1: struct a { char typename@1 [ 2 ] ; } ;\n",
-                      tokenize(code2, "test.c"));
+                      tokenize(code2, false));
         ASSERT_EQUALS("1: struct a { char typename [ 2 ] ; } ;\n",  // not valid C++ code
-                      tokenize(code2, "test.cpp"));
+                      tokenize(code2, true));
     }
 
     void varid_in_class14() {
@@ -1865,7 +1876,7 @@ class TestVarID : public TestFixture {
                       "4: std :: list < int > x@2 ;\n"
                       "5: list@1 . do_something ( ) ;\n"
                       "6: Tokenizer :: list@1 . do_something ( ) ;\n"
-                      "7: }\n", tokenize(code, "test.cpp"));
+                      "7: }\n", tokenize(code, true));
     }
 
     void varid_in_class15() { // #5533 - functions
@@ -1876,7 +1887,7 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS("1: class Fred {\n"
                       "2: void x ( int a@1 ) const ;\n"
                       "3: void y ( ) { a = 0 ; }\n"
-                      "4: }\n", tokenize(code, "test.cpp"));
+                      "4: }\n", tokenize(code, true));
     }
 
     void varid_in_class16() { // Set varId for inline member functions
@@ -1888,7 +1899,7 @@ class TestVarID : public TestFixture {
             ASSERT_EQUALS("1: class Fred {\n"
                           "2: int x@1 ;\n"
                           "3: void foo ( int x@2 ) { this . x@1 = x@2 ; }\n"
-                          "4: } ;\n", tokenize(code, "test.cpp"));
+                          "4: } ;\n", tokenize(code, true));
         }
         {
             const char code[] = "class Fred {\n"
@@ -1898,7 +1909,7 @@ class TestVarID : public TestFixture {
             ASSERT_EQUALS("1: class Fred {\n"
                           "2: void foo ( int x@1 ) { this . x@2 = x@1 ; }\n"
                           "3: int x@2 ;\n"
-                          "4: } ;\n", tokenize(code, "test.cpp"));
+                          "4: } ;\n", tokenize(code, true));
         }
         {
             const char code[] = "class Fred {\n"
@@ -1908,7 +1919,7 @@ class TestVarID : public TestFixture {
             ASSERT_EQUALS("1: class Fred {\n"
                           "2: void foo ( int x@1 ) { ( * this ) . x@2 = x@1 ; }\n"
                           "3: int x@2 ;\n"
-                          "4: } ;\n", tokenize(code, "test.cpp"));
+                          "4: } ;\n", tokenize(code, true));
         }
     }
 
@@ -1936,7 +1947,7 @@ class TestVarID : public TestFixture {
                       "9: FOO Set ( BAR ) ;\n"
                       "10: int method_with_class ( B < B > b@3 ) ;\n"
                       "11: bool function ( std :: map < int , int , MYless > & m@4 ) ;\n"
-                      "12: } ;\n", tokenize(code1, "test.cpp"));
+                      "12: } ;\n", tokenize(code1, true));
 
         const char code2[] = "int i;\n"
                              "SomeType someVar1(i, i);\n"
@@ -1947,7 +1958,7 @@ class TestVarID : public TestFixture {
                       "2: SomeType someVar1@2 ( i@1 , i@1 ) ;\n"
                       "3: SomeType someVar2 ( j , j ) ;\n" // This one could be a function
                       "4: SomeType someVar3@3 ( j , 1 ) ;\n"
-                      "5: SomeType someVar4@4 ( new bar ) ;\n", tokenize(code2, "test.cpp"));
+                      "5: SomeType someVar4@4 ( new bar ) ;\n", tokenize(code2, true));
     }
 
     void varid_in_class18() {
@@ -1970,7 +1981,7 @@ class TestVarID : public TestFixture {
                       "7: } ;\n"
                       "8: A :: B :: B ( ) :\n"
                       "9: i@1 ( 0 )\n"
-                      "10: { }\n", tokenize(code, "test.cpp"));
+                      "10: { }\n", tokenize(code, true));
     }
 
     void varid_in_class19() {
@@ -1987,7 +1998,7 @@ class TestVarID : public TestFixture {
                       "4: } ;\n"
                       "5: Fred :: ~ Fred ( ) {\n"
                       "6: free ( str1@1 ) ;\n"
-                      "7: }\n", tokenize(code, "test.cpp"));
+                      "7: }\n", tokenize(code, true));
     }
 
     void varid_in_class20() {
@@ -2007,7 +2018,7 @@ class TestVarID : public TestFixture {
                       "5: cacheEntry ( ) ;\n"
                       "6: } ;\n"
                       "7:\n"
-                      "8: template < class C > cacheEntry < C > :: cacheEntry ( ) : m_key@1 ( ) { }\n", tokenize(code, "test.cpp"));
+                      "8: template < class C > cacheEntry < C > :: cacheEntry ( ) : m_key@1 ( ) { }\n", tokenize(code, true));
     }
 
     void varid_in_class21() {
@@ -2029,7 +2040,7 @@ class TestVarID : public TestFixture {
                                 "7: template < typename t1 , typename t2 >\n"
                                 "8: A :: B < t1 , t2 > :: B ( ) : x@1 ( 9 ) { }\n";
 
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp"));
+        ASSERT_EQUALS(expected, tokenize(code, true));
     }
 
     void varid_in_class22() {
@@ -2053,7 +2064,7 @@ class TestVarID : public TestFixture {
                                 "8: for ( std :: vector < data > :: const_iterator i@3 = std@1 . begin ( ) ; i@3 != end@2 ; ++ i@3 ) { }\n"
                                 "9: }\n";
 
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp"));
+        ASSERT_EQUALS(expected, tokenize(code, true));
     }
 
     void varid_in_class23() { // #11293
@@ -2075,7 +2086,7 @@ class TestVarID : public TestFixture {
                                 "7: void f ( ) { b@1 = false ; }\n"
                                 "8: } ;\n";
 
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp"));
+        ASSERT_EQUALS(expected, tokenize(code, true));
     }
 
     void varid_in_class24() {
@@ -2091,7 +2102,7 @@ class TestVarID : public TestFixture {
                    "3: public:\n"
                    "4:\n"
                    "5: } ;\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp"));
+        ASSERT_EQUALS(expected, tokenize(code, true));
 
         code = "class A {\n"
                "    Q_OBJECT\n"
@@ -2101,7 +2112,7 @@ class TestVarID : public TestFixture {
                    "2: Q_OBJECT\n"
                    "3:\n"
                    "4: } ;\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp"));
+        ASSERT_EQUALS(expected, tokenize(code, true));
     }
 
     void varid_in_class25() {
@@ -2120,7 +2131,7 @@ class TestVarID : public TestFixture {
                    "4: if ( v@2 . front ( ) . i@3 ) { }\n"
                    "5: }\n"
                    "6: } ;\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp", &s));
+        ASSERT_EQUALS(expected, tokenize(code, true, &s));
 
         code = "struct T { };\n" // 11533
                "struct U { T t; };\n"
@@ -2136,7 +2147,7 @@ class TestVarID : public TestFixture {
                    "5: std :: vector < U * > * p@2 ; p@2 = g ( ) ;\n"
                    "6: auto t@3 ; t@3 = p@2 . front ( ) . t@4 ;\n"
                    "7: }\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp", &s));
+        ASSERT_EQUALS(expected, tokenize(code, true, &s));
     }
 
     void varid_in_class26() {
@@ -2161,7 +2172,7 @@ class TestVarID : public TestFixture {
                    "8: void S :: f ( ) {\n"
                    "9: u8@1 [ 0 ] = 0 ;\n"
                    "10: }\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp"));
+        ASSERT_EQUALS(expected, tokenize(code, true));
     }
 
     void varid_namespace_1() { // #7272
@@ -2178,7 +2189,7 @@ class TestVarID : public TestFixture {
                       "4: int x@2 ;\n"
                       "5: union { char y@3 ; } ;\n"
                       "6: } ;\n"
-                      "7: }\n", tokenize(code, "test.cpp"));
+                      "7: }\n", tokenize(code, true));
     }
 
     void varid_namespace_2() { // #7000
@@ -2195,7 +2206,7 @@ class TestVarID : public TestFixture {
                             "   X = 0;\n"  // X@2
                             "}";
 
-        const std::string actual = tokenize(code, "test.cpp");
+        const std::string actual = tokenize(code, true);
 
         ASSERT(actual.find("X@2 = 0") != std::string::npos);
     }
@@ -2226,7 +2237,7 @@ class TestVarID : public TestFixture {
                             "}\n"
                             "}";
 
-        const std::string actual = tokenize(code, "test.cpp");
+        const std::string actual = tokenize(code, true);
 
         ASSERT_EQUALS("5: int type@2 ;", getLine(actual,5));
         ASSERT_EQUALS("11: type@2 = 0 ;", getLine(actual,11));
@@ -2246,7 +2257,7 @@ class TestVarID : public TestFixture {
                       "4: void dostuff ( ) ;\n"
                       "5: } ;\n"
                       "6: void bar :: dostuff ( ) { int x2@2 ; x2@2 = x@1 * 2 ; }\n"
-                      "7: }\n", tokenize(code, "test.cpp"));
+                      "7: }\n", tokenize(code, true));
     }
 
     void varid_namespace_5() {
@@ -2267,7 +2278,7 @@ class TestVarID : public TestFixture {
                       "6: } ;\n"
                       "7: void bar :: dostuff ( ) { int x2@2 ; x2@2 = x@1 * 2 ; }\n"
                       "8: }\n"
-                      "9: }\n", tokenize(code, "test.cpp"));
+                      "9: }\n", tokenize(code, true));
     }
 
     void varid_namespace_6() {
@@ -2290,7 +2301,7 @@ class TestVarID : public TestFixture {
                       "7: std :: map < Vec2i , int > :: iterator iter@2 ;\n"
                       "8: }\n"
                       "9: }\n"
-                      "10: }\n", tokenize(code, "test.cpp"));
+                      "10: }\n", tokenize(code, true));
     }
 
     void varid_initList() {
@@ -2528,7 +2539,7 @@ class TestVarID : public TestFixture {
                                 "3: AAA\n"
                                 "4: a@1 [ 0 ] = 0 ;\n"
                                 "5: }\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected, tokenize(code, false));
     }
 
     void varid_using() {
@@ -2843,26 +2854,26 @@ class TestVarID : public TestFixture {
                       "2: struct B {\n"
                       "3: void setData ( const A@1 & a ) ;\n"
                       "4: } ;\n",
-                      tokenize("class A;\n"
-                               "struct B {\n"
-                               "    void setData(const A & a);\n"
-                               "}; ", "test.h"));
+                      tokenizeHeader("class A;\n"
+                                     "struct B {\n"
+                                     "    void setData(const A & a);\n"
+                                     "}; ", "test.h"));
         ASSERT_EQUALS("1: class A ;\n"
                       "2: struct B {\n"
                       "3: void setData ( const A & a@1 ) ;\n"
                       "4: } ;\n",
-                      tokenize("class A;\n"
-                               "struct B {\n"
-                               "    void setData(const A & a);\n"
-                               "}; ", "test.hpp"));
+                      tokenizeHeader("class A;\n"
+                                     "struct B {\n"
+                                     "    void setData(const A & a);\n"
+                                     "}; ", "test.hpp"));
         ASSERT_EQUALS("1: void f ( )\n"
                       "2: {\n"
                       "3: int class@1 ;\n"
                       "4: }\n",
-                      tokenize("void f()\n"
-                               "{\n"
-                               "    int class;\n"
-                               "}", "test.h"));
+                      tokenizeHeader("void f()\n"
+                                     "{\n"
+                                     "    int class;\n"
+                                     "}", "test.h"));
     }
 
     void varid_rangeBasedFor() {
@@ -2902,7 +2913,7 @@ class TestVarID : public TestFixture {
                                "        delta = 1;\n"
                                "        break;\n"
                                "    }\n"
-                               "}", "test.c"));
+                               "}", false));
 
         ASSERT_EQUALS("1: int * f ( ) {\n" // #11838
                       "2: int * label@1 ; label@1 = 0 ;\n"
@@ -3201,7 +3212,7 @@ class TestVarID : public TestFixture {
                             "alignas(16) int x;";
         const char expected[] = "1: extern alignas ( 16 ) int x@1 ;\n"
                                 "2: alignas ( 16 ) int x@2 ;\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected, tokenize(code, false));
     }
 
     void varidclass1() {