diff --git a/src/platform/Infineon/CYW30739/BUILD.gn b/src/platform/Infineon/CYW30739/BUILD.gn
index ff0704fb37aedc..7da725e63034be 100644
--- a/src/platform/Infineon/CYW30739/BUILD.gn
+++ b/src/platform/Infineon/CYW30739/BUILD.gn
@@ -83,14 +83,6 @@ static_library("CYW30739") {
       "ThreadStackManagerImpl.h",
     ]
 
-    # TODO: platform should NOT depend on default_address_resolve_config. This should
-    #       be removed. See https://github.com/project-chip/connectedhomeip/issues/30596
-    #
-    #       Currently this exists because OpenThread platform includes src/app/Server.h
-    public_configs = [
-      "${chip_root}/src/lib/address_resolve:default_address_resolve_config",
-    ]
-
     deps += [
       "${chip_root}/third_party/openthread/platforms:libopenthread-platform",
     ]
diff --git a/src/platform/bouffalolab/BL702/BUILD.gn b/src/platform/bouffalolab/BL702/BUILD.gn
index 28cc128fd7fb61..8582019df301e7 100644
--- a/src/platform/bouffalolab/BL702/BUILD.gn
+++ b/src/platform/bouffalolab/BL702/BUILD.gn
@@ -101,14 +101,6 @@ static_library("BL702") {
       ]
       deps += [ "${chip_root}/src/lib/dnssd:platform_header" ]
     }
-
-    # TODO: platform should NOT depend on default_address_resolve_config. This should
-    #       be removed. See https://github.com/project-chip/connectedhomeip/issues/30596
-    #
-    #       Currently this exists because OpenThread platform includes src/app/Server.h
-    public_configs = [
-      "${chip_root}/src/lib/address_resolve:default_address_resolve_config",
-    ]
   }
 
   if (chip_enable_ethernet) {
diff --git a/src/platform/bouffalolab/BL702L/BUILD.gn b/src/platform/bouffalolab/BL702L/BUILD.gn
index 4e018cf8cd65ad..547b9c695730c5 100644
--- a/src/platform/bouffalolab/BL702L/BUILD.gn
+++ b/src/platform/bouffalolab/BL702L/BUILD.gn
@@ -88,14 +88,6 @@ static_library("BL702L") {
       ]
       deps += [ "${chip_root}/src/lib/dnssd:platform_header" ]
     }
-
-    # TODO: platform should NOT depend on default_address_resolve_config. This should
-    #       be removed. See https://github.com/project-chip/connectedhomeip/issues/30596
-    #
-    #       Currently this exists because OpenThread platform includes src/app/Server.h
-    public_configs = [
-      "${chip_root}/src/lib/address_resolve:default_address_resolve_config",
-    ]
   }
 
   deps += [ "${chip_root}/src/credentials:credentials_header" ]
diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn b/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn
index f293eee81e3e58..c86b77ec45f4eb 100644
--- a/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn
+++ b/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn
@@ -53,13 +53,6 @@ static_library("cc13x2_26x2") {
     "${chip_root}/src/platform:platform_base",
   ]
 
