diff --git a/Auth/FirebaseAuthUI/AccountManagement/FUIAccountSettingsOperation.h b/Auth/FirebaseAuthUI/AccountManagement/FUIAccountSettingsOperation.h
index 912e483314e..a06342d6a72 100644
--- a/Auth/FirebaseAuthUI/AccountManagement/FUIAccountSettingsOperation.h
+++ b/Auth/FirebaseAuthUI/AccountManagement/FUIAccountSettingsOperation.h
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-#import <Foundation/Foundation.h>;
+#import <Foundation/Foundation.h>
 
 @class FIRAuth;
 @class FIRUser;
diff --git a/Auth/FirebaseAuthUI/FUIAuthErrors.h b/Auth/FirebaseAuthUI/FUIAuthErrors.h
index ade0c3fbe66..3b6acb9220e 100644
--- a/Auth/FirebaseAuthUI/FUIAuthErrors.h
+++ b/Auth/FirebaseAuthUI/FUIAuthErrors.h
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-#import <Foundation/Foundation.h>;
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Auth/FirebaseAuthUI/FirebaseAuthUI.h b/Auth/FirebaseAuthUI/FirebaseAuthUI.h
index 2c4a26b80a3..3d9509fc5df 100644
--- a/Auth/FirebaseAuthUI/FirebaseAuthUI.h
+++ b/Auth/FirebaseAuthUI/FirebaseAuthUI.h
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-#import <UIKit/UIKit.h>;
+#import <UIKit/UIKit.h>
 
 //! Project version number for FirebaseAuthUI.
 FOUNDATION_EXPORT double FirebaseAuthUIVersionNumber;
diff --git a/Database/FirebaseDatabaseUI/FUICollection.h b/Database/FirebaseDatabaseUI/FUICollection.h
index 51ad39dea7d..884bb09db75 100644
--- a/Database/FirebaseDatabaseUI/FUICollection.h
+++ b/Database/FirebaseDatabaseUI/FUICollection.h
@@ -18,7 +18,7 @@
 
 // clang-format on
 
-#import <Foundation/Foundation.h>;
+#import <Foundation/Foundation.h>
 
 @class FIRDatabaseReference, FIRDatabaseQuery, FIRDataSnapshot;
 @protocol FUICollectionDelegate;
diff --git a/Database/FirebaseDatabaseUI/FUICollectionViewDataSource.h b/Database/FirebaseDatabaseUI/FUICollectionViewDataSource.h
index 0db948c2059..bbc88782448 100644
--- a/Database/FirebaseDatabaseUI/FUICollectionViewDataSource.h
+++ b/Database/FirebaseDatabaseUI/FUICollectionViewDataSource.h
@@ -18,7 +18,7 @@
 
 // clang-format on
 
-#import <UIKit/UIKit.h>;
+#import <UIKit/UIKit.h>
 
 #import "FUICollection.h"
 
diff --git a/Database/FirebaseDatabaseUI/FUITableViewDataSource.h b/Database/FirebaseDatabaseUI/FUITableViewDataSource.h
index 418ea95bff3..1ac68f12f40 100644
--- a/Database/FirebaseDatabaseUI/FUITableViewDataSource.h
+++ b/Database/FirebaseDatabaseUI/FUITableViewDataSource.h
@@ -18,7 +18,7 @@
 
 // clang-format on
 
-#import <UIKit/UIKit.h>;
+#import <UIKit/UIKit.h>
 
 #import "FUICollection.h"
 
diff --git a/Database/FirebaseDatabaseUI/FirebaseDatabaseUI.h b/Database/FirebaseDatabaseUI/FirebaseDatabaseUI.h
index fdcf86250d5..7b599c3dea6 100644
--- a/Database/FirebaseDatabaseUI/FirebaseDatabaseUI.h
+++ b/Database/FirebaseDatabaseUI/FirebaseDatabaseUI.h
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-#import <UIKit/UIKit.h>;
+#import <UIKit/UIKit.h>
 
 //! Project version number for FirebaseDatabaseUI.
 FOUNDATION_EXPORT double FirebaseDatabaseUIVersionNumber;
diff --git a/FacebookAuth/FirebaseFacebookAuthUI/FirebaseFacebookAuthUI.h b/FacebookAuth/FirebaseFacebookAuthUI/FirebaseFacebookAuthUI.h
index 71c0e47aa26..acf563353d9 100644
--- a/FacebookAuth/FirebaseFacebookAuthUI/FirebaseFacebookAuthUI.h
+++ b/FacebookAuth/FirebaseFacebookAuthUI/FirebaseFacebookAuthUI.h
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-#import <UIKit/UIKit.h>;
+#import <UIKit/UIKit.h>
 
 //! Project version number for FirebaseFacebookAuthUI.
 FOUNDATION_EXPORT double FirebaseFacebookAuthUIVersionNumber;
