diff --git a/src/plugins/designer/cpp/formclasswizard.h b/src/plugins/designer/cpp/formclasswizard.h
index 203bd2de5f3..2c5f9f127b8 100644
--- a/src/plugins/designer/cpp/formclasswizard.h
+++ b/src/plugins/designer/cpp/formclasswizard.h
@@ -37,7 +37,7 @@
 namespace Designer {
 namespace Internal {
 
-struct FormClassWizardParameters;
+class FormClassWizardParameters;
 
 class FormClassWizard : public Core::BaseFileWizard
 {
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp
index 191200b9e3f..0c7b4694717 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.cpp
+++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp
@@ -32,8 +32,6 @@
 #include "formclasswizardpage.h"
 #include "formclasswizardparameters.h"
 
-#include <coreplugin/icore.h>
-
 #include <QtCore/QDebug>
 #include <QtGui/QAbstractButton>
 
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.h b/src/plugins/designer/cpp/formclasswizarddialog.h
index c6522de3abb..0eff06158fa 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.h
+++ b/src/plugins/designer/cpp/formclasswizarddialog.h
@@ -32,13 +32,9 @@
 
 #include <QtGui/QWizard>
 
-namespace Core {
-    class ICore;
-}
-
 namespace Designer {
 
-struct FormClassWizardParameters;
+class FormClassWizardParameters;
 
 namespace Internal {
 
diff --git a/src/plugins/designer/cpp/formclasswizardpage.cpp b/src/plugins/designer/cpp/formclasswizardpage.cpp
index 9aad7cbc985..aad1a966e46 100644
--- a/src/plugins/designer/cpp/formclasswizardpage.cpp
+++ b/src/plugins/designer/cpp/formclasswizardpage.cpp
@@ -37,7 +37,6 @@
 #include <cpptools/cpptoolsconstants.h>
 
 #include <QtCore/QDebug>
-#include <QtCore/QDir>
 #include <QtCore/QSettings>
 
 #include <QtGui/QAbstractButton>
@@ -146,7 +145,7 @@ bool FormClassWizardPage::validatePage()
     QString errorMessage;
     const bool rc = m_ui->newClassWidget->isValid(&errorMessage);
     if (!rc) {
-        QMessageBox::critical(this, tr("%1 - Error").arg(title()), errorMessage);
+        QMessageBox::warning(this, tr("%1 - Error").arg(title()), errorMessage);
     }
     return rc;
 }
diff --git a/src/plugins/designer/cpp/formclasswizardpage.h b/src/plugins/designer/cpp/formclasswizardpage.h
index d7c8ebb902c..9286b5268dc 100644
--- a/src/plugins/designer/cpp/formclasswizardpage.h
+++ b/src/plugins/designer/cpp/formclasswizardpage.h
@@ -34,8 +34,8 @@
 
 namespace Designer {
 
-struct FormClassWizardParameters;
-struct FormClassWizardGenerationParameters;
+class FormClassWizardParameters;
+class FormClassWizardGenerationParameters;
 
 namespace Internal {
 
diff --git a/src/plugins/designer/formwizard.cpp b/src/plugins/designer/formwizard.cpp
index 03dcfcd4e5b..2edecc6ae8b 100644
--- a/src/plugins/designer/formwizard.cpp
+++ b/src/plugins/designer/formwizard.cpp
@@ -32,7 +32,6 @@
 #include "formwindoweditor.h"
 #include "designerconstants.h"
 
-#include <QtCore/QFile>
 #include <QtCore/QDebug>
 
 using namespace Designer;