diff --git a/src/app/bdx/DiagnosticLogsBDXTransferHandler.cpp b/src/app/bdx/DiagnosticLogsBDXTransferHandler.cpp
index b816a68da7ab07..b81bd0c8bf5c01 100644
--- a/src/app/bdx/DiagnosticLogsBDXTransferHandler.cpp
+++ b/src/app/bdx/DiagnosticLogsBDXTransferHandler.cpp
@@ -133,6 +133,7 @@ void DiagnosticLogsBDXTransferHandler::HandleTransferSessionOutput(TransferSessi
         break;
     case TransferSession::OutputEventType::kStatusReceived:
         ChipLogError(BDX, "Got StatusReport %x", to_underlying(event.statusData.statusCode));
+        [[fallthrough]];
     case TransferSession::OutputEventType::kInternalError:
     case TransferSession::OutputEventType::kTransferTimeout:
         HandleBDXError(CHIP_ERROR_INTERNAL);
diff --git a/src/app/clusters/diagnostic-logs-server/diagnostic-logs-provider-delegate.h b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-provider-delegate.h
index 3bf325c4d6cfed..20880e05dd918d 100644
--- a/src/app/clusters/diagnostic-logs-server/diagnostic-logs-provider-delegate.h
+++ b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-provider-delegate.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/enums.h>
 #include <app/util/af.h>
 
 namespace chip {
diff --git a/src/darwin/Framework/CHIP/MTRDiagnosticsLogDownloadTask.h b/src/darwin/Framework/CHIP/MTRDiagnosticsLogDownloadTask.h
index b8c547973825d8..6f5063edde1d2e 100644
--- a/src/darwin/Framework/CHIP/MTRDiagnosticsLogDownloadTask.h
+++ b/src/darwin/Framework/CHIP/MTRDiagnosticsLogDownloadTask.h
@@ -15,8 +15,10 @@
  *    limitations under the License.
  */
 
-#import "MTRDevice.h"
 #import <Foundation/Foundation.h>
+#import <Matter/MTRDefines.h>
+
+#import "MTRDevice.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -26,6 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
  * messages and transfer events and downloads the file.
  *
  */
+MTR_HIDDEN
 @interface MTRDiagnosticsLogDownloadTask : NSObject
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
@@ -39,3 +42,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
diff --git a/src/darwin/Framework/CHIP/MTRDiagnosticsLogDownloadTask.mm b/src/darwin/Framework/CHIP/MTRDiagnosticsLogDownloadTask.mm
index 96ddb713c33fd6..fb00b5e305d37b 100644
--- a/src/darwin/Framework/CHIP/MTRDiagnosticsLogDownloadTask.mm
+++ b/src/darwin/Framework/CHIP/MTRDiagnosticsLogDownloadTask.mm
@@ -260,3 +260,4 @@ - (void)downloadLogOfType:(MTRDiagnosticLogType)type
 }
 
 @end
+
diff --git a/src/darwin/Framework/CHIP/MTRDiagnosticsLogTransferHandler.h b/src/darwin/Framework/CHIP/MTRDiagnosticsLogTransferHandler.h
index e9fb336bb67ea6..923cbfe78a8e6a 100644
--- a/src/darwin/Framework/CHIP/MTRDiagnosticsLogTransferHandler.h
+++ b/src/darwin/Framework/CHIP/MTRDiagnosticsLogTransferHandler.h
@@ -15,6 +15,8 @@
  *    limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 #include <protocols/bdx/TransferFacilitator.h>
 
 /**
diff --git a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
index a09c10f3f70fa7..7c014aedb0d1b8 100644
--- a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
+++ b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
@@ -304,8 +304,8 @@
 		B4E2621B2AA0D02000DBA5BC /* SleepCommand.mm in Sources */ = {isa = PBXBuildFile; fileRef = B4E262192AA0D01D00DBA5BC /* SleepCommand.mm */; };
 		B4E2621E2AA0D02D00DBA5BC /* WaitForCommissioneeCommand.mm in Sources */ = {isa = PBXBuildFile; fileRef = B4E2621C2AA0D02A00DBA5BC /* WaitForCommissioneeCommand.mm */; };
 		BA09EB43247477BA00605257 /* libCHIP.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BA09EB3F2474762900605257 /* libCHIP.a */; };
