diff --git a/src/plugins/pythoneditor/pythoneditor.cpp b/src/plugins/pythoneditor/pythoneditor.cpp
index 629e326e2f8d4a1a3771f246d499289deccd72a4..d00cb87182215358f3133475ecf8ea0c9ca508f8 100644
--- a/src/plugins/pythoneditor/pythoneditor.cpp
+++ b/src/plugins/pythoneditor/pythoneditor.cpp
@@ -45,6 +45,7 @@
 #include <QFileInfo>
 
 namespace PythonEditor {
+namespace Internal {
 
 PythonEditor::PythonEditor(EditorWidget *editorWidget)
     :BaseTextEditor(editorWidget)
@@ -90,4 +91,5 @@ bool PythonEditor::open(QString *errorString,
     return status;
 }
 
+} // namespace Internal
 } // namespace PythonEditor
diff --git a/src/plugins/pythoneditor/pythoneditor.h b/src/plugins/pythoneditor/pythoneditor.h
index f7bf8e33b4c3f354429769d9dbd7948cad0e0403..f56802ea8a19eb1657fc245f9322129e61bc7494 100644
--- a/src/plugins/pythoneditor/pythoneditor.h
+++ b/src/plugins/pythoneditor/pythoneditor.h
@@ -30,14 +30,14 @@
 #ifndef PYTHONEDITOR_EDITOR_H
 #define PYTHONEDITOR_EDITOR_H
 
-#include "pythoneditor_global.h"
 #include <texteditor/basetexteditor.h>
 
 namespace PythonEditor {
+namespace Internal {
 
 class EditorWidget;
 
-class PYEDITOR_EXPORT PythonEditor : public TextEditor::BaseTextEditor
+class PythonEditor : public TextEditor::BaseTextEditor
 {
     Q_OBJECT
 
@@ -58,6 +58,7 @@ public:
               const QString &realFileName);
 };
 
+} // namespace Internal
 } // namespace PythonEditor
 
 #endif // PYTHONEDITOR_EDITOR_H
diff --git a/src/plugins/pythoneditor/pythoneditor.pro b/src/plugins/pythoneditor/pythoneditor.pro
index a4e0c55675a039026a2dd01f2bce5706da92121b..0e7e02672fdf241a0df2d664c80cf009e2ba2678 100644
--- a/src/plugins/pythoneditor/pythoneditor.pro
+++ b/src/plugins/pythoneditor/pythoneditor.pro
@@ -7,7 +7,6 @@ RESOURCES += \
     pythoneditorplugin.qrc
 
 HEADERS += \
-    pythoneditor_global.h \
     pythoneditorplugin.h \
     pythoneditorfactory.h \
     pythoneditor.h \
