diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 5231896b327..bc6ddba9f78 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -42,6 +42,7 @@
 #include <coreplugin/editortoolbar.h>
 #include <coreplugin/designmode.h>
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/infobar.h>
 #include <coreplugin/helpmanager.h>
diff --git a/src/plugins/designer/formeditorw.h b/src/plugins/designer/formeditorw.h
index 00fd5494b4b..42dcefe82b0 100644
--- a/src/plugins/designer/formeditorw.h
+++ b/src/plugins/designer/formeditorw.h
@@ -33,14 +33,17 @@
 
 #include "designerconstants.h"
 
-#include <coreplugin/icontext.h>
-#include <coreplugin/dialogs/ioptionspage.h>
+#include <QObject>
 
 QT_BEGIN_NAMESPACE
 class QDesignerFormEditorInterface;
 QT_END_NAMESPACE
 
-namespace Core { class IEditor; }
+namespace Core {
+class IEditor;
+class IOptionsPage;
+}
+
 namespace SharedTools { class WidgetHost; }
 
 namespace Designer {
diff --git a/src/plugins/designer/formwindoweditor.h b/src/plugins/designer/formwindoweditor.h
index 7b8c1439309..2e5251c128b 100644
--- a/src/plugins/designer/formwindoweditor.h
+++ b/src/plugins/designer/formwindoweditor.h
@@ -32,7 +32,6 @@
 #define FORMWINDOWEDITOR_H
 
 #include "designer_export.h"
-#include <coreplugin/editormanager/ieditor.h>
 #include <texteditor/texteditor.h>
 
 namespace Designer {
diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp
index f88aabd1eb8..d1c597904fd 100644
--- a/src/plugins/designer/settingspage.cpp
+++ b/src/plugins/designer/settingspage.cpp
@@ -31,6 +31,8 @@
 #include "settingspage.h"
 #include "formeditorw.h"
 
+#include <coreplugin/icontext.h>
+
 #include <QDesignerOptionsPageInterface>
 #include <QCoreApplication>