diff --git a/config/standalone/args.gni b/config/standalone/args.gni
index 162d52f203c3e5..4b2640923ea6eb 100644
--- a/config/standalone/args.gni
+++ b/config/standalone/args.gni
@@ -12,11 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Options from standalone-chip.mk that differ from configure defaults. These
+# options are used from examples/.
 chip_build_tests = false
-
 config_network_layer_ble = false
-inet_config_enable_async_dns_sockets = false
-
-project_config_include_dirs = rebase_path([ "." ])
-chip_project_config_include = "<CHIPProjectConfig.h>"
-system_project_config_include = "<SystemProjectConfig.h>"
+inet_config_enable_tun_endpoint = false
+inet_config_enable_raw_endpoint = false
+inet_config_enable_dns_resolver = false
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
index f46e9903ac6829..09e7929c1d3e45 100644
--- a/src/lib/support/BUILD.gn
+++ b/src/lib/support/BUILD.gn
@@ -98,6 +98,14 @@ static_library("support") {
     "${nlassert_root}:nlassert",
   ]
 
+  # These are needed because we include CHIPCore.h, which uses config
+  # options for src/ble and src/inet, however we cannot depend on those
+  # directly as such a dependency is cyclic.
+  public_deps += [
+    "${chip_root}/src/ble:ble_config_header",
+    "${chip_root}/src/inet:inet_config_header",
+  ]
+
   public_configs = [ ":support_config" ]
 
   if (chip_config_memory_management == "simple") {
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index d22598e1d8dc68..d6bc99c829a6d9 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -22,14 +22,14 @@ import("system.gni")
 declare_args() {
   # Extra header to include in CHIPConfig.h for project.
   # TODO - This should probably be in src/core but src/system also uses it.
-  chip_project_config_include = ""
+  chip_project_config_include = "<CHIPProjectConfig.h>"
 
   # Extra header to include in CHIPConfig.h for platform.
   # TODO - This should probably be in src/core but src/system also uses it.
   chip_platform_config_include = ""
 
   # Extra header to include in SystemConfig.h for project.
-  system_project_config_include = ""
+  system_project_config_include = "<SystemProjectConfig.h>"
 
   # Extra header to include in SystemConfig.h for platform.
   system_platform_config_include = ""
@@ -38,6 +38,12 @@ declare_args() {
   project_config_include_dirs = []
 }
 
+if (project_config_include_dirs == [] &&
+    chip_project_config_include == "<CHIPProjectConfig.h>" &&
+    system_project_config_include == "<SystemProjectConfig.h>") {
+  project_config_include_dirs += [ "${chip_root}/config/standalone" ]
+}
+
 config("system_config") {
   configs = [ "${chip_root}/src:includes" ]