diff --git a/docs/docs.pro b/docs/docs.pro
index af55e1921..7cd24a936 100644
--- a/docs/docs.pro
+++ b/docs/docs.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,Doxygen)
+
 TEMPLATE = lib
 CONFIG += staticlib
 CONFIG -= qt
diff --git a/samples/samples.pro b/samples/samples.pro
index 912c520c5..650241e25 100644
--- a/samples/samples.pro
+++ b/samples/samples.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,Samples)
+
 TEMPLATE = subdirs
 CONFIG += ordered
 
diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro
index 69ffa3dba..fb6e537fb 100644
--- a/src/blackcore/blackcore.pro
+++ b/src/blackcore/blackcore.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,BlackCore)
+
 # GUI is required for the matrix classes
 # Network for host info etc.
 QT       += network dbus xml multimedia
diff --git a/src/blackgui/blackgui.pro b/src/blackgui/blackgui.pro
index 6aa2a6e2e..155ceec18 100644
--- a/src/blackgui/blackgui.pro
+++ b/src/blackgui/blackgui.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,BlackGui)
+
 QT       += network dbus gui svg widgets
 
 TARGET = blackgui
diff --git a/src/blackinput/blackinput.pro b/src/blackinput/blackinput.pro
index 5d74e15ac..5c8e98bae 100644
--- a/src/blackinput/blackinput.pro
+++ b/src/blackinput/blackinput.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,BlackInput)
+
 QT       += network dbus gui widgets multimedia
 
 TARGET = blackinput
diff --git a/src/blacksound/blacksound.pro b/src/blacksound/blacksound.pro
index cd5625e38..3144ccaf0 100644
--- a/src/blacksound/blacksound.pro
+++ b/src/blacksound/blacksound.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,BlackSound)
+
 QT       += network dbus gui multimedia
 
 TARGET = blacksound
diff --git a/src/plugins/simulator/fs9/fs9.pro b/src/plugins/simulator/fs9/fs9.pro
index c10b73a02..8f1340031 100644
--- a/src/plugins/simulator/fs9/fs9.pro
+++ b/src/plugins/simulator/fs9/fs9.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,FS9)
+
 QT       += core dbus gui network concurrent xml
 
 TARGET = simulatorfs9
diff --git a/src/plugins/simulator/fscommon/fscommon.pro b/src/plugins/simulator/fscommon/fscommon.pro
index 7dd7e6858..8e3268a57 100644
--- a/src/plugins/simulator/fscommon/fscommon.pro
+++ b/src/plugins/simulator/fscommon/fscommon.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,FSX|FS9)
+
 QT       += core dbus concurrent xml
 
 TARGET = simulatorfscommon
diff --git a/src/plugins/simulator/fsx/fsx.pro b/src/plugins/simulator/fsx/fsx.pro
index a2160c36a..078c4e816 100644
--- a/src/plugins/simulator/fsx/fsx.pro
+++ b/src/plugins/simulator/fsx/fsx.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,FSX)
+
 QT       += core dbus gui network concurrent xml
 
 TARGET = simulatorfsx
diff --git a/src/plugins/simulator/fsxconfig/fsxconfig.pro b/src/plugins/simulator/fsxconfig/fsxconfig.pro
index d41407db9..5be50c885 100644
--- a/src/plugins/simulator/fsxconfig/fsxconfig.pro
+++ b/src/plugins/simulator/fsxconfig/fsxconfig.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,FSX)
+
 QT       += core widgets dbus network
 
 TARGET = simulatorfsxconfig
diff --git a/src/plugins/simulator/simulator.pro b/src/plugins/simulator/simulator.pro
index 41f4e4422..a0fddb55a 100644
--- a/src/plugins/simulator/simulator.pro
+++ b/src/plugins/simulator/simulator.pro
@@ -3,21 +3,11 @@ load(common_pre)
 TEMPLATE = subdirs
 CONFIG += ordered
 
-if (contains(BLACK_CONFIG, FSX) | contains(BLACK_CONFIG, FS9)) {
-    SUBDIRS += fscommon
-}
-
-contains(BLACK_CONFIG, FSX) {
-    SUBDIRS += fsx
-    SUBDIRS += fsxconfig
-}
-contains(BLACK_CONFIG, FS9) {
-    SUBDIRS += fs9
-}
-
-contains(BLACK_CONFIG, XPlane) {
-    SUBDIRS += xplane
-    SUBDIRS += xplaneconfig
-}
+SUBDIRS += fscommon
+SUBDIRS += fsx
+SUBDIRS += fsxconfig
+SUBDIRS += fs9
+SUBDIRS += xplane
+SUBDIRS += xplaneconfig
 
 load(common_post)
diff --git a/src/plugins/simulator/xplane/xplane.pro b/src/plugins/simulator/xplane/xplane.pro
index d775ffb49..6d7e662af 100644
--- a/src/plugins/simulator/xplane/xplane.pro
+++ b/src/plugins/simulator/xplane/xplane.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,XPlane)
+
 QT       += core dbus network
 
 TARGET = simulatorxplane
