diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
index fc3349e24a0c..333a22bbccce 100644
--- a/cli/cppcheckexecutor.cpp
+++ b/cli/cppcheckexecutor.cpp
@@ -51,6 +51,7 @@
 #include <cstdio>
 #include <cstdlib> // EXIT_SUCCESS and EXIT_FAILURE
 #include <ctime>
+#include <fstream>
 #include <iostream>
 #include <iterator>
 #include <list>
diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
index ae41d6117398..1701b7c6d777 100644
--- a/cli/processexecutor.cpp
+++ b/cli/processexecutor.cpp
@@ -41,6 +41,7 @@
 #include <map>
 #include <sstream> // IWYU pragma: keep
 #include <sys/select.h>
+#include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <utility>
diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
index 0da46e6faca4..8e1a629cf8ab 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/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/checkleakautovar.cpp b/lib/checkleakautovar.cpp
index 3894de255213..be02bcccb93f 100644
--- a/lib/checkleakautovar.cpp
+++ b/lib/checkleakautovar.cpp
@@ -40,7 +40,6 @@
 #include <cstddef>
 #include <iostream>
 #include <list>
-#include <utility>
 #include <vector>
 
 //---------------------------------------------------------------------------
diff --git a/lib/checkleakautovar.h b/lib/checkleakautovar.h
index 23af88ff11ce..9c951a0d6275 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 94d64d275378..2913fe69d770 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/cppcheck.cpp b/lib/cppcheck.cpp
index 7cc42b6a54c2..c6b661deb019 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -48,7 +48,6 @@
 #include <cctype>
 #include <cstdlib>
 #include <ctime>
-#include <exception>
 #include <fstream>
 #include <iostream> // <- TEMPORARY
 #include <new>
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
index 4ed6c9188466..e3c532b22a73 100644
--- a/lib/cppcheck.h
+++ b/lib/cppcheck.h
@@ -35,7 +35,6 @@
 #include <map>
 #include <set>
 #include <string>
-#include <utility>
 #include <vector>
 
 class Tokenizer;
diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
index 886ebd516d8e..db82da7dc4ba 100644
--- a/lib/errorlogger.cpp
+++ b/lib/errorlogger.cpp
@@ -31,6 +31,7 @@
 #include <cassert>
 #include <cctype>
 #include <cstring>
+#include <fstream>
 #include <iomanip>
 #include <sstream> // IWYU pragma: keep
 #include <string>
diff --git a/lib/fwdanalysis.cpp b/lib/fwdanalysis.cpp
index 1dd44759d026..490c901985b8 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/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/tools/dmake.cpp b/tools/dmake.cpp
index 474a6b31dbd6..131f34c48cb2 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -28,7 +28,6 @@
 #include <map>
 #include <set>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include "config.h"