diff --git a/src/libs/cplusplus/ASTParent.h b/src/libs/cplusplus/ASTParent.h
index d70bcf1591cd00fd72884f09acd78b98e5cabc59..ee587b1acd177d839763ff5d52a9de8d86fabf0f 100644
--- a/src/libs/cplusplus/ASTParent.h
+++ b/src/libs/cplusplus/ASTParent.h
@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef ASTPARENT_H
-#define ASTPARENT_H
+#ifndef CPLUSPLUS_ASTPARENT_H
+#define CPLUSPLUS_ASTPARENT_H
 
 #include <ASTVisitor.h>
 #include <QtCore/QHash>
@@ -60,4 +60,4 @@ private:
 
 } // namespace CPlusPlus
 
-#endif // ASTPARENT_H
+#endif // CPLUSPLUS_ASTPARENT_H
diff --git a/src/libs/cplusplus/ASTPath.h b/src/libs/cplusplus/ASTPath.h
index 23d9c74f7022d3c5f9cbf44fd90692a64960e7d9..84b5a2ac0248f0c33b1770ca6b7d92e3c27fc86e 100644
--- a/src/libs/cplusplus/ASTPath.h
+++ b/src/libs/cplusplus/ASTPath.h
@@ -27,13 +27,13 @@
 **
 **************************************************************************/
 
-#ifndef ASTPATH_H
-#define ASTPATH_H
+#ifndef CPLUSPLUS_ASTPATH_H
+#define CPLUSPLUS_ASTPATH_H
 
 #include <ASTfwd.h>
 #include <ASTVisitor.h>
 
-#include <cplusplus/CppDocument.h>
+#include "CppDocument.h"
 
 #include <QtCore/QList>
 #include <QtGui/QTextCursor>
@@ -72,4 +72,4 @@ private:
 
 } // namespace CppTools
 
-#endif // ASTPATH_H
+#endif // CPLUSPLUS_ASTPATH_H
diff --git a/src/libs/cplusplus/BackwardsScanner.h b/src/libs/cplusplus/BackwardsScanner.h
index 8ab0685bb12aade01868e15a0f7aa8ef04efbe71..64be2bc508fcc3241eb3687e0d6604a94eae9d5e 100644
--- a/src/libs/cplusplus/BackwardsScanner.h
+++ b/src/libs/cplusplus/BackwardsScanner.h
@@ -26,8 +26,8 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 **
 **************************************************************************/
-#ifndef BACKWARDSSCANNER_H
-#define BACKWARDSSCANNER_H
+#ifndef CPLUSPLUS_BACKWARDSSCANNER_H
+#define CPLUSPLUS_BACKWARDSSCANNER_H
 
 #include "SimpleLexer.h"
 
@@ -87,4 +87,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // BACKWARDSSCANNER_H
+#endif // CPLUSPLUS_BACKWARDSSCANNER_H
diff --git a/src/libs/cplusplus/CheckUndefinedSymbols.h b/src/libs/cplusplus/CheckUndefinedSymbols.h
index ec636191c15a5572c786f2e8bba26d0b32ebed3c..0ca9f5184e1af9cc72442ac7959a255797a94bbf 100644
--- a/src/libs/cplusplus/CheckUndefinedSymbols.h
+++ b/src/libs/cplusplus/CheckUndefinedSymbols.h
@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef CHECKUNDEFINEDSYMBOLS_H
-#define CHECKUNDEFINEDSYMBOLS_H
+#ifndef CPLUSPLUS_CHECKUNDEFINEDSYMBOLS_H
+#define CPLUSPLUS_CHECKUNDEFINEDSYMBOLS_H
 
 #include "CppDocument.h"
 #include "LookupContext.h"
@@ -88,4 +88,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // CHECKUNDEFINEDSYMBOLS_H
+#endif // CPLUSPLUS_CHECKUNDEFINEDSYMBOLS_H
diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h
index cd784ed642797432fba5253290d10f26ea7fec25..cfdd42c24427c09dd8f4e4e12ee280388f74c7b3 100644
--- a/src/libs/cplusplus/CppDocument.h
+++ b/src/libs/cplusplus/CppDocument.h
@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef CPPDOCUMENT_H
-#define CPPDOCUMENT_H
+#ifndef CPLUSPLUS_CPPDOCUMENT_H
+#define CPLUSPLUS_CPPDOCUMENT_H
 
 #include <CPlusPlusForwardDeclarations.h>
 #include "Macro.h"
