4 files changed, 4 insertions, 5 deletions
diff --git a/Firestore/Source/Remote/FSTRemoteStore.h b/Firestore/Source/Remote/FSTRemoteStore.h
index 6f4d565..09e1d32 100644
--- a/Firestore/Source/Remote/FSTRemoteStore.h
+++ b/Firestore/Source/Remote/FSTRemoteStore.h
@@ -22,7 +22,6 @@
 #include "Firestore/core/src/firebase/firestore/auth/user.h"
 
 @class FSTDatastore;
-@class FSTDocumentKey;
 @class FSTLocalStore;
 @class FSTMutationBatch;
 @class FSTMutationBatchResult;
@@ -59,7 +58,8 @@ NS_ASSUME_NONNULL_BEGIN
  *     will be an indication that the user is no longer authorized to see the data matching the
  *     target.
  */
-- (void)rejectListenWithTargetID:(FSTBoxedTargetID *)targetID error:(NSError *)error;
+- (void)rejectListenWithTargetID:(const firebase::firestore::model::TargetId)targetID
+                           error:(NSError *)error;
 
 /**
  * Applies the result of a successful write of a mutation batch to the sync engine, emitting
diff --git a/Firestore/Source/Remote/FSTRemoteStore.mm b/Firestore/Source/Remote/FSTRemoteStore.mm
index 28ee594..8892ffb 100644
--- a/Firestore/Source/Remote/FSTRemoteStore.mm
+++ b/Firestore/Source/Remote/FSTRemoteStore.mm
@@ -465,7 +465,7 @@ static const int kMaxPendingWrites = 10;
   for (FSTBoxedTargetID *targetID in change.targetIDs) {
     if (self.listenTargets[targetID]) {
       [self.listenTargets removeObjectForKey:targetID];
-      [self.syncEngine rejectListenWithTargetID:targetID error:change.cause];
+      [self.syncEngine rejectListenWithTargetID:[targetID intValue] error:change.cause];
     }
   }
 }
diff --git a/Firestore/Source/Remote/FSTStream.h b/Firestore/Source/Remote/FSTStream.h
index e48f1da..fba79d2 100644
--- a/Firestore/Source/Remote/FSTStream.h
+++ b/Firestore/Source/Remote/FSTStream.h
@@ -22,7 +22,6 @@
 #include "Firestore/core/src/firebase/firestore/auth/credentials_provider.h"
 #include "Firestore/core/src/firebase/firestore/core/database_info.h"
 
-@class FSTDocumentKey;
 @class FSTDispatchQueue;
 @class FSTMutation;
 @class FSTMutationResult;
diff --git a/Firestore/Source/Remote/FSTWatchChange.mm b/Firestore/Source/Remote/FSTWatchChange.mm
index 2c1a916..284e980 100644
--- a/Firestore/Source/Remote/FSTWatchChange.mm
+++ b/Firestore/Source/Remote/FSTWatchChange.mm
@@ -70,7 +70,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSUInteger)hash {
   NSUInteger hash = self.updatedTargetIDs.hash;
   hash = hash * 31 + self.removedTargetIDs.hash;
-  hash = hash * 31 + std::hash<std::string>{}(self.documentKey.ToString());
+  hash = hash * 31 + self.documentKey.Hash();
   hash = hash * 31 + self.document.hash;
   return hash;
 }