Make header guards unique.

We add a "QBS_" prefix everywhere to reduce the chance of clashes with
header files from somewhere else. This is especially important for the
headers to be included in client code.

Change-Id: I2fe8de250073a79f4ae9a4237569c21a980f7c85
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

43 files changed, 126 insertions, 125 deletions

diff --git a/src/lib/api/internaljobs.h b/src/lib/api/internaljobs.h
index d154ad415..44d327bf6 100644
--- a/src/lib/api/internaljobs.h
+++ b/src/lib/api/internaljobs.h
@@ -26,8 +26,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#ifndef QBSJOB_H
-#define QBSJOB_H
+#ifndef QBS_INTERNALJOBS_H
+#define QBS_INTERNALJOBS_H
 
 #include "projectdata.h"
 #include <buildgraph/forward_decls.h>
@@ -172,4 +172,4 @@ private slots:
 } // namespace Internal
 } // namespace qbs
 
-#endif // QBSJOB_H
+#endif // QBS_INTERNALJOBS_H
diff --git a/src/lib/api/jobs.h b/src/lib/api/jobs.h
index bd2296711..eefb73980 100644
--- a/src/lib/api/jobs.h
+++ b/src/lib/api/jobs.h
@@ -26,8 +26,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#ifndef JOBS_H
-#define JOBS_H
+#ifndef QBS_JOBS_H
+#define QBS_JOBS_H
 
 #include <buildgraph/forward_decls.h>
 #include <tools/error.h>
@@ -116,4 +116,4 @@ private:
 };
 } // namespace qbs
 
-#endif // JOBS_H
+#endif // QBS_JOBS_H
diff --git a/src/lib/api/projectdata.h b/src/lib/api/projectdata.h
index 737aaf3c6..f08e1def7 100644
--- a/src/lib/api/projectdata.h
+++ b/src/lib/api/projectdata.h
@@ -26,8 +26,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#ifndef PUBLICTYPES_H
-#define PUBLICTYPES_H
+#ifndef QBS_PROJECTDATA_H
+#define QBS_PROJECTDATA_H
 
 #include <QList>
 #include <QPair>
@@ -110,4 +110,4 @@ bool operator!=(const ProjectData &lhs, const ProjectData &rhs);
 
 } // namespace qbs
 
-#endif // PUBLICTYPES_H
+#endif // QBS_PROJECTDATA_H
diff --git a/src/lib/buildgraph/abstractcommandexecutor.h b/src/lib/buildgraph/abstractcommandexecutor.h
index b9c4b34bc..3cceae8f2 100644
--- a/src/lib/buildgraph/abstractcommandexecutor.h
+++ b/src/lib/buildgraph/abstractcommandexecutor.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef ABSTRACTCOMMANDEXECUTOR_H
-#define ABSTRACTCOMMANDEXECUTOR_H
+#ifndef QBS_ABSTRACTCOMMANDEXECUTOR_H
+#define QBS_ABSTRACTCOMMANDEXECUTOR_H
 
 #include <QObject>
 
@@ -79,4 +79,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // ABSTRACTCOMMANDEXECUTOR_H
+#endif // QBS_ABSTRACTCOMMANDEXECUTOR_H
diff --git a/src/lib/buildgraph/artifact.h b/src/lib/buildgraph/artifact.h
index 5ea1ea3e2..31767e799 100644
--- a/src/lib/buildgraph/artifact.h
+++ b/src/lib/buildgraph/artifact.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef ARTIFACT_H
-#define ARTIFACT_H
+#ifndef QBS_ARTIFACT_H
+#define QBS_ARTIFACT_H
 
 #include "artifactlist.h"
 #include "forward_decls.h"
@@ -144,4 +144,4 @@ inline QString toString(Artifact::BuildState s)
 } // namespace Internal
 } // namespace qbs
 
