diff --git a/Firebase/InAppMessagingDisplay/Banner/FIDBannerViewController.m b/Firebase/InAppMessagingDisplay/Banner/FIDBannerViewController.m
index 2f46b77099c..80fa0c34708 100644
--- a/Firebase/InAppMessagingDisplay/Banner/FIDBannerViewController.m
+++ b/Firebase/InAppMessagingDisplay/Banner/FIDBannerViewController.m
@@ -16,7 +16,6 @@
 
 #import "FIDBannerViewController.h"
 #import "FIRCore+InAppMessagingDisplay.h"
-#import "FIRInAppMessagingRendering.h"
 
 @interface FIDBannerViewController ()
 
diff --git a/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.h b/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.h
index a585ad22501..3d39bfb6faa 100644
--- a/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.h
+++ b/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.h
@@ -16,8 +16,8 @@
 
 #import <UIKit/UIKit.h>
 
+#import <FirebaseInAppMessaging/FIRInAppMessagingRendering.h>
 #import "FIDTimeFetcher.h"
-#import "FIRInAppMessagingRendering.h"
 
 @protocol FIRInAppMessagingDisplayDelegate;
 
diff --git a/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.m b/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.m
index 953ccf0dfb3..e250dfb634a 100644
--- a/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.m
+++ b/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.m
@@ -17,7 +17,6 @@
 #import "FIDBaseRenderingViewController.h"
 #import "FIDTimeFetcher.h"
 #import "FIRCore+InAppMessagingDisplay.h"
-#import "FIRInAppMessagingRendering.h"
 
 @interface FIDBaseRenderingViewController ()
 // For fiam messages, it's required to be kMinValidImpressionTime to
diff --git a/Firebase/InAppMessagingDisplay/ImageOnly/FIDImageOnlyViewController.m b/Firebase/InAppMessagingDisplay/ImageOnly/FIDImageOnlyViewController.m
index aa87fb31701..e244a18aef4 100644
--- a/Firebase/InAppMessagingDisplay/ImageOnly/FIDImageOnlyViewController.m
+++ b/Firebase/InAppMessagingDisplay/ImageOnly/FIDImageOnlyViewController.m
@@ -16,7 +16,6 @@
 
 #import "FIDImageOnlyViewController.h"
 #import "FIRCore+InAppMessagingDisplay.h"
-#import "FIRInAppMessagingRendering.h"
 
 @interface FIDImageOnlyViewController ()
 
diff --git a/Firebase/InAppMessagingDisplay/Modal/FIDModalViewController.m b/Firebase/InAppMessagingDisplay/Modal/FIDModalViewController.m
index 40862db032f..0c4b2b4f2a1 100644
--- a/Firebase/InAppMessagingDisplay/Modal/FIDModalViewController.m
+++ b/Firebase/InAppMessagingDisplay/Modal/FIDModalViewController.m
@@ -18,7 +18,6 @@
 
 #import "FIDModalViewController.h"
 #import "FIRCore+InAppMessagingDisplay.h"
-#import "FIRInAppMessagingRendering.h"
 
 @interface FIDModalViewController ()