diff --git a/src/plugins/simulator/xplaneconfig/xplaneconfig.pro b/src/plugins/simulator/xplaneconfig/xplaneconfig.pro
index 80a10923d..6bcff4233 100644
--- a/src/plugins/simulator/xplaneconfig/xplaneconfig.pro
+++ b/src/plugins/simulator/xplaneconfig/xplaneconfig.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,XPlane)
+
 QT       += core widgets dbus
 
 TARGET = simulatorxplaneconfig
diff --git a/src/src.pro b/src/src.pro
index 4c011ce48..a0d861f7e 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -4,38 +4,15 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 SUBDIRS += blackmisc
-
-contains(BLACK_CONFIG, BlackSound) {
-    SUBDIRS += blacksound
-}
-
-contains(BLACK_CONFIG, BlackInput) {
-    SUBDIRS += blackinput
-}
-
-contains(BLACK_CONFIG, BlackCore) {
-    SUBDIRS += blackcore
-    contains(BLACK_CONFIG, BlackGui) {
-        SUBDIRS += blackgui
-        contains(BLACK_CONFIG, SwiftGui) {
-            SUBDIRS += swiftguistandard
-        }
-        contains(BLACK_CONFIG, SwiftCore) {
-            SUBDIRS += swiftcore
-        }
-        contains(BLACK_CONFIG, SwiftData) {
-            SUBDIRS += swiftdata
-        }
-        contains(BLACK_CONFIG, SwiftLauncher) {
-            SUBDIRS += swiftlauncher
-        }
-    }
-}
-
-contains(BLACK_CONFIG, XPlane) {
-    SUBDIRS += xbus/xbus.pro
-}
-
+SUBDIRS += blacksound
+SUBDIRS += blackinput
+SUBDIRS += blackcore
+SUBDIRS += blackgui
+SUBDIRS += swiftguistandard
+SUBDIRS += swiftcore
+SUBDIRS += swiftdata
+SUBDIRS += swiftlauncher
+SUBDIRS += xbus
 SUBDIRS += plugins
 
 load(common_post)
diff --git a/src/swiftcore/swiftcore.pro b/src/swiftcore/swiftcore.pro
index cdbada86c..150ab37b6 100644
--- a/src/swiftcore/swiftcore.pro
+++ b/src/swiftcore/swiftcore.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,SwiftCore)
+
 QT       += core dbus network xml multimedia gui svg
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
diff --git a/src/swiftdata/swiftdata.pro b/src/swiftdata/swiftdata.pro
index 9335d1635..34704f2be 100644
--- a/src/swiftdata/swiftdata.pro
+++ b/src/swiftdata/swiftdata.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,SwiftData)
+
 QT       += core dbus network xml multimedia gui svg
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
diff --git a/src/swiftguistandard/swiftguistandard.pro b/src/swiftguistandard/swiftguistandard.pro
index 9461cbfd2..639e5417e 100644
--- a/src/swiftguistandard/swiftguistandard.pro
+++ b/src/swiftguistandard/swiftguistandard.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,SwiftGui)
+
 QT       += core dbus gui svg network xml multimedia
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
diff --git a/src/swiftlauncher/swiftlauncher.pro b/src/swiftlauncher/swiftlauncher.pro
index a2369749e..fa8cde377 100644
--- a/src/swiftlauncher/swiftlauncher.pro
+++ b/src/swiftlauncher/swiftlauncher.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,SwiftLauncher)
+
 QT       += core dbus gui svg network xml multimedia
 
 # QWebEngine is not supported for MinGW
diff --git a/src/xbus/xbus.pro b/src/xbus/xbus.pro
index 9a5eb1410..5226ef7f6 100644
--- a/src/xbus/xbus.pro
+++ b/src/xbus/xbus.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,XPlane)
+
 QT       += core gui widgets dbus network
 
 TEMPLATE = lib
diff --git a/swift.pro b/swift.pro
index 7c25205c7..390b7c358 100644
--- a/swift.pro
+++ b/swift.pro
@@ -6,20 +6,11 @@ CONFIG += ordered
 OTHER_FILES += mkspecs/features/*.prf
 OTHER_FILES += mkspecs/features/*.pri
 
-contains(BLACK_CONFIG, Doxygen) {
 SUBDIRS += docs
-}
-
 SUBDIRS += resources
 SUBDIRS += src
-
-contains(BLACK_CONFIG, Samples) {
-    SUBDIRS += samples
-}
-
-contains(BLACK_CONFIG, Unittests) {
-    SUBDIRS += tests
-}
+SUBDIRS += samples
+SUBDIRS += tests
 
 include(install.pri)
 
diff --git a/tests/tests.pro b/tests/tests.pro
index a00fa9b71..8d0dc1897 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,5 +1,7 @@
 load(common_pre)
 
+REQUIRES += contains(BLACK_CONFIG,Unittests)
+
 TEMPLATE = subdirs
 CONFIG += ordered