diff --git a/Firestore/Swift/Source/Codable/DocumentReference+Codable.swift b/Firestore/Swift/Source/Codable/DocumentReference+Codable.swift
index 98bb15b8860..8320f1537e2 100644
--- a/Firestore/Swift/Source/Codable/DocumentReference+Codable.swift
+++ b/Firestore/Swift/Source/Codable/DocumentReference+Codable.swift
@@ -51,3 +51,4 @@ extension CodableDocumentReference {
 }
 
 extension FirebaseFirestore.DocumentReference: FirebaseFirestore.CodableDocumentReference {}
+extension FirebaseFirestore.DocumentReference: @retroactive Codable {}
diff --git a/Firestore/Swift/Source/Codable/GeoPoint+Codable.swift b/Firestore/Swift/Source/Codable/GeoPoint+Codable.swift
index a92e4baf160..c0a484ac824 100644
--- a/Firestore/Swift/Source/Codable/GeoPoint+Codable.swift
+++ b/Firestore/Swift/Source/Codable/GeoPoint+Codable.swift
@@ -64,3 +64,4 @@ extension CodableGeoPoint {
 
 /** Extends GeoPoint to conform to Codable. */
 extension FirebaseFirestore.GeoPoint: FirebaseFirestore.CodableGeoPoint {}
+extension FirebaseFirestore.GeoPoint: @retroactive Codable {}
diff --git a/Firestore/Swift/Source/Codable/Timestamp+Codable.swift b/Firestore/Swift/Source/Codable/Timestamp+Codable.swift
index 37d9b479733..c08888ab2b8 100644
--- a/Firestore/Swift/Source/Codable/Timestamp+Codable.swift
+++ b/Firestore/Swift/Source/Codable/Timestamp+Codable.swift
@@ -60,3 +60,4 @@ extension CodableTimestamp {
 
 /** Extends Timestamp to conform to Codable. */
 extension FirebaseCore.Timestamp: FirebaseFirestore.CodableTimestamp {}
+extension FirebaseCore.Timestamp: @retroactive Codable {}
diff --git a/Firestore/Swift/Source/Codable/VectorValue+Codable.swift b/Firestore/Swift/Source/Codable/VectorValue+Codable.swift
index 45f3176a74a..a6960f0febe 100644
--- a/Firestore/Swift/Source/Codable/VectorValue+Codable.swift
+++ b/Firestore/Swift/Source/Codable/VectorValue+Codable.swift
@@ -59,3 +59,4 @@ extension CodableVectorValue {
 
 /** Extends VectorValue to conform to Codable. */
 extension FirebaseFirestore.VectorValue: FirebaseFirestore.CodableVectorValue {}
+extension FirebaseFirestore.VectorValue: @retroactive Codable {}