-#endif // ARTIFACT_H
+#endif // QBS_ARTIFACT_H
diff --git a/src/lib/buildgraph/artifactcleaner.h b/src/lib/buildgraph/artifactcleaner.h
index 8b1d87268..6cdbf9e4a 100644
--- a/src/lib/buildgraph/artifactcleaner.h
+++ b/src/lib/buildgraph/artifactcleaner.h
@@ -26,8 +26,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#ifndef ARTIFACTCLEANER_H
-#define ARTIFACTCLEANER_H
+#ifndef QBS_ARTIFACTCLEANER_H
+#define QBS_ARTIFACTCLEANER_H
 
 #include <QList>
 
@@ -54,4 +54,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // ARTIFACTCLEANER_H
+#endif // QBS_ARTIFACTCLEANER_H
diff --git a/src/lib/buildgraph/artifactlist.h b/src/lib/buildgraph/artifactlist.h
index 71cf69997..53f251f4b 100644
--- a/src/lib/buildgraph/artifactlist.h
+++ b/src/lib/buildgraph/artifactlist.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef ARTIFACTLIST_H
-#define ARTIFACTLIST_H
+#ifndef QBS_ARTIFACTLIST_H
+#define QBS_ARTIFACTLIST_H
 
 #include <set>
 #include <cstddef>
@@ -105,4 +105,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // ARTIFACTLIST_H
+#endif // QBS_ARTIFACTLIST_H
diff --git a/src/lib/buildgraph/artifactvisitor.h b/src/lib/buildgraph/artifactvisitor.h
index 61dc21d33..9bea4826f 100644
--- a/src/lib/buildgraph/artifactvisitor.h
+++ b/src/lib/buildgraph/artifactvisitor.h
@@ -26,8 +26,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#ifndef ARTIFACTVISITOR_H
-#define ARTIFACTVISITOR_H
+#ifndef QBS_ARTIFACTVISITOR_H
+#define QBS_ARTIFACTVISITOR_H
 
 #include "forward_decls.h"
 
@@ -56,4 +56,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // ARTIFACTVISITOR_H
+#endif // QBS_ARTIFACTVISITOR_H
diff --git a/src/lib/buildgraph/automoc.h b/src/lib/buildgraph/automoc.h
index effbaf709..060a80c80 100644
--- a/src/lib/buildgraph/automoc.h
+++ b/src/lib/buildgraph/automoc.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef AUTOMOC_H
-#define AUTOMOC_H
+#ifndef QBS_AUTOMOC_H
+#define QBS_AUTOMOC_H
 
 #include "forward_decls.h"
 
@@ -77,4 +77,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // AUTOMOC_H
+#endif // QBS_AUTOMOC_H
diff --git a/src/lib/buildgraph/buildgraph.h b/src/lib/buildgraph/buildgraph.h
index e0b912f4f..a628d73a2 100644
--- a/src/lib/buildgraph/buildgraph.h
+++ b/src/lib/buildgraph/buildgraph.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef BUILDGRAPH_H
-#define BUILDGRAPH_H
+#ifndef QBS_BUILDGRAPH_H
+#define QBS_BUILDGRAPH_H
 
 #include "artifactlist.h"
 #include "forward_decls.h"
@@ -294,4 +294,4 @@ void freeCFileTags(char **cFileTags, int numFileTags);
 } // namespace Internal
 } // namespace qbs
 
-#endif // BUILDGRAPH_H
+#endif // QBS_BUILDGRAPH_H
diff --git a/src/lib/buildgraph/command.h b/src/lib/buildgraph/command.h
index 9e35319a6..bfd21bbf1 100644
--- a/src/lib/buildgraph/command.h
+++ b/src/lib/buildgraph/command.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef COMMAND_H
-#define COMMAND_H
+#ifndef QBS_COMMAND_H
+#define QBS_COMMAND_H
 
 #include <tools/codelocation.h>
 
@@ -151,4 +151,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // COMMAND_H
+#endif // QBS_COMMAND_H
diff --git a/src/lib/buildgraph/cycledetector.h b/src/lib/buildgraph/cycledetector.h
index 0475c5917..baeec7f48 100644
--- a/src/lib/buildgraph/cycledetector.h
+++ b/src/lib/buildgraph/cycledetector.h
@@ -26,8 +26,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#ifndef CYCLEDETECTOR_H
-#define CYCLEDETECTOR_H
+#ifndef QBS_CYCLEDETECTOR_H
+#define QBS_CYCLEDETECTOR_H
 
 #include "artifactvisitor.h"
 
