Project import generated by Copybara.

Googler · a-maurice · commit b22d521fed3b · 2020-01-23T10:32:26.000-08:00
PiperOrigin-RevId: 291195488
diff --git a/firestore/src/android/event_listener_android.cc b/firestore/src/android/event_listener_android.cc
@@ -11,7 +11,7 @@
 #include "firestore/src/android/query_snapshot_android.h"
 #include "firestore/src/android/util_android.h"
 #include "firestore/src/include/firebase/firestore/query_snapshot.h"
-#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/firestore_errors.h"
+#include "Firestore/core/include/firebase/firestore/firestore_errors.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/android/field_path_android.cc b/firestore/src/android/field_path_android.cc
@@ -6,7 +6,7 @@
 #if defined(__ANDROID__)
 #include "firestore/src/android/field_path_portable.h"
 #else  // defined(__ANDROID__)
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/field_path.h"
+#include "Firestore/core/src/firebase/firestore/model/field_path.h"
 #endif  // defined(__ANDROID__)
 
 namespace firebase {
diff --git a/firestore/src/android/field_value_android.h b/firestore/src/android/field_value_android.h
@@ -9,8 +9,8 @@
 #include "firestore/src/android/wrapper.h"
 #include "firestore/src/include/firebase/firestore/document_reference.h"
 #include "firestore/src/include/firebase/firestore/field_value.h"
-#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/geo_point.h"
-#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/timestamp.h"
+#include "Firestore/core/include/firebase/firestore/geo_point.h"
+#include "Firestore/core/include/firebase/firestore/timestamp.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/android/firebase_firestore_exception_android.h b/firestore/src/android/firebase_firestore_exception_android.h
@@ -5,7 +5,7 @@
 
 #include "app/src/include/firebase/app.h"
 #include "app/src/util_android.h"
-#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/firestore_errors.h"
+#include "Firestore/core/include/firebase/firestore/firestore_errors.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/android/firestore_android_test_main.cc b/firestore/src/android/firestore_android_test_main.cc
@@ -40,7 +40,7 @@
 // non-google3 code should include "gtest/gtest.h" instead.
 #include "testing/base/public/gunit.h"
 // For GTEST_FLAG(filter).
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/hard_assert.h"
+#include "Firestore/core/src/firebase/firestore/util/hard_assert.h"
 #include "third_party/googletest/googletest/src/gtest-internal-inl.h"
 
 #ifndef NATIVE_FUNCTION_NAME
diff --git a/firestore/src/android/geo_point_android.h b/firestore/src/android/geo_point_android.h
@@ -4,7 +4,7 @@
 #include <jni.h>
 
 #include "app/src/include/firebase/app.h"
-#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/geo_point.h"
+#include "Firestore/core/include/firebase/firestore/geo_point.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/android/geo_point_portable.cc b/firestore/src/android/geo_point_portable.cc
@@ -27,7 +27,7 @@
 #include <sstream>
 
 #include "app/src/assert.h"
-#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/geo_point.h"
+#include "Firestore/core/include/firebase/firestore/geo_point.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/android/lambda_event_listener.h b/firestore/src/android/lambda_event_listener.h
@@ -3,7 +3,7 @@
 
 #include "app/meta/move.h"
 #include "firestore/src/include/firebase/firestore/event_listener.h"
-#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/firestore_errors.h"
+#include "Firestore/core/include/firebase/firestore/firestore_errors.h"
 
 #if defined(FIREBASE_USE_STD_FUNCTION) || defined(DOXYGEN)
 #include <functional>
diff --git a/firestore/src/android/timestamp_android.h b/firestore/src/android/timestamp_android.h
@@ -4,7 +4,7 @@
 #include <jni.h>
 
 #include "app/src/include/firebase/app.h"
-#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/timestamp.h"
+#include "Firestore/core/include/firebase/firestore/timestamp.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/android/timestamp_portable.cc b/firestore/src/android/timestamp_portable.cc
@@ -25,7 +25,7 @@
 #include <ostream>
 #include <sstream>
 
-#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/timestamp.h"
+#include "Firestore/core/include/firebase/firestore/timestamp.h"
 
 #if defined(__APPLE__)
 #import <CoreFoundation/CoreFoundation.h>
diff --git a/firestore/src/common/field_path.cc b/firestore/src/common/field_path.cc
@@ -27,8 +27,8 @@
 #if defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
 #include "firestore/src/android/field_path_portable.h"
 #else
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/field_path.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/hashing.h"
+#include "Firestore/core/src/firebase/firestore/model/field_path.h"
+#include "Firestore/core/src/firebase/firestore/util/hashing.h"
 #endif  // defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
 
 namespace firebase {
diff --git a/firestore/src/common/settings.cc b/firestore/src/common/settings.cc
@@ -5,7 +5,7 @@
 #include "app/meta/move.h"
 
 #if !defined(__ANDROID__) && !defined(FIRESTORE_STUB_BUILD)
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/executor.h"
+#include "Firestore/core/src/firebase/firestore/util/executor.h"
 #endif
 
 namespace firebase {
diff --git a/firestore/src/common/settings_ios.mm b/firestore/src/common/settings_ios.mm
@@ -3,7 +3,7 @@
 #include <dispatch/dispatch.h>
 
 #include "absl/memory/memory.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/executor_libdispatch.h"
+#include "Firestore/core/src/firebase/firestore/util/executor_libdispatch.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/collection_reference_ios.cc b/firestore/src/ios/collection_reference_ios.cc
@@ -7,7 +7,7 @@
 #include "firestore/src/ios/document_reference_ios.h"
 #include "firestore/src/ios/field_value_ios.h"
 #include "firestore/src/ios/user_data_converter_ios.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/core/user_data.h"
+#include "Firestore/core/src/firebase/firestore/core/user_data.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/collection_reference_ios.h b/firestore/src/ios/collection_reference_ios.h
@@ -6,7 +6,7 @@
 #include "firestore/src/include/firebase/firestore/document_reference.h"
 #include "firestore/src/ios/promise_factory_ios.h"
 #include "firestore/src/ios/query_ios.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/collection_reference.h"
+#include "Firestore/core/src/firebase/firestore/api/collection_reference.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/converter_ios.h b/firestore/src/ios/converter_ios.h
@@ -16,15 +16,15 @@
 #include "firestore/src/ios/transaction_ios.h"
 #include "firestore/src/ios/write_batch_ios.h"
 #include "absl/memory/memory.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/collection_reference.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_change.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_reference.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_snapshot.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/listener_registration.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/query_core.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/query_snapshot.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/core/transaction.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/field_path.h"
+#include "Firestore/core/src/firebase/firestore/api/collection_reference.h"
+#include "Firestore/core/src/firebase/firestore/api/document_change.h"
+#include "Firestore/core/src/firebase/firestore/api/document_reference.h"
+#include "Firestore/core/src/firebase/firestore/api/document_snapshot.h"
+#include "Firestore/core/src/firebase/firestore/api/listener_registration.h"
+#include "Firestore/core/src/firebase/firestore/api/query_core.h"
+#include "Firestore/core/src/firebase/firestore/api/query_snapshot.h"
+#include "Firestore/core/src/firebase/firestore/core/transaction.h"
+#include "Firestore/core/src/firebase/firestore/model/field_path.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/credentials_provider_ios.cc b/firestore/src/ios/credentials_provider_ios.cc
@@ -3,8 +3,8 @@
 #include <utility>
 
 #include "firestore/src/ios/hard_assert_ios.h"
-#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/firestore_errors.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/status.h"
+#include "Firestore/core/include/firebase/firestore/firestore_errors.h"
+#include "Firestore/core/src/firebase/firestore/util/status.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/credentials_provider_ios.h b/firestore/src/ios/credentials_provider_ios.h
@@ -7,10 +7,10 @@
 
 #include "app/src/include/firebase/future.h"
 #include "auth/src/include/firebase/auth.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/auth/credentials_provider.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/auth/token.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/auth/user.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/statusor.h"
+#include "Firestore/core/src/firebase/firestore/auth/credentials_provider.h"
+#include "Firestore/core/src/firebase/firestore/auth/token.h"
+#include "Firestore/core/src/firebase/firestore/auth/user.h"
+#include "Firestore/core/src/firebase/firestore/util/statusor.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/document_change_ios.h b/firestore/src/ios/document_change_ios.h
@@ -5,7 +5,7 @@
 
 #include "firestore/src/include/firebase/firestore/document_change.h"
 #include "firestore/src/ios/firestore_ios.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_change.h"
+#include "Firestore/core/src/firebase/firestore/api/document_change.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/document_reference_ios.cc b/firestore/src/ios/document_reference_ios.cc
@@ -7,9 +7,9 @@
 #include "firestore/src/ios/set_options_ios.h"
 #include "firestore/src/ios/source_ios.h"
 #include "firestore/src/ios/util_ios.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/listener_registration.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/core/listen_options.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/core/user_data.h"
+#include "Firestore/core/src/firebase/firestore/api/listener_registration.h"
+#include "Firestore/core/src/firebase/firestore/core/listen_options.h"
+#include "Firestore/core/src/firebase/firestore/core/user_data.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/document_reference_ios.h b/firestore/src/ios/document_reference_ios.h
@@ -11,7 +11,7 @@
 #include "firestore/src/ios/firestore_ios.h"
 #include "firestore/src/ios/promise_factory_ios.h"
 #include "firestore/src/ios/user_data_converter_ios.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_reference.h"
+#include "Firestore/core/src/firebase/firestore/api/document_reference.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/document_snapshot_ios.cc b/firestore/src/ios/document_snapshot_ios.cc
@@ -6,11 +6,11 @@
 #include "firestore/src/ios/converter_ios.h"
 #include "firestore/src/ios/util_ios.h"
 #include "absl/memory/memory.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_reference.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/database_id.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/document_key.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/field_path.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/field_value_options.h"
+#include "Firestore/core/src/firebase/firestore/api/document_reference.h"
+#include "Firestore/core/src/firebase/firestore/model/database_id.h"
+#include "Firestore/core/src/firebase/firestore/model/document_key.h"
+#include "Firestore/core/src/firebase/firestore/model/field_path.h"
+#include "Firestore/core/src/firebase/firestore/model/field_value_options.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/document_snapshot_ios.h b/firestore/src/ios/document_snapshot_ios.h
@@ -11,8 +11,8 @@
 #include "firestore/src/include/firebase/firestore/map_field_value.h"
 #include "firestore/src/include/firebase/firestore/snapshot_metadata.h"
 #include "firestore/src/ios/firestore_ios.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_snapshot.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/field_value.h"
+#include "Firestore/core/src/firebase/firestore/api/document_snapshot.h"
+#include "Firestore/core/src/firebase/firestore/model/field_value.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/field_value_ios.h b/firestore/src/ios/field_value_ios.h
@@ -10,9 +10,9 @@
 #include "firestore/src/include/firebase/firestore/field_value.h"
 #include "firestore/src/ios/firestore_ios.h"
 #include "absl/types/variant.h"
-#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/geo_point.h"
-#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/timestamp.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/field_value.h"
+#include "Firestore/core/include/firebase/firestore/geo_point.h"
+#include "Firestore/core/include/firebase/firestore/timestamp.h"
+#include "Firestore/core/src/firebase/firestore/model/field_value.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/firebase_firestore_settings_ios.h b/firestore/src/ios/firebase_firestore_settings_ios.h
@@ -2,7 +2,7 @@
 #define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_IOS_FIREBASE_FIRESTORE_SETTINGS_IOS_H_
 
 #include "firestore/src/include/firebase/firestore/settings.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/settings.h"
+#include "Firestore/core/src/firebase/firestore/api/settings.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/firestore_ios.cc b/firestore/src/ios/firestore_ios.cc
@@ -13,14 +13,14 @@
 #include "firestore/src/ios/listener_ios.h"
 #include "absl/memory/memory.h"
 #include "absl/types/any.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_reference.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/query_core.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/database_id.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/resource_path.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/async_queue.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/executor.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/log.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/status.h"
+#include "Firestore/core/src/firebase/firestore/api/document_reference.h"
+#include "Firestore/core/src/firebase/firestore/api/query_core.h"
+#include "Firestore/core/src/firebase/firestore/model/database_id.h"
+#include "Firestore/core/src/firebase/firestore/model/resource_path.h"
+#include "Firestore/core/src/firebase/firestore/util/async_queue.h"
+#include "Firestore/core/src/firebase/firestore/util/executor.h"
+#include "Firestore/core/src/firebase/firestore/util/log.h"
+#include "Firestore/core/src/firebase/firestore/util/status.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/firestore_ios.h b/firestore/src/ios/firestore_ios.h
@@ -14,9 +14,9 @@
 #include "firestore/src/include/firebase/firestore/document_reference.h"
 #include "firestore/src/include/firebase/firestore/settings.h"
 #include "firestore/src/ios/promise_factory_ios.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/firestore.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/auth/credentials_provider.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/database_id.h"
+#include "Firestore/core/src/firebase/firestore/api/firestore.h"
+#include "Firestore/core/src/firebase/firestore/auth/credentials_provider.h"
+#include "Firestore/core/src/firebase/firestore/model/database_id.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/hard_assert_ios.h b/firestore/src/ios/hard_assert_ios.h
@@ -21,7 +21,7 @@
 #include <utility>
 
 #include "absl/base/optimization.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/exception.h"
+#include "Firestore/core/src/firebase/firestore/util/exception.h"
 
 // TODO(b/147444199): delete this file and use the one that comes from the
 // GitHub repo. This file provides simplified versions of `HARD_ASSERT` and
diff --git a/firestore/src/ios/listener_ios.h b/firestore/src/ios/listener_ios.h
@@ -7,9 +7,9 @@
 
 #include "firestore/src/ios/converter_ios.h"
 #include "firestore/src/ios/promise_ios.h"
-#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/firestore_errors.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/core/event_listener.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/statusor.h"
+#include "Firestore/core/include/firebase/firestore/firestore_errors.h"
+#include "Firestore/core/src/firebase/firestore/core/event_listener.h"
+#include "Firestore/core/src/firebase/firestore/util/statusor.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/listener_registration_ios.h b/firestore/src/ios/listener_registration_ios.h
@@ -4,7 +4,7 @@
 #include <memory>
 
 #include "firestore/src/ios/firestore_ios.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/listener_registration.h"
+#include "Firestore/core/src/firebase/firestore/api/listener_registration.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/promise_ios.h b/firestore/src/ios/promise_ios.h
@@ -7,9 +7,9 @@
 #include "app/src/reference_counted_future_impl.h"
 #include "firestore/src/ios/hard_assert_ios.h"
 #include "absl/meta/type_traits.h"
-#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/firestore_errors.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/status.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/statusor.h"
+#include "Firestore/core/include/firebase/firestore/firestore_errors.h"
+#include "Firestore/core/src/firebase/firestore/util/status.h"
+#include "Firestore/core/src/firebase/firestore/util/statusor.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/query_ios.cc b/firestore/src/ios/query_ios.cc
@@ -12,13 +12,13 @@
 #include "firestore/src/ios/set_options_ios.h"
 #include "firestore/src/ios/source_ios.h"
 #include "firestore/src/ios/util_ios.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/listener_registration.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/core/filter.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/core/listen_options.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/document_key.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/field_path.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/resource_path.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/exception.h"
+#include "Firestore/core/src/firebase/firestore/api/listener_registration.h"
+#include "Firestore/core/src/firebase/firestore/core/filter.h"
+#include "Firestore/core/src/firebase/firestore/core/listen_options.h"
+#include "Firestore/core/src/firebase/firestore/model/document_key.h"
+#include "Firestore/core/src/firebase/firestore/model/field_path.h"
+#include "Firestore/core/src/firebase/firestore/model/resource_path.h"
+#include "Firestore/core/src/firebase/firestore/util/exception.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/query_ios.h b/firestore/src/ios/query_ios.h
@@ -9,10 +9,10 @@
 #include "firestore/src/ios/firestore_ios.h"
 #include "firestore/src/ios/promise_factory_ios.h"
 #include "firestore/src/ios/user_data_converter_ios.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/query_core.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/core/bound.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/core/order_by.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/core/query.h"
+#include "Firestore/core/src/firebase/firestore/api/query_core.h"
+#include "Firestore/core/src/firebase/firestore/core/bound.h"
+#include "Firestore/core/src/firebase/firestore/core/order_by.h"
+#include "Firestore/core/src/firebase/firestore/core/query.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/query_snapshot_ios.h b/firestore/src/ios/query_snapshot_ios.h
@@ -12,7 +12,7 @@
 #include "firestore/src/include/firebase/firestore/snapshot_metadata.h"
 #include "firestore/src/ios/firestore_ios.h"
 #include "absl/types/optional.h"
-#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/query_snapshot.h"
+#include "Firestore/core/src/firebase/firestore/api/query_snapshot.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/firestore/src/ios/source_ios.h b/firestore/src/ios/source_ios.h
diff --git a/firestore/src/ios/transaction_ios.cc b/firestore/src/ios/transaction_ios.cc
diff --git a/firestore/src/ios/transaction_ios.h b/firestore/src/ios/transaction_ios.h
diff --git a/firestore/src/ios/user_data_converter_ios.cc b/firestore/src/ios/user_data_converter_ios.cc
diff --git a/firestore/src/ios/user_data_converter_ios.h b/firestore/src/ios/user_data_converter_ios.h
diff --git a/firestore/src/ios/util_ios.h b/firestore/src/ios/util_ios.h
diff --git a/firestore/src/ios/write_batch_ios.cc b/firestore/src/ios/write_batch_ios.cc
diff --git a/firestore/src/ios/write_batch_ios.h b/firestore/src/ios/write_batch_ios.h
diff --git a/firestore/src/stub/field_value_stub.h b/firestore/src/stub/field_value_stub.h
