diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri
index 0d36b05268244d81c8d3c54e7b3fd8452e1044aa..3720d7f6ef1d8630844aa7489c62fa4adeaefd6e 100644
--- a/src/libs/cplusplus/cplusplus-lib.pri
+++ b/src/libs/cplusplus/cplusplus-lib.pri
@@ -1,4 +1,4 @@
-DEFINES += HAVE_QT CPLUSPLUS_WITH_NAMESPACE CPLUSPLUS_BUILD_LIB
+DEFINES += CPLUSPLUS_BUILD_LIB
 INCLUDEPATH += $$PWD
 
 include(../../shared/cplusplus/cplusplus.pri)
diff --git a/src/libs/cplusplus/cplusplus.pri b/src/libs/cplusplus/cplusplus.pri
index e0cdf8900f0df050a9b1aba829b990cc0a01601d..0b8fac85fe36a47a6a33a0c819e00548a13a984f 100644
--- a/src/libs/cplusplus/cplusplus.pri
+++ b/src/libs/cplusplus/cplusplus.pri
@@ -1,3 +1,2 @@
 INCLUDEPATH += $$PWD/../../shared/cplusplus
-DEFINES += HAVE_QT CPLUSPLUS_WITH_NAMESPACE
 LIBS *= -l$$qtLibraryTarget(CPlusPlus)
diff --git a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h b/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
index d04147ad874bdf00563e767618939c40cbfac8ea..29d30428c74ba6e3445a5d3faf75652b0047eb3b 100644
--- a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
+++ b/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
@@ -49,7 +49,7 @@
 #ifndef CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H
 #define CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H
 
-#ifdef HAVE_QT
+#ifndef CPLUSPLUS_WITH_NO_QT
 #  include <QtCore/qglobal.h>
 #  define CPLUSPLUS_BEGIN_HEADER
 #  define CPLUSPLUS_END_HEADER
@@ -58,6 +58,7 @@
 #  else
 #    define CPLUSPLUS_EXPORT Q_DECL_IMPORT
 #  endif
+#  define CPLUSPLUS_WITH_NAMESPACE
 #else
 #  define CPLUSPLUS_BEGIN_HEADER
 #  define CPLUSPLUS_END_HEADER