diff --git a/SignalMessaging/SignalMessaging.h b/SignalMessaging/SignalMessaging.h
index 8c05114980..a6f0e07e29 100644
--- a/SignalMessaging/SignalMessaging.h
+++ b/SignalMessaging/SignalMessaging.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //
 
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
 
 //! Project version number for SignalMessaging.
 FOUNDATION_EXPORT double SignalMessagingVersionNumber;
@@ -24,4 +24,3 @@ FOUNDATION_EXPORT const unsigned char SignalMessagingVersionString[];
 #import <SignalMessaging/OWSSyncManager.h>
 #import <SignalMessaging/ThreadUtil.h>
 #import <SignalMessaging/VersionMigrations.h>
-#import <SignalServiceKit/OWSUserProfile.h>
diff --git a/SignalServiceKit/SignalServiceKit-Prefix.pch b/SignalServiceKit/SignalServiceKit-Prefix.pch
index 7db886d731..15bed1ea07 100644
--- a/SignalServiceKit/SignalServiceKit-Prefix.pch
+++ b/SignalServiceKit/SignalServiceKit-Prefix.pch
@@ -3,9 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //
 
-#ifndef signalservicekitprefix
-#define signalservicekitprefix
-
 #import <Availability.h>
 
 #ifdef __OBJC__
@@ -17,5 +14,3 @@
     #import <SignalServiceKit/OWSAnalytics.h>
     #import <SignalServiceKit/SSKAsserts.h>
 #endif
-
-#endif
diff --git a/SignalServiceKit/SignalServiceKit.h b/SignalServiceKit/SignalServiceKit.h
index 830a8a0e5d..9977d7c0df 100644
--- a/SignalServiceKit/SignalServiceKit.h
+++ b/SignalServiceKit/SignalServiceKit.h
@@ -5,30 +5,12 @@
 
 #import <Foundation/Foundation.h>
 
-#ifndef signalservicekitprefix
-#define signalservicekitprefix
-#import <Availability.h>
-
-#ifdef __OBJC__
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-#import <SignalCoreKit/NSObject+OWS.h>
-#import <SignalCoreKit/OWSAsserts.h>
-#import <SignalServiceKit/OWSAnalytics.h>
-#import <SignalServiceKit/SSKAsserts.h>
-
-#endif
-#endif
-
 //! Project version number for SignalServiceKit.
 FOUNDATION_EXPORT double SignalServiceKitVersionNumber;
 
 //! Project version string for SignalServiceKit.
 FOUNDATION_EXPORT const unsigned char SignalServiceKitVersionString[];
 
-// In this header, you should import all the public headers of your framework using statements like #import
-// <SignalServiceKit/PublicHeader.h>
 #import <SignalServiceKit/AppContext.h>
 #import <SignalServiceKit/AppReadiness.h>
 #import <SignalServiceKit/AxolotlExceptions.h>
diff --git a/SignalServiceKit/src/Util/AppContext.h b/SignalServiceKit/src/Util/AppContext.h
index 2b5a7594f9..c9316ae848 100644
--- a/SignalServiceKit/src/Util/AppContext.h
+++ b/SignalServiceKit/src/Util/AppContext.h
@@ -3,6 +3,8 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //
 
+#import <UIKit/UIKit.h>
+
 NS_ASSUME_NONNULL_BEGIN
 
 static inline BOOL OWSIsDebugBuild(void)