diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h
index 6249dc2b5e7..12a8f0fecc1 100644
--- a/src/plugins/designer/designerconstants.h
+++ b/src/plugins/designer/designerconstants.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DESIGNERPLUGIN_CONSTANTS_H
-#define DESIGNERPLUGIN_CONSTANTS_H
+#ifndef DESIGNERCONSTANTS_H
+#define DESIGNERCONSTANTS_H
 
 #include <QtGlobal>
 
@@ -80,4 +80,4 @@ namespace Internal {
 } // Constants
 } // Designer
 
-#endif //DESIGNERPLUGIN_CONSTANTS_H
+#endif //DESIGNERCONSTANTS_H
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 7eda1df9f97..03636bb591d 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -37,7 +37,6 @@
 #include "qtcreatorintegration.h"
 #include "designerxmleditor.h"
 #include "designercontext.h"
-#include "editorwidget.h"
 #include "resourcehandler.h"
 #include <widgethost.h>
 
@@ -76,7 +75,6 @@
 #include <abstractobjectinspector.h>
 #include <QDesignerPropertyEditorInterface>
 #include <QDesignerActionEditorInterface>
-#include <QDesignerFormEditorInterface>
 
 #include <QAction>
 #include <QActionGroup>
diff --git a/src/plugins/designer/formtemplatewizardpage.h b/src/plugins/designer/formtemplatewizardpage.h
index b4c49a9a319..5b59fea8e85 100644
--- a/src/plugins/designer/formtemplatewizardpage.h
+++ b/src/plugins/designer/formtemplatewizardpage.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef FORMWIZARDPAGE_H
-#define FORMWIZARDPAGE_H
+#ifndef FORMTEMPLATEWIZARDPAGE_H
+#define FORMTEMPLATEWIZARDPAGE_H
 
 #include <QWizardPage>
 
diff --git a/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h b/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h
index 956b603c040..89deab50d30 100644
--- a/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h
+++ b/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h
@@ -38,8 +38,8 @@
 // We mean it.
 //
 
-#ifndef QDESIGNER_FORMWINDOMANAGER_H
-#define QDESIGNER_FORMWINDOMANAGER_H
+#ifndef QDESIGNER_FORMWINDOWMANAGER_H
+#define QDESIGNER_FORMWINDOWMANAGER_H
 
 #include "shared_global_p.h"
 #include <QDesignerFormWindowManagerInterface>
@@ -84,4 +84,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QDESIGNER_FORMWINDOMANAGER_H
+#endif // QDESIGNER_FORMWINDOWMANAGER_H
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 8edb838c395..88ed8db18a9 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
+#include "qtcreatorintegration.h"
 #include "formeditorplugin.h"
 #include "formwindoweditor.h"
 #include "formclasswizardpage.h"
-#include "qtcreatorintegration.h"
 #include "formeditorw.h"
 #include "editordata.h"
 #include "codemodelhelpers.h"