diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index bfdd5624ab1c6422e1062bae846224f2ee9ed790..7d7e3c9f7e01147aa9fceffa727845ebdc4afa67 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -338,27 +338,17 @@ QStringList BinEditorFactory::mimeTypes() const
 
 ///////////////////////////////// BinEditorPlugin //////////////////////////////////
 
-BinEditorPlugin *BinEditorPlugin::m_instance = 0;
-
 BinEditorPlugin::BinEditorPlugin()
 {
     m_undoAction = m_redoAction = m_copyAction = m_selectAllAction = 0;
-    m_instance = this;
 }
 
 BinEditorPlugin::~BinEditorPlugin()
 {
-    m_instance = 0;
-}
-
-BinEditorPlugin *BinEditorPlugin::instance()
-{
-    return m_instance;
 }
 
 QAction *BinEditorPlugin::registerNewAction(const QString &id, const QString &title)
 {
-
     QAction *result = new QAction(title, this);
     Core::ICore::instance()->actionManager()->registerAction(result, id, m_context);
     return result;
diff --git a/src/plugins/bineditor/bineditorplugin.h b/src/plugins/bineditor/bineditorplugin.h
index ddc4333acdb5c36514060642c9ee98228f052a1a..a7c782697075fa7a1c7c467afee3a58bf8e511db 100644
--- a/src/plugins/bineditor/bineditorplugin.h
+++ b/src/plugins/bineditor/bineditorplugin.h
@@ -43,7 +43,6 @@
 #include <QtGui/QAction>
 
 namespace Core {
-class ICore;
 class IWizard;
 }
 
@@ -61,8 +60,6 @@ public:
     BinEditorPlugin();
     ~BinEditorPlugin();
 
-    static BinEditorPlugin *instance();
-
     bool initialize(const QStringList &arguments, QString *error_message = 0);
     void extensionsInitialized();
 
@@ -77,6 +74,7 @@ private slots:
     void updateActions();
 
     void updateCurrentEditor(Core::IContext *object);
+
 private:
     QList<int> m_context;
     QAction *registerNewAction(const QString &id, const QString &title = QString());
@@ -90,9 +88,6 @@ private:
     friend class BinEditorFactory;
     Core::IEditor *createEditor(QWidget *parent);
 
-    static BinEditorPlugin *m_instance;
-
-    Core::ICore *m_core;
     typedef QList<Core::IWizard *> WizardList;
     WizardList m_wizards;
     BinEditorFactory *m_factory;
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp
index e574140d3d8eff399c7c81f1dd513b61b0985880..36295979d1dc7b60d782f4551a3e9e67926ea208 100644
--- a/src/plugins/texteditor/basefilefind.cpp
+++ b/src/plugins/texteditor/basefilefind.cpp
@@ -33,6 +33,7 @@
 
 #include "basefilefind.h"
 
+#include <coreplugin/icore.h>
 #include <coreplugin/stylehelper.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
@@ -40,7 +41,7 @@
 #include <texteditor/itexteditor.h>
 #include <texteditor/basetexteditor.h>
 
-#include <QtDebug>
+#include <QtCore/QDebug>
 #include <QtCore/QDirIterator>
 #include <QtGui/QPushButton>
 #include <QtGui/QFileDialog>
diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp
index ed0e43e30b7411c0db06b3a65e0c6b2321158df8..f4fbe12aa8c4f470025cac96a6b9098e7009fe45 100644
--- a/src/plugins/texteditor/plaintexteditor.cpp
+++ b/src/plugins/texteditor/plaintexteditor.cpp
@@ -42,15 +42,15 @@ using namespace TextEditor;
 using namespace TextEditor::Internal;
 
 PlainTextEditorEditable::PlainTextEditorEditable(PlainTextEditor *editor)
-    :BaseTextEditorEditable(editor)
+  : BaseTextEditorEditable(editor)
 {
     Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
     m_context << uidm->uniqueIdentifier(Core::Constants::K_DEFAULT_TEXT_EDITOR);
     m_context << uidm->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR);
 }
 
-PlainTextEditor::PlainTextEditor(QWidget *parent) :
-    BaseTextEditor(parent)
+PlainTextEditor::PlainTextEditor(QWidget *parent)
+  : BaseTextEditor(parent)
 {
     setRevisionsVisible(true);
     setMarksVisible(true);
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index 3432d221e4e7e7d780f6366a4994dd9f456374b8..1e6a47e47d4a56d7e1ff0b6117659813d3135e14 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -43,6 +43,7 @@
 #include "plaintexteditor.h"
 #include "storagesettings.h"
 
+#include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/uniqueidmanager.h>