5 files changed, 57 insertions, 54 deletions
diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h
index 014d1be2c9..f4e4188434 100644
--- a/src/libs/cplusplus/LookupContext.h
+++ b/src/libs/cplusplus/LookupContext.h
@@ -34,7 +34,7 @@
 #ifndef CPLUSPLUS_LOOKUPCONTEXT_H
 #define CPLUSPLUS_LOOKUPCONTEXT_H
 
-#include <cplusplus/CppDocument.h>
+#include "CppDocument.h"
 #include <QPair>
 
 namespace CPlusPlus {
diff --git a/src/libs/cplusplus/TypeOfExpression.cpp b/src/libs/cplusplus/TypeOfExpression.cpp
index 90ec7837a7..fe9a664d18 100644
--- a/src/libs/cplusplus/TypeOfExpression.cpp
+++ b/src/libs/cplusplus/TypeOfExpression.cpp
@@ -32,12 +32,12 @@
 ***************************************************************************/
 
 #include "TypeOfExpression.h"
+#include <TranslationUnit.h>
+#include "LookupContext.h"
+#include "ResolveExpression.h"
+#include "pp.h"
 
 #include <AST.h>
-#include <TranslationUnit.h>
-#include <cplusplus/LookupContext.h>
-#include <cplusplus/ResolveExpression.h>
-#include <cplusplus/pp.h>
 #include <QSet>
 
 using namespace CPlusPlus;
diff --git a/src/libs/cplusplus/TypeOfExpression.h b/src/libs/cplusplus/TypeOfExpression.h
index 78af034634..4b057ce292 100644
--- a/src/libs/cplusplus/TypeOfExpression.h
+++ b/src/libs/cplusplus/TypeOfExpression.h
@@ -33,10 +33,10 @@
 #ifndef CPLUSPLUS_TYPEOFEXPRESSION_H
 #define CPLUSPLUS_TYPEOFEXPRESSION_H
 
-#include <ASTfwd.h>
-#include <cplusplus/CppDocument.h>
-#include <cplusplus/LookupContext.h>
+#include "CppDocument.h"
+#include "LookupContext.h"
 
+#include <ASTfwd.h>
 #include <QtCore/QMap>
 #include <QtCore/QObject>
 #include <QtCore/QString>
diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri
new file mode 100644
index 0000000000..d3053228fc
--- /dev/null
+++ b/src/libs/cplusplus/cplusplus-lib.pri
@@ -0,0 +1,48 @@
+DEFINES += HAVE_QT CPLUSPLUS_WITH_NAMESPACE CPLUSPLUS_BUILD_LIB
+INCLUDEPATH += $$PWD
+
+include(../../shared/cplusplus/cplusplus.pri)
+
+HEADERS += \
+    $$PWD/SimpleLexer.h \
+    $$PWD/ExpressionUnderCursor.h \
+    $$PWD/TokenUnderCursor.h \
+    $$PWD/CppDocument.h \
+    $$PWD/Icons.h \
+    $$PWD/Overview.h \
+    $$PWD/OverviewModel.h \
+    $$PWD/NamePrettyPrinter.h \
+    $$PWD/TypeOfExpression.h \
+    $$PWD/TypePrettyPrinter.h \
+    $$PWD/ResolveExpression.h \
+    $$PWD/LookupContext.h \
+    $$PWD/PreprocessorClient.h \
+    $$PWD/PreprocessorEnvironment.h \
+    $$PWD/Macro.h \
+    $$PWD/pp.h \
+    $$PWD/pp-cctype.h \
+    $$PWD/pp-engine.h \
+    $$PWD/pp-macro-expander.h \
+    $$PWD/pp-scanner.h
+
+SOURCES += \
+    $$PWD/SimpleLexer.cpp \
+    $$PWD/ExpressionUnderCursor.cpp \
+    $$PWD/TokenUnderCursor.cpp \
+    $$PWD/CppDocument.cpp \
+    $$PWD/Icons.cpp \
+    $$PWD/Overview.cpp \
+    $$PWD/OverviewModel.cpp \
+    $$PWD/NamePrettyPrinter.cpp \
+    $$PWD/TypeOfExpression.cpp \
+    $$PWD/TypePrettyPrinter.cpp \
+    $$PWD/ResolveExpression.cpp \
+    $$PWD/LookupContext.cpp \
+    $$PWD/PreprocessorClient.cpp \
+    $$PWD/PreprocessorEnvironment.cpp \
+    $$PWD/Macro.cpp \
+    $$PWD/pp-engine.cpp \
+    $$PWD/pp-macro-expander.cpp \
+    $$PWD/pp-scanner.cpp
+
+RESOURCES += $$PWD/cplusplus.qrc
diff --git a/src/libs/cplusplus/cplusplus.pro b/src/libs/cplusplus/cplusplus.pro
index ccc38abb49..f13ef15fa2 100644
--- a/src/libs/cplusplus/cplusplus.pro
+++ b/src/libs/cplusplus/cplusplus.pro
@@ -2,53 +2,8 @@ TEMPLATE = lib
 
 TARGET = CPlusPlus
 
-DEFINES += HAVE_QT CPLUSPLUS_WITH_NAMESPACE CPLUSPLUS_BUILD_LIB
 DEFINES += NDEBUG
 unix:QMAKE_CXXFLAGS_DEBUG += -O3
 
 include(../../qworkbenchlibrary.pri)
-include(../../shared/cplusplus/cplusplus.pri)
-
-HEADERS += \
-    SimpleLexer.h \
-    ExpressionUnderCursor.h \
-    TokenUnderCursor.h \
-    CppDocument.h \
-    Icons.h \
-    Overview.h \
-    OverviewModel.h \
-    NamePrettyPrinter.h \
-    TypeOfExpression.h \
-    TypePrettyPrinter.h \
-    ResolveExpression.h \
-    LookupContext.h \
-    PreprocessorClient.h \
-    PreprocessorEnvironment.h \
-    Macro.h \
-    pp.h \
-    pp-cctype.h \
-    pp-engine.h \
-    pp-macro-expander.h \
-    pp-scanner.h
-
-SOURCES += \
-    SimpleLexer.cpp \
-    ExpressionUnderCursor.cpp \
-    TokenUnderCursor.cpp \
-    CppDocument.cpp \
-    Icons.cpp \
-    Overview.cpp \
-    OverviewModel.cpp \
-    NamePrettyPrinter.cpp \
-    TypeOfExpression.cpp \
-    TypePrettyPrinter.cpp \
-    ResolveExpression.cpp \
-    LookupContext.cpp \
-    PreprocessorClient.cpp \
-    PreprocessorEnvironment.cpp \
-    Macro.cpp \
-    pp-engine.cpp \
-    pp-macro-expander.cpp \
-    pp-scanner.cpp
-
-RESOURCES += cplusplus.qrc
+include(cplusplus-lib.pri)