diff --git a/src/libs/utils/environmentfwd.h b/src/libs/utils/environmentfwd.h
index 51089eeee19..8a2c444cc42 100644
--- a/src/libs/utils/environmentfwd.h
+++ b/src/libs/utils/environmentfwd.h
@@ -5,11 +5,8 @@
 
 #include <QList>
 
-QT_BEGIN_NAMESPACE
-class QTreeView;
-QT_END_NAMESPACE
-
 namespace Utils {
+
 class NameValueDictionary;
 class NameValueItem;
 using NameValueItems = QList<NameValueItem>;
@@ -24,4 +21,5 @@ using PreprocessorMacroItems = NameValueItems;
 
 class NameValueModel;
 class EnvironmentModel;
+
 } // namespace Utils
diff --git a/src/libs/utils/namevaluevalidator.h b/src/libs/utils/namevaluevalidator.h
index 2f11196eb6a..bf0f1b27f74 100644
--- a/src/libs/utils/namevaluevalidator.h
+++ b/src/libs/utils/namevaluevalidator.h
@@ -5,14 +5,13 @@
 
 #include "utils_global.h"
 
-#include "environmentfwd.h"
-
 #include <QPersistentModelIndex>
 #include <QTimer>
 #include <QValidator>
 
 QT_BEGIN_NAMESPACE
 class QModelIndex;
+class QTreeView;
 QT_END_NAMESPACE
 
 namespace Utils {
diff --git a/src/plugins/clangtools/clangselectablefilesdialog.h b/src/plugins/clangtools/clangselectablefilesdialog.h
index cfe8c975cae..f8926adffd4 100644
--- a/src/plugins/clangtools/clangselectablefilesdialog.h
+++ b/src/plugins/clangtools/clangselectablefilesdialog.h
@@ -9,6 +9,7 @@
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
+class QTreeView;
 QT_END_NAMESPACE
 
 namespace ClangTools {
diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.h b/src/plugins/cppeditor/cppcodemodelinspectordialog.h
index c4d4e2164d8..ba592b0a074 100644
--- a/src/plugins/cppeditor/cppcodemodelinspectordialog.h
+++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.h
@@ -17,6 +17,7 @@ class QModelIndex;
 class QPlainTextEdit;
 class QSortFilterProxyModel;
 class QTabWidget;
+class QTreeView;
 QT_END_NAMESPACE
 
 namespace CppEditor::Internal {