HomeKit iOS xcode13.2 b1

#HomeKit.framework https://github.com/xamarin/xamarin-macios/pull/13497

diff -ruN /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupManager.h /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupManager.h
--- /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupManager.h	2021-09-09 16:50:04.000000000 -0400
+++ /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMAccessorySetupManager.h	2021-10-22 20:34:00.000000000 -0400
@@ -10,7 +10,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class HMCHIPServiceTopology;
+@class HMMatterTopology;
 
 HM_EXTERN API_AVAILABLE(ios(15.0)) API_UNAVAILABLE(watchos, tvos) API_UNAVAILABLE(macos, macCatalyst)
 @interface HMAccessorySetupManager : NSObject
@@ -23,7 +23,7 @@
  *
  * @param topology  A configuration object representing the topology of the initiating ecosystem
  */
-- (void)addAndSetUpAccessoriesForTopology:(HMCHIPServiceTopology *)topology completionHandler:(HMErrorBlock)completion;
+- (void)addAndSetUpAccessoriesForTopology:(HMMatterTopology *)topology completionHandler:(HMErrorBlock)completion;
 
 @end
 
diff -ruN /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceHome.h /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceHome.h
--- /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceHome.h	2021-09-09 16:50:05.000000000 -0400
+++ /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceHome.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,38 +0,0 @@
-//
-//  HMCHIPServiceHome.h
-//  HomeKit
-//
-//  Copyright © 2021 Apple Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <HomeKit/HMDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/*!
- * @abstract A simple home  representation that can be passed back and forth between Partner Ecosystem App extensions and iOS for the purposes of CHIP accessory setup.
- */
-HM_EXTERN API_AVAILABLE(ios(15.0))
-@interface HMCHIPServiceHome : NSObject <NSCopying, NSSecureCoding>
-
-/*!
- *  @abstract   The UUID of the receiver
- */
-@property (nonatomic, strong, readonly) NSUUID *uuid;
-
-/*!
- *  @abstract   The name of the receiver
- */
-@property (nonatomic, strong, readonly) NSString *name;
-
-/*!
- *  @abstract   Initializes a new instance
- */
-- (instancetype)initWithUUID:(NSUUID *)uuid name:(NSString *)name NS_DESIGNATED_INITIALIZER;
-- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRequestHandler.h /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRequestHandler.h
--- /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRequestHandler.h	2021-09-09 16:50:06.000000000 -0400
+++ /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRequestHandler.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,43 +0,0 @@
-//
-//  HMCHIPServiceRequestHandler.h
-//  HomeKit
-//
-//  Copyright © 2021 Apple Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <HomeKit/HMDefines.h>
-
-@class HMCHIPServiceHome;
-@class HMCHIPServiceRoom;
-
-NS_ASSUME_NONNULL_BEGIN
-
-HM_EXTERN API_AVAILABLE(ios(15.0))
-@interface HMCHIPServiceRequestHandler : NSObject <NSExtensionRequestHandling>
-
-/**
- * @abstract Use this method to vend the rooms that correspond to a given home to accessory setup. iOS will issue this request before presenting the "Select Room" card.
- * @param home The home for which iOS is requesting rooms.
- * @param completion Invoke the completion block with the requested rooms or an optional error.
- */
-- (void)fetchRoomsInHome:(HMCHIPServiceHome *)home completion:(void (^)(NSArray<HMCHIPServiceRoom *> * _Nullable, NSError * _Nullable))completion NS_SWIFT_ASYNC_NAME(rooms(in:));
-
-/*!
- * @abstract When this method is invoked, pair with the given accessory payload.
- * @param onboardingPayload The onboarding payload your CHIP stack will use to pair with the accessory.
- * @param completion Invoke the completion handler with an optional error after pairing.
- */
-- (void)pairAccessoryInHome:(HMCHIPServiceHome *)home onboardingPayload:(NSString *)onboardingPayload completion:(void(^)( NSError * _Nullable ))completion;
-
-/*!
- * @abstract When this method is invoked, configure the accessory with user selected attributes.
- * @param accessoryName The user given name for the accessory.
- * @param accessoryRoom The user selected room for the accessory.
- * @param completion Invoke the completion handler with an optional error after configuration.
- */
-- (void)configureAccessoryWithName:(NSString *)accessoryName room:(HMCHIPServiceRoom *)accessoryRoom completion:(void(^)( NSError * _Nullable ))completion NS_SWIFT_NAME(configureAccessory(named:room:completion:));
-
-@end
-
-NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRoom.h /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRoom.h
--- /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRoom.h	2021-09-09 16:50:03.000000000 -0400
+++ /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceRoom.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,37 +0,0 @@
-//
-//  HMCHIPServiceRoom.h
-//  HomeKit
-//
-//  Copyright © 2021 Apple Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <HomeKit/HMDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-/*!
- * @abstract A simple room representation that can be passed back and forth between Partner Ecosystem App extensions and iOS for the purposes of CHIP accessory setup.
- */
-HM_EXTERN API_AVAILABLE(ios(15.0))
-@interface HMCHIPServiceRoom : NSObject <NSCopying, NSSecureCoding>
-
-/*!
- *  @abstract   The UUID of the receiver
- */
-@property (nonatomic, strong, readonly) NSUUID *uuid;
-
-/*!
- *  @abstract   The name of the receiver
- */
-@property (nonatomic, strong, readonly) NSString *name;
-
-/*!
- *  @abstract   Initializes a new instance
- */
-- (instancetype)initWithUUID:(NSUUID *)uuid name:(NSString *)name NS_DESIGNATED_INITIALIZER;
-- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceTopology.h /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceTopology.h
--- /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceTopology.h	2021-09-09 16:50:03.000000000 -0400
+++ /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMCHIPServiceTopology.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,38 +0,0 @@
-//
-//  HMCHIPServiceTopology.h
-//  HomeKit
-//
-//  Copyright © 2020 Apple Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <HomeKit/HMDefines.h>
-
-@class HMCHIPServiceHome;
-@class HMCHIPServiceRoom;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/*!
- * @abstract Wraps the information a CHIP Ecosystem Partner is expected to pass when initiating setup. The number of homes vended to HomeKit by this class dictate whether a home selection step will be presented as part of setup. If so, these homes will be represented in system UI for user selection.
- */
-HM_EXTERN API_AVAILABLE(ios(15.0))
-@interface HMCHIPServiceTopology: NSObject <NSCopying, NSSecureCoding>
-
-/*!
- * @abstract HMCHIPServiceTopology initializer.
- * @param homes count must be greater than 0.  If count is greater than 1, setup will present a home selection card.
- */
-- (instancetype)initWithHomes:(NSArray<HMCHIPServiceHome *> *)homes;
-
-- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
-
-/*!
- * @abstract Homes  provided by the partner ecosystem app for selection in iOS system UI.
- */
-@property (nonatomic, copy, readonly) NSArray<HMCHIPServiceHome *> *homes;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterHome.h /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterHome.h
--- /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterHome.h	1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterHome.h	2021-10-22 20:34:01.000000000 -0400
@@ -0,0 +1,38 @@
+//
+//  HMMatterHome.h
+//  HomeKit
+//
+//  Copyright © 2021 Apple Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HomeKit/HMDefines.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ * @abstract A simple home  representation that can be passed back and forth between Partner Ecosystem App extensions and iOS for the purposes of CHIP accessory setup.
+ */
+HM_EXTERN API_AVAILABLE(ios(15.0))
+@interface HMMatterHome : NSObject <NSCopying, NSSecureCoding>
+
+/*!
+ *  @abstract   The UUID of the receiver
+ */
+@property (nonatomic, strong, readonly) NSUUID *uuid;
+
+/*!
+ *  @abstract   The name of the receiver
+ */
+@property (nonatomic, strong, readonly) NSString *name;
+
+/*!
+ *  @abstract   Initializes a new instance
+ */
+- (instancetype)initWithUUID:(NSUUID *)uuid name:(NSString *)name NS_DESIGNATED_INITIALIZER;
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRequestHandler.h /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRequestHandler.h
--- /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRequestHandler.h	1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRequestHandler.h	2021-10-22 20:33:59.000000000 -0400
@@ -0,0 +1,43 @@
+//
+//  HMMatterRequestHandler.h
+//  HomeKit
+//
+//  Copyright © 2021 Apple Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HomeKit/HMDefines.h>
+
+@class HMMatterHome;
+@class HMMatterRoom;
+
+NS_ASSUME_NONNULL_BEGIN
+
+HM_EXTERN API_AVAILABLE(ios(15.0))
+@interface HMMatterRequestHandler : NSObject <NSExtensionRequestHandling>
+
+/**
+ * @abstract Use this method to vend the rooms that correspond to a given home to accessory setup. iOS will issue this request before presenting the "Select Room" card.
+ * @param home The home for which iOS is requesting rooms.
+ * @param completion Invoke the completion block with the requested rooms or an optional error.
+ */
+- (void)fetchRoomsInHome:(HMMatterHome *)home completion:(void (^)(NSArray<HMMatterRoom *> * _Nullable, NSError * _Nullable))completion NS_SWIFT_ASYNC_NAME(rooms(in:));
+
+/*!
+ * @abstract When this method is invoked, pair with the given accessory payload.
+ * @param onboardingPayload The onboarding payload your CHIP stack will use to pair with the accessory.
+ * @param completion Invoke the completion handler with an optional error after pairing.
+ */
+- (void)pairAccessoryInHome:(HMMatterHome *)home onboardingPayload:(NSString *)onboardingPayload completion:(void(^)( NSError * _Nullable ))completion;
+
+/*!
+ * @abstract When this method is invoked, configure the accessory with user selected attributes.
+ * @param accessoryName The user given name for the accessory.
+ * @param accessoryRoom The user selected room for the accessory.
+ * @param completion Invoke the completion handler with an optional error after configuration.
+ */
+- (void)configureAccessoryWithName:(NSString *)accessoryName room:(HMMatterRoom *)accessoryRoom completion:(void(^)( NSError * _Nullable ))completion NS_SWIFT_NAME(configureAccessory(named:room:completion:));
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRoom.h /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRoom.h
--- /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRoom.h	1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterRoom.h	2021-10-22 20:33:59.000000000 -0400
@@ -0,0 +1,37 @@
+//
+//  HMMatterRoom.h
+//  HomeKit
+//
+//  Copyright © 2021 Apple Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HomeKit/HMDefines.h>
+
+NS_ASSUME_NONNULL_BEGIN
+/*!
+ * @abstract A simple room representation that can be passed back and forth between Partner Ecosystem App extensions and iOS for the purposes of CHIP accessory setup.
+ */
+HM_EXTERN API_AVAILABLE(ios(15.0))
+@interface HMMatterRoom : NSObject <NSCopying, NSSecureCoding>
+
+/*!
+ *  @abstract   The UUID of the receiver
+ */
+@property (nonatomic, strong, readonly) NSUUID *uuid;
+
+/*!
+ *  @abstract   The name of the receiver
+ */
+@property (nonatomic, strong, readonly) NSString *name;
+
+/*!
+ *  @abstract   Initializes a new instance
+ */
+- (instancetype)initWithUUID:(NSUUID *)uuid name:(NSString *)name NS_DESIGNATED_INITIALIZER;
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterTopology.h /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterTopology.h
--- /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterTopology.h	1969-12-31 19:00:00.000000000 -0500
+++ /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HMMatterTopology.h	2021-10-22 20:33:59.000000000 -0400
@@ -0,0 +1,38 @@
+//
+//  HMMatterTopology.h
+//  HomeKit
+//
+//  Copyright © 2020 Apple Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <HomeKit/HMDefines.h>
+
+@class HMMatterHome;
+@class HMMatterRoom;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ * @abstract Wraps the information a Matter Ecosystem Partner is expected to pass when initiating setup. The number of homes vended to HomeKit by this class dictate whether a home selection step will be presented as part of setup. If so, these homes will be represented in system UI for user selection.
+ */
+HM_EXTERN API_AVAILABLE(ios(15.0))
+@interface HMMatterTopology: NSObject <NSCopying, NSSecureCoding>
+
+/*!
+ * @abstract HMMatterTopology initializer.
+ * @param homes count must be greater than 0.  If count is greater than 1, setup will present a home selection card.
+ */
+- (instancetype)initWithHomes:(NSArray<HMMatterHome *> *)homes;
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+/*!
+ * @abstract Homes  provided by the partner ecosystem app for selection in iOS system UI.
+ */
+@property (nonatomic, copy, readonly) NSArray<HMMatterHome *> *homes;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff -ruN /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HomeKit.h /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HomeKit.h
--- /Applications/Xcode_13.1.0-rc.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HomeKit.h	2021-08-20 01:13:17.000000000 -0400
+++ /Applications/Xcode_13.2.0-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/HomeKit.framework/Headers/HomeKit.h	2021-10-20 05:38:49.000000000 -0400
@@ -62,7 +62,7 @@
 #import <HomeKit/HMCameraAudioControl.h>
 
 #import <HomeKit/HMAccessorySetupManager.h>
-#import <HomeKit/HMCHIPServiceHome.h>
-#import <HomeKit/HMCHIPServiceRoom.h>
-#import <HomeKit/HMCHIPServiceTopology.h>
-#import <HomeKit/HMCHIPServiceRequestHandler.h>
+#import <HomeKit/HMMatterHome.h>
+#import <HomeKit/HMMatterRoom.h>
+#import <HomeKit/HMMatterTopology.h>
+#import <HomeKit/HMMatterRequestHandler.h>