diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 442fd7daf8f4..10868ca9a05d 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -38,12 +38,12 @@
 #include <cstdio>
 #include <cstdlib> // EXIT_FAILURE
 #include <cstring>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <iostream>
 #include <iterator>
 #include <list>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <unordered_set>
 #include <utility>
 
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
index 333a22bbccce..c29b1befea18 100644
--- a/cli/cppcheckexecutor.cpp
+++ b/cli/cppcheckexecutor.cpp
@@ -56,7 +56,7 @@
 #include <iterator>
 #include <list>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <unordered_set>
 #include <utility>
 #include <vector>
diff --git a/cli/executor.cpp b/cli/executor.cpp
index 40ae2437b21d..1a08cfc9369e 100644
--- a/cli/executor.cpp
+++ b/cli/executor.cpp
@@ -25,7 +25,7 @@
 
 #include <algorithm>
 #include <cassert>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <utility>
 
 struct FileSettings;
diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
index 1701b7c6d777..86bd7c5e84cc 100644
--- a/cli/processexecutor.cpp
+++ b/cli/processexecutor.cpp
@@ -39,7 +39,7 @@
 #include <iostream>
 #include <list>
 #include <map>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <sys/select.h>
 #include <sys/time.h>
 #include <sys/wait.h>
diff --git a/lib/analyzerinfo.cpp b/lib/analyzerinfo.cpp
index 1ee29621ac8c..36a5c014732a 100644
--- a/lib/analyzerinfo.cpp
+++ b/lib/analyzerinfo.cpp
@@ -26,7 +26,7 @@
 #include <tinyxml2.h>
 #include <cstring>
 #include <map>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 
 AnalyzerInformation::~AnalyzerInformation()
 {
diff --git a/lib/checkio.cpp b/lib/checkio.cpp
index 2d52f9ad4e1c..169e85c61710 100644
--- a/lib/checkio.cpp
+++ b/lib/checkio.cpp
@@ -37,7 +37,7 @@
 #include <list>
 #include <map>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <unordered_set>
 #include <utility>
 #include <vector>
diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
index f1f8abae0f6a..8b2467f88769 100644
--- a/lib/checkunusedfunctions.cpp
+++ b/lib/checkunusedfunctions.cpp
@@ -34,9 +34,9 @@
 #include <algorithm>
 #include <cctype>
 #include <cstring>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <map>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <tuple>
 #include <utility>
 #include <vector>
diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
index 805741fd00bb..604b91d174b3 100644
--- a/lib/clangimport.cpp
+++ b/lib/clangimport.cpp
@@ -37,7 +37,7 @@
 #include <map>
 #include <memory>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
 #include <string>
 #include <utility>
diff --git a/lib/color.cpp b/lib/color.cpp
index 20c3d7e37600..6212a06fe3da 100644
--- a/lib/color.cpp
+++ b/lib/color.cpp
@@ -21,7 +21,7 @@
 #ifndef _WIN32
 #include <unistd.h>
 #include <cstddef>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <iostream>
 #endif
 
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index c6b661deb019..4af8fb3882b4 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -52,7 +52,7 @@
 #include <iostream> // <- TEMPORARY
 #include <new>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stdexcept>
 #include <string>
 #include <unordered_set>
diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
index db82da7dc4ba..2d0ff4a6b6e8 100644
--- a/lib/errorlogger.cpp
+++ b/lib/errorlogger.cpp
@@ -33,7 +33,7 @@
 #include <cstring>
 #include <fstream>
 #include <iomanip>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <unordered_map>
 #include <utility>
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
index 2b7790e5982b..774d1adff9df 100644
--- a/lib/importproject.cpp
+++ b/lib/importproject.cpp
@@ -29,10 +29,10 @@
 #include <algorithm>
 #include <cstdlib>
 #include <cstring>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <iostream>
 #include <iterator>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <unordered_set>
 #include <utility>
 
diff --git a/lib/library.cpp b/lib/library.cpp
index 593e764485c2..ed833e760bd6 100644
--- a/lib/library.cpp
+++ b/lib/library.cpp
@@ -35,7 +35,7 @@
 #include <cstring>
 #include <list>
 #include <memory>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
 #include <stdexcept>
 #include <string>
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
index 4efba6d1e13c..4475061ccc11 100644
--- a/lib/preprocessor.cpp
+++ b/lib/preprocessor.cpp
@@ -33,7 +33,7 @@
 #include <array>
 #include <cstddef>
 #include <iterator> // back_inserter
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <utility>
 
 #include <simplecpp.h>
diff --git a/lib/summaries.cpp b/lib/summaries.cpp
index 21892500c492..270f7a7073b2 100644
--- a/lib/summaries.cpp
+++ b/lib/summaries.cpp
@@ -26,9 +26,9 @@
 #include "tokenlist.h"
 
 #include <algorithm>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <map>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <utility>
 #include <vector>
 
diff --git a/lib/suppressions.cpp b/lib/suppressions.cpp
index d395a4c1ed2f..f8e67813dc51 100644
--- a/lib/suppressions.cpp
+++ b/lib/suppressions.cpp
@@ -30,7 +30,7 @@
 #include <cctype>   // std::isdigit, std::isalnum, etc
 #include <cstring>
 #include <functional> // std::bind, std::placeholders
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <utility>
 
 #include <tinyxml2.h>
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index 5e9c9d24081c..7ebca999fa68 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -44,7 +44,7 @@
 #include <iostream>
 #include <iterator>
 #include <limits>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
 #include <string>
 #include <tuple>
diff --git a/lib/token.cpp b/lib/token.cpp
index 0b548aa14b41..d09ee2c1dc60 100644
--- a/lib/token.cpp
+++ b/lib/token.cpp
@@ -40,7 +40,7 @@
 #include <iterator>
 #include <map>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
 #include <unordered_set>
 #include <utility>
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 75fa0ebea9c3..2644e3061423 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -48,7 +48,7 @@
 #include <exception>
 #include <memory>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
 #include <stdexcept>
 #include <unordered_map>
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
index 97c2c453dee1..b94137e460b5 100644
--- a/lib/valueflow.cpp
+++ b/lib/valueflow.cpp
@@ -120,7 +120,7 @@
 #include <map>
 #include <memory>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <type_traits>
 #include <unordered_map>
diff --git a/test/helpers.cpp b/test/helpers.cpp
index b4c46a90d2ce..1f5e07b20ce8 100644
--- a/test/helpers.cpp
+++ b/test/helpers.cpp
@@ -26,7 +26,7 @@
 #include <cerrno>
 #include <cstdio>
 #include <iostream>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <list>
 #include <map>
 #include <stdexcept>
diff --git a/test/test64bit.cpp b/test/test64bit.cpp
index 72d54f91d1e3..e36dd5f923cd 100644
--- a/test/test64bit.cpp
+++ b/test/test64bit.cpp
@@ -23,7 +23,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 
 class Test64BitPortability : public TestFixture {
 public:
diff --git a/test/testassert.cpp b/test/testassert.cpp
index 589b53641236..832426bfe095 100644
--- a/test/testassert.cpp
+++ b/test/testassert.cpp
@@ -23,7 +23,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 
 
 class TestAssert : public TestFixture {
diff --git a/test/testastutils.cpp b/test/testastutils.cpp
index eacaaace885f..8c1f76c257b4 100644
--- a/test/testastutils.cpp
+++ b/test/testastutils.cpp
@@ -27,7 +27,7 @@
 #include "tokenlist.h"
 
 #include <cstring>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 
 class TestAstUtils : public TestFixture {
 public:
diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
index ede111f1cdd8..83afc5bf85b9 100644
--- a/test/testautovariables.cpp
+++ b/test/testautovariables.cpp
@@ -23,7 +23,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 
 class TestAutoVariables : public TestFixture {
 public:
diff --git a/test/testbool.cpp b/test/testbool.cpp
index 17115bd9e50b..5581db8e6bba 100644
--- a/test/testbool.cpp
+++ b/test/testbool.cpp
@@ -23,7 +23,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 
 class TestBool : public TestFixture {
 public:
diff --git a/test/testboost.cpp b/test/testboost.cpp
index fd6d8ef4b6a8..da874c08b894 100644
--- a/test/testboost.cpp
+++ b/test/testboost.cpp
@@ -23,7 +23,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 
 class TestBoost : public TestFixture {
 public:
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
index 63491d85f3c5..511fdc5adb40 100644
--- a/test/testbufferoverrun.cpp
+++ b/test/testbufferoverrun.cpp
@@ -29,7 +29,7 @@
 #include "tokenize.h"
 
 #include <list>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testcharvar.cpp b/test/testcharvar.cpp
index 1936720e5614..fc2a66e4fa3f 100644
--- a/test/testcharvar.cpp
+++ b/test/testcharvar.cpp
@@ -24,7 +24,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 
 class TestCharVar : public TestFixture {
 public:
diff --git a/test/testclangimport.cpp b/test/testclangimport.cpp
index f92b8ef98f4c..15990b2ae14d 100644
--- a/test/testclangimport.cpp
+++ b/test/testclangimport.cpp
@@ -24,7 +24,7 @@
 
 #include <cstdint>
 #include <list>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testclass.cpp b/test/testclass.cpp
index 04a3f2f700c1..7d7924c84a75 100644
--- a/test/testclass.cpp
+++ b/test/testclass.cpp
@@ -26,7 +26,7 @@
 #include "tokenize.h"
 
 #include <list>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
index e89031a818a5..eff8c021235e 100644
--- a/test/testcondition.cpp
+++ b/test/testcondition.cpp
@@ -26,7 +26,7 @@
 #include "tokenize.h"
 
 #include <limits>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testconstructors.cpp b/test/testconstructors.cpp
index 77ab92d86778..9a295ca29bc9 100644
--- a/test/testconstructors.cpp
+++ b/test/testconstructors.cpp
@@ -24,7 +24,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 
 
 class TestConstructors : public TestFixture {
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
index 76291ee8541a..549b61699992 100644
--- a/test/testexceptionsafety.cpp
+++ b/test/testexceptionsafety.cpp
@@ -23,7 +23,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 
 class TestExceptionSafety : public TestFixture {
 public:
diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
index e223e74b05f5..23892b696873 100644
--- a/test/testfunctions.cpp
+++ b/test/testfunctions.cpp
@@ -23,7 +23,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 
 class TestFunctions : public TestFixture {
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
index 88387d4a4251..d9844f4bd88f 100644
--- a/test/testgarbage.cpp
+++ b/test/testgarbage.cpp
@@ -25,7 +25,7 @@
 #include "tokenize.h"
 
 #include <list>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 
 
diff --git a/test/testimportproject.cpp b/test/testimportproject.cpp
index fb6a667073d1..d36374a9d598 100644
--- a/test/testimportproject.cpp
+++ b/test/testimportproject.cpp
@@ -23,7 +23,7 @@
 
 #include <list>
 #include <map>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testincompletestatement.cpp b/test/testincompletestatement.cpp
index 1cf105b0ace5..a4268f6714b0 100644
--- a/test/testincompletestatement.cpp
+++ b/test/testincompletestatement.cpp
@@ -23,7 +23,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testio.cpp b/test/testio.cpp
index 8f89f0a7bd57..9ae772ed2c50 100644
--- a/test/testio.cpp
+++ b/test/testio.cpp
@@ -25,7 +25,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 
 
diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
index 0b70e28f2636..91367ee5efc5 100644
--- a/test/testleakautovar.cpp
+++ b/test/testleakautovar.cpp
@@ -24,7 +24,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp
index 7fa157ad0ad7..f27236a48d3e 100644
--- a/test/testlibrary.cpp
+++ b/test/testlibrary.cpp
@@ -28,7 +28,7 @@
 
 #include <cstddef>
 #include <map>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index 7358cd97fb6f..fa382fd04ca3 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -25,7 +25,7 @@
 #include "tokenize.h"
 
 #include <list>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 
 class TestMemleakInClass;
 class TestMemleakNoVar;
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
index b1757014e713..f133b244d6d6 100644
--- a/test/testnullpointer.cpp
+++ b/test/testnullpointer.cpp
@@ -29,7 +29,7 @@
 
 #include <list>
 #include <map>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/test/testother.cpp b/test/testother.cpp
index b5dc0432eb33..590a78179510 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -26,7 +26,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testpostfixoperator.cpp b/test/testpostfixoperator.cpp
index 48ff941f542e..e33ecab5a45f 100644
--- a/test/testpostfixoperator.cpp
+++ b/test/testpostfixoperator.cpp
@@ -23,7 +23,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 
 class TestPostfixOperator : public TestFixture {
 public:
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
index 9d2bd010e5a0..3e3aa63dd6d6 100644
--- a/test/testpreprocessor.cpp
+++ b/test/testpreprocessor.cpp
@@ -33,7 +33,7 @@
 #include <list>
 #include <map>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
index 03d62dbe7bab..e6f43c5fb23f 100644
--- a/test/testsimplifytemplate.cpp
+++ b/test/testsimplifytemplate.cpp
@@ -27,7 +27,7 @@
 #include "tokenlist.h"
 
 #include <cstring>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
index 3cb4dd7c24f2..87add6e52403 100644
--- a/test/testsimplifytokens.cpp
+++ b/test/testsimplifytokens.cpp
@@ -24,7 +24,7 @@
 #include "token.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 
 
diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
index 5e3a5427a576..1b8cba848569 100644
--- a/test/testsimplifyusing.cpp
+++ b/test/testsimplifyusing.cpp
@@ -26,7 +26,7 @@
 #include "tokenize.h"
 #include "utils.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testsizeof.cpp b/test/testsizeof.cpp
index 22bd7e7ed421..6bc951e3f900 100644
--- a/test/testsizeof.cpp
+++ b/test/testsizeof.cpp
@@ -23,7 +23,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/teststl.cpp b/test/teststl.cpp
index b545a52fc70e..67f578193241 100644
--- a/test/teststl.cpp
+++ b/test/teststl.cpp
@@ -25,7 +25,7 @@
 #include "utils.h"
 
 #include <cstddef>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 
 
diff --git a/test/teststring.cpp b/test/teststring.cpp
index 8d443e215b46..c94efd2081ce 100644
--- a/test/teststring.cpp
+++ b/test/teststring.cpp
@@ -24,7 +24,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testsummaries.cpp b/test/testsummaries.cpp
index cfead86fdd75..832915dac2d8 100644
--- a/test/testsummaries.cpp
+++ b/test/testsummaries.cpp
@@ -22,7 +22,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 
 
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
index 87aee88a02a9..8489423d0ada 100644
--- a/test/testsuppressions.cpp
+++ b/test/testsuppressions.cpp
@@ -35,7 +35,7 @@
 #include <list>
 #include <map>
 #include <memory>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/test/testtoken.cpp b/test/testtoken.cpp
index 827f6f20c435..a9c9aeab62e1 100644
--- a/test/testtoken.cpp
+++ b/test/testtoken.cpp
@@ -26,7 +26,7 @@
 #include "vfvalue.h"
 
 #include <algorithm>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testtokenlist.cpp b/test/testtokenlist.cpp
index 2e764608ee49..40dbc7f85d16 100644
--- a/test/testtokenlist.cpp
+++ b/test/testtokenlist.cpp
@@ -23,7 +23,7 @@
 #include "token.h"
 #include "tokenlist.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 
 class TestTokenList : public TestFixture {
diff --git a/test/testtype.cpp b/test/testtype.cpp
index dbf6c07ae4fd..9fd51c23282a 100644
--- a/test/testtype.cpp
+++ b/test/testtype.cpp
@@ -27,7 +27,7 @@
 #include "tokenize.h"
 
 #include <list>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
index a0842a8526a0..0488f2cb47a4 100644
--- a/test/testunusedprivfunc.cpp
+++ b/test/testunusedprivfunc.cpp
@@ -24,7 +24,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
index 75ae9b961fa2..7167a69222b3 100644
--- a/test/testunusedvar.cpp
+++ b/test/testunusedvar.cpp
@@ -25,7 +25,7 @@
 #include "tokenize.h"
 
 #include <list>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/testvaarg.cpp b/test/testvaarg.cpp
index 90769ee8387c..747d19836b50 100644
--- a/test/testvaarg.cpp
+++ b/test/testvaarg.cpp
@@ -23,7 +23,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 
 class TestVaarg : public TestFixture {
 public:
diff --git a/test/testvarid.cpp b/test/testvarid.cpp
index 6e835f2dfe9f..e205c8c603d4 100644
--- a/test/testvarid.cpp
+++ b/test/testvarid.cpp
@@ -24,7 +24,7 @@
 #include "token.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 
 class TestVarID : public TestFixture {
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index 131f34c48cb2..6cbe3bc46c93 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -21,7 +21,7 @@
 #include <algorithm>
 #include <array>
 #include <cstdlib>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <functional>
 #include <iostream>
 #include <list>