diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h
index 6392036444fe08f64c14f0f2c09f80dbc61f84e4..f40ce7e652542d7ca85b11ebd36e28b38f3a6969 100644
--- a/src/plugins/qmljseditor/qmljseditor.h
+++ b/src/plugins/qmljseditor/qmljseditor.h
@@ -60,11 +60,11 @@ namespace QmlJS {
     The top-level namespace of the QmlJSEditor plug-in.
  */
 namespace QmlJSEditor {
+class QmlJSEditorEditable;
 class FindReferences;
 
 namespace Internal {
 class QmlOutlineModel;
-class QmlJSEditorEditable;
 class SemanticHighlighter;
 struct SemanticHighlighterSource;
 } // namespace Internal
@@ -199,7 +199,7 @@ protected:
     void resizeEvent(QResizeEvent *event);
     void scrollContentsBy(int dx, int dy);
     TextEditor::BaseTextEditorEditable *createEditableInterface();
-    void createToolBar(Internal::QmlJSEditorEditable *editable);
+    void createToolBar(QmlJSEditorEditable *editable);
     TextEditor::BaseTextEditor::Link findLinkAt(const QTextCursor &cursor, bool resolveTarget = true);
 
 private:
diff --git a/src/plugins/qmljseditor/qmljseditoreditable.cpp b/src/plugins/qmljseditor/qmljseditoreditable.cpp
index c1168a9e03466c7c99010a1be65033e8ffeba55c..aabb07c1d47a035101a6e51c3f1f9b5660c48cca 100644
--- a/src/plugins/qmljseditor/qmljseditoreditable.cpp
+++ b/src/plugins/qmljseditor/qmljseditoreditable.cpp
@@ -42,7 +42,6 @@
 #include <coreplugin/coreconstants.h>
 
 namespace QmlJSEditor {
-namespace Internal {
 
 QmlJSEditorEditable::QmlJSEditorEditable(QmlJSTextEditor *editor)
     : BaseTextEditorEditable(editor)
@@ -90,5 +89,4 @@ QString QmlJSEditorEditable::preferredModeType() const
     return QString();
 }
 
-} // namespace Internal
 } // namespace QmlJSEditor
diff --git a/src/plugins/qmljseditor/qmljseditoreditable.h b/src/plugins/qmljseditor/qmljseditoreditable.h
index 86253b5c9956e23a39b809d7170f630abc069eb5..c30433ea96a6511c45feb11baecafc86f3dcb8be 100644
--- a/src/plugins/qmljseditor/qmljseditoreditable.h
+++ b/src/plugins/qmljseditor/qmljseditoreditable.h
@@ -30,14 +30,13 @@
 #ifndef QMLJSEDITOREDITABLE_H
 #define QMLJSEDITOREDITABLE_H
 
+#include "qmljseditor_global.h"
 #include <texteditor/basetexteditor.h>
 
 namespace QmlJSEditor {
 class QmlJSTextEditor;
 
-namespace Internal {
-
-class QmlJSEditorEditable : public TextEditor::BaseTextEditorEditable
+class QMLJSEDITOR_EXPORT QmlJSEditorEditable : public TextEditor::BaseTextEditorEditable
 {
     Q_OBJECT
 
@@ -56,7 +55,6 @@ private:
     Core::Context m_context;
 };
 
-} // namespace Internal
 } // namespace QmlJSEditor
 
 #endif // QMLJSEDITOREDITABLE_H
diff --git a/src/plugins/qmljseditor/qmljseditorfactory.cpp b/src/plugins/qmljseditor/qmljseditorfactory.cpp
index dbdafac49758d4901c376682875408003d63ffc3..1db1ec66a169550a119cf7d5db300cb64caf3a3f 100644
--- a/src/plugins/qmljseditor/qmljseditorfactory.cpp
+++ b/src/plugins/qmljseditor/qmljseditorfactory.cpp
@@ -78,6 +78,7 @@ namespace {
     }
 }
 
+using namespace QmlJSEditor;
 using namespace QmlJSEditor::Internal;
 using namespace QmlJSEditor::Constants;