@@ -57,4 +57,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // CYCLEDETECTOR_H
+#endif // QBS_CYCLEDETECTOR_H
diff --git a/src/lib/buildgraph/executor.h b/src/lib/buildgraph/executor.h
index c55a642a3..918045308 100644
--- a/src/lib/buildgraph/executor.h
+++ b/src/lib/buildgraph/executor.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef BUILDGRAPHEXECUTOR_H
-#define BUILDGRAPHEXECUTOR_H
+#ifndef QBS_BUILDGRAPHEXECUTOR_H
+#define QBS_BUILDGRAPHEXECUTOR_H
 
 #include "forward_decls.h"
 #include <buildgraph/artifact.h>
@@ -116,4 +116,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // BUILDGRAPHEXECUTOR_H
+#endif // QBS_BUILDGRAPHEXECUTOR_H
diff --git a/src/lib/buildgraph/executorjob.h b/src/lib/buildgraph/executorjob.h
index 910c6fa9b..6b44bab0c 100644
--- a/src/lib/buildgraph/executorjob.h
+++ b/src/lib/buildgraph/executorjob.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef EXECUTORJOB_H
-#define EXECUTORJOB_H
+#ifndef QBS_EXECUTORJOB_H
+#define QBS_EXECUTORJOB_H
 
 #include <QObject>
 
@@ -79,4 +79,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // EXECUTORJOB_H
+#endif // QBS_EXECUTORJOB_H
diff --git a/src/lib/buildgraph/inputartifactscanner.h b/src/lib/buildgraph/inputartifactscanner.h
index add9523dd..f6d0faefa 100644
--- a/src/lib/buildgraph/inputartifactscanner.h
+++ b/src/lib/buildgraph/inputartifactscanner.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef INPUTARTIFACTSCANNER_H
-#define INPUTARTIFACTSCANNER_H
+#ifndef QBS_INPUTARTIFACTSCANNER_H
+#define QBS_INPUTARTIFACTSCANNER_H
 
 #include "scanresultcache.h"
 #include <language/forward_decls.h>
@@ -116,4 +116,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // INPUTARTIFACTSCANNER_H
+#endif // QBS_INPUTARTIFACTSCANNER_H
diff --git a/src/lib/buildgraph/jscommandexecutor.h b/src/lib/buildgraph/jscommandexecutor.h
index d2b18a0e2..9ff649245 100644
--- a/src/lib/buildgraph/jscommandexecutor.h
+++ b/src/lib/buildgraph/jscommandexecutor.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef JSCOMMANDEXECUTOR_H
-#define JSCOMMANDEXECUTOR_H
+#ifndef QBS_JSCOMMANDEXECUTOR_H
+#define QBS_JSCOMMANDEXECUTOR_H
 
 #include "abstractcommandexecutor.h"
 
@@ -58,4 +58,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // JSCOMMANDEXECUTOR_H
+#endif // QBS_JSCOMMANDEXECUTOR_H
diff --git a/src/lib/buildgraph/processcommandexecutor.h b/src/lib/buildgraph/processcommandexecutor.h
index cf3bf1a18..2d3a97af9 100644
--- a/src/lib/buildgraph/processcommandexecutor.h
+++ b/src/lib/buildgraph/processcommandexecutor.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef PROCESSCOMMANDEXECUTOR_H
-#define PROCESSCOMMANDEXECUTOR_H
+#ifndef QBS_PROCESSCOMMANDEXECUTOR_H
+#define QBS_PROCESSCOMMANDEXECUTOR_H
 
 #include "abstractcommandexecutor.h"
 
@@ -77,4 +77,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // PROCESSCOMMANDEXECUTOR_H
+#endif // QBS_PROCESSCOMMANDEXECUTOR_H
diff --git a/src/lib/buildgraph/rulegraph.h b/src/lib/buildgraph/rulegraph.h
index a23000a2c..1f5bdb799 100644
--- a/src/lib/buildgraph/rulegraph.h
+++ b/src/lib/buildgraph/rulegraph.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef RULEGRAPH_H
-#define RULEGRAPH_H
+#ifndef QBS_RULEGRAPH_H
+#define QBS_RULEGRAPH_H
 
 #include <language/forward_decls.h>
 
