diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_internal.h
new file mode 100644
index 00000000000000..34f237e91e19b3
--- /dev/null
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_internal.h
@@ -0,0 +1,281 @@
+/*
+ *
+ *    Copyright (c) 2022 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.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+#import <Foundation/Foundation.h>
+
+#import "MTRBaseClusters.h"
+#import "MTRBaseDevice.h"
+
+#include <controller-clusters/zap-generated/CHIPClusters.h>
+
+@interface MTRBaseClusterIdentify ()
+@property (readonly) chip::Controller::IdentifyCluster cppCluster;
+@end
+
+@interface MTRBaseClusterGroups ()
+@property (readonly) chip::Controller::GroupsCluster cppCluster;
+@end
+
+@interface MTRBaseClusterScenes ()
+@property (readonly) chip::Controller::ScenesCluster cppCluster;
+@end
+
+@interface MTRBaseClusterOnOff ()
+@property (readonly) chip::Controller::OnOffCluster cppCluster;
+@end
+
+@interface MTRBaseClusterOnOffSwitchConfiguration ()
+@property (readonly) chip::Controller::OnOffSwitchConfigurationCluster cppCluster;
+@end
+
+@interface MTRBaseClusterLevelControl ()
+@property (readonly) chip::Controller::LevelControlCluster cppCluster;
+@end
+
+@interface MTRBaseClusterBinaryInputBasic ()
+@property (readonly) chip::Controller::BinaryInputBasicCluster cppCluster;
+@end
+
+@interface MTRBaseClusterDescriptor ()
+@property (readonly) chip::Controller::DescriptorCluster cppCluster;
+@end
+
+@interface MTRBaseClusterBinding ()
+@property (readonly) chip::Controller::BindingCluster cppCluster;
+@end
+
+@interface MTRBaseClusterAccessControl ()
+@property (readonly) chip::Controller::AccessControlCluster cppCluster;
+@end
+
+@interface MTRBaseClusterBridgedActions ()
+@property (readonly) chip::Controller::BridgedActionsCluster cppCluster;
+@end
+
+@interface MTRBaseClusterBasic ()
+@property (readonly) chip::Controller::BasicCluster cppCluster;
+@end
+
+@interface MTRBaseClusterOtaSoftwareUpdateProvider ()
+@property (readonly) chip::Controller::OtaSoftwareUpdateProviderCluster cppCluster;
+@end
+
+@interface MTRBaseClusterOtaSoftwareUpdateRequestor ()
+@property (readonly) chip::Controller::OtaSoftwareUpdateRequestorCluster cppCluster;
+@end
+
+@interface MTRBaseClusterLocalizationConfiguration ()
+@property (readonly) chip::Controller::LocalizationConfigurationCluster cppCluster;
+@end
+
+@interface MTRBaseClusterTimeFormatLocalization ()
+@property (readonly) chip::Controller::TimeFormatLocalizationCluster cppCluster;
+@end
+
+@interface MTRBaseClusterUnitLocalization ()
+@property (readonly) chip::Controller::UnitLocalizationCluster cppCluster;
+@end
+
+@interface MTRBaseClusterPowerSourceConfiguration ()
+@property (readonly) chip::Controller::PowerSourceConfigurationCluster cppCluster;
+@end
+
+@interface MTRBaseClusterPowerSource ()
+@property (readonly) chip::Controller::PowerSourceCluster cppCluster;
+@end
+
+@interface MTRBaseClusterGeneralCommissioning ()
+@property (readonly) chip::Controller::GeneralCommissioningCluster cppCluster;
+@end
+
+@interface MTRBaseClusterNetworkCommissioning ()
+@property (readonly) chip::Controller::NetworkCommissioningCluster cppCluster;
+@end
+
+@interface MTRBaseClusterDiagnosticLogs ()
+@property (readonly) chip::Controller::DiagnosticLogsCluster cppCluster;
+@end
+
+@interface MTRBaseClusterGeneralDiagnostics ()
+@property (readonly) chip::Controller::GeneralDiagnosticsCluster cppCluster;
+@end
+
+@interface MTRBaseClusterSoftwareDiagnostics ()
+@property (readonly) chip::Controller::SoftwareDiagnosticsCluster cppCluster;
+@end
+
+@interface MTRBaseClusterThreadNetworkDiagnostics ()
+@property (readonly) chip::Controller::ThreadNetworkDiagnosticsCluster cppCluster;
+@end
+
+@interface MTRBaseClusterWiFiNetworkDiagnostics ()
+@property (readonly) chip::Controller::WiFiNetworkDiagnosticsCluster cppCluster;
+@end
+
+@interface MTRBaseClusterEthernetNetworkDiagnostics ()
+@property (readonly) chip::Controller::EthernetNetworkDiagnosticsCluster cppCluster;
+@end
+
+@interface MTRBaseClusterBridgedDeviceBasic ()
+@property (readonly) chip::Controller::BridgedDeviceBasicCluster cppCluster;
+@end
+
+@interface MTRBaseClusterSwitch ()
+@property (readonly) chip::Controller::SwitchCluster cppCluster;
+@end
+
+@interface MTRBaseClusterAdministratorCommissioning ()
+@property (readonly) chip::Controller::AdministratorCommissioningCluster cppCluster;
+@end
+
+@interface MTRBaseClusterOperationalCredentials ()
+@property (readonly) chip::Controller::OperationalCredentialsCluster cppCluster;
+@end
+
+@interface MTRBaseClusterGroupKeyManagement ()
+@property (readonly) chip::Controller::GroupKeyManagementCluster cppCluster;
+@end
+
+@interface MTRBaseClusterFixedLabel ()
+@property (readonly) chip::Controller::FixedLabelCluster cppCluster;
+@end
+
+@interface MTRBaseClusterUserLabel ()
+@property (readonly) chip::Controller::UserLabelCluster cppCluster;
+@end
+
+@interface MTRBaseClusterBooleanState ()
+@property (readonly) chip::Controller::BooleanStateCluster cppCluster;
+@end
+
+@interface MTRBaseClusterModeSelect ()
+@property (readonly) chip::Controller::ModeSelectCluster cppCluster;
+@end
+
+@interface MTRBaseClusterDoorLock ()
+@property (readonly) chip::Controller::DoorLockCluster cppCluster;
+@end
+
+@interface MTRBaseClusterWindowCovering ()
+@property (readonly) chip::Controller::WindowCoveringCluster cppCluster;
+@end
+
+@interface MTRBaseClusterBarrierControl ()
+@property (readonly) chip::Controller::BarrierControlCluster cppCluster;
+@end
+
+@interface MTRBaseClusterPumpConfigurationAndControl ()
+@property (readonly) chip::Controller::PumpConfigurationAndControlCluster cppCluster;
+@end
+
+@interface MTRBaseClusterThermostat ()
+@property (readonly) chip::Controller::ThermostatCluster cppCluster;
+@end
+
+@interface MTRBaseClusterFanControl ()
+@property (readonly) chip::Controller::FanControlCluster cppCluster;
+@end
+
+@interface MTRBaseClusterThermostatUserInterfaceConfiguration ()
+@property (readonly) chip::Controller::ThermostatUserInterfaceConfigurationCluster cppCluster;
+@end
+
+@interface MTRBaseClusterColorControl ()
+@property (readonly) chip::Controller::ColorControlCluster cppCluster;
+@end
+
+@interface MTRBaseClusterIlluminanceMeasurement ()
+@property (readonly) chip::Controller::IlluminanceMeasurementCluster cppCluster;
+@end
+
+@interface MTRBaseClusterTemperatureMeasurement ()
+@property (readonly) chip::Controller::TemperatureMeasurementCluster cppCluster;
+@end
+
+@interface MTRBaseClusterPressureMeasurement ()
+@property (readonly) chip::Controller::PressureMeasurementCluster cppCluster;
+@end
+
+@interface MTRBaseClusterFlowMeasurement ()
+@property (readonly) chip::Controller::FlowMeasurementCluster cppCluster;
+@end
+
+@interface MTRBaseClusterRelativeHumidityMeasurement ()
+@property (readonly) chip::Controller::RelativeHumidityMeasurementCluster cppCluster;
+@end
+
+@interface MTRBaseClusterOccupancySensing ()
+@property (readonly) chip::Controller::OccupancySensingCluster cppCluster;
+@end
+
+@interface MTRBaseClusterWakeOnLan ()
+@property (readonly) chip::Controller::WakeOnLanCluster cppCluster;
+@end
+
+@interface MTRBaseClusterChannel ()
+@property (readonly) chip::Controller::ChannelCluster cppCluster;
+@end
+
+@interface MTRBaseClusterTargetNavigator ()
+@property (readonly) chip::Controller::TargetNavigatorCluster cppCluster;
+@end
+
+@interface MTRBaseClusterMediaPlayback ()
+@property (readonly) chip::Controller::MediaPlaybackCluster cppCluster;
+@end
+
+@interface MTRBaseClusterMediaInput ()
+@property (readonly) chip::Controller::MediaInputCluster cppCluster;
+@end
+
+@interface MTRBaseClusterLowPower ()
+@property (readonly) chip::Controller::LowPowerCluster cppCluster;
+@end
+
+@interface MTRBaseClusterKeypadInput ()
+@property (readonly) chip::Controller::KeypadInputCluster cppCluster;
+@end
+
+@interface MTRBaseClusterContentLauncher ()
+@property (readonly) chip::Controller::ContentLauncherCluster cppCluster;
+@end
+
+@interface MTRBaseClusterAudioOutput ()
+@property (readonly) chip::Controller::AudioOutputCluster cppCluster;
+@end
+
+@interface MTRBaseClusterApplicationLauncher ()
+@property (readonly) chip::Controller::ApplicationLauncherCluster cppCluster;
+@end
+
+@interface MTRBaseClusterApplicationBasic ()
+@property (readonly) chip::Controller::ApplicationBasicCluster cppCluster;
+@end
+
+@interface MTRBaseClusterAccountLogin ()
+@property (readonly) chip::Controller::AccountLoginCluster cppCluster;
+@end
+
+@interface MTRBaseClusterElectricalMeasurement ()
+@property (readonly) chip::Controller::ElectricalMeasurementCluster cppCluster;
+@end
+
+@interface MTRBaseClusterTestCluster ()
+@property (readonly) chip::Controller::TestClusterCluster cppCluster;
+@end