-  # TODO: platform should NOT depend on default_address_resolve_config. This should
-  #       be removed. See https://github.com/project-chip/connectedhomeip/issues/30596
-  #
-  #       Currently this exists because OpenThread platform includes src/app/Server.h
-  public_configs =
-      [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ]
-
   if (chip_enable_ble) {
     sources += [
       "../BLEManagerImpl.cpp",
diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn b/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn
index d6967347eca720..18298ed0ce5841 100644
--- a/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn
+++ b/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn
@@ -53,13 +53,6 @@ static_library("cc13x4_26x4") {
     "${chip_root}/src/platform:platform_base",
   ]
 
-  # TODO: platform should NOT depend on default_address_resolve_config. This should
-  #       be removed. See https://github.com/project-chip/connectedhomeip/issues/30596
-  #
-  #       Currently this exists because OpenThread platform includes src/app/Server.h
-  public_configs =
-      [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ]
-
   if (chip_enable_ble) {
     sources += [
       "../BLEManagerImpl.cpp",
diff --git a/src/platform/nxp/k32w/k32w0/BUILD.gn b/src/platform/nxp/k32w/k32w0/BUILD.gn
index a5c204a10b956c..a58609f28ef539 100644
--- a/src/platform/nxp/k32w/k32w0/BUILD.gn
+++ b/src/platform/nxp/k32w/k32w0/BUILD.gn
@@ -140,14 +140,6 @@ static_library("k32w0") {
       ]
       deps += [ "${chip_root}/src/lib/dnssd:platform_header" ]
     }
-
-    # TODO: platform should NOT depend on default_address_resolve_config. This should
-    #       be removed. See https://github.com/project-chip/connectedhomeip/issues/30596
-    #
-    #       Currently this exists because OpenThread platform includes src/app/Server.h
-    public_configs = [
-      "${chip_root}/src/lib/address_resolve:default_address_resolve_config",
-    ]
   }
 
   public_deps += [ "${chip_root}/src/crypto" ]
diff --git a/src/platform/nxp/k32w/k32w1/BUILD.gn b/src/platform/nxp/k32w/k32w1/BUILD.gn
index 053f8d784ac180..187a7360cd27d2 100644
--- a/src/platform/nxp/k32w/k32w1/BUILD.gn
+++ b/src/platform/nxp/k32w/k32w1/BUILD.gn
@@ -106,11 +106,4 @@ static_library("k32w1") {
   }
 
   public_deps += [ "${chip_root}/src/crypto" ]
-
-  # TODO: platform should NOT depend on default_address_resolve_config. This should
-  #       be removed. See https://github.com/project-chip/connectedhomeip/issues/30596
-  #
-  #       Currently this exists because OpenThread platform includes src/app/Server.h
-  public_configs =
-      [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ]
 }
diff --git a/src/platform/nxp/rt/rw61x/BUILD.gn b/src/platform/nxp/rt/rw61x/BUILD.gn
index 1cf0b5ac55f9a7..5de785556ef7f7 100644
--- a/src/platform/nxp/rt/rw61x/BUILD.gn
+++ b/src/platform/nxp/rt/rw61x/BUILD.gn
@@ -144,13 +144,5 @@ static_library("nxp_platform") {
     "${chip_root}/src/platform:syscalls_stub",
   ]
 
-  public_configs = [
-    ":nxp_platform_config",
-
-    # TODO: platform should NOT depend on default_address_resolve_config. This should
-    #       be removed. See https://github.com/project-chip/connectedhomeip/issues/30596
-    #
-    #       Currently this exists because OpenThread platform includes src/app/Server.h
-    "${chip_root}/src/lib/address_resolve:default_address_resolve_config",
-  ]
+  public_configs = [ ":nxp_platform_config" ]
 }
diff --git a/src/platform/qpg/BUILD.gn b/src/platform/qpg/BUILD.gn
index 4e1e5241269cc8..1087c6d06677c8 100644
--- a/src/platform/qpg/BUILD.gn
+++ b/src/platform/qpg/BUILD.gn
@@ -70,13 +70,8 @@ static_library("qpg") {
       public_deps += [ "${openthread_root}:libopenthread-mtd" ]
     }
 
-    # TODO: platform should NOT depend on default_address_resolve_config. This should
-    #       be removed. See https://github.com/project-chip/connectedhomeip/issues/30596
-    #
-    #       Currently this exists because OpenThread platform includes src/app/Server.h
     public_configs += [
       "${chip_root}/third_party/openthread/platforms/qpg:openthread_qpg_config",
-      "${chip_root}/src/lib/address_resolve:default_address_resolve_config",
     ]
 
     sources += [
diff --git a/src/platform/stm32/BUILD.gn b/src/platform/stm32/BUILD.gn
index f6610d7ff7329a..43f656d0eca988 100644
--- a/src/platform/stm32/BUILD.gn
+++ b/src/platform/stm32/BUILD.gn
@@ -89,14 +89,6 @@ static_library("stm32") {
     public_deps += [ "${stm32_sdk_build_root}:stm32_sdk" ]
 
     deps += [ "${chip_root}/src/lib/dnssd:platform_header" ]
-
-    # TODO: platform should NOT depend on default_address_resolve_config. This should
-    #       be removed. See https://github.com/project-chip/connectedhomeip/issues/30596
-    #
-    #       Currently this exists because OpenThread platform includes src/app/Server.h
-    public_configs = [
-      "${chip_root}/src/lib/address_resolve:default_address_resolve_config",
-    ]
   }
 
   # Set the compiler flags