@@ -71,4 +71,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // RULEGRAPH_H
+#endif // QBS_RULEGRAPH_H
diff --git a/src/lib/buildgraph/scanresultcache.h b/src/lib/buildgraph/scanresultcache.h
index 8ba387c23..5946371f1 100644
--- a/src/lib/buildgraph/scanresultcache.h
+++ b/src/lib/buildgraph/scanresultcache.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef SCANRESULTCACHE_H
-#define SCANRESULTCACHE_H
+#ifndef QBS_SCANRESULTCACHE_H
+#define QBS_SCANRESULTCACHE_H
 
 #include <QHash>
 #include <QMutex>
@@ -82,4 +82,4 @@ private:
 } // namespace qbs
 } // namespace qbs
 
-#endif // SCANRESULTCACHE_H
+#endif // QBS_SCANRESULTCACHE_H
diff --git a/src/lib/buildgraph/transformer.h b/src/lib/buildgraph/transformer.h
index 3ec1c270c..ec8e19d3a 100644
--- a/src/lib/buildgraph/transformer.h
+++ b/src/lib/buildgraph/transformer.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef TRANSFORMER_H
-#define TRANSFORMER_H
+#ifndef QBS_TRANSFORMER_H
+#define QBS_TRANSFORMER_H
 
 #include "artifactlist.h"
 #include "forward_decls.h"
@@ -76,4 +76,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // TRANSFORMER_H
+#endif // QBS_TRANSFORMER_H
diff --git a/src/lib/jsextensions/file.h b/src/lib/jsextensions/file.h
index bd4e06b06..243034a3e 100644
--- a/src/lib/jsextensions/file.h
+++ b/src/lib/jsextensions/file.h
@@ -27,7 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef FILE_H
+#ifndef QBS_FILE_H
+#define QBS_FILE_H
 
 #include <QScriptContext>
 #include <QScriptValue>
@@ -50,4 +51,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // FILE_H
+#endif // QBS_FILE_H
diff --git a/src/lib/jsextensions/process.h b/src/lib/jsextensions/process.h
index 89ce98a62..1db05a52c 100644
--- a/src/lib/jsextensions/process.h
+++ b/src/lib/jsextensions/process.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef PROCESS_H
-#define PROCESS_H
+#ifndef QBS_PROCESS_H
+#define QBS_PROCESS_H
 
 #include <QObject>
 #include <QScriptable>
@@ -79,4 +79,4 @@ private:
 
 Q_DECLARE_METATYPE(qbs::Internal::Process *)
 
-#endif // PROCESS_H
+#endif // QBS_PROCESS_H
diff --git a/src/lib/jsextensions/textfile.h b/src/lib/jsextensions/textfile.h
index 13f2db973..92d3d8622 100644
--- a/src/lib/jsextensions/textfile.h
+++ b/src/lib/jsextensions/textfile.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef TEXTFILE_H
-#define TEXTFILE_H
+#ifndef QBS_TEXTFILE_H
+#define QBS_TEXTFILE_H
 
 #include <QObject>
 #include <QScriptable>
@@ -71,4 +71,4 @@ private:
 
 Q_DECLARE_METATYPE(qbs::Internal::TextFile *)
 
-#endif // TEXTFILE_H
+#endif // QBS_TEXTFILE_H
diff --git a/src/lib/language/identifiersearch.h b/src/lib/language/identifiersearch.h
index eac817219..95ef21efb 100644
--- a/src/lib/language/identifiersearch.h
+++ b/src/lib/language/identifiersearch.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef IDENTIFIERSEARCHVISITOR_H
-#define IDENTIFIERSEARCHVISITOR_H
+#ifndef QBS_IDENTIFIERSEARCHVISITOR_H
+#define QBS_IDENTIFIERSEARCHVISITOR_H
 
 #include <parser/qmljsastfwd_p.h>
 #include <parser/qmljsastvisitor_p.h>
