diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
index 9661852b2a8..ab1245ffcec 100644
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -585,11 +585,8 @@ Preprocessor::Preprocessor(Client *client, Environment *env)
 
 QByteArray Preprocessor::operator()(const QString &fileName, const QString &source)
 {
-    const QString previousOriginalSource = m_originalSource;
-    m_originalSource = source;
     const QByteArray bytes = source.toLatin1();
     const QByteArray preprocessedCode = operator()(fileName, bytes);
-    m_originalSource = previousOriginalSource;
     return preprocessedCode;
 }
 
diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h
index 5fa9dfa547f..e972e78267e 100644
--- a/src/libs/cplusplus/pp-engine.h
+++ b/src/libs/cplusplus/pp-engine.h
@@ -183,6 +183,8 @@ private:
     QByteArray m_scratchBuffer;
 
     QString m_originalSource;
+    QList<State> m_savedStates;
+
     bool m_expandMacros;
     bool m_keepComments;