diff --git a/lib/addoninfo.cpp b/lib/addoninfo.cpp
index 217f04ae532..82effa13834 100644
--- a/lib/addoninfo.cpp
+++ b/lib/addoninfo.cpp
@@ -24,6 +24,7 @@
 #include <fstream>
 #include <iostream>
 #include <string>
+#include <utility>
 
 #include "json.h"
 
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
index 2e10b433063..0f30c82147d 100644
--- a/lib/checkleakautovar.cpp
+++ b/lib/checkleakautovar.cpp
@@ -34,7 +34,6 @@
 #include "tokenize.h"
 #include "tokenlist.h"
 #include "utils.h"
-#include "vfvalue.h"
 
 #include <algorithm>
 #include <array>
diff --git a/lib/forwardanalyzer.cpp b/lib/forwardanalyzer.cpp
index 339c814280d..1ad97c8fb80 100644
--- a/lib/forwardanalyzer.cpp
+++ b/lib/forwardanalyzer.cpp
@@ -30,7 +30,6 @@
 #include "tokenlist.h"
 #include "utils.h"
 #include "valueptr.h"
-#include "vfvalue.h"
 
 #include <algorithm>
 #include <cassert>
diff --git a/lib/json.h b/lib/json.h
index 25b62c53cb8..2bcfe102071 100644
--- a/lib/json.h
+++ b/lib/json.h
@@ -30,7 +30,7 @@ SUPPRESS_WARNING_CLANG_PUSH("-Wformat")
 SUPPRESS_WARNING_CLANG_PUSH("-Wfloat-conversion")
 
 #define PICOJSON_USE_INT64
-#include <picojson.h>
+#include <picojson.h> // IWYU pragma: export
 
 SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
diff --git a/test/testexecutor.cpp b/test/testexecutor.cpp
index e11f563b553..b87a4971ac2 100644
--- a/test/testexecutor.cpp
+++ b/test/testexecutor.cpp
@@ -16,12 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "errorlogger.h"
+#include "errortypes.h"
 #include "executor.h"
 #include "filesettings.h"
 #include "fixture.h"
+#include "settings.h"
 #include "suppressions.h"
 
+#include <list>
 #include <stdexcept>
+#include <string>
+#include <utility>
 
 class DummyExecutor : public Executor
 {
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
index ead4e0eb499..5ab1cc0132e 100644
--- a/test/testsuppressions.cpp
+++ b/test/testsuppressions.cpp
@@ -18,6 +18,7 @@
 
 #include "cppcheck.h"
 #include "cppcheckexecutor.h"
+#include "errorlogger.h"
 #include "errortypes.h"
 #include "filesettings.h"
 #include "fixture.h"
diff --git a/test/testtoken.cpp b/test/testtoken.cpp
index 96381a1a222..6f88bef266e 100644
--- a/test/testtoken.cpp
+++ b/test/testtoken.cpp
@@ -18,6 +18,7 @@
 
 #include "fixture.h"
 #include "helpers.h"
+#include "settings.h"
 #include "standards.h"
 #include "token.h"
 #include "tokenlist.h"