diff --git a/src/plugins/pythoneditor/pythoneditor.qbs b/src/plugins/pythoneditor/pythoneditor.qbs
index 1a032f7d456c170a22ab744849a6da593cbbe646..5637b891b1ad1a2c4b4f4afb260919fc332db7f0 100644
--- a/src/plugins/pythoneditor/pythoneditor.qbs
+++ b/src/plugins/pythoneditor/pythoneditor.qbs
@@ -16,7 +16,6 @@ QtcPlugin {
         name: "General"
         files: [
             "pythoneditor.cpp", "pythoneditor.h",
-            "pythoneditor_global.h",
             "pythoneditorconstants.h",
             "pythoneditorfactory.cpp", "pythoneditorfactory.h",
             "pythoneditorplugin.cpp", "pythoneditorplugin.h",
diff --git a/src/plugins/pythoneditor/pythoneditor_global.h b/src/plugins/pythoneditor/pythoneditor_global.h
deleted file mode 100644
index 307700db417e40f6870e729da6b0c8ab490f69dd..0000000000000000000000000000000000000000
--- a/src/plugins/pythoneditor/pythoneditor_global.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef PYTHONEDITOR_GLOBAL_H
-#define PYTHONEDITOR_GLOBAL_H
-
-#include <QtGlobal>
-
-#if defined(PYTHONEDITOR_LIBRARY)
-#  define PYEDITOR_EXPORT Q_DECL_EXPORT
-#else
-#  define PYEDITOR_EXPORT Q_DECL_IMPORT
-#endif
-
-#endif // PYTHONEDITOR_GLOBAL_H
diff --git a/src/plugins/pythoneditor/pythoneditorfactory.cpp b/src/plugins/pythoneditor/pythoneditorfactory.cpp
index e0b36e189939174db2254ee817aecfe0fbff4c46..2851d611af923b67ddd34b8420269cec368eae21 100644
--- a/src/plugins/pythoneditor/pythoneditorfactory.cpp
+++ b/src/plugins/pythoneditor/pythoneditorfactory.cpp
@@ -39,6 +39,7 @@
 #include <QDebug>
 
 namespace PythonEditor {
+namespace Internal {
 
 EditorFactory::EditorFactory(QObject *parent)
     : Core::IEditorFactory(parent)
@@ -56,4 +57,5 @@ Core::IEditor *EditorFactory::createEditor(QWidget *parent)
     return widget->editor();
 }
 
+} // namespace Internal
 } // namespace PythonEditor
diff --git a/src/plugins/pythoneditor/pythoneditorfactory.h b/src/plugins/pythoneditor/pythoneditorfactory.h
index 334002121271d1e11b58c9676b8fa213c94e1d86..79e4d54e4ec6b0ce8fbf746673ce198a6920dacb 100644
--- a/src/plugins/pythoneditor/pythoneditorfactory.h
+++ b/src/plugins/pythoneditor/pythoneditorfactory.h
@@ -30,12 +30,12 @@
 #ifndef PYTHONEDITORFACTORY_H
 #define PYTHONEDITORFACTORY_H
 
-#include "pythoneditor_global.h"
 #include <coreplugin/editormanager/ieditorfactory.h>
 
 namespace PythonEditor {
+namespace Internal {
 
-class PYEDITOR_EXPORT EditorFactory : public Core::IEditorFactory
+class EditorFactory : public Core::IEditorFactory
 {
     Q_OBJECT
 
@@ -48,6 +48,7 @@ public:
     Core::IEditor *createEditor(QWidget *parent);
 };
 
+} // namespace Internal
 } // namespace PythonEditor
 
 #endif // PYTHONEDITORFACTORY_H
diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp
index d027bf986da7262244eea622802d52e58c45a549..b49ae92f48a8060e5484a91f142f5dd6fd39e3cb 100644
--- a/src/plugins/pythoneditor/pythoneditorplugin.cpp
+++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp
@@ -183,6 +183,7 @@ static const char *const LIST_OF_PYTHON_BUILTINS[] = {
 };
 
 namespace PythonEditor {
+namespace Internal {
 
 PythonEditorPlugin *PythonEditorPlugin::m_instance = 0;
 
@@ -280,7 +281,7 @@ QSet<QString> PythonEditorPlugin::builtins()
     return instance()->m_builtins;
 }
 
+} // namespace Internal
 } // namespace PythonEditor
 
-Q_EXPORT_PLUGIN(PythonEditor::PythonEditorPlugin)
-
+Q_EXPORT_PLUGIN(PythonEditor::Internal::PythonEditorPlugin)
diff --git a/src/plugins/pythoneditor/pythoneditorplugin.h b/src/plugins/pythoneditor/pythoneditorplugin.h
index 093536dddbcd886cc12c3470b7fe1526391d39df..f6c730cb69bf061ba70f056fbf02aa76116a1c34 100644
--- a/src/plugins/pythoneditor/pythoneditorplugin.h
+++ b/src/plugins/pythoneditor/pythoneditorplugin.h
@@ -36,6 +36,7 @@
 #include <QScopedPointer>
 
 namespace PythonEditor {
+namespace Internal {
 
 class EditorFactory;
 class EditorWidget;
@@ -71,6 +72,7 @@ private:
     QSet<QString> m_builtins;
 };
 
+} // namespace Internal
 } // namespace PythonEditor
 
 #endif // PYTHONEDITOR_PLUGIN_H
