2 files changed, 8 insertions, 4 deletions
diff --git a/Firestore/Source/API/FIRCollectionReference.mm b/Firestore/Source/API/FIRCollectionReference.mm
index 7b487c6..92cccc6 100644
--- a/Firestore/Source/API/FIRCollectionReference.mm
+++ b/Firestore/Source/API/FIRCollectionReference.mm
@@ -16,7 +16,7 @@
 
 #import "FIRCollectionReference.h"
 
-#include "Firestore/src/core/util/autoid.h"
+#include "Firestore/core/src/firebase/firestore/util/autoid.h"
 
 #import "Firestore/Source/API/FIRDocumentReference+Internal.h"
 #import "Firestore/Source/API/FIRQuery+Internal.h"
@@ -27,6 +27,8 @@
 #import "Firestore/Source/Util/FSTAssert.h"
 #import "Firestore/Source/Util/FSTUsageValidation.h"
 
+using firebase::firestore::util::CreateAutoId;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface FIRCollectionReference ()
@@ -103,7 +105,7 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (FIRDocumentReference *)documentWithAutoID {
-  NSString *autoID = [NSString stringWithUTF8String:firestore::CreateAutoId().c_str()];
+  NSString *autoID = [NSString stringWithUTF8String:CreateAutoId().c_str()];
   FSTDocumentKey *key =
       [FSTDocumentKey keyWithPath:[self.query.path pathByAppendingSegment:autoID]];
   return [FIRDocumentReference referenceWithKey:key firestore:self.firestore];
diff --git a/Firestore/Source/Remote/FSTExponentialBackoff.mm b/Firestore/Source/Remote/FSTExponentialBackoff.mm
index ad27c25..8077357 100644
--- a/Firestore/Source/Remote/FSTExponentialBackoff.mm
+++ b/Firestore/Source/Remote/FSTExponentialBackoff.mm
@@ -18,11 +18,13 @@
 
 #include <random>
 
-#include "Firestore/src/support/secure_random.h"
+#include "Firestore/core/src/firebase/firestore/util/secure_random.h"
 
 #import "Firestore/Source/Util/FSTDispatchQueue.h"
 #import "Firestore/Source/Util/FSTLogger.h"
 
+using firebase::firestore::util::SecureRandom;
+
 @interface FSTExponentialBackoff ()
 - (instancetype)initWithDispatchQueue:(FSTDispatchQueue *)dispatchQueue
                          initialDelay:(NSTimeInterval)initialDelay
@@ -37,7 +39,7 @@
 @end
 
 @implementation FSTExponentialBackoff {
-  firestore::SecureRandom _secureRandom;
+  SecureRandom _secureRandom;
 }
 
 - (instancetype)initWithDispatchQueue:(FSTDispatchQueue *)dispatchQueue