@@ -382,4 +382,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // CPPDOCUMENT_H
+#endif // CPLUSPLUS_CPPDOCUMENT_H
diff --git a/src/libs/cplusplus/DependencyTable.h b/src/libs/cplusplus/DependencyTable.h
index 97b34c4e5904292af71cf7284c376a02fb973a92..01d7e7f0017d674eb4762f72d4666d41b51c46ee 100644
--- a/src/libs/cplusplus/DependencyTable.h
+++ b/src/libs/cplusplus/DependencyTable.h
@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef DEPENDENCYTABLE_H
-#define DEPENDENCYTABLE_H
+#ifndef CPLUSPLUS_DEPENDENCYTABLE_H
+#define CPLUSPLUS_DEPENDENCYTABLE_H
 
 #include <CPlusPlusForwardDeclarations.h>
 
@@ -62,4 +62,4 @@ private:
 
 } // namespace CPlusPlus
 
-#endif // DEPENDENCYTABLE_H
+#endif // CPLUSPLUS_DEPENDENCYTABLE_H
diff --git a/src/libs/cplusplus/ExpressionUnderCursor.h b/src/libs/cplusplus/ExpressionUnderCursor.h
index e7ef2f9912a462031e7d4ddda76de092796c9d57..3972aca6e4f408da9a5affbe56e6241d421b55cf 100644
--- a/src/libs/cplusplus/ExpressionUnderCursor.h
+++ b/src/libs/cplusplus/ExpressionUnderCursor.h
@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef EXPRESSIONUNDERCURSOR_H
-#define EXPRESSIONUNDERCURSOR_H
+#ifndef CPLUSPLUS_EXPRESSIONUNDERCURSOR_H
+#define CPLUSPLUS_EXPRESSIONUNDERCURSOR_H
 
 #include "CPlusPlusForwardDeclarations.h"
 #include <QList>
@@ -64,4 +64,4 @@ private:
 
 } // namespace CPlusPlus
 
-#endif // EXPRESSIONUNDERCURSOR_H
+#endif // CPLUSPLUS_EXPRESSIONUNDERCURSOR_H
diff --git a/src/libs/cplusplus/FastPreprocessor.h b/src/libs/cplusplus/FastPreprocessor.h
index a22b0ae9de7fb75a3b4d0787dac7562b7adc2b44..81506e915cffbe0b79d2fefd708aaf6f19a22c8b 100644
--- a/src/libs/cplusplus/FastPreprocessor.h
+++ b/src/libs/cplusplus/FastPreprocessor.h
@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef FASTPREPROCESSOR_H
-#define FASTPREPROCESSOR_H
+#ifndef CPLUSPLUS_FASTPREPROCESSOR_H
+#define CPLUSPLUS_FASTPREPROCESSOR_H
 
 #include "PreprocessorClient.h"
 #include "CppDocument.h"
@@ -77,4 +77,4 @@ public:
 
 } // end of namespace CPlusPlus
 
-#endif // FASTPREPROCESSOR_H
+#endif // CPLUSPLUS_FASTPREPROCESSOR_H
diff --git a/src/libs/cplusplus/FindUsages.h b/src/libs/cplusplus/FindUsages.h
index efc0775030d5ce1f2d906584a94634c76e798b0c..12f7743db76b2972bbfe2c14ec96665677f2919d 100644
--- a/src/libs/cplusplus/FindUsages.h
+++ b/src/libs/cplusplus/FindUsages.h
@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef FINDUSAGES_H
-#define FINDUSAGES_H
+#ifndef CPLUSPLUS_FINDUSAGES_H
+#define CPLUSPLUS_FINDUSAGES_H
 
 #include "LookupContext.h"
 #include "CppDocument.h"
@@ -119,4 +119,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // FINDUSAGES_H
+#endif // CPLUSPLUS_FINDUSAGES_H
diff --git a/src/libs/cplusplus/Macro.h b/src/libs/cplusplus/Macro.h
index 3a16e6e28a49734a7adc9061c5687725a8706e51..2ff54b12cb9ddfcc4ecc0bfe146811d89d9724d4 100644
--- a/src/libs/cplusplus/Macro.h
+++ b/src/libs/cplusplus/Macro.h
@@ -46,8 +46,8 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef PP_MACRO_H
-#define PP_MACRO_H
+#ifndef CPLUSPLUS_PP_MACRO_H
+#define CPLUSPLUS_PP_MACRO_H
 
 #include <CPlusPlusForwardDeclarations.h>
 
@@ -153,4 +153,4 @@ private:
 
 } // namespace CPlusPlus
 
-#endif // PP_MACRO_H
+#endif // CPLUSPLUS_PP_MACRO_H
diff --git a/src/libs/cplusplus/MatchingText.h b/src/libs/cplusplus/MatchingText.h
index 6c83970e92d82fe52baf4d894800fd8d323972a5..5a49fa927c0a04aa7b3ecc4b7753e75cbbc46afc 100644
--- a/src/libs/cplusplus/MatchingText.h
+++ b/src/libs/cplusplus/MatchingText.h
@@ -26,8 +26,8 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 **
 **************************************************************************/
