diff --git a/src/plugins/analyzerbase/analyzerbase.pro b/src/plugins/analyzerbase/analyzerbase.pro
index 4eb207e786f..f0039995106 100644
--- a/src/plugins/analyzerbase/analyzerbase.pro
+++ b/src/plugins/analyzerbase/analyzerbase.pro
@@ -1,4 +1,4 @@
-DEFINES += ANALYZER_LIBRARY
+DEFINES += ANALYZERBASE_LIBRARY
 
 include(../../qtcreatorplugin.pri)
 
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 621bdd10d7d..e943c0adb15 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -12,9 +12,6 @@ QtcPlugin {
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
 
-    Depends { name: "cpp" }
-    cpp.defines: base.concat("ANALYZER_LIBRARY")
-
     files: [
         "analyzerbase.qrc",
         "analyzerbase_global.h",
diff --git a/src/plugins/analyzerbase/analyzerbase_global.h b/src/plugins/analyzerbase/analyzerbase_global.h
index 8fb5de1cc69..a5966fd4729 100644
--- a/src/plugins/analyzerbase/analyzerbase_global.h
+++ b/src/plugins/analyzerbase/analyzerbase_global.h
@@ -33,7 +33,7 @@
 
 #include <qglobal.h>
 
-#if defined(ANALYZER_LIBRARY)
+#if defined(ANALYZERBASE_LIBRARY)
 #  define ANALYZER_EXPORT Q_DECL_EXPORT
 #else
 #  define ANALYZER_EXPORT Q_DECL_IMPORT
diff --git a/src/plugins/pythoneditor/pythoneditor.pro b/src/plugins/pythoneditor/pythoneditor.pro
index ec79b248f93..c9434f1e1cd 100644
--- a/src/plugins/pythoneditor/pythoneditor.pro
+++ b/src/plugins/pythoneditor/pythoneditor.pro
@@ -2,7 +2,7 @@ include(../../qtcreatorplugin.pri)
 include(pythoneditor_dependencies.pri)
 
 DEFINES += \
-    PYEDITOR_LIBRARY
+    PYTHONEDITOR_LIBRARY
 
 OTHER_FILES += PythonEditor.pluginspec.in \
     pythoneditor.mimetypes.xml
diff --git a/src/plugins/pythoneditor/pythoneditor.qbs b/src/plugins/pythoneditor/pythoneditor.qbs
index c4fcbf6a1a3..d14ba9fbc39 100644
--- a/src/plugins/pythoneditor/pythoneditor.qbs
+++ b/src/plugins/pythoneditor/pythoneditor.qbs
@@ -11,9 +11,6 @@ QtcPlugin {
     Depends { name: "CppTools" }
     Depends { name: "QtSupport" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "cpp" }
-
-    cpp.defines: base.concat(["PYEDITOR_LIBRARY"])
 
     files: [
         "pythoneditor.cpp",
diff --git a/src/plugins/pythoneditor/pythoneditor_global.h b/src/plugins/pythoneditor/pythoneditor_global.h
index 83b810d75b1..307700db417 100644
--- a/src/plugins/pythoneditor/pythoneditor_global.h
+++ b/src/plugins/pythoneditor/pythoneditor_global.h
@@ -32,7 +32,7 @@
 
 #include <QtGlobal>
 
-#if defined(PYEDITOR_LIBRARY)
+#if defined(PYTHONEDITOR_LIBRARY)
 #  define PYEDITOR_EXPORT Q_DECL_EXPORT
 #else
 #  define PYEDITOR_EXPORT Q_DECL_IMPORT