diff --git a/src/plugins/coreplugin/CMakeLists.txt b/src/plugins/coreplugin/CMakeLists.txt
index 0c071e8ef76..10b580ba257 100644
--- a/src/plugins/coreplugin/CMakeLists.txt
+++ b/src/plugins/coreplugin/CMakeLists.txt
@@ -18,6 +18,7 @@ add_qtc_plugin(Core
     coreplugin.cpp coreplugin.h
     designmode.cpp designmode.h
     dialogs/addtovcsdialog.cpp dialogs/addtovcsdialog.h dialogs/addtovcsdialog.ui
+    dialogs/codecselector.cpp dialogs/codecselector.h
     dialogs/externaltoolconfig.cpp dialogs/externaltoolconfig.h dialogs/externaltoolconfig.ui
     dialogs/filepropertiesdialog.cpp dialogs/filepropertiesdialog.h dialogs/filepropertiesdialog.ui
     dialogs/ioptionspage.cpp dialogs/ioptionspage.h
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index 0a11dafc56b..495d02028a8 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -112,7 +112,8 @@ SOURCES += corejsextensions.cpp \
     coreicons.cpp \
     diffservice.cpp \
     menubarfilter.cpp \
-    welcomepagehelper.cpp
+    welcomepagehelper.cpp \
+    dialogs/codecselector.cpp
 
 HEADERS += corejsextensions.h \
     mainwindow.h \
@@ -228,7 +229,8 @@ HEADERS += corejsextensions.h \
     diffservice.h \
     menubarfilter.h \
     editormanager/ieditorfactory_p.h \
-    welcomepagehelper.h
+    welcomepagehelper.h \
+    dialogs/codecselector.h
 
 FORMS += dialogs/newdialog.ui \
     dialogs/saveitemsdialog.ui \
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index dc54a0a4dff..63dcd4ab6f3 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -208,6 +208,7 @@ Project {
             prefix: "dialogs/"
             files: [
                 "addtovcsdialog.cpp", "addtovcsdialog.h", "addtovcsdialog.ui",
+                "codecselector.cpp", "codecselector.h",
                 "externaltoolconfig.cpp", "externaltoolconfig.h", "externaltoolconfig.ui",
                 "filepropertiesdialog.cpp", "filepropertiesdialog.h", "filepropertiesdialog.ui",
                 "ioptionspage.cpp", "ioptionspage.h",
diff --git a/src/plugins/texteditor/codecselector.cpp b/src/plugins/coreplugin/dialogs/codecselector.cpp
similarity index 96%
rename from src/plugins/texteditor/codecselector.cpp
rename to src/plugins/coreplugin/dialogs/codecselector.cpp
index 1fe3a25da16..a84b0fa1122 100644
--- a/src/plugins/texteditor/codecselector.cpp
+++ b/src/plugins/coreplugin/dialogs/codecselector.cpp
@@ -24,7 +24,7 @@
 ****************************************************************************/
 
 #include "codecselector.h"
-#include "textdocument.h"
+#include <coreplugin/textdocument.h>
 
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
@@ -36,11 +36,7 @@
 #include <QScrollBar>
 #include <QVBoxLayout>
 
-using namespace TextEditor;
-using namespace TextEditor::Internal;
-
-namespace TextEditor {
-namespace Internal {
+namespace Core {
 
 /* custom class to make sure the width is wide enough for the
  * contents. Should be easier with Qt. */
@@ -54,10 +50,6 @@ public:
     }
 };
 
-} // namespace Internal
-} // namespace TextEditor
-
-
 CodecSelector::CodecSelector(QWidget *parent, Core::BaseTextDocument *doc)
     : QDialog(parent)
 {
@@ -166,3 +158,4 @@ void CodecSelector::buttonClicked(QAbstractButton *button)
     done(result);
 }
 
+} // namespace Core
diff --git a/src/plugins/texteditor/codecselector.h b/src/plugins/coreplugin/dialogs/codecselector.h
similarity index 93%
rename from src/plugins/texteditor/codecselector.h
rename to src/plugins/coreplugin/dialogs/codecselector.h
index eda3b91819f..f2495bcc051 100644
--- a/src/plugins/texteditor/codecselector.h
+++ b/src/plugins/coreplugin/dialogs/codecselector.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include "../core_global.h"
+
 #include <QDialog>
 #include <QLabel>
 #include <QDialogButtonBox>
@@ -33,10 +35,9 @@
 namespace Utils { class ListWidget; }
 namespace Core { class BaseTextDocument; }
 
-namespace TextEditor {
-namespace Internal {
+namespace Core {
 
-class CodecSelector : public QDialog
+class CORE_EXPORT CodecSelector : public QDialog
 {
     Q_OBJECT
 
@@ -65,5 +66,4 @@ private:
     QAbstractButton *m_saveButton;
 };
 
-} // namespace Internal
-} // namespace TextEditor
+} // namespace Core
diff --git a/src/plugins/texteditor/CMakeLists.txt b/src/plugins/texteditor/CMakeLists.txt
index 368afb47423..ab8d806f080 100644
--- a/src/plugins/texteditor/CMakeLists.txt
+++ b/src/plugins/texteditor/CMakeLists.txt
@@ -34,7 +34,6 @@ add_qtc_plugin(TextEditor
     codeassist/runner.cpp codeassist/runner.h
     codeassist/textdocumentmanipulator.cpp codeassist/textdocumentmanipulator.h
     codeassist/textdocumentmanipulatorinterface.h
-    codecselector.cpp codecselector.h
     codestyleeditor.cpp codestyleeditor.h
     codestylepool.cpp codestylepool.h
     codestyleselectorwidget.cpp codestyleselectorwidget.h codestyleselectorwidget.ui
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index ae4ac073b61..865753217cd 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -35,7 +35,6 @@
 #include "behaviorsettings.h"
 #include "circularclipboard.h"
 #include "circularclipboardassist.h"
-#include "codecselector.h"
 #include "completionsettings.h"
 #include "extraencodingsettings.h"
 #include "highlighter.h"
@@ -59,6 +58,7 @@
 #include <texteditor/codeassist/completionassistprovider.h>
 #include <texteditor/codeassist/documentcontentcompletion.h>
 
+#include <coreplugin/dialogs/codecselector.h>
 #include <coreplugin/icore.h>
 #include <aggregation/aggregate.h>
 #include <coreplugin/actionmanager/actionmanager.h>
diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro
index 6892ddd79c1..bbf536459ed 100644
--- a/src/plugins/texteditor/texteditor.pro
+++ b/src/plugins/texteditor/texteditor.pro
@@ -33,7 +33,6 @@ SOURCES += texteditorplugin.cpp \
     findinfiles.cpp \
     basefilefind.cpp \
     texteditorsettings.cpp \
-    codecselector.cpp \
     findincurrentfile.cpp \
     findinopenfiles.cpp \
     colorscheme.cpp \
@@ -120,7 +119,6 @@ HEADERS += texteditorplugin.h \
     findinfiles.h \
     basefilefind.h \
     texteditorsettings.h \
-    codecselector.h \
     findincurrentfile.h \
     findinopenfiles.h \
     colorscheme.h \
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index 6564c97b0ce..fb43695ef92 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -41,8 +41,6 @@ Project {
             "circularclipboard.h",
             "circularclipboardassist.cpp",
             "circularclipboardassist.h",
-            "codecselector.cpp",
-            "codecselector.h",
             "codestyleeditor.cpp",
             "codestyleeditor.h",
             "codestylepool.cpp",