-#ifndef MATCHINGTEXT_H
-#define MATCHINGTEXT_H
+#ifndef CPLUSPLUS_MATCHINGTEXT_H
+#define CPLUSPLUS_MATCHINGTEXT_H
 
 #include <CPlusPlusForwardDeclarations.h>
 #include <QtGui/QTextCursor>
diff --git a/src/libs/cplusplus/Overview.h b/src/libs/cplusplus/Overview.h
index b1018def6bdd42136bcf98ed74a206ccec9305c1..9cebefed01f456c81bab1a52a9fddb4c6f3edd03 100644
--- a/src/libs/cplusplus/Overview.h
+++ b/src/libs/cplusplus/Overview.h
@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef OVERVIEW_H
-#define OVERVIEW_H
+#ifndef CPLUSPLUS_OVERVIEW_H
+#define CPLUSPLUS_OVERVIEW_H
 
 #include <CPlusPlusForwardDeclarations.h>
 #include <QString>
@@ -92,4 +92,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // OVERVIEW_H
+#endif // CPLUSPLUS_OVERVIEW_H
diff --git a/src/libs/cplusplus/SimpleLexer.h b/src/libs/cplusplus/SimpleLexer.h
index 5046b0f6dbd9754968c75500875b771269c02b93..f3af52b6b68618ab3990e572b8a47e06cde61bae 100644
--- a/src/libs/cplusplus/SimpleLexer.h
+++ b/src/libs/cplusplus/SimpleLexer.h
@@ -26,8 +26,8 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 **
 **************************************************************************/
-#ifndef SIMPLELEXER_H
-#define SIMPLELEXER_H
+#ifndef CPLUSPLUS_SIMPLELEXER_H
+#define CPLUSPLUS_SIMPLELEXER_H
 
 #include <CPlusPlusForwardDeclarations.h>
 
@@ -143,4 +143,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // SIMPLELEXER_H
+#endif // CPLUSPLUS_SIMPLELEXER_H
diff --git a/src/libs/cplusplus/TokenUnderCursor.h b/src/libs/cplusplus/TokenUnderCursor.h
index af1da311ec132cce7f8757b92c5d8c3ea0e7c5db..92d421963c9cd22458aacaf5d884b092572374a9 100644
--- a/src/libs/cplusplus/TokenUnderCursor.h
+++ b/src/libs/cplusplus/TokenUnderCursor.h
@@ -26,8 +26,8 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 **
 **************************************************************************/
-#ifndef TOKENUNDERCURSOR_H
-#define TOKENUNDERCURSOR_H
+#ifndef CPLUSPLUS_TOKENUNDERCURSOR_H
+#define CPLUSPLUS_TOKENUNDERCURSOR_H
 
 #include "SimpleLexer.h"
 #include <QList>
@@ -58,4 +58,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // TOKENUNDERCURSOR_H
+#endif // CPLUSPLUS_TOKENUNDERCURSOR_H
diff --git a/src/libs/cplusplus/TypePrettyPrinter.h b/src/libs/cplusplus/TypePrettyPrinter.h
index d5775bd9b8504d85fd0d95e941fc1a8fa072f298..aed93e0e7583aaf99f8f655878751bfae1b8ac6b 100644
--- a/src/libs/cplusplus/TypePrettyPrinter.h
+++ b/src/libs/cplusplus/TypePrettyPrinter.h
@@ -26,8 +26,8 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 **
 **************************************************************************/
-#ifndef TYPEPRETTYPRINTER_H
-#define TYPEPRETTYPRINTER_H
+#ifndef CPLUSPLUS_TYPEPRETTYPRINTER_H
+#define CPLUSPLUS_TYPEPRETTYPRINTER_H
 
 #include <TypeVisitor.h>
 #include <FullySpecifiedType.h>
@@ -86,4 +86,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // TYPEPRETTYPRINTER_H
+#endif // CPLUSPLUS_TYPEPRETTYPRINTER_H
diff --git a/src/libs/cplusplus/pp-macro-expander.h b/src/libs/cplusplus/pp-macro-expander.h
index e4d10217e4d2e3933f8783189813c10b46047e9c..f19be4111fa2d8c123a8c4b9bbade8a85f94c29b 100644
--- a/src/libs/cplusplus/pp-macro-expander.h
+++ b/src/libs/cplusplus/pp-macro-expander.h
@@ -46,8 +46,8 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef PP_MACRO_EXPANDER_H
-#define PP_MACRO_EXPANDER_H
+#ifndef CPLUSPLUS_PP_MACRO_EXPANDER_H
+#define CPLUSPLUS_PP_MACRO_EXPANDER_H
 
 #include "Macro.h"
 #include "pp-scanner.h"
@@ -102,5 +102,5 @@ public: // attributes
 
 } // namespace CPlusPlus
 
-#endif // PP_MACRO_EXPANDER_H
+#endif // CPLUSPLUS_PP_MACRO_EXPANDER_H