diff --git a/src/plugins/pythoneditor/pythoneditorwidget.cpp b/src/plugins/pythoneditor/pythoneditorwidget.cpp
index 15010ffa52a5df4e400eb09d5a4d15018867ab59..a8588e3e07083b81e8d87becba7506b768ac995a 100644
--- a/src/plugins/pythoneditor/pythoneditorwidget.cpp
+++ b/src/plugins/pythoneditor/pythoneditorwidget.cpp
@@ -45,6 +45,7 @@
 #include <texteditor/autocompleter.h>
 
 namespace PythonEditor {
+namespace Internal {
 
 EditorWidget::EditorWidget(QWidget *parent)
     :TextEditor::BaseTextEditorWidget(parent)
@@ -92,4 +93,5 @@ TextEditor::BaseTextEditor *EditorWidget::createEditor()
     return new PythonEditor(this);
 }
 
+} // namespace Internal
 } // namespace PythonEditor
diff --git a/src/plugins/pythoneditor/pythoneditorwidget.h b/src/plugins/pythoneditor/pythoneditorwidget.h
index 63f646b79f0dac5290319ae938e9db53b8e11f5d..24258dfa5c1d2e8210dd0fee84dc8d80481d48d1 100644
--- a/src/plugins/pythoneditor/pythoneditorwidget.h
+++ b/src/plugins/pythoneditor/pythoneditorwidget.h
@@ -30,14 +30,13 @@
 #ifndef PYTHONEDITORWIDGET_H
 #define PYTHONEDITORWIDGET_H
 
-#include "pythoneditor_global.h"
-
 #include <texteditor/basetexteditor.h>
 #include <utils/uncommentselection.h>
 
 namespace PythonEditor {
+namespace Internal {
 
-class PYEDITOR_EXPORT EditorWidget : public TextEditor::BaseTextEditorWidget
+class EditorWidget : public TextEditor::BaseTextEditorWidget
 {
     Q_OBJECT
 
@@ -57,6 +56,7 @@ private:
     Utils::CommentDefinition m_commentDefinition;
 };
 
+} // namespace Internal
 } // namespace PythonEditor
 
 #endif // PYTHONEDITORWIDGET_H
diff --git a/src/plugins/pythoneditor/tools/pythonhighlighter.h b/src/plugins/pythoneditor/tools/pythonhighlighter.h
index 801f55e06683065ae007446bb0d2ec90981ef766..41b7eb6c7171add27365d9660ab969d3ba914d68 100644
--- a/src/plugins/pythoneditor/tools/pythonhighlighter.h
+++ b/src/plugins/pythoneditor/tools/pythonhighlighter.h
@@ -30,14 +30,13 @@
 #ifndef PYTHONHIGHLIGHTER_H
 #define PYTHONHIGHLIGHTER_H
 
