diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri
index 812dbe0c9a41bbd6f73642fedf25422b67ae1596..2e50a401333ecb14bdda9d9b5a839cf8fe634b84 100644
--- a/src/libs/cplusplus/cplusplus-lib.pri
+++ b/src/libs/cplusplus/cplusplus-lib.pri
@@ -1,4 +1,9 @@
-DEFINES += CPLUSPLUS_BUILD_LIB
+contains(CONFIG, dll) {
+    DEFINES += CPLUSPLUS_BUILD_LIB
+} else {
+    DEFINES += CPLUSPLUS_BUILD_STATIC_LIB
+}
+
 INCLUDEPATH += $$PWD
 
 include(../../shared/cplusplus/cplusplus.pri)
diff --git a/src/libs/cplusplus/cplusplus.pro b/src/libs/cplusplus/cplusplus.pro
index a6e804439ba0a2a707a6c3e2454cd4d6bc32f430..88c6b18e3d320223f5c2341f6b8fa41d5b4ad569 100644
--- a/src/libs/cplusplus/cplusplus.pro
+++ b/src/libs/cplusplus/cplusplus.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-
+CONFIG+=dll
 TARGET = CPlusPlus
 
 DEFINES += NDEBUG
diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro
index 74939e2f063b917e6cdf1cc72d6a244f07b1659f..88687c63b433d7e928310d1805cf176b4c68d4ea 100644
--- a/src/libs/utils/utils.pro
+++ b/src/libs/utils/utils.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
 TARGET = Utils
 QT += gui \
     network
-DEFINES += QTCREATOR_UTILS_LIBRARY
+DEFINES += QTCREATOR_UTILS_LIB
 include(../../qtcreatorlibrary.pri)
 SOURCES += reloadpromptutils.cpp \
     settingsutils.cpp \
diff --git a/src/libs/utils/utils_global.h b/src/libs/utils/utils_global.h
index a36b6e728b5a94348002307d32d67e4f14d1b4e4..f158766087e12a40f2d272910dd956cff0430642 100644
--- a/src/libs/utils/utils_global.h
+++ b/src/libs/utils/utils_global.h
@@ -32,8 +32,10 @@
 
 #include <QtCore/qglobal.h>
 
-#if defined(QTCREATOR_UTILS_LIBRARY)
+#if defined(QTCREATOR_UTILS_LIB)
 #  define QTCREATOR_UTILS_EXPORT Q_DECL_EXPORT
+#elif  defined(QTCREATOR_UTILS_STATIC_LIB) // Abuse single files for manual tests
+#  define QTCREATOR_UTILS_EXPORT
 #else
 #  define QTCREATOR_UTILS_EXPORT Q_DECL_IMPORT
 #endif
diff --git a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h b/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
index 9e570d2c1afeb5c326250c0b2e0895fa887382c5..9616f51780df1e4637c0802fb7d9b61b5df80002 100644
--- a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
+++ b/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
@@ -54,6 +54,8 @@
 
 #  if defined(CPLUSPLUS_BUILD_LIB)
 #    define CPLUSPLUS_EXPORT Q_DECL_EXPORT
+#  elif defined(CPLUSPLUS_BUILD_STATIC_LIB)
+#    define CPLUSPLUS_EXPORT
 #  else
 #    define CPLUSPLUS_EXPORT Q_DECL_IMPORT
 #  endif
diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri
index 80dab035ba8f6b391b20a2ad86f9146b3ac45772..9b173daa6137a0b88ef93efd124971a6015ff365 100644
--- a/tests/auto/cplusplus/shared/shared.pri
+++ b/tests/auto/cplusplus/shared/shared.pri
@@ -1,4 +1,4 @@
-
+DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB
 INCLUDEPATH += $$PWD/../../../../src/shared/cplusplus
 INCLUDEPATH += $$PWD/../../../../src/libs/cplusplus
 DEPENDPATH  += $$INCLUDEPATH .
diff --git a/tests/auto/debugger/debugger.pro b/tests/auto/debugger/debugger.pro
index ef1547f9ce69a765f4a06ada22cc07c862031abf..c4cadd3715fe7d7a30cc98d3436ac24c7d5c17fa 100644
--- a/tests/auto/debugger/debugger.pro
+++ b/tests/auto/debugger/debugger.pro
@@ -1,5 +1,5 @@
 
 TEMPLATE = subdirs
 
-SUBDIRS = dumpers.pro plugin.pro gdb.pro
+SUBDIRS = dumpers.pro plugin.pro
 
diff --git a/tests/auto/fakevim/fakevim.pro b/tests/auto/fakevim/fakevim.pro
index a4aaea078ed29b2f350d81243cd758280ab2f397..84c1029e3a62fc76eb962a3f952f696305a9168c 100644
--- a/tests/auto/fakevim/fakevim.pro
+++ b/tests/auto/fakevim/fakevim.pro
@@ -1,6 +1,9 @@
 
 QT += testlib
 
+# Defines import symbol as empty
+DEFINES+=QTCREATOR_UTILS_STATIC_LIB
+
 FAKEVIMDIR = ../../../src/plugins/fakevim
 UTILSDIR = ../../../src/libs