diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h
index 6249dc2b5e7bc0a555f0403309ac32f097153da0..12a8f0fecc18b053e319351ab5b40c3948131710 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 7eda1df9f973ff35b620922101c50e01a768488f..03636bb591d302a0282475be2e4afe8db5b20c84 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 b4c49a9a31999063f74a6d89972496ccfd7a15c0..5b59fea8e850dd868f4df83582c8c8d7f1171839 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 956b603c0407be7227a8fc635546a88b67e92e4e..89deab50d30e86e34a8e3fcd400501a0ba7c74ca 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 8edb838c39584bd060031a8015bfbf700f25f243..88ed8db18a926a794cf3e174a8adc5a2d0e1e388 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"