diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri
index b1e27c950e8..24bb51cf5e2 100644
--- a/src/libs/cplusplus/cplusplus-lib.pri
+++ b/src/libs/cplusplus/cplusplus-lib.pri
@@ -38,7 +38,6 @@ HEADERS += \
     $$PWD/ASTPath.h \
     $$PWD/DeprecatedGenTemplateInstance.h \
     $$PWD/FindUsages.h \
-    $$PWD/CheckUndefinedSymbols.h \
     $$PWD/DependencyTable.h \
     $$PWD/PreprocessorClient.h \
     $$PWD/PreprocessorEnvironment.h \
@@ -64,7 +63,6 @@ SOURCES += \
     $$PWD/ASTPath.cpp \
     $$PWD/DeprecatedGenTemplateInstance.cpp \
     $$PWD/FindUsages.cpp \
-    $$PWD/CheckUndefinedSymbols.cpp \
     $$PWD/DependencyTable.cpp \
     $$PWD/PreprocessorClient.cpp \
     $$PWD/PreprocessorEnvironment.cpp \
diff --git a/src/libs/cplusplus/CheckUndefinedSymbols.cpp b/src/plugins/cppeditor/cppcheckundefinedsymbols.cpp
similarity index 99%
rename from src/libs/cplusplus/CheckUndefinedSymbols.cpp
rename to src/plugins/cppeditor/cppcheckundefinedsymbols.cpp
index 10fb5dc7e65..d5f8e3337aa 100644
--- a/src/libs/cplusplus/CheckUndefinedSymbols.cpp
+++ b/src/plugins/cppeditor/cppcheckundefinedsymbols.cpp
@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#include "CheckUndefinedSymbols.h"
-#include "Overview.h"
+#include "cppcheckundefinedsymbols.h"
+#include <cplusplus/Overview.h>
 
 #include <Names.h>
 #include <Literals.h>
diff --git a/src/libs/cplusplus/CheckUndefinedSymbols.h b/src/plugins/cppeditor/cppcheckundefinedsymbols.h
similarity index 96%
rename from src/libs/cplusplus/CheckUndefinedSymbols.h
rename to src/plugins/cppeditor/cppcheckundefinedsymbols.h
index fd5ffbc7861..e4dd960f503 100644
--- a/src/libs/cplusplus/CheckUndefinedSymbols.h
+++ b/src/plugins/cppeditor/cppcheckundefinedsymbols.h
@@ -30,14 +30,14 @@
 #ifndef CPLUSPLUS_CHECKUNDEFINEDSYMBOLS_H
 #define CPLUSPLUS_CHECKUNDEFINEDSYMBOLS_H
 
-#include "CppDocument.h"
-#include "LookupContext.h"
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/LookupContext.h>
 #include <ASTVisitor.h>
 #include <QtCore/QSet>
 
 namespace CPlusPlus {
 
-class CPLUSPLUS_EXPORT CheckUndefinedSymbols: protected ASTVisitor
+class CheckUndefinedSymbols: protected ASTVisitor
 {
 public:
     CheckUndefinedSymbols(TranslationUnit *unit, const LookupContext &context);
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index fc7b9f3a668..bb89ca7187d 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -31,6 +31,8 @@
 #include "cppeditorconstants.h"
 #include "cppplugin.h"
 #include "cpphighlighter.h"
+#include "cppcheckundefinedsymbols.h"
+
 #include "cppquickfix.h"
 #include <cpptools/cpptoolsplugin.h>
 
@@ -54,7 +56,6 @@
 #include <cplusplus/MatchingText.h>
 #include <cplusplus/BackwardsScanner.h>
 #include <cplusplus/FastPreprocessor.h>
-#include <cplusplus/CheckUndefinedSymbols.h>
 
 #include <cpptools/cppmodelmanagerinterface.h>
 #include <cpptools/cpptoolsconstants.h>
diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro
index 8e3b022e4bf..0fbfba07811 100644
--- a/src/plugins/cppeditor/cppeditor.pro
+++ b/src/plugins/cppeditor/cppeditor.pro
@@ -15,7 +15,8 @@ HEADERS += cppplugin.h \
     cppeditor_global.h \
     cppclasswizard.h \
     cppquickfix.h \
-    cpprefactoringchanges.h
+    cpprefactoringchanges.h \
+    cppcheckundefinedsymbols.h
 
 SOURCES += cppplugin.cpp \
     cppeditor.cpp \
@@ -24,7 +25,8 @@ SOURCES += cppplugin.cpp \
     cppfilewizard.cpp \
     cppclasswizard.cpp \
     cppquickfix.cpp \
-    cpprefactoringchanges.cpp
+    cpprefactoringchanges.cpp \
+    cppcheckundefinedsymbols.cpp
 
 RESOURCES += cppeditor.qrc
 
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 317fba77d81..486eabb51f0 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -29,7 +29,6 @@
 
 #include <cplusplus/pp.h>
 #include <cplusplus/Overview.h>
-#include <cplusplus/CheckUndefinedSymbols.h>
 
 #include "cppmodelmanager.h"
 #ifndef ICHECK_BUILD
diff --git a/src/shared/cplusplus/Symbols.h b/src/shared/cplusplus/Symbols.h
index 46be950121c..2a90fd0cc03 100644
--- a/src/shared/cplusplus/Symbols.h
+++ b/src/shared/cplusplus/Symbols.h
@@ -57,7 +57,7 @@
 
 namespace CPlusPlus {
 
-class TemplateParameters
+class CPLUSPLUS_EXPORT TemplateParameters
 {
 public:
     TemplateParameters(Scope *scope);