diff --git a/src/qrcodetool/BUILD.gn b/src/qrcodetool/BUILD.gn
index 1783bbb9e1c03f..fb1c687d4da24c 100644
--- a/src/qrcodetool/BUILD.gn
+++ b/src/qrcodetool/BUILD.gn
@@ -30,6 +30,6 @@ executable("qrcodetool") {
   public_deps = [
     "${chip_root}/src/lib/support",
     "${chip_root}/src/platform/logging:stdio",
-    "${chip_root}/src/setup_payload",
+    "${chip_root}/src/setup_payload:setup_payload_helper",
   ]
 }
diff --git a/src/setup_payload/BUILD.gn b/src/setup_payload/BUILD.gn
index e42e2e9ceafcee..fa3ac4dc70da7e 100644
--- a/src/setup_payload/BUILD.gn
+++ b/src/setup_payload/BUILD.gn
@@ -66,8 +66,6 @@ static_library("setup_payload") {
     "QRCodeSetupPayloadParser.h",
     "SetupPayload.cpp",
     "SetupPayload.h",
-    "SetupPayloadHelper.cpp",
-    "SetupPayloadHelper.h",
   ]
 
   cflags = [ "-Wconversion" ]
@@ -80,6 +78,15 @@ static_library("setup_payload") {
   ]
 }
 
+source_set("setup_payload_helper") {
+  sources = [
+    "SetupPayloadHelper.cpp",
+    "SetupPayloadHelper.h",
+  ]
+
+  public_deps = [ "${chip_root}/src/setup_payload" ]
+}
+
 source_set("onboarding-codes-utils") {
   sources = [
     "OnboardingCodesUtil.cpp",