@@ -56,4 +56,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // IDENTIFIERSEARCHVISITOR_H
+#endif // QBS_IDENTIFIERSEARCHVISITOR_H
diff --git a/src/lib/language/jsimports.h b/src/lib/language/jsimports.h
index 679a697e9..a89a8a50f 100644
--- a/src/lib/language/jsimports.h
+++ b/src/lib/language/jsimports.h
@@ -1,5 +1,5 @@
-#ifndef JSIMPORTS_H
-#define JSIMPORTS_H
+#ifndef QBS_JSIMPORTS_H
+#define QBS_JSIMPORTS_H
 
 #include <tools/codelocation.h>
 #include <QStringList>
@@ -27,4 +27,4 @@ typedef QList<JsImport> JsImports;
 } // namespace Internal
 } // namespace qbs
 
-#endif // JSIMPORTS_H
+#endif // QBS_JSIMPORTS_H
diff --git a/src/lib/language/language.h b/src/lib/language/language.h
index 9a2d57ffd..9b0c67873 100644
--- a/src/lib/language/language.h
+++ b/src/lib/language/language.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef L2_LANGUAGE_HPP
-#define L2_LANGUAGE_HPP
+#ifndef QBS_L2_LANGUAGE_HPP
+#define QBS_L2_LANGUAGE_HPP
 
 #include "forward_decls.h"
 #include "jsimports.h"
diff --git a/src/lib/language/loader.h b/src/lib/language/loader.h
index 60a67d171..282613b50 100644
--- a/src/lib/language/loader.h
+++ b/src/lib/language/loader.h
@@ -26,8 +26,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#ifndef  LOADER_H
-#define  LOADER_H
+#ifndef  QBS_LOADER_H
+#define  QBS_LOADER_H
 
 #include "forward_decls.h"
 
@@ -59,4 +59,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // LOADER_H
+#endif // QBS_LOADER_H
diff --git a/src/lib/language/scriptengine.h b/src/lib/language/scriptengine.h
index 8262827c8..8b34fb363 100644
--- a/src/lib/language/scriptengine.h
+++ b/src/lib/language/scriptengine.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef SCRIPTENGINE_H
-#define SCRIPTENGINE_H
+#ifndef QBS_SCRIPTENGINE_H
+#define QBS_SCRIPTENGINE_H
 
 #include "jsimports.h"
 
@@ -58,4 +58,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // SCRIPTENGINE_H
+#endif // QBS_SCRIPTENGINE_H
diff --git a/src/lib/logging/coloredoutput.h b/src/lib/logging/coloredoutput.h
index 34971b4ad..848de2ca8 100644
--- a/src/lib/logging/coloredoutput.h
+++ b/src/lib/logging/coloredoutput.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef COLOREDOUTPUT_H
-#define COLOREDOUTPUT_H
+#ifndef QBS_COLOREDOUTPUT_H
+#define QBS_COLOREDOUTPUT_H
 
 #include <cstdio>
 #include <cstdarg>
@@ -65,4 +65,4 @@ void fprintfColored(TextColor color, FILE *file, const char *str, ...);
 } // namespace Internal
 } // namespace qbs
 
-#endif // COLOREDOUTPUT_H
+#endif // QBS_COLOREDOUTPUT_H
diff --git a/src/lib/logging/consolelogger.h b/src/lib/logging/consolelogger.h
index 24e015c43..8084c2062 100644
--- a/src/lib/logging/consolelogger.h
+++ b/src/lib/logging/consolelogger.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef LOGSINK_H
-#define LOGSINK_H
+#ifndef QBS_LOGSINK_H
+#define QBS_LOGSINK_H
 
 #include "ilogsink.h"
 #include "logger.h"
@@ -64,4 +64,4 @@ private:
 
 } // namespace qbs
 
-#endif // LOGSINK_H
+#endif // QBS_LOGSINK_H
diff --git a/src/lib/logging/logger.h b/src/lib/logging/logger.h
index ebf475b98..7f7468f00 100644
--- a/src/lib/logging/logger.h
+++ b/src/lib/logging/logger.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef LOGGER_H
-#define LOGGER_H
+#ifndef QBS_LOGGER_H
+#define QBS_LOGGER_H
 
 #include "ilogsink.h"
 
