3 files changed, 9 insertions, 15 deletions
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index 7e104cac51..ab0cef6a97 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -70,7 +70,6 @@ static const char useDiffEditorKeyC[] = "UseDiffEditor";
 using namespace TextEditor;
 
 namespace DiffEditor {
-
 namespace Internal {
 
 class DescriptionEditorWidget : public TextEditorWidget
@@ -199,10 +198,6 @@ void DescriptionEditorWidget::handleCurrentContents()
     emit requestBranchList();
 }
 
-} // namespace Internal
-
-using namespace Internal;
-
 ///////////////////////////////// DiffEditor //////////////////////////////////
 
 DiffEditor::DiffEditor(const QSharedPointer<DiffEditorDocument> &doc)
@@ -619,6 +614,7 @@ void DiffEditor::writeCurrentDiffEditorSetting(QWidget *currentEditor)
     s->endGroup();
 }
 
+} // namespace Internal
 } // namespace DiffEditor
 
 #include "diffeditor.moc"
diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h
index 6df2974bc2..c4c111d4f4 100644
--- a/src/plugins/diffeditor/diffeditor.h
+++ b/src/plugins/diffeditor/diffeditor.h
@@ -31,7 +31,6 @@
 #ifndef DIFFEDITOR_H
 #define DIFFEDITOR_H
 
-#include "diffeditor_global.h"
 #include "diffeditorcontroller.h"
 
 #include <coreplugin/editormanager/ieditor.h>
@@ -54,14 +53,13 @@ class DiffEditorDocument;
 class DiffEditorGuiController;
 class UnifiedDiffEditorWidget;
 class SideBySideDiffEditorWidget;
-} // namespace Internal
 
-class DIFFEDITOR_EXPORT DiffEditor : public Core::IEditor
+class DiffEditor : public Core::IEditor
 {
     Q_OBJECT
 
 public:
-    DiffEditor(const QSharedPointer<Internal::DiffEditorDocument> &doc);
+    DiffEditor(const QSharedPointer<DiffEditorDocument> &doc);
     ~DiffEditor();
 
 public:
@@ -97,13 +95,13 @@ private:
     QWidget *readCurrentDiffEditorSetting();
     void writeCurrentDiffEditorSetting(QWidget *currentEditor);
 
-    QSharedPointer<Internal::DiffEditorDocument> m_document;
-    Internal::DescriptionEditorWidget *m_descriptionWidget;
+    QSharedPointer<DiffEditorDocument> m_document;
+    DescriptionEditorWidget *m_descriptionWidget;
     QStackedWidget *m_stackedWidget;
-    Internal::SideBySideDiffEditorWidget *m_sideBySideEditor;
-    Internal::UnifiedDiffEditorWidget *m_unifiedEditor;
+    SideBySideDiffEditorWidget *m_sideBySideEditor;
+    UnifiedDiffEditorWidget *m_unifiedEditor;
     QWidget *m_currentEditor;
-    Internal::DiffEditorGuiController *m_guiController;
+    DiffEditorGuiController *m_guiController;
     QToolBar *m_toolBar;
     QComboBox *m_entriesComboBox;
     QAction *m_whitespaceButtonAction;
@@ -114,6 +112,7 @@ private:
     QToolButton *m_diffEditorSwitcher;
 };
 
+} // namespace Internal
 } // namespace DiffEditor
 
 #endif // DIFFEDITOR_H
diff --git a/src/plugins/diffeditor/diffeditorfactory.cpp b/src/plugins/diffeditor/diffeditorfactory.cpp
index 3bf5928737..e52b0c5e17 100644
--- a/src/plugins/diffeditor/diffeditorfactory.cpp
+++ b/src/plugins/diffeditor/diffeditorfactory.cpp
@@ -37,7 +37,6 @@
 #include <QCoreApplication>
 
 namespace DiffEditor {
-
 namespace Internal {
 
 DiffEditorFactory::DiffEditorFactory(QObject *parent)