diff --git a/src/plugins/resourceeditor/qrceditor/qrceditor.cpp b/src/plugins/resourceeditor/qrceditor/qrceditor.cpp
index e1a2b25ecf35f442141fd30ef17fa0111473901d..79120d34cf71b74b8ba426ba869178efc187e6ca 100644
--- a/src/plugins/resourceeditor/qrceditor/qrceditor.cpp
+++ b/src/plugins/resourceeditor/qrceditor/qrceditor.cpp
@@ -38,6 +38,7 @@
 #include <QMessageBox>
 
 using namespace ResourceEditor;
+using namespace ResourceEditor::Internal;
 
 QrcEditor::QrcEditor(QWidget *parent)
   : QWidget(parent),
diff --git a/src/plugins/resourceeditor/qrceditor/qrceditor.h b/src/plugins/resourceeditor/qrceditor/qrceditor.h
index 8641cbded3235a8c6f994f12825143e0c83de75d..0c6dea9b98432d59ecfc4758d77e0dffae919a44 100644
--- a/src/plugins/resourceeditor/qrceditor/qrceditor.h
+++ b/src/plugins/resourceeditor/qrceditor/qrceditor.h
@@ -37,6 +37,7 @@
 #include <QUndoStack>
 
 namespace ResourceEditor {
+namespace Internal {
 
 class QrcEditor : public QWidget
 {
@@ -105,6 +106,7 @@ private:
     QString m_currentLanguage;
 };
 
-}
+} // namespace Internal
+} // namespace ResourceEditor
 
 #endif
diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
index 9ba65101fe5c461e2a9d81a0f71084b2069d5d65..33fc8accb4c93616b7ca1ac4e8f11c2596c56380 100644
--- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
+++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
@@ -59,7 +59,8 @@ static QString msgFileNameEmpty()
     return QCoreApplication::translate("Designer", "The file name is empty.");
 }
 
