diff --git a/src/libs/utils/namevaluesdialog.h b/src/libs/utils/namevaluesdialog.h
index 8170a99a1d3..e690c717d70 100644
--- a/src/libs/utils/namevaluesdialog.h
+++ b/src/libs/utils/namevaluesdialog.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include "environmentfwd.h"
+#include "namevalueitem.h"
 #include "optional.h"
 #include "utils_global.h"
 
diff --git a/src/plugins/cppcheck/cppcheckrunner.h b/src/plugins/cppcheck/cppcheckrunner.h
index 0fd031bbce3..83aca95192f 100644
--- a/src/plugins/cppcheck/cppcheckrunner.h
+++ b/src/plugins/cppcheck/cppcheckrunner.h
@@ -25,14 +25,12 @@
 
 #pragma once
 
+#include <utils/filepath.h>
+
 #include <QHash>
 #include <QTimer>
 
-namespace Utils {
-class QtcProcess;
-class FilePath;
-using FilePaths = QList<FilePath>;
-}
+namespace Utils { class QtcProcess; }
 
 namespace Cppcheck {
 namespace Internal {