diff --git a/Firebase/Storage/Private/FIRStorageDownloadTask_Private.h b/Firebase/Storage/Private/FIRStorageDownloadTask_Private.h
index 8b5a0d86d2f..f79638a7f32 100644
--- a/Firebase/Storage/Private/FIRStorageDownloadTask_Private.h
+++ b/Firebase/Storage/Private/FIRStorageDownloadTask_Private.h
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
+#import "FIRStorageDownloadTask.h"
+
+@class FIRStorageReference;
 @class GTMSessionFetcherService;
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Firebase/Storage/Private/FIRStorageObservableTask_Private.h b/Firebase/Storage/Private/FIRStorageObservableTask_Private.h
index 404ec9e328f..47aeb0a28db 100644
--- a/Firebase/Storage/Private/FIRStorageObservableTask_Private.h
+++ b/Firebase/Storage/Private/FIRStorageObservableTask_Private.h
@@ -14,10 +14,14 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
+#import "FIRStorageObservableTask.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
+@class FIRStorageReference;
 @class FIRStorageTaskSnapshot;
-
 @class GTMSessionFetcherService;
 
 @interface FIRStorageObservableTask ()
diff --git a/Firebase/Storage/Private/FIRStorageTaskSnapshot_Private.h b/Firebase/Storage/Private/FIRStorageTaskSnapshot_Private.h
index 1762a61e858..c302832782f 100644
--- a/Firebase/Storage/Private/FIRStorageTaskSnapshot_Private.h
+++ b/Firebase/Storage/Private/FIRStorageTaskSnapshot_Private.h
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
+#import "FIRStorageTaskSnapshot.h"
+
 #import "FIRStorageConstants_Private.h"
 
 NS_ASSUME_NONNULL_BEGIN