diff --git a/Parse/Internal/PFInternalUtils.h b/Parse/Internal/PFInternalUtils.h
index 9ef62ec50..eedf09e52 100644
--- a/Parse/Internal/PFInternalUtils.h
+++ b/Parse/Internal/PFInternalUtils.h
@@ -10,7 +10,6 @@
 #import <Foundation/Foundation.h>
 
 #import <Parse/PFConstants.h>
-#import "PFPushPrivate.h"
 
 #import "PFEncoder.h"
 
diff --git a/Parse/Internal/PFInternalUtils.m b/Parse/Internal/PFInternalUtils.m
index 48e8daefd..0b585bbca 100644
--- a/Parse/Internal/PFInternalUtils.m
+++ b/Parse/Internal/PFInternalUtils.m
@@ -34,7 +34,7 @@
 #import "PFMultiProcessFileLockController.h"
 #import "PFHash.h"
 
-#if PARSE_IOS_ONLY
+#if TARGET_OS_IOS
 #import "PFProduct.h"
 #endif
 
diff --git a/Parse/Internal/ParseManager.m b/Parse/Internal/ParseManager.m
index 167ddb4db..74756c39b 100644
--- a/Parse/Internal/ParseManager.m
+++ b/Parse/Internal/ParseManager.m
@@ -18,7 +18,6 @@
 #import "PFConfig.h"
 #import "PFCoreManager.h"
 #import "PFFileManager.h"
-#import "PFInstallation.h"
 #import "PFInstallationIdentifierStore.h"
 #import "PFKeyValueCache.h"
 #import "PFKeychainStore.h"
@@ -29,6 +28,10 @@
 #import "PFUser.h"
 #import "PFURLSessionCommandRunner.h"
 
+#if !TARGET_OS_WATCH
+#import "PFInstallation.h"
+#endif
+
 #if TARGET_OS_IOS
 #import "PFPurchaseController.h"
 #import "PFProduct.h"
diff --git a/Parse/Parse.h b/Parse/Parse.h
index 752dfbb5c..797da75ba 100644
--- a/Parse/Parse.h
+++ b/Parse/Parse.h
@@ -26,10 +26,15 @@
 #import <Parse/PFSubclassing.h>
 #import <Parse/PFUser.h>
 #import <Parse/PFUserAuthenticationDelegate.h>
-#import <Parse/PFInstallation.h>
 #import <Parse/PFNullability.h>
+
+#if !TARGET_OS_WATCH
+
+#import <Parse/PFInstallation.h>
 #import <Parse/PFPush.h>
 
+#endif
+
 #if TARGET_OS_IOS
 
 #import <Parse/PFNetworkActivityIndicatorManager.h>
diff --git a/Parse/Parse.m b/Parse/Parse.m
index 5d8933ca3..4bafd457c 100644
--- a/Parse/Parse.m
+++ b/Parse/Parse.m
@@ -23,12 +23,14 @@
 #import "PFApplication.h"
 #import "PFKeychainStore.h"
 #import "PFLogging.h"
-#import "PFInstallationPrivate.h"
 #import "PFObjectSubclassingController.h"
 
-#if PARSE_IOS_ONLY
+#if !TARGET_OS_WATCH
+#import "PFInstallationPrivate.h"
+#if TARGET_OS_IOS
 #import "PFProduct+Private.h"
 #endif
+#endif
 
 #import "PFCategoryLoader.h"