-#include "../pythoneditor_global.h"
 #include <texteditor/syntaxhighlighter.h>
 
 namespace PythonEditor {
 
 namespace Internal { class Scanner; }
 
-class PYEDITOR_EXPORT PythonHighlighter : public TextEditor::SyntaxHighlighter
+class PythonHighlighter : public TextEditor::SyntaxHighlighter
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/pythoneditor/tools/pythonindenter.h b/src/plugins/pythoneditor/tools/pythonindenter.h
index 3e0fc043196d8a6c2a2fbd7d387e740ce91c905e..10bf4d809bcee77b0cf6f3f256e3b1c7992ef94a 100644
--- a/src/plugins/pythoneditor/tools/pythonindenter.h
+++ b/src/plugins/pythoneditor/tools/pythonindenter.h
@@ -30,13 +30,12 @@
 #ifndef PYTHONINDENTER_H
 #define PYTHONINDENTER_H
 
-#include "../pythoneditor_global.h"
 #include <texteditor/indenter.h>
 #include <QStringList>
 
 namespace PythonEditor {
 
-class PYEDITOR_EXPORT PythonIndenter : public TextEditor::Indenter
+class PythonIndenter : public TextEditor::Indenter
 {
 public:
     PythonIndenter();
diff --git a/src/plugins/pythoneditor/wizard/pythonclassnamepage.cpp b/src/plugins/pythoneditor/wizard/pythonclassnamepage.cpp
index 96548386e3ca2b1487934cc8525fd7793fa5c98a..33024396a047326d069a627f234f0cf282c59c32 100644
--- a/src/plugins/pythoneditor/wizard/pythonclassnamepage.cpp
+++ b/src/plugins/pythoneditor/wizard/pythonclassnamepage.cpp
@@ -37,6 +37,7 @@
 #include <QVBoxLayout>
 
 namespace PythonEditor {
+namespace Internal {
 
 ClassNamePage::ClassNamePage(QWidget *parent)
     : QWizardPage(parent)
@@ -91,4 +92,5 @@ void ClassNamePage::slotValidChanged()
     }
 }
 
+} // namespace Internal
 } // namespace PythonEditor
diff --git a/src/plugins/pythoneditor/wizard/pythonclassnamepage.h b/src/plugins/pythoneditor/wizard/pythonclassnamepage.h
index ca8c98a35a8aa8c933c95124427ac13170dd4da2..55d542f11b36888f5079676482f4b35efac85da9 100644
--- a/src/plugins/pythoneditor/wizard/pythonclassnamepage.h
+++ b/src/plugins/pythoneditor/wizard/pythonclassnamepage.h
@@ -36,6 +36,7 @@
 namespace Utils { class NewClassWidget; }
 
 namespace PythonEditor {
+namespace Internal {
 
 class ClassNamePage : public QWizardPage
 {
@@ -58,6 +59,7 @@ private:
     bool m_isValid;
 };
 
+} // namespace Internal
 } // namespace PythonEditor
 
 #endif // PYTHONEDITOR_CLASSNAMEPAGE_H
diff --git a/src/plugins/pythoneditor/wizard/pythonclasswizard.cpp b/src/plugins/pythoneditor/wizard/pythonclasswizard.cpp
index 262d178efc0eb68e61ff16994d6bf37af06cc861..34297f1743a35a8af8d78c6c4285fb2f2cf3abb9 100644
--- a/src/plugins/pythoneditor/wizard/pythonclasswizard.cpp
+++ b/src/plugins/pythoneditor/wizard/pythonclasswizard.cpp
@@ -43,6 +43,7 @@
 using namespace ProjectExplorer;
 
 namespace PythonEditor {
+namespace Internal {
 
 static Core::BaseFileWizardParameters getDefaultParams()
 {
@@ -120,4 +121,5 @@ Kit *ClassWizard::kitForWizard(const ClassWizardDialog *wizard) const
     return KitManager::defaultKit();
 }
 
+} // namespace Internal
 } // namespace PythonEditor
diff --git a/src/plugins/pythoneditor/wizard/pythonclasswizard.h b/src/plugins/pythoneditor/wizard/pythonclasswizard.h
index 763be1b9f67af60b7ce79baf8e855dd8d7b88f60..22ca710ddbe3e911da07e67a78b4eaed0c2b6707 100644
--- a/src/plugins/pythoneditor/wizard/pythonclasswizard.h
+++ b/src/plugins/pythoneditor/wizard/pythonclasswizard.h
@@ -37,6 +37,8 @@ namespace Utils { class NewClassWidget; }
 namespace ProjectExplorer { class Kit; }
 
 namespace PythonEditor {
+namespace Internal {
+
 class ClassWizardDialog;
 
 class ClassWizard : public Core::BaseFileWizard
@@ -56,6 +58,7 @@ protected:
     ProjectExplorer::Kit *kitForWizard(const ClassWizardDialog *wizard) const;
 };
 
+} // namespace Internal
 } // namespace PythonEditor
 
 #endif // PYTHONEDITOR_CLASSWIZARD_H
