diff --git a/src/libs/cplusplus/cplusplus.pro b/src/libs/cplusplus/cplusplus.pro
index 1a2b5326623927b3854057c33d3874e51fff012b..49d78fda8b36d4def16fdfab74c3158cace20339 100644
--- a/src/libs/cplusplus/cplusplus.pro
+++ b/src/libs/cplusplus/cplusplus.pro
@@ -21,7 +21,16 @@ HEADERS += \
     TypeOfExpression.h \
     TypePrettyPrinter.h \
     ResolveExpression.h \
-    LookupContext.h
+    LookupContext.h \
+    pp-cctype.h \
+    pp-engine.h \
+    pp-fwd.h \
+    pp-macro-expander.h \
+    pp-scanner.h \
+    pp-client.h \
+    pp-environment.h \
+    pp-internal.h \
+    pp-macro.h
 
 SOURCES += \
     SimpleLexer.cpp \
@@ -35,6 +44,9 @@ SOURCES += \
     TypeOfExpression.cpp \
     TypePrettyPrinter.cpp \
     ResolveExpression.cpp \
-    LookupContext.cpp
+    LookupContext.cpp \
+    pp-engine.cpp \
+    pp-environment.cpp \
+    pp-macro-expander.cpp
 
 RESOURCES += cplusplus.qrc
diff --git a/src/plugins/cpptools/rpp/pp-cctype.h b/src/libs/cplusplus/pp-cctype.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-cctype.h
rename to src/libs/cplusplus/pp-cctype.h
diff --git a/src/plugins/cpptools/rpp/pp-client.h b/src/libs/cplusplus/pp-client.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-client.h
rename to src/libs/cplusplus/pp-client.h
diff --git a/src/plugins/cpptools/rpp/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-engine.cpp
rename to src/libs/cplusplus/pp-engine.cpp
diff --git a/src/plugins/cpptools/rpp/pp-engine.h b/src/libs/cplusplus/pp-engine.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-engine.h
rename to src/libs/cplusplus/pp-engine.h
diff --git a/src/plugins/cpptools/rpp/pp-environment.cpp b/src/libs/cplusplus/pp-environment.cpp
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-environment.cpp
rename to src/libs/cplusplus/pp-environment.cpp
diff --git a/src/plugins/cpptools/rpp/pp-environment.h b/src/libs/cplusplus/pp-environment.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-environment.h
rename to src/libs/cplusplus/pp-environment.h
diff --git a/src/plugins/cpptools/rpp/pp-fwd.h b/src/libs/cplusplus/pp-fwd.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-fwd.h
rename to src/libs/cplusplus/pp-fwd.h
diff --git a/src/plugins/cpptools/rpp/pp-internal.h b/src/libs/cplusplus/pp-internal.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-internal.h
rename to src/libs/cplusplus/pp-internal.h
diff --git a/src/plugins/cpptools/rpp/pp-macro-expander.cpp b/src/libs/cplusplus/pp-macro-expander.cpp
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-macro-expander.cpp
rename to src/libs/cplusplus/pp-macro-expander.cpp
diff --git a/src/plugins/cpptools/rpp/pp-macro-expander.h b/src/libs/cplusplus/pp-macro-expander.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-macro-expander.h
rename to src/libs/cplusplus/pp-macro-expander.h
diff --git a/src/plugins/cpptools/rpp/pp-macro.h b/src/libs/cplusplus/pp-macro.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-macro.h
rename to src/libs/cplusplus/pp-macro.h
diff --git a/src/plugins/cpptools/rpp/pp-scanner.h b/src/libs/cplusplus/pp-scanner.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-scanner.h
rename to src/libs/cplusplus/pp-scanner.h
diff --git a/src/plugins/cpptools/rpp/pp.h b/src/libs/cplusplus/pp.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp.h
rename to src/libs/cplusplus/pp.h
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro
index 8a096900ebf699ba9f0712eafb670660ebffb113..92905e42ef9af7659dd58358a3fd7c7d50694b3d 100644
--- a/src/plugins/cpptools/cpptools.pro
+++ b/src/plugins/cpptools/cpptools.pro
@@ -10,7 +10,7 @@ unix:QMAKE_CXXFLAGS_DEBUG += -O3
 INCLUDEPATH += .
 DEFINES += CPPTOOLS_LIBRARY
 CONFIG += help
-include(rpp/rpp.pri)|error("Can't find RPP")
+
 HEADERS += cpptools_global.h \
     cppquickopenfilter.h \
     cppclassesfilter.h \
diff --git a/src/plugins/cpptools/rpp/rpp.pri b/src/plugins/cpptools/rpp/rpp.pri
deleted file mode 100644
index a79b0028a056faf793ac0b38a4e4bb048a74b15d..0000000000000000000000000000000000000000
--- a/src/plugins/cpptools/rpp/rpp.pri
+++ /dev/null
@@ -1,18 +0,0 @@
-DEPENDPATH += $$PWD
-INCLUDEPATH += $$PWD
-
-HEADERS += $$PWD/pp-cctype.h \
-           $$PWD/pp-engine.h \
-           $$PWD/pp-environment.h \
-           $$PWD/pp-internal.h \
-           $$PWD/pp-macro-expander.h \
-           $$PWD/pp-macro.h \
-           $$PWD/pp-scanner.h \
-           $$PWD/pp.h \
-           $$PWD/pp-client.h
-
-SOURCES += $$PWD/pp-engine.cpp \
-           $$PWD/pp-environment.cpp \
-           $$PWD/pp-macro-expander.cpp
-
-