1 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h
index 752addecb3..3b7e1519e7 100644
--- a/src/plugins/coreplugin/editormanager/editorview.h
+++ b/src/plugins/coreplugin/editormanager/editorview.h
@@ -25,9 +25,8 @@
 
 #pragma once
 
-#include "../id.h"
-
 #include <utils/dropsupport.h>
+#include <utils/id.h>
 
 #include <QMap>
 #include <QList>
@@ -50,10 +49,13 @@ class QStackedWidget;
 class QToolButton;
 QT_END_NAMESPACE
 
+namespace Utils {
+class InfoBarDisplay;
+}
+
 namespace Core {
 class IDocument;
 class IEditor;
-class InfoBarDisplay;
 class EditorToolBar;
 
 namespace Internal {
@@ -61,7 +63,7 @@ namespace Internal {
 struct EditLocation {
     QPointer<IDocument> document;
     QString fileName;
-    Id id;
+    Utils::Id id;
     QVariant state;
 };
 
@@ -130,7 +132,7 @@ private:
     EditorToolBar *m_toolBar;
 
     QStackedWidget *m_container;
-    InfoBarDisplay *m_infoBarDisplay;
+    Utils::InfoBarDisplay *m_infoBarDisplay;
     QString m_statusWidgetId;
     QFrame *m_statusHLine;
     QFrame *m_statusWidget;