-namespace ResourceEditor {
+using namespace ResourceEditor;
+using namespace ResourceEditor::Internal;
 
 /******************************************************************************
 ** File
@@ -1155,5 +1156,3 @@ QMimeData *ResourceModel::mimeData(const QModelIndexList &indexes) const
     rc->setText(doc.toString());
     return rc;
 }
-
-} // namespace ResourceEditor
diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile_p.h b/src/plugins/resourceeditor/qrceditor/resourcefile_p.h
index bc2458cccac0b56e4eee789ad99551d232759b0f..2794ef6946ad53b469b2e25e73e088ae7bbb3c7b 100644
--- a/src/plugins/resourceeditor/qrceditor/resourcefile_p.h
+++ b/src/plugins/resourceeditor/qrceditor/resourcefile_p.h
@@ -38,6 +38,7 @@
 #include <QIcon>
 
 namespace ResourceEditor {
+namespace Internal {
 
 class File;
 struct Prefix;
@@ -274,6 +275,7 @@ private:
     QIcon m_prefixIcon;
 };
 
-} // namespace SharedTools
+} // namespace Internal
+} // namespace ResourceEditor
 
 #endif // RESOURCEFILE_P_H
diff --git a/src/plugins/resourceeditor/qrceditor/resourceview.cpp b/src/plugins/resourceeditor/qrceditor/resourceview.cpp
index bbd7cdfb934c5e90ed2dc92981173c7ace74cd58..3762981062c70c6f068816f22541d0b5f90cf033 100644
--- a/src/plugins/resourceeditor/qrceditor/resourceview.cpp
+++ b/src/plugins/resourceeditor/qrceditor/resourceview.cpp
@@ -48,6 +48,7 @@
 #include <QUndoStack>
 
 namespace ResourceEditor {
+namespace Internal {
 
 /*!
     \class FileEntryBackup
@@ -99,8 +100,6 @@ void PrefixEntryBackup::restore() const
     }
 }
 
-namespace Internal {
-
 class RelativeResourceModel : public ResourceModel
 {
 public:
@@ -184,10 +183,14 @@ EntryBackup * RelativeResourceModel::removeEntry(const QModelIndex &index)
 }
 
 } // namespace Internal
+} // namespace ResourceEditor
+
+using namespace ResourceEditor;
+using namespace ResourceEditor::Internal;
 
 ResourceView::ResourceView(QUndoStack *history, QWidget *parent) :
     QTreeView(parent),
-    m_qrcModel(new Internal::RelativeResourceModel(m_qrcFile, this)),
+    m_qrcModel(new RelativeResourceModel(m_qrcFile, this)),
     m_history(history),
     m_mergeId(-1)
 {
@@ -547,5 +550,3 @@ bool ResourceView::resourceDragEnabled() const
 {
     return m_qrcModel->resourceDragEnabled();
 }
-
-} // namespace SharedTools
diff --git a/src/plugins/resourceeditor/qrceditor/resourceview.h b/src/plugins/resourceeditor/qrceditor/resourceview.h
index e737890e3b55b5e7938a609573148d0e03f88c26..68ac557ee15686cd7ceb1322c3bd2bae429c0560 100644
--- a/src/plugins/resourceeditor/qrceditor/resourceview.h
+++ b/src/plugins/resourceeditor/qrceditor/resourceview.h
@@ -44,6 +44,7 @@ class QUndoStack;
 QT_END_NAMESPACE
 
 namespace ResourceEditor {
+namespace Internal {
 
 /*!
     \class EntryBackup
@@ -65,9 +66,7 @@ public:
     virtual ~EntryBackup() { }
 };
 
-namespace Internal {
-    class RelativeResourceModel;
-}
+class RelativeResourceModel;
 
 class ResourceView : public QTreeView
 {
@@ -144,12 +143,13 @@ private:
                         const QString &before, const QString &after);
 
     ResourceFile m_qrcFile;
-    Internal::RelativeResourceModel *m_qrcModel;
+    RelativeResourceModel *m_qrcModel;
 
     QUndoStack *m_history;
     int m_mergeId;
 };
 
-} // namespace SharedTools
+} // namespace Internal
+} // namespace ResourceEditor
 
 #endif // RESOURCEVIEW_H
diff --git a/src/plugins/resourceeditor/qrceditor/undocommands.cpp b/src/plugins/resourceeditor/qrceditor/undocommands.cpp
index 58bb2ed339990561a897a2fd46a45a7d7962e9e6..fa21cec7de6f71bc09b477dad1caa6f413d19a1c 100644
--- a/src/plugins/resourceeditor/qrceditor/undocommands.cpp
+++ b/src/plugins/resourceeditor/qrceditor/undocommands.cpp
@@ -32,7 +32,8 @@
 
 #include <QModelIndex>
 
-namespace ResourceEditor {
+using namespace ResourceEditor;
+using namespace ResourceEditor::Internal;
 
 ViewCommand::ViewCommand(ResourceView *view)
         : m_view(view)
@@ -183,5 +184,3 @@ void AddEmptyPrefixCommand::undo()
             m_prefixArrayIndex, 0, QModelIndex());
     delete m_view->removeEntry(prefixModelIndex);
 }
-
-} // namespace SharedTools
diff --git a/src/plugins/resourceeditor/qrceditor/undocommands_p.h b/src/plugins/resourceeditor/qrceditor/undocommands_p.h
index e943b4f0fe297ee128613b1a9a0bcaf5864d6ff4..66df5c43377c849ffecfbd3b049e61cfec2384ae 100644
--- a/src/plugins/resourceeditor/qrceditor/undocommands_p.h
+++ b/src/plugins/resourceeditor/qrceditor/undocommands_p.h
@@ -41,6 +41,7 @@ class QModelIndex;
 QT_END_NAMESPACE
 
 namespace ResourceEditor {
+namespace Internal {
 
 /*!
     \class ViewCommand
@@ -157,6 +158,7 @@ private:
     void undo();
 };
 
-} // namespace SharedTools
+} // namespace Internal
+} // namespace ResourceEditor
 
 #endif // UNDO_COMMANDS_H
diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h
index f863751e677efda463e48166b4534309467ad33f..38b47b76dd8d73cbd6992012e18c3dee8643d488 100644
--- a/src/plugins/resourceeditor/resourceeditorw.h
+++ b/src/plugins/resourceeditor/resourceeditorw.h
@@ -42,13 +42,11 @@ class QToolBar;
 QT_END_NAMESPACE
 
 namespace ResourceEditor {
-
-class QrcEditor;
-
 namespace Internal {
 
 class ResourceEditorPlugin;
 class ResourceEditorW;
+class QrcEditor;
 
 class ResourceEditorDocument
   : public virtual Core::IDocument