diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index e0efda90dbe..396db19b05d 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -46,12 +46,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 2eb30441894..b734077ca6c 100644
--- a/cli/cppcheckexecutor.cpp
+++ b/cli/cppcheckexecutor.cpp
@@ -44,10 +44,11 @@
 #include <cstdio>
 #include <cstdlib> // EXIT_SUCCESS and EXIT_FAILURE
 #include <ctime>
+#include <fstream>
 #include <iostream>
 #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 f1d54fd2743..8b8d8232730 100644
--- a/cli/executor.cpp
+++ b/cli/executor.cpp
@@ -25,7 +25,7 @@
 #include "suppressions.h"
 
 #include <cassert>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <utility>
 
 struct FileSettings;
diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
index 1035cd830a1..de847015ded 100644
--- a/cli/processexecutor.cpp
+++ b/cli/processexecutor.cpp
@@ -39,8 +39,9 @@
 #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>
 #include <unistd.h>
 #include <utility>
diff --git a/externals/simplecpp/simplecpp.cpp b/externals/simplecpp/simplecpp.cpp
index d8363267328..d3bd1c0c9a2 100644
--- a/externals/simplecpp/simplecpp.cpp
+++ b/externals/simplecpp/simplecpp.cpp
@@ -20,13 +20,13 @@
 #include <cstring>
 #include <ctime>
 #include <exception>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <iostream>
 #include <limits>
 #include <list>
 #include <map>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
 #include <stdexcept>
 #include <string>
diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
index 47d10fb000c..971a1b4cdc3 100644
--- a/gui/checkthread.cpp
+++ b/gui/checkthread.cpp
@@ -32,9 +32,9 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <fstream>
 #include <iterator>
 #include <list>
-#include <ostream>
 #include <set>
 #include <string>
 #include <utility>
diff --git a/lib/analyzerinfo.cpp b/lib/analyzerinfo.cpp
index 2efad8d5d04..78452107432 100644
--- a/lib/analyzerinfo.cpp
+++ b/lib/analyzerinfo.cpp
@@ -25,7 +25,6 @@
 
 #include <cstring>
 #include <map>
-#include <sstream> // IWYU pragma: keep
 
 #include "xml.h"
 
diff --git a/lib/checkersreport.cpp b/lib/checkersreport.cpp
index bff22361d5f..8fd7512069b 100644
--- a/lib/checkersreport.cpp
+++ b/lib/checkersreport.cpp
@@ -25,7 +25,6 @@
 #include <map>
 #include <sstream>
 #include <unordered_set>
