From a49a84b6865d02060ab2c937a64610db357d4a14 Mon Sep 17 00:00:00 2001
From: firewave <firewave@users.noreply.github.com>
Date: Fri, 17 Nov 2023 03:04:41 +0100
Subject: [PATCH] =?UTF-8?q?cleaned=20up=20includes=20based=20on=20`=C3=ACn?=
 =?UTF-8?q?clude-what-you-use`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cli/cmdlineparser.cpp             | 4 ++--
 cli/cppcheckexecutor.cpp          | 3 ++-
 cli/executor.cpp                  | 2 +-
 cli/processexecutor.cpp           | 3 ++-
 externals/simplecpp/simplecpp.cpp | 4 ++--
 gui/checkthread.cpp               | 2 +-
 gui/threadresult.cpp              | 1 -
 lib/analyzerinfo.cpp              | 1 -
 lib/checkersreport.cpp            | 1 -
 lib/checkfunctions.h              | 1 -
 lib/checkio.cpp                   | 2 +-
 lib/checkleakautovar.cpp          | 1 -
 lib/checkleakautovar.h            | 1 -
 lib/checkuninitvar.cpp            | 1 -
 lib/checkunusedfunctions.cpp      | 4 ++--
 lib/clangimport.cpp               | 2 +-
 lib/color.cpp                     | 2 +-
 lib/cppcheck.cpp                  | 4 ++--
 lib/cppcheck.h                    | 1 -
 lib/errorlogger.cpp               | 3 ++-
 lib/fwdanalysis.cpp               | 1 -
 lib/importproject.cpp             | 4 ++--
 lib/library.cpp                   | 2 +-
 lib/path.cpp                      | 1 +
 lib/preprocessor.cpp              | 2 +-
 lib/summaries.cpp                 | 4 ++--
 lib/suppressions.cpp              | 2 +-
 lib/symboldatabase.cpp            | 2 +-
 lib/token.cpp                     | 2 +-
 lib/tokenize.cpp                  | 2 +-
 lib/valueflow.cpp                 | 2 +-
 test/helpers.cpp                  | 2 +-
 test/test64bit.cpp                | 2 +-
 test/testassert.cpp               | 2 +-
 test/testastutils.cpp             | 2 +-
 test/testautovariables.cpp        | 2 +-
 test/testbool.cpp                 | 2 +-
 test/testboost.cpp                | 2 +-
 test/testbufferoverrun.cpp        | 2 +-
 test/testcharvar.cpp              | 2 +-
 test/testclangimport.cpp          | 2 +-
 test/testclass.cpp                | 2 +-
 test/testcondition.cpp            | 2 +-
 test/testconstructors.cpp         | 2 +-
 test/testexceptionsafety.cpp      | 2 +-
 test/testfunctions.cpp            | 2 +-
 test/testgarbage.cpp              | 2 +-
 test/testimportproject.cpp        | 2 +-
 test/testincompletestatement.cpp  | 2 +-
 test/testio.cpp                   | 2 +-
 test/testleakautovar.cpp          | 2 +-
 test/testlibrary.cpp              | 2 +-
 test/testmemleak.cpp              | 2 +-
 test/testnullpointer.cpp          | 2 +-
 test/testother.cpp                | 2 +-
 test/testpostfixoperator.cpp      | 2 +-
 test/testpreprocessor.cpp         | 2 +-
 test/testsimplifytemplate.cpp     | 2 +-
 test/testsimplifytokens.cpp       | 2 +-
 test/testsimplifyusing.cpp        | 2 +-
 test/testsizeof.cpp               | 2 +-
 test/teststl.cpp                  | 2 +-
 test/teststring.cpp               | 2 +-
 test/testsummaries.cpp            | 2 +-
 test/testsuppressions.cpp         | 2 +-
 test/testtoken.cpp                | 2 +-
 test/testtokenlist.cpp            | 2 +-
 test/testtype.cpp                 | 2 +-
 test/testunusedprivfunc.cpp       | 2 +-
 test/testunusedvar.cpp            | 2 +-
 test/testvaarg.cpp                | 2 +-
 test/testvarid.cpp                | 2 +-
 tools/dmake.cpp                   | 3 +--
 73 files changed, 73 insertions(+), 79 deletions(-)

diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 79cf7e7f5257..5b3f945cde0c 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 40fa87842a0a..042b1217344c 100644
--- a/cli/cppcheckexecutor.cpp
+++ b/cli/cppcheckexecutor.cpp
@@ -46,10 +46,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 b5e27643d704..f5c2e42ac4a2 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 9a514c66c67e..18ee8eb999bd 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 881b7c7f6fca..c13d9636e306 100644
--- a/externals/simplecpp/simplecpp.cpp
+++ b/externals/simplecpp/simplecpp.cpp
@@ -33,13 +33,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 e7d682ba0efb..39568067678a 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/gui/threadresult.cpp b/gui/threadresult.cpp
index 8f5989b885a7..1dbec569eb61 100644
--- a/gui/threadresult.cpp
+++ b/gui/threadresult.cpp
@@ -27,7 +27,6 @@
 #include <numeric>
 
 #include <QFile>
-#include <QMutexLocker>
 
 void ThreadResult::reportOut(const std::string &outmsg, Color /*c*/)
 {
diff --git a/lib/analyzerinfo.cpp b/lib/analyzerinfo.cpp
index 2efad8d5d04e..784521074320 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 bff22361d5fa..8fd7512069b8 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 537f8fe874b6..4ca62f2b56bf 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 a3805dc7ac30..d91e181e9245 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 f58e05d66c1c..bca62e38dc07 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 b91f6b5cc3f8..cc19c34ef404 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 7fa7c1c760bf..d0b0ce87f12b 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 eb789fdf7277..51657df04813 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 a31956e68f19..e4957f65c36d 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 521b3f106030..06408a76f676 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 99272e89af11..fcd26b46459d 100644
--- a/lib/cppcheck.h
+++ b/lib/cppcheck.h
@@ -36,7 +36,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 fbb635c691df..e36ff4051b3e 100644
--- a/lib/errorlogger.cpp
+++ b/lib/errorlogger.cpp
@@ -31,8 +31,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 e43b5dfec08a..e0b3074ff0dd 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 16bcc2e471f7..d98740076b4b 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 f1058c7883a1..1dacb6e37a5d 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 013044fd05e3..454e54515d35 100644
--- a/lib/path.cpp
+++ b/lib/path.cpp
@@ -31,6 +31,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 efad79ac3f7c..1392aa1867e1 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 d13ba5705fe0..af975eb2ded3 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 413a7684feec..6fa08c93b348 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 5be97b9b426e..0bcb87e9dabf 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 15c747b7fe03..089014f1e441 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 63d538dd3530..7ae1660a337e 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 e363c1266ddb..fda835dc22a3 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 d6ba495b482b..98c762cede6c 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 8ba1298158e1..ea1234dfa0c2 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 c16477fb60eb..7e430020f94c 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 c655c3d8f7a6..a30aef80c082 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 e301c41db023..b69b06221936 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 528188947222..df05730e109d 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 30cbfd2a5d8d..36f047d59f96 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 636df6e8d06e..9512c9585758 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 df88f8ce1ca5..050418f04a8e 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 <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 4f01d6b6fc70..57dd854b366b 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 c6815db4bab3..e9652557ddce 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 11870ba90294..4bae60d4b9e3 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 f2ad99a9ede5..5028fa7ad9dd 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 8e33d2d099d1..fa54f776745e 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 1b26e57ebb45..1f3824dbd325 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 b4d8d815646c..f316090b3e19 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 85432331a023..199b553f720b 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 213c9fd12043..f067b9b285ca 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 0b979aa2df6a..291352bd0c76 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 a55bfa505160..7e028c8ffa86 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 a4237aefa2dd..a246c620c1b9 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 f54f25cca74a..b18819339e8e 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>
 
 class TestVarID : public TestFixture {
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index eee4b458ba3a..2de25bc187e3 100644
--- a/tools/dmake.cpp
+++ b/tools/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"