diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
index c674a8d36e94c4..a0091f29d65ed6 100644
--- a/src/app/BUILD.gn
+++ b/src/app/BUILD.gn
@@ -264,6 +264,19 @@ static_library("app") {
     "WriteHandler.cpp",
   ]
 
+  public_deps = [
+    ":app_config",
+    ":interaction-model",
+    ":revision_info",
+    "${chip_root}/src/app/icd:icd_config",
+    "${chip_root}/src/lib/address_resolve",
+    "${chip_root}/src/lib/support",
+    "${chip_root}/src/messaging",
+    "${chip_root}/src/protocols/interaction_model",
+    "${chip_root}/src/system",
+    "${nlio_root}:nlio",
+  ]
+
   if (chip_build_controller_dynamic_server) {
     defines = [
       "CHIP_CONFIG_SKIP_APP_SPECIFIC_GENERATED_HEADER_INCLUDES=1",
@@ -289,19 +302,6 @@ static_library("app") {
     ]
   }
 
-  public_deps = [
-    ":app_config",
-    ":interaction-model",
-    ":revision_info",
-    "${chip_root}/src/app/icd:icd_config",
-    "${chip_root}/src/lib/address_resolve",
-    "${chip_root}/src/lib/support",
-    "${chip_root}/src/messaging",
-    "${chip_root}/src/protocols/interaction_model",
-    "${chip_root}/src/system",
-    "${nlio_root}:nlio",
-  ]
-
   if (chip_enable_icd_server) {
     public_deps += [
       "${chip_root}/src/app/icd:manager",