@@ -137,4 +137,4 @@ LogWriter operator<<(LogWriter w, TextColor);
 
 } // namespace qbs
 
-#endif // LOGGER_H
+#endif // QBS_LOGGER_H
diff --git a/src/lib/logging/translator.h b/src/lib/logging/translator.h
index 7a1a3255f..cbf1422c8 100644
--- a/src/lib/logging/translator.h
+++ b/src/lib/logging/translator.h
@@ -26,8 +26,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#ifndef TRANSLATOR_H
-#define TRANSLATOR_H
+#ifndef QBS_TRANSLATOR_H
+#define QBS_TRANSLATOR_H
 
 #include <QCoreApplication>
 
@@ -42,4 +42,4 @@ class Tr // Name intended to be short.
 } // namespace Internal
 } // namespace qbs
 
-#endif // TRANSLATOR_H
+#endif // QBS_TRANSLATOR_H
diff --git a/src/lib/tools/buildoptions.h b/src/lib/tools/buildoptions.h
index 28339ce63..41fb14111 100644
--- a/src/lib/tools/buildoptions.h
+++ b/src/lib/tools/buildoptions.h
@@ -26,8 +26,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#ifndef BUILDOPTIONS_H
-#define BUILDOPTIONS_H
+#ifndef QBS_BUILDOPTIONS_H
+#define QBS_BUILDOPTIONS_H
 
 #include <QStringList>
 
@@ -49,4 +49,4 @@ inline bool operator!=(const BuildOptions &bo1, const BuildOptions &bo2) { retur
 
 } // namespace qbs
 
-#endif // BUILDOPTIONS_H
+#endif // QBS_BUILDOPTIONS_H
diff --git a/src/lib/tools/codelocation.h b/src/lib/tools/codelocation.h
index eb8470361..669cbc590 100644
--- a/src/lib/tools/codelocation.h
+++ b/src/lib/tools/codelocation.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef SOURCELOCATION_H
-#define SOURCELOCATION_H
+#ifndef QBS_SOURCELOCATION_H
+#define QBS_SOURCELOCATION_H
 
 #include <QDataStream>
 #include <QString>
@@ -82,4 +82,4 @@ inline QDataStream &operator>> (QDataStream &s, qbs::CodeLocation &o)
 }
 QT_END_NAMESPACE
 
-#endif // SOURCELOCATION_H
+#endif // QBS_SOURCELOCATION_H
diff --git a/src/lib/tools/fileinfo.h b/src/lib/tools/fileinfo.h
index c8f1253ad..bcc2ef226 100644
--- a/src/lib/tools/fileinfo.h
+++ b/src/lib/tools/fileinfo.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef FILEINFO_H
-#define FILEINFO_H
+#ifndef QBS_FILEINFO_H
+#define QBS_FILEINFO_H
 
 #include "filetime.h"
 
diff --git a/src/lib/tools/filetime.h b/src/lib/tools/filetime.h
index 1567e84ed..e8f6290ca 100644
--- a/src/lib/tools/filetime.h
+++ b/src/lib/tools/filetime.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef FILETIME_H
-#define FILETIME_H
+#ifndef QBS_FILETIME_H
+#define QBS_FILETIME_H
 
 #include <QDataStream>
 #include <QDebug>
@@ -125,4 +125,4 @@ inline QDebug operator<<(QDebug dbg, const qbs::Internal::FileTime &t)
 
 QT_END_NAMESPACE
 
-#endif // FILETIME_H
+#endif // QBS_FILETIME_H
diff --git a/src/lib/tools/hostosinfo.h b/src/lib/tools/hostosinfo.h
index ba377e99a..9254a70ea 100644
--- a/src/lib/tools/hostosinfo.h
+++ b/src/lib/tools/hostosinfo.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef HOSTOSINFO_H
-#define HOSTOSINFO_H
+#ifndef QBS_HOSTOSINFO_H
+#define QBS_HOSTOSINFO_H
 
 #include <QtGlobal>
 #include <QString>
