diff --git a/src/darwin/Framework/CHIP/MTRSetupPayload.mm b/src/darwin/Framework/CHIP/MTRSetupPayload.mm
index 309494e3a01922..8ebd85a7563b0c 100644
--- a/src/darwin/Framework/CHIP/MTRSetupPayload.mm
+++ b/src/darwin/Framework/CHIP/MTRSetupPayload.mm
@@ -1,6 +1,6 @@
 /**
  *
- *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020-2024 Project CHIP Authors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,20 +15,21 @@
  *    limitations under the License.
  */
 
-#import "MTRError.h"
+#import "MTRSetupPayload_Internal.h"
+
 #import "MTRError_Internal.h"
 #import "MTRFramework.h"
 #import "MTROnboardingPayloadParser.h"
-#import "MTRSetupPayload_Internal.h"
-#import "setup_payload/ManualSetupPayloadGenerator.h"
-#import "setup_payload/QRCodeSetupPayloadGenerator.h"
-#import <setup_payload/SetupPayload.h>
 
+#include <setup_payload/ManualSetupPayloadGenerator.h>
+#include <setup_payload/QRCodeSetupPayloadGenerator.h>
+#include <setup_payload/SetupPayload.h>
 #include <string>
 
 @implementation MTROptionalQRCodeInfo
 @end
 
+MTR_DIRECT_MEMBERS
 @implementation MTRSetupPayload {
     chip::SetupPayload _chipSetupPayload;
 }
@@ -418,6 +419,7 @@ + (MTRDiscoveryCapabilities)_unboxDiscoveryCapabilities:(nullable NSNumber *)box
 
 @end
 
+MTR_DIRECT_MEMBERS
 @implementation MTROptionalQRCodeInfo (Deprecated)
 
 - (NSNumber *)infoType
@@ -432,6 +434,7 @@ - (void)setInfoType:(NSNumber *)infoType
 
 @end
 
+MTR_DIRECT_MEMBERS
 @implementation MTRSetupPayload (Deprecated)
 
 - (nullable NSNumber *)rendezvousInformation
diff --git a/src/darwin/Framework/CHIP/MTRSetupPayload_Internal.h b/src/darwin/Framework/CHIP/MTRSetupPayload_Internal.h
index 6cac43e7d5ea4b..a119a4b6e2059f 100644
--- a/src/darwin/Framework/CHIP/MTRSetupPayload_Internal.h
+++ b/src/darwin/Framework/CHIP/MTRSetupPayload_Internal.h
@@ -1,19 +1,30 @@
-//
-//  MTRSetupPayload_Internal.h
-//  MTR
-//
-//  Copyright © 2021 CHIP. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
+/**
+ *
+ *    Copyright (c) 2021-2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
 
 #import "MTRSetupPayload.h"
 
+#import "MTRDefines_Internal.h"
+
 #ifdef __cplusplus
 #import <lib/core/Optional.h>
 #import <setup_payload/SetupPayload.h>
 #endif
 
+MTR_DIRECT_MEMBERS
 @interface MTRSetupPayload ()
 
 #ifdef __cplusplus