-		CF4BAE472B06EB8300022ED3 /* MTRDiagnosticsLogDownloadTask.mm in Sources */ = {isa = PBXBuildFile; fileRef = CF4BAE462B06EB8300022ED3 /* MTRDiagnosticsLogDownloadTask.mm */; };
-		CF4BAE492B06EBC400022ED3 /* MTRDiagnosticsLogDownloadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = CF4BAE482B06EBC400022ED3 /* MTRDiagnosticsLogDownloadTask.h */; };
+		CF4BAE4B2B083CE700022ED3 /* MTRDiagnosticsLogDownloadTask.mm in Sources */ = {isa = PBXBuildFile; fileRef = CF4BAE4A2B083CE700022ED3 /* MTRDiagnosticsLogDownloadTask.mm */; };
+		CF4BAE4D2B083CF200022ED3 /* MTRDiagnosticsLogDownloadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = CF4BAE4C2B083CF200022ED3 /* MTRDiagnosticsLogDownloadTask.h */; };
 		CFA0EDAD2AD9D75600C7FA40 /* MTRDiagnosticsLogTransferHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFA0EDAC2AD9D75600C7FA40 /* MTRDiagnosticsLogTransferHandler.mm */; };
 		CFA0EDAF2AD9D76000C7FA40 /* MTRDiagnosticsLogTransferHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = CFA0EDAE2AD9D76000C7FA40 /* MTRDiagnosticsLogTransferHandler.h */; };
 		D4772A46285AE98400383630 /* MTRClusterConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = D4772A45285AE98300383630 /* MTRClusterConstants.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -679,8 +679,8 @@
 		B4E2621C2AA0D02A00DBA5BC /* WaitForCommissioneeCommand.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WaitForCommissioneeCommand.mm; sourceTree = "<group>"; };
 		BA09EB3F2474762900605257 /* libCHIP.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libCHIP.a; path = lib/libCHIP.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		BA107AEE2470CFBB004287EB /* chip_xcode_build_connector.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = chip_xcode_build_connector.sh; sourceTree = "<group>"; };
-		CF4BAE462B06EB8300022ED3 /* MTRDiagnosticsLogDownloadTask.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRDiagnosticsLogDownloadTask.mm; sourceTree = "<group>"; };
-		CF4BAE482B06EBC400022ED3 /* MTRDiagnosticsLogDownloadTask.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MTRDiagnosticsLogDownloadTask.h; sourceTree = "<group>"; };
+		CF4BAE4A2B083CE700022ED3 /* MTRDiagnosticsLogDownloadTask.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRDiagnosticsLogDownloadTask.mm; sourceTree = "<group>"; };
+		CF4BAE4C2B083CF200022ED3 /* MTRDiagnosticsLogDownloadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRDiagnosticsLogDownloadTask.h; sourceTree = "<group>"; };
 		CFA0EDAC2AD9D75600C7FA40 /* MTRDiagnosticsLogTransferHandler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRDiagnosticsLogTransferHandler.mm; sourceTree = "<group>"; };
 		CFA0EDAE2AD9D76000C7FA40 /* MTRDiagnosticsLogTransferHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRDiagnosticsLogTransferHandler.h; sourceTree = "<group>"; };
 		D437613E285BDC0D0051FEA2 /* MTRErrorTestUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRErrorTestUtils.h; sourceTree = "<group>"; };
@@ -1113,9 +1113,9 @@
 		B202528F2459E34F00F97062 /* CHIP */ = {
 			isa = PBXGroup;
 			children = (
+				CF4BAE4C2B083CF200022ED3 /* MTRDiagnosticsLogDownloadTask.h */,
+				CF4BAE4A2B083CE700022ED3 /* MTRDiagnosticsLogDownloadTask.mm */,
 				CFA0EDAE2AD9D76000C7FA40 /* MTRDiagnosticsLogTransferHandler.h */,
-				CF4BAE462B06EB8300022ED3 /* MTRDiagnosticsLogDownloadTask.mm */,
-				CF4BAE482B06EBC400022ED3 /* MTRDiagnosticsLogDownloadTask.h */,
 				CFA0EDAC2AD9D75600C7FA40 /* MTRDiagnosticsLogTransferHandler.mm */,
 				1E4D655129C30A8700BC3478 /* MTRCommissionableBrowser.mm */,
 				1E4D654C29C208DD00BC3478 /* MTRCommissionableBrowser.h */,
@@ -1454,12 +1454,12 @@
 				3CF134AB289D8DF70017A19E /* MTRDeviceAttestationInfo.h in Headers */,
 				B2E0D7B2245B0B5C003C5B48 /* MTRManualSetupPayloadParser.h in Headers */,
 				CFA0EDAF2AD9D76000C7FA40 /* MTRDiagnosticsLogTransferHandler.h in Headers */,
+				CF4BAE4D2B083CF200022ED3 /* MTRDiagnosticsLogDownloadTask.h in Headers */,
 				3CF134A7289D8ADA0017A19E /* MTRCSRInfo.h in Headers */,
 				B2E0D7B1245B0B5C003C5B48 /* Matter.h in Headers */,
 				7596A84428762729004DAE0E /* MTRDevice.h in Headers */,
 				B2E0D7B8245B0B5C003C5B48 /* MTRSetupPayload.h in Headers */,
 				1E4D654F29C208DD00BC3478 /* MTRCommissionableBrowser.h in Headers */,
-				CF4BAE492B06EBC400022ED3 /* MTRDiagnosticsLogDownloadTask.h in Headers */,
 				3D843756294AD25A0070D20A /* MTRCertificateInfo.h in Headers */,
 				7596A83E28751220004DAE0E /* MTRBaseClusters_Internal.h in Headers */,
 				997DED182695344800975E97 /* MTRThreadOperationalDataset.h in Headers */,
@@ -1769,7 +1769,6 @@
 				5A6FEC9627B5983000F25F42 /* MTRDeviceControllerXPCConnection.mm in Sources */,
 				511913FB28C100EF009235E9 /* MTRBaseSubscriptionCallback.mm in Sources */,
 				510470FB2A2F7DF60053EA7E /* MTRBackwardsCompatShims.mm in Sources */,
-				CF4BAE472B06EB8300022ED3 /* MTRDiagnosticsLogDownloadTask.mm in Sources */,
 				5173A47629C0E2ED00F67F48 /* MTRFabricInfo.mm in Sources */,
 				5ACDDD7D27CD16D200EFD68A /* MTRClusterStateCacheContainer.mm in Sources */,
 				513DDB8A2761F6F900DAA01A /* MTRAttributeTLVValueDecoder.mm in Sources */,
@@ -1784,6 +1783,7 @@
 				7560FD1C27FBBD3F005E85B3 /* MTREventTLVValueDecoder.mm in Sources */,
 				5178E67E2AE098210069DF72 /* MTRCommandTimedCheck.mm in Sources */,
 				7596A84928762783004DAE0E /* MTRAsyncCallbackWorkQueue.mm in Sources */,
+				CF4BAE4B2B083CE700022ED3 /* MTRDiagnosticsLogDownloadTask.mm in Sources */,
 				B2E0D7B9245B0B5C003C5B48 /* MTRSetupPayload.mm in Sources */,
 				B2E0D7B6245B0B5C003C5B48 /* MTRManualSetupPayloadParser.mm in Sources */,
 				7596A85528788557004DAE0E /* MTRClusters.mm in Sources */,