Add lint checking for Objective-C++ sources (#1048)

* lint.sh now lints Objective-C++ too

* cpplint checks system-style includes that should be user-style

This prevents it from recognizing project sources as if they were C
system headers and then complaining that they're in the wrong place.

* cpplint checks #imports and #includes

* cpplint checks that C++ system headers aren't #imported

* cpplint checks for C system headers that could be C++ system headers

* cpplint checks that Objective-C sources include their headers

29 files changed, 72 insertions, 47 deletions

diff --git a/Firestore/Source/API/FIRDocumentReference.mm b/Firestore/Source/API/FIRDocumentReference.mm
index cc52d45..67e401d 100644
--- a/Firestore/Source/API/FIRDocumentReference.mm
+++ b/Firestore/Source/API/FIRDocumentReference.mm
@@ -16,11 +16,11 @@
 
 #import "FIRDocumentReference.h"
 
+#import <GRPCClient/GRPCCall.h>
+
 #include <memory>
 #include <utility>
 
-#import <GRPCClient/GRPCCall.h>
-
 #import "FIRFirestoreErrors.h"
 #import "FIRSnapshotMetadata.h"
 #import "Firestore/Source/API/FIRCollectionReference+Internal.h"
diff --git a/Firestore/Source/API/FIRFieldPath.mm b/Firestore/Source/API/FIRFieldPath.mm
index c651160..d0d8714 100644
--- a/Firestore/Source/API/FIRFieldPath.mm
+++ b/Firestore/Source/API/FIRFieldPath.mm
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-#import "Firestore/Source/API/FIRFieldPath+Internal.h"
+#import "FIRFieldPath.h"
 
 #include <functional>
 #include <string>
 #include <utility>
 #include <vector>
 
+#import "Firestore/Source/API/FIRFieldPath+Internal.h"
 #import "Firestore/Source/Util/FSTUsageValidation.h"
 
 #include "Firestore/core/src/firebase/firestore/model/field_path.h"
diff --git a/Firestore/Source/API/FIRFirestore.mm b/Firestore/Source/API/FIRFirestore.mm
index 45d67cf..fe461d6 100644
--- a/Firestore/Source/API/FIRFirestore.mm
+++ b/Firestore/Source/API/FIRFirestore.mm
@@ -16,14 +16,14 @@
 
 #import "FIRFirestore.h"
 
-#include <memory>
-#include <utility>
-
 #import <FirebaseCore/FIRApp.h>
 #import <FirebaseCore/FIRAppInternal.h>
 #import <FirebaseCore/FIRLogger.h>
 #import <FirebaseCore/FIROptions.h>
 
+#include <memory>
+#include <utility>
+
 #import "FIRFirestoreSettings.h"
 #import "Firestore/Source/API/FIRCollectionReference+Internal.h"
 #import "Firestore/Source/API/FIRDocumentReference+Internal.h"
@@ -31,7 +31,6 @@
 #import "Firestore/Source/API/FIRTransaction+Internal.h"
 #import "Firestore/Source/API/FIRWriteBatch+Internal.h"
 #import "Firestore/Source/API/FSTUserDataConverter.h"
-
 #import "Firestore/Source/Core/FSTFirestoreClient.h"
 #import "Firestore/Source/Util/FSTAssert.h"
 #import "Firestore/Source/Util/FSTDispatchQueue.h"
diff --git a/Firestore/Source/API/FIRFirestoreVersion.mm b/Firestore/Source/API/FIRFirestoreVersion.mm
index b1fe480..8ebe814 100644
--- a/Firestore/Source/API/FIRFirestoreVersion.mm
+++ b/Firestore/Source/API/FIRFirestoreVersion.mm
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#import "Firestore/Source/API/FIRFirestoreVersion.h"
+
 #ifndef FIRFirestore_VERSION
 #error "FIRFirestore_VERSION is not defined: add -DFIRFirestore_VERSION=... to the build invocation"
 #endif
diff --git a/Firestore/Source/Core/FSTFirestoreClient.mm b/Firestore/Source/Core/FSTFirestoreClient.mm
index c0d38ca..33d1903 100644
--- a/Firestore/Source/Core/FSTFirestoreClient.mm
+++ b/Firestore/Source/Core/FSTFirestoreClient.mm
@@ -16,7 +16,8 @@
 
 #import "Firestore/Source/Core/FSTFirestoreClient.h"
 
-#import <future>
+#include <future>  // NOLINT(build/c++11)
+#include <memory>
 
 #import "Firestore/Source/Core/FSTEventManager.h"
 #import "Firestore/Source/Core/FSTSyncEngine.h"
diff --git a/Firestore/Source/Core/FSTListenSequence.mm b/Firestore/Source/Core/FSTListenSequence.mm
index 6f50d35..6a9f9ae 100644
--- a/Firestore/Source/Core/FSTListenSequence.mm
+++ b/Firestore/Source/Core/FSTListenSequence.mm
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FSTListenSequence.h"
+#import "Firestore/Source/Core/FSTListenSequence.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Core/FSTQuery.mm b/Firestore/Source/Core/FSTQuery.mm
index 811ad03..8f49c26 100644
--- a/Firestore/Source/Core/FSTQuery.mm
+++ b/Firestore/Source/Core/FSTQuery.mm
@@ -17,6 +17,7 @@
 #import "Firestore/Source/Core/FSTQuery.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 
 #import "Firestore/Source/API/FIRFirestore+Internal.h"
diff --git a/Firestore/Source/Core/FSTSyncEngine.mm b/Firestore/Source/Core/FSTSyncEngine.mm
index 673991c..0a4fc94 100644
--- a/Firestore/Source/Core/FSTSyncEngine.mm
+++ b/Firestore/Source/Core/FSTSyncEngine.mm
@@ -16,11 +16,12 @@
 
 #import "Firestore/Source/Core/FSTSyncEngine.h"
 
+#import <GRPCClient/GRPCCall.h>
+
 #include <map>
+#include <set>
 #include <unordered_map>
 
-#import <GRPCClient/GRPCCall.h>
-
 #import "FIRFirestoreErrors.h"
 #import "Firestore/Source/Core/FSTQuery.h"
 #import "Firestore/Source/Core/FSTSnapshotVersion.h"
diff --git a/Firestore/Source/Core/FSTTransaction.mm b/Firestore/Source/Core/FSTTransaction.mm
index 9e67ed4..71c1f35 100644
--- a/Firestore/Source/Core/FSTTransaction.mm
+++ b/Firestore/Source/Core/FSTTransaction.mm
@@ -16,11 +16,11 @@
 
 #import "Firestore/Source/Core/FSTTransaction.h"
 
+#import <GRPCClient/GRPCCall.h>
+
 #include <map>
 #include <vector>
 
-#import <GRPCClient/GRPCCall.h>
-
 #import "FIRFirestoreErrors.h"
 #import "FIRSetOptions.h"
 #import "Firestore/Source/API/FSTUserDataConverter.h"
diff --git a/Firestore/Source/Local/FSTLevelDB.mm b/Firestore/Source/Local/FSTLevelDB.mm
index 4812228..fae85e7 100644
--- a/Firestore/Source/Local/FSTLevelDB.mm
+++ b/Firestore/Source/Local/FSTLevelDB.mm
@@ -16,7 +16,7 @@
 
 #import "Firestore/Source/Local/FSTLevelDB.h"
 
-#include <leveldb/db.h>
+#include <memory>
 
 #import "FIRFirestoreErrors.h"
 #import "Firestore/Source/Local/FSTLevelDBMigrations.h"
@@ -26,13 +26,14 @@
 #import "Firestore/Source/Remote/FSTSerializerBeta.h"
 #import "Firestore/Source/Util/FSTAssert.h"
 #import "Firestore/Source/Util/FSTLogger.h"
-#include "absl/memory/memory.h"
 
 #include "Firestore/core/src/firebase/firestore/auth/user.h"
 #include "Firestore/core/src/firebase/firestore/core/database_info.h"
 #include "Firestore/core/src/firebase/firestore/local/leveldb_transaction.h"
 #include "Firestore/core/src/firebase/firestore/model/database_id.h"
 #include "Firestore/core/src/firebase/firestore/util/string_apple.h"
+#include "absl/memory/memory.h"
+#include "leveldb/db.h"
 
 namespace util = firebase::firestore::util;
 using firebase::firestore::auth::User;
diff --git a/Firestore/Source/Local/FSTLevelDBKey.h b/Firestore/Source/Local/FSTLevelDBKey.h
index c7a64ee..5b234ec 100644
--- a/Firestore/Source/Local/FSTLevelDBKey.h
+++ b/Firestore/Source/Local/FSTLevelDBKey.h
@@ -16,6 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
+#include <string>
+
 #import "Firestore/Source/Core/FSTTypes.h"
 #import "Firestore/Source/Local/StringView.h"
 
diff --git a/Firestore/Source/Local/FSTLevelDBMigrations.mm b/Firestore/Source/Local/FSTLevelDBMigrations.mm
index cf06c9f..fefd0f7 100644
--- a/Firestore/Source/Local/FSTLevelDBMigrations.mm
+++ b/Firestore/Source/Local/FSTLevelDBMigrations.mm
@@ -14,16 +14,18 @@
  * limitations under the License.
  */
 
-#include "Firestore/Source/Local/FSTLevelDBMigrations.h"
+#import "Firestore/Source/Local/FSTLevelDBMigrations.h"
 
-#include <absl/strings/match.h>
-#include "leveldb/write_batch.h"
+#include <string>
 
 #import "Firestore/Protos/objc/firestore/local/Target.pbobjc.h"
 #import "Firestore/Source/Local/FSTLevelDBKey.h"
 #import "Firestore/Source/Local/FSTLevelDBQueryCache.h"
 #import "Firestore/Source/Util/FSTAssert.h"
 
+#include "absl/strings/match.h"
+#include "leveldb/write_batch.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 // Current version of the schema defined in this file.
diff --git a/Firestore/Source/Local/FSTLevelDBMutationQueue.mm b/Firestore/Source/Local/FSTLevelDBMutationQueue.mm
index 29acead..75c3cf6 100644
--- a/Firestore/Source/Local/FSTLevelDBMutationQueue.mm
+++ b/Firestore/Source/Local/FSTLevelDBMutationQueue.mm
@@ -16,13 +16,10 @@
 
 #import "Firestore/Source/Local/FSTLevelDBMutationQueue.h"
 
+#include <memory>
 #include <set>
 #include <string>
 
-#include <absl/strings/match.h>
-#include <leveldb/db.h>
-#include <leveldb/write_batch.h>
-
 #import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h"
 #import "Firestore/Source/Core/FSTQuery.h"
 #import "Firestore/Source/Local/FSTLevelDB.h"
@@ -38,6 +35,9 @@
 #include "Firestore/core/src/firebase/firestore/model/resource_path.h"
 #include "Firestore/core/src/firebase/firestore/util/string_apple.h"
 #include "Firestore/core/src/firebase/firestore/util/string_util.h"
+#include "absl/strings/match.h"
+#include "leveldb/db.h"
+#include "leveldb/write_batch.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTLevelDBQueryCache.mm b/Firestore/Source/Local/FSTLevelDBQueryCache.mm
index aa1ab41..5fde7d7 100644
--- a/Firestore/Source/Local/FSTLevelDBQueryCache.mm
+++ b/Firestore/Source/Local/FSTLevelDBQueryCache.mm
@@ -16,6 +16,9 @@
 
 #import "Firestore/Source/Local/FSTLevelDBQueryCache.h"
 
+#include <memory>
+#include <string>
+
 #import "Firestore/Protos/objc/firestore/local/Target.pbobjc.h"
 #import "Firestore/Source/Core/FSTQuery.h"
 #import "Firestore/Source/Local/FSTLevelDB.h"
@@ -23,9 +26,9 @@
 #import "Firestore/Source/Local/FSTLocalSerializer.h"
 #import "Firestore/Source/Local/FSTQueryData.h"
 #import "Firestore/Source/Util/FSTAssert.h"
-#include "absl/strings/match.h"
 
 #include "Firestore/core/src/firebase/firestore/model/document_key.h"
+#include "absl/strings/match.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm b/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm
index 703fc69..f655e3a 100644
--- a/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm
+++ b/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm
@@ -16,8 +16,6 @@
 
 #import "Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.h"
 
-#include <leveldb/db.h>
-#include <leveldb/write_batch.h>
 #include <string>
 
 #import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h"
@@ -29,8 +27,11 @@
 #import "Firestore/Source/Model/FSTDocumentDictionary.h"
 #import "Firestore/Source/Model/FSTDocumentSet.h"
 #import "Firestore/Source/Util/FSTAssert.h"
+
 #include "Firestore/core/src/firebase/firestore/local/leveldb_transaction.h"
 #include "Firestore/core/src/firebase/firestore/model/document_key.h"
+#include "leveldb/db.h"
+#include "leveldb/write_batch.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTLocalSerializer.mm b/Firestore/Source/Local/FSTLocalSerializer.mm
index 1d9455d..61e173a 100644
--- a/Firestore/Source/Local/FSTLocalSerializer.mm
+++ b/Firestore/Source/Local/FSTLocalSerializer.mm
@@ -16,7 +16,7 @@
 
 #import "Firestore/Source/Local/FSTLocalSerializer.h"
 
-#include <inttypes.h>
+#include <cinttypes>
 
 #import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h"
 #import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h"
diff --git a/Firestore/Source/Local/FSTLocalStore.mm b/Firestore/Source/Local/FSTLocalStore.mm
index 990e332..b5dfeec 100644
--- a/Firestore/Source/Local/FSTLocalStore.mm
+++ b/Firestore/Source/Local/FSTLocalStore.mm
@@ -16,6 +16,8 @@
 
 #import "Firestore/Source/Local/FSTLocalStore.h"
 
+#include <set>
+
 #import "FIRTimestamp.h"
 #import "Firestore/Source/Core/FSTListenSequence.h"
 #import "Firestore/Source/Core/FSTQuery.h"
diff --git a/Firestore/Source/Local/FSTNoOpGarbageCollector.mm b/Firestore/Source/Local/FSTNoOpGarbageCollector.mm
index 451cde2..421d283 100644
--- a/Firestore/Source/Local/FSTNoOpGarbageCollector.mm
+++ b/Firestore/Source/Local/FSTNoOpGarbageCollector.mm
@@ -16,6 +16,8 @@
 
 #import "Firestore/Source/Local/FSTNoOpGarbageCollector.h"
 
+#include <set>
+
 #include "Firestore/core/src/firebase/firestore/model/document_key.h"
 
 using firebase::firestore::model::DocumentKey;
diff --git a/Firestore/Source/Local/StringView.h b/Firestore/Source/Local/StringView.h
index 4e36cff..85afcaa 100644
--- a/Firestore/Source/Local/StringView.h
+++ b/Firestore/Source/Local/StringView.h
@@ -19,9 +19,10 @@
 
 #import <Foundation/Foundation.h>
 
-#include <leveldb/slice.h>
 #include <string>
+
 #include "absl/strings/string_view.h"
+#include "leveldb/slice.h"
 
 namespace Firestore {
 
@@ -43,7 +44,7 @@ class StringView {
   // Creates a StringView from an NSString. When StringView is an argument type
   // into which an NSString* is passed, the caller should ensure that the
   // NSString is retained.
-  StringView(NSString *str)
+  StringView(NSString *str)  // NOLINT(runtime/explicit)
       : data_([str UTF8String]), size_([str lengthOfBytesUsingEncoding:NSUTF8StringEncoding]) {
   }
 
@@ -54,20 +55,24 @@ class StringView {
 
   // Creates a StringView from the given char* pointer but computes the size
   // with strlen. This is really only suitable for passing C string literals.
-  StringView(const char *data) : data_(data), size_(strlen(data)) {
+  StringView(const char *data)  // NOLINT(runtime/explicit)
+      : data_(data), size_(strlen(data)) {
   }
 
   // Creates a StringView from the given slice.
-  StringView(leveldb::Slice slice) : data_(slice.data()), size_(slice.size()) {
+  StringView(leveldb::Slice slice)  // NOLINT(runtime/explicit)
+      : data_(slice.data()), size_(slice.size()) {
   }
 
   // Creates a StringView from the absl::string_view.
-  StringView(absl::string_view s) : data_(s.data()), size_(s.size()) {
+  StringView(absl::string_view s)  // NOLINT(runtime/explicit)
+      : data_(s.data()), size_(s.size()) {
   }
 
   // Creates a StringView from the given std::string. The string must be an
   // lvalue for the lifetime requirements to be satisfied.
-  StringView(const std::string &str) : data_(str.data()), size_(str.size()) {
+  StringView(const std::string &str)  // NOLINT(runtime/explicit)
+      : data_(str.data()), size_(str.size()) {
   }
 
   // Converts this StringView to a Slice, which is an equivalent (and more
diff --git a/Firestore/Source/Model/FSTDocumentKey.h b/Firestore/Source/Model/FSTDocumentKey.h
index dbcff2c..a403117 100644
--- a/Firestore/Source/Model/FSTDocumentKey.h
+++ b/Firestore/Source/Model/FSTDocumentKey.h
@@ -17,6 +17,7 @@
 #import <Foundation/Foundation.h>
 
 #include <initializer_list>
+#include <string>
 
 #include "Firestore/core/src/firebase/firestore/model/resource_path.h"
 
diff --git a/Firestore/Source/Model/FSTDocumentKey.mm b/Firestore/Source/Model/FSTDocumentKey.mm
index cbe9c89..679d7a6 100644
--- a/Firestore/Source/Model/FSTDocumentKey.mm
+++ b/Firestore/Source/Model/FSTDocumentKey.mm
@@ -16,6 +16,7 @@
 
 #import "Firestore/Source/Model/FSTDocumentKey.h"
 
+#include <string>
 #include <utility>
 
 #import "Firestore/Source/Core/FSTFirestoreClient.h"
diff --git a/Firestore/Source/Model/FSTFieldValue.mm b/Firestore/Source/Model/FSTFieldValue.mm
index 80bd11f..0d7c649 100644
--- a/Firestore/Source/Model/FSTFieldValue.mm
+++ b/Firestore/Source/Model/FSTFieldValue.mm
@@ -18,9 +18,6 @@
 
 #import "FIRTimestamp.h"
 
-#include "Firestore/core/src/firebase/firestore/util/comparison.h"
-#include "Firestore/core/src/firebase/firestore/util/string_apple.h"
-
 #import "Firestore/Source/API/FIRGeoPoint+Internal.h"
 #import "Firestore/Source/API/FIRSnapshotOptions+Internal.h"
 #import "Firestore/Source/Model/FSTDocumentKey.h"
@@ -29,6 +26,7 @@
 
 #include "Firestore/core/src/firebase/firestore/model/database_id.h"
 #include "Firestore/core/src/firebase/firestore/model/field_path.h"
+#include "Firestore/core/src/firebase/firestore/util/comparison.h"
 #include "Firestore/core/src/firebase/firestore/util/string_apple.h"
 
 namespace util = firebase::firestore::util;
diff --git a/Firestore/Source/Remote/FSTDatastore.mm b/Firestore/Source/Remote/FSTDatastore.mm
index 501237f..b34f78f 100644
--- a/Firestore/Source/Remote/FSTDatastore.mm
+++ b/Firestore/Source/Remote/FSTDatastore.mm
@@ -16,12 +16,12 @@
 
 #import "Firestore/Source/Remote/FSTDatastore.h"
 
-#include <memory>
-#include <vector>
-
 #import <GRPCClient/GRPCCall+OAuth2.h>
 #import <ProtoRPC/ProtoRPC.h>
 
+#include <memory>
+#include <vector>
+
 #import "FIRFirestoreErrors.h"
 #import "Firestore/Source/API/FIRFirestore+Internal.h"
 #import "Firestore/Source/API/FIRFirestoreVersion.h"
diff --git a/Firestore/Source/Remote/FSTRemoteStore.mm b/Firestore/Source/Remote/FSTRemoteStore.mm
index 8892ffb..39d285a 100644
--- a/Firestore/Source/Remote/FSTRemoteStore.mm
+++ b/Firestore/Source/Remote/FSTRemoteStore.mm
@@ -16,7 +16,7 @@
 
 #import "Firestore/Source/Remote/FSTRemoteStore.h"
 
-#include <inttypes.h>
+#include <cinttypes>
 
 #import "Firestore/Source/Core/FSTQuery.h"
 #import "Firestore/Source/Core/FSTSnapshotVersion.h"
diff --git a/Firestore/Source/Remote/FSTSerializerBeta.mm b/Firestore/Source/Remote/FSTSerializerBeta.mm
index 5433154..095d731 100644
--- a/Firestore/Source/Remote/FSTSerializerBeta.mm
+++ b/Firestore/Source/Remote/FSTSerializerBeta.mm
@@ -16,10 +16,12 @@
 
 #import "Firestore/Source/Remote/FSTSerializerBeta.h"
 
-#include <inttypes.h>
-
 #import <GRPCClient/GRPCCall.h>
-#import "FIRTimestamp.h"
+
+#include <cinttypes>
+#include <string>
+#include <utility>
+#include <vector>
 
 #import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h"
 #import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h"
@@ -31,6 +33,7 @@
 
 #import "FIRFirestoreErrors.h"
 #import "FIRGeoPoint.h"
+#import "FIRTimestamp.h"
 #import "Firestore/Source/Core/FSTQuery.h"
 #import "Firestore/Source/Core/FSTSnapshotVersion.h"
 #import "Firestore/Source/Local/FSTQueryData.h"
diff --git a/Firestore/Source/Remote/FSTStream.mm b/Firestore/Source/Remote/FSTStream.mm
index f65230b..a96feae 100644
--- a/Firestore/Source/Remote/FSTStream.mm
+++ b/Firestore/Source/Remote/FSTStream.mm
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#import "Firestore/Source/Remote/FSTDatastore.h"
-
 #import <GRPCClient/GRPCCall+OAuth2.h>
 #import <GRPCClient/GRPCCall.h>
 
@@ -24,6 +22,7 @@
 #import "Firestore/Source/Local/FSTQueryData.h"
 #import "Firestore/Source/Model/FSTMutation.h"
 #import "Firestore/Source/Remote/FSTBufferedWriter.h"
+#import "Firestore/Source/Remote/FSTDatastore.h"
 #import "Firestore/Source/Remote/FSTExponentialBackoff.h"
 #import "Firestore/Source/Remote/FSTSerializerBeta.h"
 #import "Firestore/Source/Remote/FSTStream.h"
diff --git a/Firestore/Source/Util/FSTAssert.h b/Firestore/Source/Util/FSTAssert.h
index 77bbb1d..610d306 100644
--- a/Firestore/Source/Util/FSTAssert.h
+++ b/Firestore/Source/Util/FSTAssert.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <Foundation/Foundation.h>
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Util/FSTUsageValidation.h b/Firestore/Source/Util/FSTUsageValidation.h
index a80dafa..05933ea 100644
--- a/Firestore/Source/Util/FSTUsageValidation.h
+++ b/Firestore/Source/Util/FSTUsageValidation.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <Foundation/Foundation.h>
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Util/FSTUsageValidation.mm b/Firestore/Source/Util/FSTUsageValidation.mm
index 82128f4..93abf87 100644
--- a/Firestore/Source/Util/FSTUsageValidation.mm
+++ b/Firestore/Source/Util/FSTUsageValidation.mm
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <Foundation/Foundation.h>
+#import "Firestore/Source/Util/FSTUsageValidation.h"
 
 NS_ASSUME_NONNULL_BEGIN