diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm
index 73fed8d3c..07dd923f1 100644
--- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm
+++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentHostingViewDescriptor.mm
@@ -9,8 +9,14 @@
 
 #import "SKComponentHostingViewDescriptor.h"
 
+// TODO T41966103 Remove conditional imports
+#if FLIPPER_OSS
 #import <ComponentKit/CKComponentDataSourceAttachController.h>
 #import <ComponentKit/CKComponentDataSourceAttachControllerInternal.h>
+#else
+#import <ComponentKit/CKComponentAttachController.h>
+#import <ComponentKit/CKComponentAttachControllerInternal.h>
+#endif
 #import <ComponentKit/CKComponentHostingView.h>
 #import <ComponentKit/CKComponentHostingViewInternal.h>
 #import <ComponentKit/CKComponentLayout.h>
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm
index adfe43442..c5abbacb3 100644
--- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm
+++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm
@@ -11,8 +11,14 @@
 
 #import <ComponentKit/CKComponent.h>
 #import <ComponentKit/CKComponentRootView.h>
+// TODO T41966103 Remove conditional imports
+#if FLIPPER_OSS
 #import <ComponentKit/CKComponentDataSourceAttachController.h>
 #import <ComponentKit/CKComponentDataSourceAttachControllerInternal.h>
+#else
+#import <ComponentKit/CKComponentAttachController.h>
+#import <ComponentKit/CKComponentAttachControllerInternal.h>
+#endif
 #import <ComponentKit/CKInspectableView.h>
 
 static char const kLayoutWrapperKey = ' ';
diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm
index a9f73c825..0ac655c2b 100644
--- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm
+++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentRootViewDescriptor.mm
@@ -9,8 +9,14 @@
 
 #import "SKComponentRootViewDescriptor.h"
 
+// TODO T41966103 Remove conditional imports
+#if FLIPPER_OSS
 #import <ComponentKit/CKComponentDataSourceAttachController.h>
 #import <ComponentKit/CKComponentDataSourceAttachControllerInternal.h>
+#else
+#import <ComponentKit/CKComponentAttachController.h>
+#import <ComponentKit/CKComponentAttachControllerInternal.h>
+#endif
 #import <ComponentKit/CKComponentHostingView.h>
 #import <ComponentKit/CKComponentHostingViewInternal.h>
 #import <ComponentKit/CKComponentLayout.h>
@@ -28,7 +34,7 @@
 
 - (NSUInteger)childCountForNode:(CKComponentRootView *)node {
   if ([node respondsToSelector:@selector(ck_attachState)]) {
-    CKComponentDataSourceAttachState *state = [node ck_attachState];
+    const auto state = [node ck_attachState];
     return state == nil ? 0 : 1;
   }
   return 0;