Use fully qualified imports in Firestore (#467)

This simplifies the import process back into google3 and allows us to add additional directories to the project without needing to update the project files for each directory we add. This shows up most clearly in the change to Firestore/Example/Firestore.xcodeproj/project.pbxproj: this no longer needs to list essentially every directory in the project as a header search path.

* Clang-format configuration for C++ files
* Add support C++-only sources to the podspec
* Podspec support for fully qualified imports
* xcodeproj changes for fully-qualified imports
* Use fully-qualified imports in Firestore sources

44 files changed, 199 insertions, 200 deletions

diff --git a/Firestore/Source/Local/FSTDocumentReference.m b/Firestore/Source/Local/FSTDocumentReference.m
index 7d9e3db..1631789 100644
--- a/Firestore/Source/Local/FSTDocumentReference.m
+++ b/Firestore/Source/Local/FSTDocumentReference.m
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "FSTDocumentReference.h"
+#import "Firestore/Source/Local/FSTDocumentReference.h"
 
-#import "FSTComparison.h"
-#import "FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Util/FSTComparison.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTEagerGarbageCollector.h b/Firestore/Source/Local/FSTEagerGarbageCollector.h
index f2f373c..40815b7 100644
--- a/Firestore/Source/Local/FSTEagerGarbageCollector.h
+++ b/Firestore/Source/Local/FSTEagerGarbageCollector.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTGarbageCollector.h"
+#import "Firestore/Source/Local/FSTGarbageCollector.h"
 
 @class FSTDocumentKey;
 
diff --git a/Firestore/Source/Local/FSTEagerGarbageCollector.m b/Firestore/Source/Local/FSTEagerGarbageCollector.m
index 971f368..77a577e 100644
--- a/Firestore/Source/Local/FSTEagerGarbageCollector.m
+++ b/Firestore/Source/Local/FSTEagerGarbageCollector.m
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#import "FSTEagerGarbageCollector.h"
+#import "Firestore/Source/Local/FSTEagerGarbageCollector.h"
 
-#import "FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTGarbageCollector.h b/Firestore/Source/Local/FSTGarbageCollector.h
index c999f66..ff5116b 100644
--- a/Firestore/Source/Local/FSTGarbageCollector.h
+++ b/Firestore/Source/Local/FSTGarbageCollector.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTTypes.h"
+#import "Firestore/Source/Core/FSTTypes.h"
 
 @class FSTDocumentKey;
 @class FSTDocumentReference;
diff --git a/Firestore/Source/Local/FSTLevelDB.h b/Firestore/Source/Local/FSTLevelDB.h
index a2c838d..762054b 100644
--- a/Firestore/Source/Local/FSTLevelDB.h
+++ b/Firestore/Source/Local/FSTLevelDB.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTPersistence.h"
+#import "Firestore/Source/Local/FSTPersistence.h"
 
 #ifdef __cplusplus
 #include <memory>
diff --git a/Firestore/Source/Local/FSTLevelDB.mm b/Firestore/Source/Local/FSTLevelDB.mm
index 81e1064..fb1c81a 100644
--- a/Firestore/Source/Local/FSTLevelDB.mm
+++ b/Firestore/Source/Local/FSTLevelDB.mm
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-#import "FSTLevelDB.h"
+#import "Firestore/Source/Local/FSTLevelDB.h"
 
 #include <leveldb/db.h>
 
 #import "FIRFirestoreErrors.h"
-#import "FSTAssert.h"
-#import "FSTDatabaseID.h"
-#import "FSTDatabaseInfo.h"
-#import "FSTLevelDBMutationQueue.h"
-#import "FSTLevelDBQueryCache.h"
-#import "FSTLevelDBRemoteDocumentCache.h"
-#import "FSTLogger.h"
-#import "FSTSerializerBeta.h"
-#import "FSTWriteGroup.h"
-#import "FSTWriteGroupTracker.h"
+#import "Firestore/Source/Core/FSTDatabaseInfo.h"
+#import "Firestore/Source/Local/FSTLevelDBMutationQueue.h"
+#import "Firestore/Source/Local/FSTLevelDBQueryCache.h"
+#import "Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.h"
+#import "Firestore/Source/Local/FSTWriteGroup.h"
+#import "Firestore/Source/Local/FSTWriteGroupTracker.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Remote/FSTSerializerBeta.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTLogger.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTLevelDBKey.h b/Firestore/Source/Local/FSTLevelDBKey.h
index bad7829..2e9b9b2 100644
--- a/Firestore/Source/Local/FSTLevelDBKey.h
+++ b/Firestore/Source/Local/FSTLevelDBKey.h
@@ -20,9 +20,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTTypes.h"
-
-#import "StringView.h"
+#import "Firestore/Source/Core/FSTTypes.h"
+#import "Firestore/Source/Local/StringView.h"
 
 @class FSTDocumentKey;
 @class FSTResourcePath;
diff --git a/Firestore/Source/Local/FSTLevelDBKey.mm b/Firestore/Source/Local/FSTLevelDBKey.mm
index 1c0af45..c6f51b9 100644
--- a/Firestore/Source/Local/FSTLevelDBKey.mm
+++ b/Firestore/Source/Local/FSTLevelDBKey.mm
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#import "FSTLevelDBKey.h"
+#import "Firestore/Source/Local/FSTLevelDBKey.h"
 
 #include <string>
 
-#import "FSTDocumentKey.h"
-#import "FSTPath.h"
-#include "ordered_code.h"
-#include "string_util.h"
+#include "Firestore/Port/ordered_code.h"
+#include "Firestore/Port/string_util.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTPath.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTLevelDBMutationQueue.h b/Firestore/Source/Local/FSTLevelDBMutationQueue.h
index c9b5166..dd2ed4f 100644
--- a/Firestore/Source/Local/FSTLevelDBMutationQueue.h
+++ b/Firestore/Source/Local/FSTLevelDBMutationQueue.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTMutationQueue.h"
+#import "Firestore/Source/Local/FSTMutationQueue.h"
 
 #ifdef __cplusplus
 #include <memory>
diff --git a/Firestore/Source/Local/FSTLevelDBMutationQueue.mm b/Firestore/Source/Local/FSTLevelDBMutationQueue.mm
index 689ea6e..56a22a1 100644
--- a/Firestore/Source/Local/FSTLevelDBMutationQueue.mm
+++ b/Firestore/Source/Local/FSTLevelDBMutationQueue.mm
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-#import "FSTLevelDBMutationQueue.h"
+#import "Firestore/Source/Local/FSTLevelDBMutationQueue.h"
 
 #include <leveldb/db.h>
 #include <leveldb/write_batch.h>
 #include <set>
 #include <string>
 
-#import "FSTAssert.h"
-#import "FSTDocumentKey.h"
-#import "FSTLevelDB.h"
-#import "FSTLevelDBKey.h"
-#import "FSTLocalSerializer.h"
-#import "FSTMutation.h"
-#import "FSTMutationBatch.h"
-#import "FSTPath.h"
-#import "FSTQuery.h"
-#import "FSTUser.h"
-#import "FSTWriteGroup.h"
-#import "Mutation.pbobjc.h"
-
-#include "ordered_code.h"
-#include "string_util.h"
+#import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h"
+#import "Firestore/Source/Auth/FSTUser.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Local/FSTLevelDB.h"
+#import "Firestore/Source/Local/FSTLevelDBKey.h"
+#import "Firestore/Source/Local/FSTLocalSerializer.h"
+#import "Firestore/Source/Local/FSTWriteGroup.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTMutationBatch.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+
+#include "Firestore/Port/ordered_code.h"
+#include "Firestore/Port/string_util.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTLevelDBQueryCache.h b/Firestore/Source/Local/FSTLevelDBQueryCache.h
index 3f24e6a..6d5cd60 100644
--- a/Firestore/Source/Local/FSTLevelDBQueryCache.h
+++ b/Firestore/Source/Local/FSTLevelDBQueryCache.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTQueryCache.h"
+#import "Firestore/Source/Local/FSTQueryCache.h"
 
 #ifdef __cplusplus
 #include <memory>
diff --git a/Firestore/Source/Local/FSTLevelDBQueryCache.mm b/Firestore/Source/Local/FSTLevelDBQueryCache.mm
index c79014d..13d15ee 100644
--- a/Firestore/Source/Local/FSTLevelDBQueryCache.mm
+++ b/Firestore/Source/Local/FSTLevelDBQueryCache.mm
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-#import "FSTLevelDBQueryCache.h"
+#import "Firestore/Source/Local/FSTLevelDBQueryCache.h"
 
 #include <leveldb/db.h>
 #include <leveldb/write_batch.h>
 #include <string>
 
-#import "FSTAssert.h"
-#import "FSTDocumentKey.h"
-#import "FSTLevelDBKey.h"
-#import "FSTLocalSerializer.h"
-#import "FSTQuery.h"
-#import "FSTQueryData.h"
-#import "FSTWriteGroup.h"
-#import "Target.pbobjc.h"
-
-#include "ordered_code.h"
-#include "string_util.h"
+#import "Firestore/Protos/objc/firestore/local/Target.pbobjc.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Local/FSTLevelDBKey.h"
+#import "Firestore/Source/Local/FSTLocalSerializer.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Local/FSTWriteGroup.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+
+#include "Firestore/Port/ordered_code.h"
+#include "Firestore/Port/string_util.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.h b/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.h
index f327813..1da3cca 100644
--- a/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.h
+++ b/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTRemoteDocumentCache.h"
+#import "Firestore/Source/Local/FSTRemoteDocumentCache.h"
 
 #ifdef __cplusplus
 #include <memory>
diff --git a/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm b/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm
index 67c654e..b2df67f 100644
--- a/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm
+++ b/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-#import "FSTLevelDBRemoteDocumentCache.h"
+#import "Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.h"
 
 #include <leveldb/db.h>
 #include <leveldb/write_batch.h>
 #include <string>
 
-#import "FSTAssert.h"
-#import "FSTDocument.h"
-#import "FSTDocumentDictionary.h"
-#import "FSTDocumentKey.h"
-#import "FSTDocumentSet.h"
-#import "FSTLevelDBKey.h"
-#import "FSTLocalSerializer.h"
-#import "FSTWriteGroup.h"
-#import "MaybeDocument.pbobjc.h"
-
-#include "ordered_code.h"
-#include "string_util.h"
+#import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h"
+#import "Firestore/Source/Local/FSTLevelDBKey.h"
+#import "Firestore/Source/Local/FSTLocalSerializer.h"
+#import "Firestore/Source/Local/FSTWriteGroup.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentDictionary.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTDocumentSet.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+
+#include "Firestore/Port/ordered_code.h"
+#include "Firestore/Port/string_util.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTLocalDocumentsView.h b/Firestore/Source/Local/FSTLocalDocumentsView.h
index 60571c2..46830e7 100644
--- a/Firestore/Source/Local/FSTLocalDocumentsView.h
+++ b/Firestore/Source/Local/FSTLocalDocumentsView.h
@@ -16,8 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTDocumentDictionary.h"
-#import "FSTDocumentKeySet.h"
+#import "Firestore/Source/Model/FSTDocumentDictionary.h"
+#import "Firestore/Source/Model/FSTDocumentKeySet.h"
 
 @class FSTDocumentKey;
 @class FSTMaybeDocument;
diff --git a/Firestore/Source/Local/FSTLocalDocumentsView.m b/Firestore/Source/Local/FSTLocalDocumentsView.m
index 0cad593..a6734c4 100644
--- a/Firestore/Source/Local/FSTLocalDocumentsView.m
+++ b/Firestore/Source/Local/FSTLocalDocumentsView.m
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-#import "FSTLocalDocumentsView.h"
-
-#import "FSTAssert.h"
-#import "FSTDocument.h"
-#import "FSTDocumentDictionary.h"
-#import "FSTDocumentKey.h"
-#import "FSTMutation.h"
-#import "FSTMutationBatch.h"
-#import "FSTMutationQueue.h"
-#import "FSTQuery.h"
-#import "FSTRemoteDocumentCache.h"
-#import "FSTSnapshotVersion.h"
+#import "Firestore/Source/Local/FSTLocalDocumentsView.h"
+
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Local/FSTMutationQueue.h"
+#import "Firestore/Source/Local/FSTRemoteDocumentCache.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentDictionary.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTMutationBatch.h"
+#import "Firestore/Source/Util/FSTAssert.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTLocalSerializer.m b/Firestore/Source/Local/FSTLocalSerializer.m
index 58b09af..c71e9dd 100644
--- a/Firestore/Source/Local/FSTLocalSerializer.m
+++ b/Firestore/Source/Local/FSTLocalSerializer.m
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-#import "FSTLocalSerializer.h"
-
-#import "Document.pbobjc.h"
-#import "FSTAssert.h"
-#import "FSTDocument.h"
-#import "FSTFieldValue.h"
-#import "FSTMutationBatch.h"
-#import "FSTQuery.h"
-#import "FSTQueryData.h"
-#import "FSTSerializerBeta.h"
-#import "MaybeDocument.pbobjc.h"
-#import "Mutation.pbobjc.h"
-#import "Target.pbobjc.h"
+#import "Firestore/Source/Local/FSTLocalSerializer.h"
+
+#import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h"
+#import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h"
+#import "Firestore/Protos/objc/firestore/local/Target.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTMutationBatch.h"
+#import "Firestore/Source/Remote/FSTSerializerBeta.h"
+#import "Firestore/Source/Util/FSTAssert.h"
 
 @interface FSTLocalSerializer ()
 
diff --git a/Firestore/Source/Local/FSTLocalStore.h b/Firestore/Source/Local/FSTLocalStore.h
index 0fdc08e..19803ac 100644
--- a/Firestore/Source/Local/FSTLocalStore.h
+++ b/Firestore/Source/Local/FSTLocalStore.h
@@ -16,10 +16,10 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTDocumentDictionary.h"
-#import "FSTDocumentKeySet.h"
-#import "FSTDocumentVersionDictionary.h"
-#import "FSTTypes.h"
+#import "Firestore/Source/Core/FSTTypes.h"
+#import "Firestore/Source/Model/FSTDocumentDictionary.h"
+#import "Firestore/Source/Model/FSTDocumentKeySet.h"
+#import "Firestore/Source/Model/FSTDocumentVersionDictionary.h"
 
 @class FSTLocalViewChanges;
 @class FSTLocalWriteResult;
diff --git a/Firestore/Source/Local/FSTLocalStore.m b/Firestore/Source/Local/FSTLocalStore.m
index d31712a..cde7104 100644
--- a/Firestore/Source/Local/FSTLocalStore.m
+++ b/Firestore/Source/Local/FSTLocalStore.m
@@ -14,32 +14,32 @@
  * limitations under the License.
  */
 
-#import "FSTLocalStore.h"
-
-#import "FSTAssert.h"
-#import "FSTDocument.h"
-#import "FSTDocumentDictionary.h"
-#import "FSTDocumentKey.h"
-#import "FSTGarbageCollector.h"
-#import "FSTLocalDocumentsView.h"
-#import "FSTLocalViewChanges.h"
-#import "FSTLocalWriteResult.h"
-#import "FSTLogger.h"
-#import "FSTMutation.h"
-#import "FSTMutationBatch.h"
-#import "FSTMutationQueue.h"
-#import "FSTPersistence.h"
-#import "FSTQuery.h"
-#import "FSTQueryCache.h"
-#import "FSTQueryData.h"
-#import "FSTReferenceSet.h"
-#import "FSTRemoteDocumentCache.h"
-#import "FSTRemoteDocumentChangeBuffer.h"
-#import "FSTRemoteEvent.h"
-#import "FSTSnapshotVersion.h"
-#import "FSTTargetIDGenerator.h"
-#import "FSTTimestamp.h"
-#import "FSTUser.h"
+#import "Firestore/Source/Local/FSTLocalStore.h"
+
+#import "Firestore/Source/Auth/FSTUser.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTTargetIDGenerator.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Local/FSTGarbageCollector.h"
+#import "Firestore/Source/Local/FSTLocalDocumentsView.h"
+#import "Firestore/Source/Local/FSTLocalViewChanges.h"
+#import "Firestore/Source/Local/FSTLocalWriteResult.h"
+#import "Firestore/Source/Local/FSTMutationQueue.h"
+#import "Firestore/Source/Local/FSTPersistence.h"
+#import "Firestore/Source/Local/FSTQueryCache.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Local/FSTReferenceSet.h"
+#import "Firestore/Source/Local/FSTRemoteDocumentCache.h"
+#import "Firestore/Source/Local/FSTRemoteDocumentChangeBuffer.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentDictionary.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTMutationBatch.h"
+#import "Firestore/Source/Remote/FSTRemoteEvent.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTLogger.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTLocalViewChanges.h b/Firestore/Source/Local/FSTLocalViewChanges.h
index d44959e..e391472 100644
--- a/Firestore/Source/Local/FSTLocalViewChanges.h
+++ b/Firestore/Source/Local/FSTLocalViewChanges.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTDocumentKeySet.h"
+#import "Firestore/Source/Model/FSTDocumentKeySet.h"
 
 @class FSTDocumentKey;
 @class FSTDocumentSet;
diff --git a/Firestore/Source/Local/FSTLocalViewChanges.m b/Firestore/Source/Local/FSTLocalViewChanges.m
index 05407b2..9a7f445 100644
--- a/Firestore/Source/Local/FSTLocalViewChanges.m
+++ b/Firestore/Source/Local/FSTLocalViewChanges.m
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "FSTLocalViewChanges.h"
+#import "Firestore/Source/Local/FSTLocalViewChanges.h"
 
-#import "FSTDocument.h"
-#import "FSTViewSnapshot.h"
+#import "Firestore/Source/Core/FSTViewSnapshot.h"
+#import "Firestore/Source/Model/FSTDocument.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTLocalWriteResult.h b/Firestore/Source/Local/FSTLocalWriteResult.h
index 4cd7d34..b6190aa 100644
--- a/Firestore/Source/Local/FSTLocalWriteResult.h
+++ b/Firestore/Source/Local/FSTLocalWriteResult.h
@@ -16,8 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTDocumentDictionary.h"
-#import "FSTTypes.h"
+#import "Firestore/Source/Core/FSTTypes.h"
+#import "Firestore/Source/Model/FSTDocumentDictionary.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTLocalWriteResult.m b/Firestore/Source/Local/FSTLocalWriteResult.m
index 7586686..c1753fe 100644
--- a/Firestore/Source/Local/FSTLocalWriteResult.m
+++ b/Firestore/Source/Local/FSTLocalWriteResult.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FSTLocalWriteResult.h"
+#import "Firestore/Source/Local/FSTLocalWriteResult.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTMemoryMutationQueue.h b/Firestore/Source/Local/FSTMemoryMutationQueue.h
index 6d917b7..f0786cc 100644
--- a/Firestore/Source/Local/FSTMemoryMutationQueue.h
+++ b/Firestore/Source/Local/FSTMemoryMutationQueue.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTMutationQueue.h"
+#import "Firestore/Source/Local/FSTMutationQueue.h"
 
 @protocol FSTGarbageCollector;
 
diff --git a/Firestore/Source/Local/FSTMemoryMutationQueue.m b/Firestore/Source/Local/FSTMemoryMutationQueue.m
index 6118ad6..b155264 100644
--- a/Firestore/Source/Local/FSTMemoryMutationQueue.m
+++ b/Firestore/Source/Local/FSTMemoryMutationQueue.m
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#import "FSTMemoryMutationQueue.h"
-
-#import "FSTAssert.h"
-#import "FSTComparison.h"
-#import "FSTDocumentKey.h"
-#import "FSTDocumentReference.h"
-#import "FSTMutation.h"
-#import "FSTMutationBatch.h"
-#import "FSTPath.h"
-#import "FSTQuery.h"
+#import "Firestore/Source/Local/FSTMemoryMutationQueue.h"
+
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Local/FSTDocumentReference.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTMutationBatch.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTComparison.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTMemoryPersistence.h b/Firestore/Source/Local/FSTMemoryPersistence.h
index c52962a..a1c4f13 100644
--- a/Firestore/Source/Local/FSTMemoryPersistence.h
+++ b/Firestore/Source/Local/FSTMemoryPersistence.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTPersistence.h"
+#import "Firestore/Source/Local/FSTPersistence.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTMemoryPersistence.m b/Firestore/Source/Local/FSTMemoryPersistence.m
index 9caf3e7..e301820 100644
--- a/Firestore/Source/Local/FSTMemoryPersistence.m
+++ b/Firestore/Source/Local/FSTMemoryPersistence.m
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#import "FSTMemoryPersistence.h"
-
-#import "FSTAssert.h"
-#import "FSTMemoryMutationQueue.h"
-#import "FSTMemoryQueryCache.h"
-#import "FSTMemoryRemoteDocumentCache.h"
-#import "FSTUser.h"
-#import "FSTWriteGroup.h"
-#import "FSTWriteGroupTracker.h"
+#import "Firestore/Source/Local/FSTMemoryPersistence.h"
+
+#import "Firestore/Source/Auth/FSTUser.h"
+#import "Firestore/Source/Local/FSTMemoryMutationQueue.h"
+#import "Firestore/Source/Local/FSTMemoryQueryCache.h"
+#import "Firestore/Source/Local/FSTMemoryRemoteDocumentCache.h"
+#import "Firestore/Source/Local/FSTWriteGroup.h"
+#import "Firestore/Source/Local/FSTWriteGroupTracker.h"
+#import "Firestore/Source/Util/FSTAssert.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTMemoryQueryCache.h b/Firestore/Source/Local/FSTMemoryQueryCache.h
index 58e0133..98f0277 100644
--- a/Firestore/Source/Local/FSTMemoryQueryCache.h
+++ b/Firestore/Source/Local/FSTMemoryQueryCache.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTQueryCache.h"
+#import "Firestore/Source/Local/FSTQueryCache.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTMemoryQueryCache.m b/Firestore/Source/Local/FSTMemoryQueryCache.m
index 1466caa..8d37bcb 100644
--- a/Firestore/Source/Local/FSTMemoryQueryCache.m
+++ b/Firestore/Source/Local/FSTMemoryQueryCache.m
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#import "FSTMemoryQueryCache.h"
+#import "Firestore/Source/Local/FSTMemoryQueryCache.h"
 
-#import "FSTQuery.h"
-#import "FSTQueryData.h"
-#import "FSTReferenceSet.h"
-#import "FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Local/FSTReferenceSet.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.h b/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.h
index aca0ca1..d718a04 100644
--- a/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.h
+++ b/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTRemoteDocumentCache.h"
+#import "Firestore/Source/Local/FSTRemoteDocumentCache.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.m b/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.m
index 175be43..9bbc047 100644
--- a/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.m
+++ b/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.m
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#import "FSTMemoryRemoteDocumentCache.h"
+#import "Firestore/Source/Local/FSTMemoryRemoteDocumentCache.h"
 
-#import "FSTDocument.h"
-#import "FSTDocumentDictionary.h"
-#import "FSTDocumentKey.h"
-#import "FSTPath.h"
-#import "FSTQuery.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentDictionary.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTPath.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTMutationQueue.h b/Firestore/Source/Local/FSTMutationQueue.h
index c822b96..a1eddd4 100644
--- a/Firestore/Source/Local/FSTMutationQueue.h
+++ b/Firestore/Source/Local/FSTMutationQueue.h
@@ -16,8 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTGarbageCollector.h"
-#import "FSTTypes.h"
+#import "Firestore/Source/Core/FSTTypes.h"
+#import "Firestore/Source/Local/FSTGarbageCollector.h"
 
 @class FSTDocumentKey;
 @class FSTMutation;
diff --git a/Firestore/Source/Local/FSTNoOpGarbageCollector.h b/Firestore/Source/Local/FSTNoOpGarbageCollector.h
index 8873a1b..c9b5862 100644
--- a/Firestore/Source/Local/FSTNoOpGarbageCollector.h
+++ b/Firestore/Source/Local/FSTNoOpGarbageCollector.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTGarbageCollector.h"
+#import "Firestore/Source/Local/FSTGarbageCollector.h"
 
 @class FSTDocumentKey;
 
diff --git a/Firestore/Source/Local/FSTNoOpGarbageCollector.m b/Firestore/Source/Local/FSTNoOpGarbageCollector.m
index 6e035ab..e03b599 100644
--- a/Firestore/Source/Local/FSTNoOpGarbageCollector.m
+++ b/Firestore/Source/Local/FSTNoOpGarbageCollector.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FSTNoOpGarbageCollector.h"
+#import "Firestore/Source/Local/FSTNoOpGarbageCollector.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTQueryCache.h b/Firestore/Source/Local/FSTQueryCache.h
index 87ee342..e0cf4c8 100644
--- a/Firestore/Source/Local/FSTQueryCache.h
+++ b/Firestore/Source/Local/FSTQueryCache.h
@@ -16,9 +16,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTDocumentKeySet.h"
-#import "FSTGarbageCollector.h"
-#import "FSTTypes.h"
+#import "Firestore/Source/Core/FSTTypes.h"
+#import "Firestore/Source/Local/FSTGarbageCollector.h"
+#import "Firestore/Source/Model/FSTDocumentKeySet.h"
 
 @class FSTDocumentKey;
 @class FSTDocumentSet;
diff --git a/Firestore/Source/Local/FSTQueryData.h b/Firestore/Source/Local/FSTQueryData.h
index 060fd78..048bfad 100644
--- a/Firestore/Source/Local/FSTQueryData.h
+++ b/Firestore/Source/Local/FSTQueryData.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTTypes.h"
+#import "Firestore/Source/Core/FSTTypes.h"
 
 @class FSTQuery;
 @class FSTSnapshotVersion;
diff --git a/Firestore/Source/Local/FSTQueryData.m b/Firestore/Source/Local/FSTQueryData.m
index 438f229..080f136 100644
--- a/Firestore/Source/Local/FSTQueryData.m
+++ b/Firestore/Source/Local/FSTQueryData.m
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "FSTQueryData.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
 
-#import "FSTQuery.h"
-#import "FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTReferenceSet.h b/Firestore/Source/Local/FSTReferenceSet.h
index e4f50a7..66285d9 100644
--- a/Firestore/Source/Local/FSTReferenceSet.h
+++ b/Firestore/Source/Local/FSTReferenceSet.h
@@ -16,9 +16,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTDocumentKeySet.h"
-#import "FSTGarbageCollector.h"
-#import "FSTTypes.h"
+#import "Firestore/Source/Core/FSTTypes.h"
+#import "Firestore/Source/Local/FSTGarbageCollector.h"
+#import "Firestore/Source/Model/FSTDocumentKeySet.h"
 
 @class FSTDocumentKey;
 
diff --git a/Firestore/Source/Local/FSTReferenceSet.m b/Firestore/Source/Local/FSTReferenceSet.m
index 2326ded..2acd64b 100644
--- a/Firestore/Source/Local/FSTReferenceSet.m
+++ b/Firestore/Source/Local/FSTReferenceSet.m
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "FSTReferenceSet.h"
+#import "Firestore/Source/Local/FSTReferenceSet.h"
 
-#import "FSTDocumentKey.h"
-#import "FSTDocumentReference.h"
+#import "Firestore/Source/Local/FSTDocumentReference.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTRemoteDocumentCache.h b/Firestore/Source/Local/FSTRemoteDocumentCache.h
index 8979455..fa42ce5 100644
--- a/Firestore/Source/Local/FSTRemoteDocumentCache.h
+++ b/Firestore/Source/Local/FSTRemoteDocumentCache.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FSTDocumentDictionary.h"
+#import "Firestore/Source/Model/FSTDocumentDictionary.h"
 
 @class FSTDocumentKey;
 @class FSTMaybeDocument;
diff --git a/Firestore/Source/Local/FSTRemoteDocumentChangeBuffer.m b/Firestore/Source/Local/FSTRemoteDocumentChangeBuffer.m
index 12a68ff..bca587a 100644
--- a/Firestore/Source/Local/FSTRemoteDocumentChangeBuffer.m
+++ b/Firestore/Source/Local/FSTRemoteDocumentChangeBuffer.m
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#import "FSTRemoteDocumentChangeBuffer.h"
+#import "Firestore/Source/Local/FSTRemoteDocumentChangeBuffer.h"
 
-#import "FSTAssert.h"
-#import "FSTDocument.h"
-#import "FSTDocumentKey.h"
-#import "FSTRemoteDocumentCache.h"
+#import "Firestore/Source/Local/FSTRemoteDocumentCache.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Util/FSTAssert.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/Local/FSTWriteGroup.h b/Firestore/Source/Local/FSTWriteGroup.h
index 21482af..5ea0387 100644
--- a/Firestore/Source/Local/FSTWriteGroup.h
+++ b/Firestore/Source/Local/FSTWriteGroup.h
@@ -19,7 +19,7 @@
 #ifdef __cplusplus
 #include <memory>
 
-#include "StringView.h"
+#include "Firestore/Source/Local/StringView.h"
 
 namespace leveldb {
 class DB;
diff --git a/Firestore/Source/Local/FSTWriteGroup.mm b/Firestore/Source/Local/FSTWriteGroup.mm
index 7ddf642..6859d53 100644
--- a/Firestore/Source/Local/FSTWriteGroup.mm
+++ b/Firestore/Source/Local/FSTWriteGroup.mm
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#import "FSTWriteGroup.h"
+#import "Firestore/Source/Local/FSTWriteGroup.h"
 
 #import <Protobuf/GPBProtocolBuffers.h>
 #include <leveldb/db.h>
 #include <leveldb/write_batch.h>
 
-#import "FSTAssert.h"
-#import "FSTLevelDBKey.h"
+#import "Firestore/Source/Local/FSTLevelDBKey.h"
+#import "Firestore/Source/Util/FSTAssert.h"
 
-#include "ordered_code.h"
+#include "Firestore/Port/ordered_code.h"
 
 using Firestore::OrderedCode;
 using Firestore::StringView;
diff --git a/Firestore/Source/Local/FSTWriteGroupTracker.m b/Firestore/Source/Local/FSTWriteGroupTracker.m
index 1c6c84d..7e3bf60 100644
--- a/Firestore/Source/Local/FSTWriteGroupTracker.m
+++ b/Firestore/Source/Local/FSTWriteGroupTracker.m
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "FSTWriteGroupTracker.h"
+#import "Firestore/Source/Local/FSTWriteGroupTracker.h"
 
-#import "FSTAssert.h"
-#import "FSTWriteGroup.h"
+#import "Firestore/Source/Local/FSTWriteGroup.h"
+#import "Firestore/Source/Util/FSTAssert.h"
 
 NS_ASSUME_NONNULL_BEGIN