diff --git a/FirebaseUI.podspec b/FirebaseUI.podspec
index 37e76784890..004206e1d8b 100644
--- a/FirebaseUI.podspec
+++ b/FirebaseUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseUI'
-  s.version      = '8.4.2'
+  s.version      = '8.5.0'
   s.summary      = 'UI binding libraries for Firebase.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }
diff --git a/Firestore/FirebaseFirestoreUI/FUIFirestoreCollectionViewDataSource.h b/Firestore/FirebaseFirestoreUI/FUIFirestoreCollectionViewDataSource.h
index 18006f46b24..a0385662ea1 100644
--- a/Firestore/FirebaseFirestoreUI/FUIFirestoreCollectionViewDataSource.h
+++ b/Firestore/FirebaseFirestoreUI/FUIFirestoreCollectionViewDataSource.h
@@ -18,7 +18,7 @@
 
 // clang-format on
 
-#import <UIKit/UIKit.h>;
+#import <UIKit/UIKit.h>
 
 #import "FUIBatchedArray.h"
 
diff --git a/Firestore/FirebaseFirestoreUI/FUIFirestoreTableViewDataSource.h b/Firestore/FirebaseFirestoreUI/FUIFirestoreTableViewDataSource.h
index 6fcb52175e6..d127b27e60e 100644
--- a/Firestore/FirebaseFirestoreUI/FUIFirestoreTableViewDataSource.h
+++ b/Firestore/FirebaseFirestoreUI/FUIFirestoreTableViewDataSource.h
@@ -18,7 +18,7 @@
 
 // clang-format on
 
-#import <UIKit/UIKit.h>;
+#import <UIKit/UIKit.h>
 
 #import "FUIBatchedArray.h"
 
diff --git a/Firestore/FirebaseFirestoreUI/FUISnapshotArrayDiff.h b/Firestore/FirebaseFirestoreUI/FUISnapshotArrayDiff.h
index 1c4f767d9ac..f56cd0de833 100644
--- a/Firestore/FirebaseFirestoreUI/FUISnapshotArrayDiff.h
+++ b/Firestore/FirebaseFirestoreUI/FUISnapshotArrayDiff.h
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-#import <Foundation/Foundation.h>;
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/GoogleAuth/FirebaseGoogleAuthUI/FirebaseGoogleAuthUI.h b/GoogleAuth/FirebaseGoogleAuthUI/FirebaseGoogleAuthUI.h
index 021283dfedb..8ebc7aca199 100644
--- a/GoogleAuth/FirebaseGoogleAuthUI/FirebaseGoogleAuthUI.h
+++ b/GoogleAuth/FirebaseGoogleAuthUI/FirebaseGoogleAuthUI.h
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-#import <UIKit/UIKit.h>;
+#import <UIKit/UIKit.h>
 
 //! Project version number for FirebaseGoogleAuthUI.
 FOUNDATION_EXPORT double FirebaseGoogleAuthUIVersionNumber;
diff --git a/PhoneAuth/FirebasePhoneAuthUI/FirebasePhoneAuthUI.h b/PhoneAuth/FirebasePhoneAuthUI/FirebasePhoneAuthUI.h
index 1d87444a453..8dc76c0b3c7 100644
--- a/PhoneAuth/FirebasePhoneAuthUI/FirebasePhoneAuthUI.h
+++ b/PhoneAuth/FirebasePhoneAuthUI/FirebasePhoneAuthUI.h
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-#import <UIKit/UIKit.h>;
+#import <UIKit/UIKit.h>
 
 //! Project version number for FirebasePhoneAuthUI.
 FOUNDATION_EXPORT double FirebasePhoneAuthUIVersionNumber;
diff --git a/Storage/FirebaseStorageUI/UIImageView+FirebaseStorage.h b/Storage/FirebaseStorageUI/UIImageView+FirebaseStorage.h
index c111d6c6c25..1e816d62a5f 100644
--- a/Storage/FirebaseStorageUI/UIImageView+FirebaseStorage.h
+++ b/Storage/FirebaseStorageUI/UIImageView+FirebaseStorage.h
@@ -14,7 +14,7 @@
 //  limitations under the License.
 //
 
-#import <UIKit/UIKit.h>;
+#import <UIKit/UIKit.h>
 
 #import <FirebaseStorage/FirebaseStorage.h>
 #import <SDWebImage/SDWebImage.h>