diff --git a/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.cpp b/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.cpp
index 80d5f0e4b5dfb3179a9815ffd1ed895e5062e870..040a9c222b8da538700ae65a4590dbcf4a12b5cc 100644
--- a/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.cpp
+++ b/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.cpp
@@ -34,6 +34,7 @@
 #include <coreplugin/basefilewizard.h>
 
 namespace PythonEditor {
+namespace Internal {
 
 ClassWizardDialog::ClassWizardDialog(QWidget *parent)
     : Utils::Wizard(parent)
@@ -77,4 +78,5 @@ void ClassWizardDialog::setPath(const QString &path)
     m_classNamePage->newClassWidget()->setPath(path);
 }
 
+} // namespace Internal
 } // namespace PythonEditor
diff --git a/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.h b/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.h
index 5e9d011f5fabe5df70209933b96fcf35a5b395f8..5743f86be5b532a17b437c8a8611b7fd1d747022 100644
--- a/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.h
+++ b/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.h
@@ -36,6 +36,7 @@
 #include <QVariantMap>
 
 namespace PythonEditor {
+namespace Internal {
 
 class ClassNamePage;
 
@@ -67,6 +68,7 @@ private:
     QVariantMap m_extraValues;
 };
 
+} // namespace Internal
 } // namespace PythonEditor
 
 #endif // PYTHONEDITOR_CLASSWIZARDDIALOG_H
diff --git a/src/plugins/pythoneditor/wizard/pythonsourcegenerator.cpp b/src/plugins/pythoneditor/wizard/pythonsourcegenerator.cpp
index d1407a06ec3c146214d45f10b7f83b1131999050..87f2e04c13c13f4902b527f6aa206d79e468d6ae 100644
--- a/src/plugins/pythoneditor/wizard/pythonsourcegenerator.cpp
+++ b/src/plugins/pythoneditor/wizard/pythonsourcegenerator.cpp
@@ -31,6 +31,7 @@
 #include <QSet>
 
 namespace PythonEditor {
+namespace Internal {
 
 static const char BASH_RUN_HEADER[] = "#!/usr/bin/env python\n";
 static const char ENCODING_HEADER[] = "# -*- coding: utf-8 -*-\n";
@@ -207,4 +208,5 @@ QString SourceGenerator::moduleForQWidget() const
         return QLatin1String("QtWidgets");
 }
 
+} // namespace Internal
 } // namespace PythonEditor
diff --git a/src/plugins/pythoneditor/wizard/pythonsourcegenerator.h b/src/plugins/pythoneditor/wizard/pythonsourcegenerator.h
index ef82955351f159414290d35c50829c1e26da71e1..d638ac8d8718c43d567e29a4af4202fc35788425 100644
--- a/src/plugins/pythoneditor/wizard/pythonsourcegenerator.h
+++ b/src/plugins/pythoneditor/wizard/pythonsourcegenerator.h
@@ -30,14 +30,14 @@
 #ifndef PYTHON_SOURCEGENERATOR_H
 #define PYTHON_SOURCEGENERATOR_H
 
-#include "../pythoneditor_global.h"
 #include <utils/newclasswidget.h>
 #include <QSet>
 #include <QString>
 
 namespace PythonEditor {
+namespace Internal {
 
-class PYEDITOR_EXPORT SourceGenerator
+class SourceGenerator
 {
 public:
     enum QtBinding {
@@ -70,6 +70,7 @@ private:
     QtVersion m_pythonQtVersion;
 };
 
+} // namespace Internal
 } // namespace PythonEditor
 
 #endif // PYTHON_SOURCEGENERATOR_H