diff --git a/Config/Common-Debug.xcconfig b/Config/Common-Debug.xcconfig
index e65912188..075fe8cd1 100644
--- a/Config/Common-Debug.xcconfig
+++ b/Config/Common-Debug.xcconfig
@@ -14,6 +14,9 @@
 // limitations under the License.
 //
 
+// This file defines project settings for Debug.
+// Targets (App, extensions) xcconfig files automatically include it for Debug build.
+
 #include "Common.xcconfig"
 
 ONLY_ACTIVE_ARCH = YES
diff --git a/Config/Common-Release.xcconfig b/Config/Common-Release.xcconfig
index 6fe798bbb..fe28e299c 100644
--- a/Config/Common-Release.xcconfig
+++ b/Config/Common-Release.xcconfig
@@ -14,6 +14,9 @@
 // limitations under the License.
 //
 
+// This file defines project settings for Release.
+// Targets (App, extensions) xcconfig files automatically include it for Release build.
+
 #include "Common.xcconfig"
 
 COPY_PHASE_STRIP = YES
diff --git a/Config/Common.xcconfig b/Config/Common.xcconfig
index 1ff13fa67..559eb7420 100644
--- a/Config/Common.xcconfig
+++ b/Config/Common.xcconfig
@@ -18,6 +18,9 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 
+// This file defines base project settings.
+// Targets (App, extensions) xcconfig files automatically include it.
+
 // Application constants
 KEYCHAIN_ACCESS_GROUP = $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER).keychain.shared
 
diff --git a/Riot/SupportingFiles/App-Common.xcconfig b/Riot/SupportingFiles/App-Common.xcconfig
index 94664c299..173727042 100644
--- a/Riot/SupportingFiles/App-Common.xcconfig
+++ b/Riot/SupportingFiles/App-Common.xcconfig
@@ -18,7 +18,6 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 #include "Config/AppIdentifiers.xcconfig"
-#include "Config/Common.xcconfig"
 
 PRODUCT_NAME = Riot
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER)
diff --git a/RiotNSE/NSE-Common.xcconfig b/RiotNSE/NSE-Common.xcconfig
index a0cfda5a6..ee4f8b558 100644
--- a/RiotNSE/NSE-Common.xcconfig
+++ b/RiotNSE/NSE-Common.xcconfig
@@ -18,7 +18,6 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 #include "Config/AppIdentifiers.xcconfig"
-#include "Config/Common.xcconfig"
 
 PRODUCT_NAME = RiotNSE
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).nse
diff --git a/RiotShareExtension/SupportingFiles/ShareExtension-Common.xcconfig b/RiotShareExtension/SupportingFiles/ShareExtension-Common.xcconfig
index 9e1a9baee..41a210c68 100644
--- a/RiotShareExtension/SupportingFiles/ShareExtension-Common.xcconfig
+++ b/RiotShareExtension/SupportingFiles/ShareExtension-Common.xcconfig
@@ -18,7 +18,6 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 #include "Config/AppIdentifiers.xcconfig"
-#include "Config/Common.xcconfig"
 
 PRODUCT_NAME = RiotShareExtension
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).shareExtension
diff --git a/SiriIntents/SiriIntents-Common.xcconfig b/SiriIntents/SiriIntents-Common.xcconfig
index 3197ce2ec..7f78e4731 100644
--- a/SiriIntents/SiriIntents-Common.xcconfig
+++ b/SiriIntents/SiriIntents-Common.xcconfig
@@ -18,7 +18,6 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 #include "Config/AppIdentifiers.xcconfig"
-#include "Config/Common.xcconfig"
 
 PRODUCT_NAME=  SiriIntents
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).SiriIntents