-#include <utility>
 #include <vector>
 
 static bool isCppcheckPremium(const Settings& settings) {
diff --git a/lib/checkfunctions.h b/lib/checkfunctions.h
index c97348e2818..5343403b86a 100644
--- a/lib/checkfunctions.h
+++ b/lib/checkfunctions.h
@@ -31,7 +31,6 @@
 
 #include <map>
 #include <string>
-#include <utility>
 
 class Token;
 class ErrorLogger;
diff --git a/lib/checkio.cpp b/lib/checkio.cpp
index e5556a3c99a..b4fc0a4abb6 100644
--- a/lib/checkio.cpp
+++ b/lib/checkio.cpp
@@ -38,7 +38,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/checkleakautovar.cpp b/lib/checkleakautovar.cpp
index 655273a9048..1f246581765 100644
--- a/lib/checkleakautovar.cpp
+++ b/lib/checkleakautovar.cpp
@@ -41,7 +41,6 @@
 #include <cstddef>
 #include <iostream>
 #include <list>
-#include <utility>
 #include <vector>
 
 //---------------------------------------------------------------------------
diff --git a/lib/checkleakautovar.h b/lib/checkleakautovar.h
index 38b1abbd82d..97aaff5722f 100644
--- a/lib/checkleakautovar.h
+++ b/lib/checkleakautovar.h
@@ -30,7 +30,6 @@
 #include <map>
 #include <set>
 #include <string>
-#include <utility>
 
 class ErrorLogger;
 class Settings;
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
index b1e8e0ccf1a..e4d029958ae 100644
--- a/lib/checkuninitvar.cpp
+++ b/lib/checkuninitvar.cpp
@@ -39,7 +39,6 @@
 #include <list>
 #include <map>
 #include <unordered_set>
-#include <utility>
 #include <vector>
 
 
diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
index 292652fb019..fdc2789d321 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/checkunusedvar.cpp b/lib/checkunusedvar.cpp
index 5e20b990c91..d7e4f4bf55e 100644
--- a/lib/checkunusedvar.cpp
+++ b/lib/checkunusedvar.cpp
@@ -28,7 +28,6 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
-#include "tokenlist.h"
 #include "utils.h"
 #include "valueflow.h"
 
diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
index aa46a1ff259..f1b7732cc38 100644
--- a/lib/clangimport.cpp
+++ b/lib/clangimport.cpp
@@ -38,7 +38,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 20c3d7e3760..6212a06fe3d 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 1cc088120a7..fa3e0e846c9 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -48,12 +48,12 @@
 #include <cctype>
 #include <cstdlib>
 #include <ctime>
-#include <exception>
+#include <exception> // IWYU pragma: keep
 #include <fstream>
 #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/cppcheck.h b/lib/cppcheck.h
index 64c5e0b3164..f17e66541df 100644
--- a/lib/cppcheck.h
+++ b/lib/cppcheck.h
@@ -29,7 +29,7 @@
 #include "settings.h"
 
 #include <cstddef>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <functional>
 #include <list>
 #include <map>
@@ -37,7 +37,6 @@
 #include <set>
 #include <string>
 #include <unordered_set>
-#include <utility>
 #include <vector>
 
 class Tokenizer;
diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
index f2c5f74c19b..fdffd82e283 100644
--- a/lib/errorlogger.cpp
+++ b/lib/errorlogger.cpp
@@ -32,8 +32,9 @@
 #include <cassert>
 #include <cctype>
 #include <cstring>
+#include <fstream>
 #include <iomanip>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <unordered_map>
 #include <utility>
diff --git a/lib/fwdanalysis.cpp b/lib/fwdanalysis.cpp
index e43b5dfec08..e0b3074ff0d 100644
--- a/lib/fwdanalysis.cpp
+++ b/lib/fwdanalysis.cpp
@@ -28,7 +28,6 @@
 #include <list>
 #include <map>
 #include <string>
-#include <utility>
 
 static bool isUnchanged(const Token *startToken, const Token *endToken, const std::set<nonneg int> &exprVarIds, bool local)
 {
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
index dc592efefb1..754dcb812d8 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 76b549e34f4..b90f07bc6a7 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/path.cpp b/lib/path.cpp
index d469cf352af..1acf8737bdf 100644
--- a/lib/path.cpp
+++ b/lib/path.cpp
@@ -32,6 +32,7 @@
 #include <simplecpp.h>
 
 #ifndef _WIN32
+#include <sys/types.h>
 #include <unistd.h>
 #else
 #include <direct.h>
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
index fe222a2687b..b0f991ed3ac 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/settings.cpp b/lib/settings.cpp
index 738202483d1..27c4ecdebef 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -22,8 +22,9 @@
 #include "vfvalue.h"
 
 #include <cctype>
-#include <fstream> // IWYU pragma: keep
-#include <sstream> // IWYU pragma: keep
+#include <fstream>
+#include <sstream>
+#include <utility>
 
 #include "json.h"
 
diff --git a/lib/summaries.cpp b/lib/summaries.cpp
index f2d3cf4e67f..c35f66f8f49 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 80e922490ea..7c2713d176b 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 "xml.h"
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index 062e3301846..458e480fc11 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -43,7 +43,7 @@
 #include <iomanip>
 #include <iostream>
 #include <iterator>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
 #include <string>
 #include <tuple>
diff --git a/lib/token.cpp b/lib/token.cpp
index 5f151a48e4a..2392acd6732 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 <type_traits>
 #include <unordered_set>
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index c62973cc048..ccccd2f740b 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 5171615ad6e..6a7d6e71e9f 100644
--- a/lib/valueflow.cpp
+++ b/lib/valueflow.cpp
@@ -121,7 +121,7 @@
 #include <memory>
 #include <numeric>
 #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 1492f5868f1..6b78fa5b0f2 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/helpers.h b/test/helpers.h
index d5e1e3f4491..9326b7255eb 100644
--- a/test/helpers.h
+++ b/test/helpers.h
@@ -24,7 +24,7 @@
 #include "tokenlist.h"
 
 #include <cstddef>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/test/test64bit.cpp b/test/test64bit.cpp
index 041e3228fd7..04ae74d5a5e 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 8c4864ef718..735d87dddfa 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 1a42749be35..c2f5c083840 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 86488536a4e..4cc23f727c6 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 015534ccfa0..6f5402171dd 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 080cf45303a..702f88c6808 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 f1995a222c6..127212ca1b6 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 47fe3b3cabc..115ebb7baff 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 d5c12e73c8e..65686e7d262 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 f0ffab38135..e9a4f2fc94f 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 5e792ce993e..ff66059e4d5 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 55a3bf732c2..f91bc3133aa 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 243cd63af52..3f4b7bf187d 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 9e677690eda..bbe849f78dc 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 8e94cd11d58..639b931e7e0 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 d8d65af4f10..a21819c60ec 100644
--- a/test/testimportproject.cpp
+++ b/test/testimportproject.cpp
@@ -24,7 +24,7 @@
 
 #include <list>
 #include <map>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/test/testincompletestatement.cpp b/test/testincompletestatement.cpp
index 9b895c517ee..6e25f14ee9d 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 7d79eec0ee6..140747ecf51 100644
--- a/test/testio.cpp
+++ b/test/testio.cpp
@@ -26,7 +26,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 
 class TestIO : public TestFixture {
diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
index 239d5dd75cc..027c0ac29f2 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 d7fc3ca68d5..1e8f5b6aa1f 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 eada4036faf..5f4c1c7670c 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 5f76195af10..1e626f38b6e 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 e85cd590bd5..61683534f5c 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 622bdff486b..17459f0f120 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 4d8a655a82c..764bbba71a3 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 784c4b36c7a..d7eca7c1d8f 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 865d01b4189..ea809ed6533 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 f1a3ff49a94..263f68bcfdd 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 9cd18196529..3276788d693 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 f7bf96fb034..5c3951b2881 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 ba843bcd880..8168d77d5ba 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 ecaa893d687..e591070f57c 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 927d6938d69..7e92ea52a19 100644
--- a/test/testsuppressions.cpp
+++ b/test/testsuppressions.cpp
@@ -34,7 +34,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 1a75ccc3084..c0e3b700f76 100644
--- a/test/testtoken.cpp
+++ b/test/testtoken.cpp
@@ -27,7 +27,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 ed3729c4926..e58dd7b7c6d 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 882754b6547..3328e2b6630 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 0f958e6fc9f..23319dff77b 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 fc23b6a66f2..4b1486ab36e 100644
--- a/test/testunusedvar.cpp
+++ b/test/testunusedvar.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/testvaarg.cpp b/test/testvaarg.cpp
index 9de44961d4d..a4406278e01 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 9da4a4a53ab..727035b9c64 100644
--- a/test/testvarid.cpp
+++ b/test/testvarid.cpp
@@ -25,7 +25,7 @@
 #include "token.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/tools/dmake/dmake.cpp b/tools/dmake/dmake.cpp
index eefc2a3d377..e12d6e9c929 100644
--- a/tools/dmake/dmake.cpp
+++ b/tools/dmake/dmake.cpp
@@ -21,14 +21,13 @@
 #include <algorithm>
 #include <array>
 #include <cstdlib>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <functional>
 #include <iostream>
 #include <list>
 #include <map>
 #include <set>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include "config.h"