diff --git a/test/test64bit.cpp b/test/test64bit.cpp
index cc76c3f3d..fbe40c57a 100644
--- a/test/test64bit.cpp
+++ b/test/test64bit.cpp
@@ -24,6 +24,7 @@
 #include "tokenize.h"
 
 #include <iosfwd>
+#include <sstream>
 
 class Test64BitPortability : public TestFixture {
 public:
diff --git a/test/testanalyzerinformation.cpp b/test/testanalyzerinformation.cpp
index 0c310e024..579049ee0 100644
--- a/test/testanalyzerinformation.cpp
+++ b/test/testanalyzerinformation.cpp
@@ -19,6 +19,7 @@
 
 #include "analyzerinfo.h"
 #include "testsuite.h"
+
 #include <sstream>
 
 class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation {
diff --git a/test/testassert.cpp b/test/testassert.cpp
index 0a326b197..699d773ae 100644
--- a/test/testassert.cpp
+++ b/test/testassert.cpp
@@ -24,6 +24,7 @@
 #include "tokenize.h"
 
 #include <iosfwd>
+#include <sstream>
 
 
 class TestAssert : public TestFixture {
diff --git a/test/testastutils.cpp b/test/testastutils.cpp
index 7d5535cbc..029eff8e0 100644
--- a/test/testastutils.cpp
+++ b/test/testastutils.cpp
@@ -27,6 +27,7 @@
 
 #include <cstring>
 #include <iosfwd>
+#include <sstream>
 
 class TestAstUtils : public TestFixture {
 public:
diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
index fbf630e5b..7a89892e8 100644
--- a/test/testautovariables.cpp
+++ b/test/testautovariables.cpp
@@ -24,6 +24,7 @@
 #include "tokenize.h"
 
 #include <iosfwd>
+#include <sstream>
 
 class TestAutoVariables : public TestFixture {
 public:
diff --git a/test/testbool.cpp b/test/testbool.cpp
index 669ec4c12..0d6843e11 100644
--- a/test/testbool.cpp
+++ b/test/testbool.cpp
@@ -24,6 +24,7 @@
 #include "tokenize.h"
 
 #include <iosfwd>
+#include <sstream>
 
 class TestBool : public TestFixture {
 public:
diff --git a/test/testboost.cpp b/test/testboost.cpp
index 14672c60e..5e0d9952a 100644
--- a/test/testboost.cpp
+++ b/test/testboost.cpp
@@ -24,6 +24,7 @@
 #include "tokenize.h"
 
 #include <iosfwd>
+#include <sstream>
 
 class TestBoost : public TestFixture {
 public:
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
index b47f8c251..c1cb1fc78 100644
--- a/test/testbufferoverrun.cpp
+++ b/test/testbufferoverrun.cpp
@@ -31,6 +31,7 @@
 #include <iosfwd>
 #include <map>
 #include <list>
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/test/testcharvar.cpp b/test/testcharvar.cpp
index 2b7910e33..2b0f09fd3 100644
--- a/test/testcharvar.cpp
+++ b/test/testcharvar.cpp
@@ -25,6 +25,7 @@
 #include "tokenize.h"
 
 #include <iosfwd>
+#include <sstream>
 
 class TestCharVar : public TestFixture {
 public:
diff --git a/test/testclangimport.cpp b/test/testclangimport.cpp
index 40b021014..713af04e0 100644
--- a/test/testclangimport.cpp
+++ b/test/testclangimport.cpp
@@ -26,6 +26,7 @@
 #include <iosfwd>
 #include <list>
 #include <memory>
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testclass.cpp b/test/testclass.cpp
index a44b64e3e..ce7bf9aee 100644
--- a/test/testclass.cpp
+++ b/test/testclass.cpp
@@ -26,6 +26,7 @@
 
 #include <iosfwd>
 #include <list>
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
index 66aa5a080..9459b1e15 100644
--- a/test/testcondition.cpp
+++ b/test/testcondition.cpp
@@ -27,6 +27,7 @@
 
 #include <iosfwd>
 #include <map>
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/test/testconstructors.cpp b/test/testconstructors.cpp
index 4db5f43ee..88516f2da 100644
--- a/test/testconstructors.cpp
+++ b/test/testconstructors.cpp
@@ -26,6 +26,7 @@
 
 #include <iosfwd>
 #include <list>
+#include <sstream>
 #include <string>
 
 
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
index e27bd08de..d8f2074d9 100644
--- a/test/testexceptionsafety.cpp
+++ b/test/testexceptionsafety.cpp
@@ -24,6 +24,7 @@
 #include "tokenize.h"
 
 #include <iosfwd>
+#include <sstream>
 
 class TestExceptionSafety : public TestFixture {
 public:
diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
index 0338243e7..22599425b 100644
--- a/test/testfunctions.cpp
+++ b/test/testfunctions.cpp
@@ -26,6 +26,7 @@
 
 #include <iosfwd>
 #include <list>
+#include <sstream>
 #include <string>
 
 #include <tinyxml2.h>
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
index 380301497..5d50e584e 100644
--- a/test/testgarbage.cpp
+++ b/test/testgarbage.cpp
@@ -26,6 +26,7 @@
 
 #include <iosfwd>
 #include <list>
+#include <sstream>
 #include <string>
 
 
diff --git a/test/testimportproject.cpp b/test/testimportproject.cpp
index fe1e88d51..afbd0bea7 100644
--- a/test/testimportproject.cpp
+++ b/test/testimportproject.cpp
@@ -24,6 +24,7 @@
 #include <list>
 #include <memory>
 #include <map>
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testincompletestatement.cpp b/test/testincompletestatement.cpp
index 5e499f92c..dac577d6d 100644
--- a/test/testincompletestatement.cpp
+++ b/test/testincompletestatement.cpp
@@ -24,6 +24,7 @@
 
 #include <iosfwd>
 #include <map>
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/test/testinternal.cpp b/test/testinternal.cpp
index 7fd2238b8..ffb4e7ea3 100644
--- a/test/testinternal.cpp
+++ b/test/testinternal.cpp
@@ -22,6 +22,7 @@
 #include "checkinternal.h"
 #include "testsuite.h"
 
+#include <sstream>
 
 class TestInternal : public TestFixture {
 public:
diff --git a/test/testio.cpp b/test/testio.cpp
index 68bfaf68d..5bc7f7524 100644
--- a/test/testio.cpp
+++ b/test/testio.cpp
@@ -26,6 +26,7 @@
 #include "tokenize.h"
 
 #include <iosfwd>
+#include <sstream>
 
 
 class TestIO : public TestFixture {
diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
index e5d34c620..1a3c68211 100644
--- a/test/testleakautovar.cpp
+++ b/test/testleakautovar.cpp
@@ -26,6 +26,7 @@
 
 #include <iosfwd>
 #include <map>
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp
index a03602155..6b168ebbb 100644
--- a/test/testlibrary.cpp
+++ b/test/testlibrary.cpp
@@ -27,6 +27,7 @@
 
 #include <iosfwd>
 #include <map>
+#include <sstream>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index 9873a1517..df9539cbd 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -27,6 +27,7 @@
 #include <iosfwd>
 #include <list>
 #include <memory>
+#include <sstream>
 #include <string>
 
 class TestMemleakInClass;
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
index 7cc241894..40f6e1d30 100644
--- a/test/testnullpointer.cpp
+++ b/test/testnullpointer.cpp
@@ -29,6 +29,7 @@
 #include <iosfwd>
 #include <list>
 #include <map>
+#include <sstream>
 #include <string>
 #include <unordered_map>
 #include <utility>
diff --git a/test/testother.cpp b/test/testother.cpp
index 3739a8ea6..af6facca6 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -28,6 +28,7 @@
 
 #include <iosfwd>
 #include <map>
+#include <sstream>
 #include <string>
 #include <unordered_map>
 #include <utility>
diff --git a/test/testpostfixoperator.cpp b/test/testpostfixoperator.cpp
index f3b9086aa..60a06615d 100644
--- a/test/testpostfixoperator.cpp
+++ b/test/testpostfixoperator.cpp
@@ -24,6 +24,7 @@
 #include "tokenize.h"
 
 #include <iosfwd>
+#include <sstream>
 
 class TestPostfixOperator : public TestFixture {
 public:
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
index 7b7406457..1b19770bb 100644
--- a/test/testpreprocessor.cpp
+++ b/test/testpreprocessor.cpp
@@ -35,6 +35,7 @@
 #include <map>
 #include <memory>
 #include <set>
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testprocessexecutor.cpp b/test/testprocessexecutor.cpp
index 8fc5459db..c0600c1f1 100644
--- a/test/testprocessexecutor.cpp
+++ b/test/testprocessexecutor.cpp
@@ -25,6 +25,7 @@
 #include <cstddef>
 #include <map>
 #include <ostream>
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
index be25ac053..87fa8938c 100644
--- a/test/testsimplifytemplate.cpp
+++ b/test/testsimplifytemplate.cpp
@@ -28,6 +28,7 @@
 
 #include <cstring>
 #include <iosfwd>
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
index 6d11e68fc..bc1ff7999 100644
--- a/test/testsimplifytokens.cpp
+++ b/test/testsimplifytokens.cpp
@@ -25,6 +25,7 @@
 #include "tokenize.h"
 
 #include <istream>
+#include <sstream>
 #include <string>
 
 
diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
index 6074015a1..775daf39b 100644
--- a/test/testsimplifyusing.cpp
+++ b/test/testsimplifyusing.cpp
@@ -25,6 +25,7 @@
 #include "tokenize.h"
 
 #include <iosfwd>
+#include <sstream>
 #include <string>
 
 
diff --git a/test/testsizeof.cpp b/test/testsizeof.cpp
index b23f033c4..9f9b6d0b1 100644
--- a/test/testsizeof.cpp
+++ b/test/testsizeof.cpp
@@ -24,6 +24,7 @@
 
 #include <iosfwd>
 #include <map>
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/test/teststl.cpp b/test/teststl.cpp
index e279d8e85..c988a3966 100644
--- a/test/teststl.cpp
+++ b/test/teststl.cpp
@@ -25,6 +25,7 @@
 
 #include <cstddef>
 #include <iosfwd>
+#include <sstream>
 #include <string>
 
 
diff --git a/test/teststring.cpp b/test/teststring.cpp
index 36ea2bf00..f1347c8aa 100644
--- a/test/teststring.cpp
+++ b/test/teststring.cpp
@@ -24,6 +24,7 @@
 #include "tokenize.h"
 
 #include <iosfwd>
+#include <sstream>
 
 
 class TestString : public TestFixture {
diff --git a/test/testsuite.cpp b/test/testsuite.cpp
index 0d76bd235..c084b7424 100644
--- a/test/testsuite.cpp
+++ b/test/testsuite.cpp
@@ -25,6 +25,7 @@
 #include <cstdio>
 #include <cctype>
 #include <iostream>
+#include <sstream>
 #include <string>
 
 std::ostringstream errout;
diff --git a/test/testsummaries.cpp b/test/testsummaries.cpp
index 5f9d5cf39..a26636562 100644
--- a/test/testsummaries.cpp
+++ b/test/testsummaries.cpp
@@ -22,7 +22,8 @@
 #include "testsuite.h"
 #include "tokenize.h"
 
-#include <iosfwd>       // for istringstream, ostringstream
+#include <iosfwd>
+#include <sstream>
 #include <string>
 
 
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
index f33633bdd..40b8be72f 100644
--- a/test/testsuppressions.cpp
+++ b/test/testsuppressions.cpp
@@ -35,6 +35,7 @@
 #include <list>
 #include <map>
 #include <memory>
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
index a2a9fb8dc..908f3a208 100644
--- a/test/testthreadexecutor.cpp
+++ b/test/testthreadexecutor.cpp
@@ -25,6 +25,7 @@
 #include <cstddef>
 #include <map>
 #include <ostream>
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/test/testtoken.cpp b/test/testtoken.cpp
index 66a24c34f..ea94f140d 100644
--- a/test/testtoken.cpp
+++ b/test/testtoken.cpp
@@ -26,6 +26,7 @@
 
 #include <algorithm>
 #include <iosfwd>
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testtokenlist.cpp b/test/testtokenlist.cpp
index 836b086e5..314d34b7a 100644
--- a/test/testtokenlist.cpp
+++ b/test/testtokenlist.cpp
@@ -22,6 +22,7 @@
 #include "tokenlist.h"
 
 #include <iosfwd>
+#include <sstream>
 #include <string>
 
 class TestTokenList : public TestFixture {
diff --git a/test/testtokenrange.cpp b/test/testtokenrange.cpp
index 9ba8e7f55..6cdda8c19 100644
--- a/test/testtokenrange.cpp
+++ b/test/testtokenrange.cpp
@@ -28,6 +28,7 @@
 #include <iterator>
 #include <list>
 #include <ostream>
+#include <sstream>
 #include <string>
 
 
diff --git a/test/testtype.cpp b/test/testtype.cpp
index 02dcfca97..cdd0307ce 100644
--- a/test/testtype.cpp
+++ b/test/testtype.cpp
@@ -25,6 +25,7 @@
 #include "tokenize.h"
 
 #include <iosfwd>
+#include <sstream>
 #include <string>
 
 class TestType : public TestFixture {
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
index a3774b7e8..837b8869f 100644
--- a/test/testunusedprivfunc.cpp
+++ b/test/testunusedprivfunc.cpp
@@ -25,6 +25,7 @@
 
 #include <iosfwd>
 #include <map>
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
index a97bc3980..c020684f7 100644
--- a/test/testunusedvar.cpp
+++ b/test/testunusedvar.cpp
@@ -25,6 +25,7 @@
 
 #include <iosfwd>
 #include <list>
+#include <sstream>
 #include <string>
 
 class TestUnusedVar : public TestFixture {
diff --git a/test/testutils.h b/test/testutils.h
index 269b9a1fa..0c87f7236 100644
--- a/test/testutils.h
+++ b/test/testutils.h
@@ -30,6 +30,7 @@
 #include <iosfwd>
 #include <list>
 #include <ostream>
+#include <sstream>
 #include <string>
 
 class Token;
diff --git a/test/testvaarg.cpp b/test/testvaarg.cpp
index 63511d345..0b57e1357 100644
--- a/test/testvaarg.cpp
+++ b/test/testvaarg.cpp
@@ -24,6 +24,7 @@
 #include "tokenize.h"
 
 #include <iosfwd>
+#include <sstream>
 
 class TestVaarg : public TestFixture {
 public:
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
index 1c7c8cc4d..8acca5137 100644
--- a/test/testvalueflow.cpp
+++ b/test/testvalueflow.cpp
@@ -36,6 +36,7 @@
 #include <memory>
 #include <ostream>
 #include <set>
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/test/testvarid.cpp b/test/testvarid.cpp
index 9bc608b2b..fbda0ef32 100644
--- a/test/testvarid.cpp
+++ b/test/testvarid.cpp
@@ -25,6 +25,7 @@
 #include "tokenize.h"
 
 #include <iosfwd>
+#include <sstream>
 #include <string>
 
 struct InternalError;