diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index f3d9e7e462f..5a576f4b56e 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -610,7 +610,7 @@ CPPEditor::CPPEditor(QWidget *parent)
     , m_firstRenameChange(false)
 {
     m_initialized = false;
-    qRegisterMetaType<SemanticInfo>("SemanticInfo");
+    qRegisterMetaType<CppEditor::Internal::SemanticInfo>("CppEditor::Internal::SemanticInfo");
 
     m_semanticHighlighter = new SemanticHighlighter(this);
     m_semanticHighlighter->start();
@@ -700,8 +700,8 @@ void CPPEditor::createToolBar(CPPEditorEditable *editable)
     connect(this, SIGNAL(cursorPositionChanged()), this, SLOT(updateUses()));
     connect(this, SIGNAL(textChanged()), this, SLOT(updateUses()));
 
-    connect(m_semanticHighlighter, SIGNAL(changed(SemanticInfo)),
-            this, SLOT(updateSemanticInfo(SemanticInfo)));
+    connect(m_semanticHighlighter, SIGNAL(changed(CppEditor::Internal::SemanticInfo)),
+            this, SLOT(updateSemanticInfo(CppEditor::Internal::SemanticInfo)));
 
     QToolBar *toolBar = static_cast<QToolBar*>(editable->toolBar());
     QList<QAction*> actions = toolBar->actions();
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index 243c4843d41..6c70e1da62c 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -141,7 +141,7 @@ public:
     void rehighlight(const Source &source);
 
 Q_SIGNALS:
-    void changed(const SemanticInfo &semanticInfo);
+    void changed(const CppEditor::Internal::SemanticInfo &semanticInfo);
 
 protected:
     virtual void run();
@@ -242,7 +242,7 @@ private Q_SLOTS:
     void onContentsChanged(int position, int charsRemoved, int charsAdded);
 
     void semanticRehighlight();
-    void updateSemanticInfo(const SemanticInfo &semanticInfo);
+    void updateSemanticInfo(const CppEditor::Internal::SemanticInfo &semanticInfo);
 
     void performQuickFix(int index);
 
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 319dc009551..924c45d3513 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -564,7 +564,7 @@ QmlJSTextEditor::QmlJSTextEditor(QWidget *parent) :
     m_methodCombo(0),
     m_modelManager(0)
 {
-    qRegisterMetaType<SemanticInfo>("SemanticInfo");
+    qRegisterMetaType<QmlJSEditor::Internal::SemanticInfo>("QmlJSEditor::Internal::SemanticInfo");
 
     m_semanticHighlighter = new SemanticHighlighter(this);
     m_semanticHighlighter->start();
@@ -596,8 +596,8 @@ QmlJSTextEditor::QmlJSTextEditor(QWidget *parent) :
                 this, SLOT(onDocumentUpdated(QmlJS::Document::Ptr)));
     }
 
-    connect(m_semanticHighlighter, SIGNAL(changed(SemanticInfo)),
-            this, SLOT(updateSemanticInfo(SemanticInfo)));
+    connect(m_semanticHighlighter, SIGNAL(changed(QmlJSEditor::Internal::SemanticInfo)),
+            this, SLOT(updateSemanticInfo(QmlJSEditor::Internal::SemanticInfo)));
 }
 
 QmlJSTextEditor::~QmlJSTextEditor()
diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h
index 956684e1d2a..dc8d93a3006 100644
--- a/src/plugins/qmljseditor/qmljseditor.h
+++ b/src/plugins/qmljseditor/qmljseditor.h
@@ -175,7 +175,7 @@ public:
     void rehighlight(const Source &source);
 
 Q_SIGNALS:
-    void changed(const SemanticInfo &semanticInfo);
+    void changed(const QmlJSEditor::Internal::SemanticInfo &semanticInfo);
 
 protected:
     virtual void run();
@@ -228,7 +228,7 @@ private slots:
     void renameIdUnderCursor();
 
     void semanticRehighlight();
-    void updateSemanticInfo(const SemanticInfo &semanticInfo);
+    void updateSemanticInfo(const QmlJSEditor::Internal::SemanticInfo &semanticInfo);
 
 protected:
     void contextMenuEvent(QContextMenuEvent *e);