diff --git a/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp b/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp
index c3963044d4e..3d0bbf873ea 100644
--- a/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp
@@ -33,6 +33,9 @@
 
 #include "s60certificateinfo.h"
 
+using namespace Qt4ProjectManager;
+using namespace Qt4ProjectManager::Internal;
+
 CertificatePathChooser::CertificatePathChooser(QWidget *parent) :
     Utils::PathChooser(parent)
 {
diff --git a/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.h b/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.h
index 667611e43c9..c335d72c5b3 100644
--- a/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.h
+++ b/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.h
@@ -32,6 +32,9 @@
 
 #include "utils/pathchooser.h"
 
+namespace Qt4ProjectManager {
+namespace Internal {
+
 class CertificatePathChooser : public Utils::PathChooser
 {
     Q_DISABLE_COPY(CertificatePathChooser)
@@ -42,4 +45,7 @@ public:
     virtual bool validatePath(const QString &path, QString *errorMessage = 0);
 };
 
+} // namespace Internal
+} // namespace Qt4ProjectManager
+
 #endif // CERTIFICATEPATHCHOOSER_H
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.cpp b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.cpp
index dc11322bbb2..f572d9d3ac0 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.cpp
@@ -1,20 +1,29 @@
 #include "s60certificatedetailsdialog.h"
 #include "ui_s60certificatedetailsdialog.h"
 
+using namespace Qt4ProjectManager;
+using namespace Qt4ProjectManager::Internal;
+
+struct S60CertificateDetailsDialogPrivate
+{
+    S60CertificateDetailsDialogPrivate(){};
+    Ui::S60CertificateDetailsDialog m_ui;
+};
+
 S60CertificateDetailsDialog::S60CertificateDetailsDialog(QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::S60CertificateDetailsDialog)
+    m_d(new S60CertificateDetailsDialogPrivate)
 {
-    ui->setupUi(this);
-    connect(ui->buttonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(close()));
+    m_d->m_ui.setupUi(this);
+    connect(m_d->m_ui.buttonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(close()));
 }
 
 S60CertificateDetailsDialog::~S60CertificateDetailsDialog()
 {
-    delete ui;
+    delete m_d;
 }
 
 void S60CertificateDetailsDialog::setText(const QString &text)
 {
-    ui->textBrowser->setText(text);
+    m_d->m_ui.textBrowser->setText(text);
 }
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h
index 50608df7622..5f643ad9ac4 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h
@@ -3,9 +3,10 @@
 
 #include <QDialog>
 
-namespace Ui {
-    class S60CertificateDetailsDialog;
-}
+struct S60CertificateDetailsDialogPrivate;
+
+namespace Qt4ProjectManager {
+namespace Internal {
 
 class S60CertificateDetailsDialog : public QDialog
 {
@@ -18,7 +19,10 @@ public:
     void setText(const QString &text);
 
 private:
-    Ui::S60CertificateDetailsDialog *ui;
+    S60CertificateDetailsDialogPrivate *m_d;
 };
 
+} // namespace Internal
+} // namespace Qt4ProjectManager
+
 #endif // S60CERTIFICATEDETAILSDIALOG_H
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h
index 2fdf705b912..16f55511dc6 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h
@@ -34,12 +34,11 @@
 #include <QtCore/QStringList>
 #include <QtCore/QtGlobal>
 
-QT_FORWARD_DECLARE_CLASS(QString)
-QT_FORWARD_DECLARE_CLASS(S60SymbianCertificate)
-
 namespace Qt4ProjectManager {
 namespace Internal {
 
+class S60SymbianCertificate;
+
 class S60CertificateInfo : public QObject
 {
     Q_OBJECT
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
index ca39aacb524..386181025ad 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
@@ -786,7 +786,9 @@ S60CreatePackageStepConfigWidget::S60CreatePackageStepConfigWidget(S60CreatePack
     m_ui.keyFilePath->setExpectedKind(Utils::PathChooser::File);
     updateUi();
 
-    m_ui.certificateDetails->setEnabled(m_ui.signaturePath->isValid());
+    bool enableCertDetails = m_signStep->signingMode() == S60CreatePackageStep::SignCustom
+            && m_ui.signaturePath->isValid();
+    m_ui.certificateDetails->setEnabled(enableCertDetails);
 
     connect(m_ui.certificateDetails, SIGNAL(clicked()),
             this, SLOT(displayCertificateDetails()));
@@ -841,16 +843,19 @@ void S60CreatePackageStepConfigWidget::updateUi()
         m_ui.selfSignedButton->setChecked(false);
         m_ui.customCertificateButton->setChecked(true);
         m_ui.notSignedButton->setChecked(false);
+        m_ui.certificateDetails->setEnabled(m_ui.signaturePath->isValid());
         break;
     case S60CreatePackageStep::NotSigned:
         m_ui.selfSignedButton->setChecked(false);
         m_ui.customCertificateButton->setChecked(false);
         m_ui.notSignedButton->setChecked(true);
+        m_ui.certificateDetails->setEnabled(false);
         break;
     default:
         m_ui.selfSignedButton->setChecked(true);
         m_ui.customCertificateButton->setChecked(false);
         m_ui.notSignedButton->setChecked(false);
+        m_ui.certificateDetails->setEnabled(false);
         break;
     }
     bool customSigned = m_signStep->signingMode() == S60CreatePackageStep::SignCustom;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp
index f239f4995e4..384f4394e9c 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp
@@ -46,6 +46,8 @@
 #include <memory>
 
 using namespace Botan;
+using namespace Qt4ProjectManager;
+using namespace Qt4ProjectManager::Internal;
 
 namespace {
     const char * const CERT_IMEI_FIELD_NAME = "1.2.826.0.1.1796587.1.1.1.1";
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h
index a634163834f..d8ff463d11e 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h
@@ -35,6 +35,9 @@
 
 class S60SymbianCertificatePrivate;
 
+namespace Qt4ProjectManager {
+namespace Internal {
+
 class S60SymbianCertificate
 {
 public:
@@ -63,4 +66,7 @@ protected:
     QString m_errorString;
 };
 
+} // namespace Internal
+} // namespace Qt4ProjectManager
+
 #endif // S60SYMBIANCERTIFICATE_H