@@ -126,4 +126,4 @@ bool HostOsInfo::isAnyUnixHost()
 
 } // namespace qbs
 
-#endif // HOSTOSINFO_H
+#endif // QBS_HOSTOSINFO_H
diff --git a/src/lib/tools/persistentobject.h b/src/lib/tools/persistentobject.h
index 11d327060..80e118df0 100644
--- a/src/lib/tools/persistentobject.h
+++ b/src/lib/tools/persistentobject.h
@@ -26,8 +26,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#ifndef PERSISTENTOBJECT_H
-#define PERSISTENTOBJECT_H
+#ifndef QBS_PERSISTENTOBJECT_H
+#define QBS_PERSISTENTOBJECT_H
 
 namespace qbs {
 namespace Internal {
@@ -45,4 +45,4 @@ public:
 } // namespace Internal
 } // namespace qbs
 
-#endif // PERSISTENTOBJECT_H
+#endif // QBS_PERSISTENTOBJECT_H
diff --git a/src/lib/tools/progressobserver.h b/src/lib/tools/progressobserver.h
index f5733194c..65b4fc201 100644
--- a/src/lib/tools/progressobserver.h
+++ b/src/lib/tools/progressobserver.h
@@ -26,8 +26,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#ifndef PROGRESSOBSERVER_H
-#define PROGRESSOBSERVER_H
+#ifndef QBS_PROGRESSOBSERVER_H
+#define QBS_PROGRESSOBSERVER_H
 
 #include <QtGlobal>
 
@@ -58,4 +58,4 @@ public:
 } // namespace Internal
 } // namespace qbs
 
-#endif // PROGRESSOBSERVER_H
+#endif // QBS_PROGRESSOBSERVER_H
diff --git a/src/lib/tools/scannerpluginmanager.h b/src/lib/tools/scannerpluginmanager.h
index 3707d7368..f742e8ff1 100644
--- a/src/lib/tools/scannerpluginmanager.h
+++ b/src/lib/tools/scannerpluginmanager.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef PLUGINS_H
-#define PLUGINS_H
+#ifndef QBS_PLUGINS_H
+#define QBS_PLUGINS_H
 
 #include <plugins/scanner/scanner.h>
 
diff --git a/src/lib/tools/scripttools.h b/src/lib/tools/scripttools.h
index fc435ee34..f2b1976fb 100644
--- a/src/lib/tools/scripttools.h
+++ b/src/lib/tools/scripttools.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef SCRIPTTOOLS_H
-#define SCRIPTTOOLS_H
+#ifndef QBS_SCRIPTTOOLS_H
+#define QBS_SCRIPTTOOLS_H
 
 #include <QScriptEngine>
 #include <QScriptProgram>
@@ -86,4 +86,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // SCRIPTTOOLS_H
+#endif // QBS_SCRIPTTOOLS_H
diff --git a/src/lib/tools/settings.h b/src/lib/tools/settings.h
index 6aae043db..acc484ece 100644
--- a/src/lib/tools/settings.h
+++ b/src/lib/tools/settings.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef SETTINGS_H
-#define SETTINGS_H
+#ifndef QBS_SETTINGS_H
+#define QBS_SETTINGS_H
 
 #include <QStringList>
 #include <QVariant>
@@ -79,4 +79,4 @@ private:
 
 } // namespace qbs
 
-#endif // SETTINGS_H
+#endif // QBS_SETTINGS_H
diff --git a/src/lib/tools/weakpointer.h b/src/lib/tools/weakpointer.h
index 4c851f655..d60b2f44a 100644
--- a/src/lib/tools/weakpointer.h
+++ b/src/lib/tools/weakpointer.h
@@ -26,8 +26,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#ifndef WEAKPOINTER_H
-#define WEAKPOINTER_H
+#ifndef QBS_WEAKPOINTER_H
+#define QBS_WEAKPOINTER_H
 
 #include <QWeakPointer>
 
@@ -55,4 +55,4 @@ private:
 } // namespace Internal
 } // namespace qbs
 
-#endif // WEAKPOINTER_H
+#endif // QBS_WEAKPOINTER_H