diff --git a/src/plugins/qmlinspector/components/expressionquerywidget.h b/src/plugins/qmlinspector/components/expressionquerywidget.h
index 2e188f3137c..41a8dc155ef 100644
--- a/src/plugins/qmlinspector/components/expressionquerywidget.h
+++ b/src/plugins/qmlinspector/components/expressionquerywidget.h
@@ -41,6 +41,8 @@ class QPlainTextEdit;
 class QLineEdit;
 class QPushButton;
 
+QT_END_NAMESPACE
+
 namespace Core {
     class IContext;
 }
@@ -100,7 +102,5 @@ private:
     QDeclarativeDebugObjectReference m_objectAtLastFocus;
 };
 
-QT_END_NAMESPACE
-
 #endif
 
diff --git a/src/plugins/qmlinspector/qmlinspector.h b/src/plugins/qmlinspector/qmlinspector.h
index 8214df75397..cadfabe1620 100644
--- a/src/plugins/qmlinspector/qmlinspector.h
+++ b/src/plugins/qmlinspector/qmlinspector.h
@@ -53,10 +53,10 @@ class WatchTableModel;
 class WatchTableView;
 class ObjectPropertiesView;
 class CanvasFrameRate;
-class ExpressionQueryWidget;
-
 QT_END_NAMESPACE
 
+class ExpressionQueryWidget;
+
 namespace Core {
     class IContext;
 }
diff --git a/src/plugins/qmlinspector/qmlinspectorplugin.cpp b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
index 817fe6676de..52ee83c5a05 100644
--- a/src/plugins/qmlinspector/qmlinspectorplugin.cpp
+++ b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
@@ -105,7 +105,7 @@ bool QmlInspectorPlugin::initialize(const QStringList &arguments, QString *error
 
     m_inspector = new QmlInspector;
     addObject(m_inspector);
-    core->addContextObject(m_inspector->context());
+    Core::ICore::instance()->addContextObject(m_inspector->context());
 
     connect(m_connectionTimer, SIGNAL(timeout()), SLOT(pollInspector()));