diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj
index 59a3a15c8..337d6bb96 100644
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@@ -43,7 +43,7 @@
 		3461295B1FD1D74C00532771 /* Environment.m in Sources */ = {isa = PBXBuildFile; fileRef = 346129411FD1D74B00532771 /* Environment.m */; };
 		3461296F1FD1D74C00532771 /* Release.h in Headers */ = {isa = PBXBuildFile; fileRef = 346129561FD1D74B00532771 /* Release.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		346129701FD1D74C00532771 /* Release.m in Sources */ = {isa = PBXBuildFile; fileRef = 346129571FD1D74B00532771 /* Release.m */; };
-		346129711FD1D74C00532771 /* SignalKeyingStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 346129581FD1D74B00532771 /* SignalKeyingStorage.h */; };
+		346129711FD1D74C00532771 /* SignalKeyingStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 346129581FD1D74B00532771 /* SignalKeyingStorage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		346129721FD1D74C00532771 /* SignalKeyingStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 346129591FD1D74B00532771 /* SignalKeyingStorage.m */; };
 		346129731FD1E01700532771 /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 451DE9F11DC1585F00810E42 /* PromiseKit.framework */; };
 		346129741FD1E02D00532771 /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 451DE9F11DC1585F00810E42 /* PromiseKit.framework */; };
@@ -3098,7 +3098,11 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "DEBUG=1 $(inherited) SSK_BUILDING_FOR_TESTS=1";
+				"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = (
+					"DEBUG=1",
+					"$(inherited)",
+					"SSK_BUILDING_FOR_TESTS=1",
+				);
 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
diff --git a/Signal/src/Signal-Bridging-Header.h b/Signal/src/Signal-Bridging-Header.h
index ce1dcff18..3987ca017 100644
--- a/Signal/src/Signal-Bridging-Header.h
+++ b/Signal/src/Signal-Bridging-Header.h
@@ -7,8 +7,6 @@
 
 // Separate iOS Frameworks from other imports.
 #import "AppSettingsViewController.h"
-#import "AttachmentSharing.h"
-#import "ContactTableViewCell.h"
 #import "ConversationViewItem.h"
 #import "DateUtil.h"
 #import "DebugUIPage.h"
@@ -21,8 +19,6 @@
 #import "OWSAudioAttachmentPlayer.h"
 #import "OWSBezierPathView.h"
 #import "OWSCallNotificationsAdaptee.h"
-#import "OWSContactAvatarBuilder.h"
-#import "OWSContactsManager.h"
 #import "OWSDatabaseMigration.h"
 #import "OWSLogger.h"
 #import "OWSNavigationController.h"
@@ -35,12 +31,6 @@
 #import "PushManager.h"
 #import "RemoteVideoView.h"
 #import "SignalApp.h"
-#import "ThreadUtil.h"
-#import "UIColor+OWS.h"
-#import "UIFont+OWS.h"
-#import "UIImage+OWS.h"
-#import "UIUtil.h"
-#import "UIView+OWS.h"
 #import "UIViewController+Permissions.h"
 #import "ViewControllerUtils.h"
 #import <AxolotlKit/NSData+keyVersionByte.h>
@@ -52,10 +42,20 @@
 #import <JSQSystemSoundPlayer/JSQSystemSoundPlayer.h>
 #import <PureLayout/PureLayout.h>
 #import <Reachability/Reachability.h>
+#import <SignalMessaging/AttachmentSharing.h>
+#import <SignalMessaging/ContactTableViewCell.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSContactAvatarBuilder.h>
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/OWSFormat.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/Release.h>
+#import <SignalMessaging/ThreadUtil.h>
+#import <SignalMessaging/UIColor+OWS.h>
+#import <SignalMessaging/UIFont+OWS.h>
+#import <SignalMessaging/UIImage+OWS.h>
+#import <SignalMessaging/UIUtil.h>
+#import <SignalMessaging/UIView+OWS.h>
 #import <SignalMessaging/UIViewController+OWS.h>
 #import <SignalServiceKit/AppVersion.h>
 #import <SignalServiceKit/Asserts.h>
diff --git a/Signal/src/ViewControllers/AboutTableViewController.m b/Signal/src/ViewControllers/AboutTableViewController.m
index dcd1986d1..d2ebaf474 100644
--- a/Signal/src/ViewControllers/AboutTableViewController.m
+++ b/Signal/src/ViewControllers/AboutTableViewController.m
@@ -6,8 +6,8 @@
 #import "Environment.h"
 #import "OWSPreferences.h"
 #import "Signal-Swift.h"
-#import "UIUtil.h"
 #import "UIView+OWS.h"
+#import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/TSDatabaseView.h>
 #import <SignalServiceKit/TSStorageManager.h>
 
diff --git a/Signal/src/ViewControllers/AppSettingsViewController.m b/Signal/src/ViewControllers/AppSettingsViewController.m
index be92804ef..22ba6b9e5 100644
--- a/Signal/src/ViewControllers/AppSettingsViewController.m
+++ b/Signal/src/ViewControllers/AppSettingsViewController.m
@@ -15,7 +15,7 @@
 #import "ProfileViewController.h"
 #import "PushManager.h"
 #import "Signal-Swift.h"
-#import "UIUtil.h"
+#import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/TSAccountManager.h>
 #import <SignalServiceKit/TSSocketManager.h>
 
diff --git a/Signal/src/ViewControllers/AvatarViewHelper.m b/Signal/src/ViewControllers/AvatarViewHelper.m
index ea612f9c8..ce3d23f7f 100644
--- a/Signal/src/ViewControllers/AvatarViewHelper.m
+++ b/Signal/src/ViewControllers/AvatarViewHelper.m
@@ -6,8 +6,8 @@
 #import "OWSContactsManager.h"
 #import "OWSNavigationController.h"
 #import "Signal-Swift.h"
-#import "UIUtil.h"
 #import <MobileCoreServices/UTCoreTypes.h>
+#import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/PhoneNumber.h>
 #import <SignalServiceKit/TSGroupModel.h>
 #import <SignalServiceKit/TSGroupThread.h>
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m
index 4506926b4..e772b1ba5 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m
@@ -5,11 +5,11 @@
 #import "OWSContactOffersCell.h"
 #import "ConversationViewItem.h"
 #import "NSBundle+JSQMessages.h"
-#import "OWSContactOffersInteraction.h"
-#import "UIColor+OWS.h"
-#import "UIFont+OWS.h"
-#import "UIView+OWS.h"
 #import <JSQMessagesViewController/UIView+JSQMessages.h>
+#import <SignalMessaging/OWSContactOffersInteraction.h>
+#import <SignalMessaging/UIColor+OWS.h>
+#import <SignalMessaging/UIFont+OWS.h>
+#import <SignalMessaging/UIView+OWS.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSUnreadIndicatorCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSUnreadIndicatorCell.m
index e97d32e08..86eec804e 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSUnreadIndicatorCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSUnreadIndicatorCell.m
@@ -5,11 +5,11 @@
 #import "OWSUnreadIndicatorCell.h"
 #import "ConversationViewItem.h"
 #import "NSBundle+JSQMessages.h"
-#import "TSUnreadIndicatorInteraction.h"
-#import "UIColor+OWS.h"
-#import "UIFont+OWS.h"
-#import "UIView+OWS.h"
 #import <JSQMessagesViewController/UIView+JSQMessages.h>
+#import <SignalMessaging/TSUnreadIndicatorInteraction.h>
+#import <SignalMessaging/UIColor+OWS.h>
+#import <SignalMessaging/UIFont+OWS.h>
+#import <SignalMessaging/UIView+OWS.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 67a912785..c2c98e70a 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -25,7 +25,6 @@
 #import "NewGroupViewController.h"
 #import "OWSAudioAttachmentPlayer.h"
 #import "OWSContactOffersCell.h"
-#import "OWSContactOffersInteraction.h"
 #import "OWSContactsManager.h"
 #import "OWSConversationSettingsViewController.h"
 #import "OWSConversationSettingsViewDelegate.h"
@@ -45,10 +44,7 @@
 #import "TSIncomingMessage.h"
 #import "TSInfoMessage.h"
 #import "TSInvalidIdentityKeyErrorMessage.h"
-#import "TSUnreadIndicatorInteraction.h"
-#import "ThreadUtil.h"
 #import "UIFont+OWS.h"
-#import "UIUtil.h"
 #import "UIViewController+OWS.h"
 #import "UIViewController+Permissions.h"
 #import "ViewControllerUtils.h"
@@ -66,7 +62,11 @@
 #import <JSQSystemSoundPlayer/JSQSystemSoundPlayer.h>
 #import <MediaPlayer/MediaPlayer.h>
 #import <MobileCoreServices/UTCoreTypes.h>
+#import <SignalMessaging/OWSContactOffersInteraction.h>
 #import <SignalMessaging/OWSFormat.h>
+#import <SignalMessaging/TSUnreadIndicatorInteraction.h>
+#import <SignalMessaging/ThreadUtil.h>
+#import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/ContactsUpdater.h>
 #import <SignalServiceKit/MimeTypeUtil.h>
 #import <SignalServiceKit/NSDate+OWS.h>
diff --git a/Signal/src/ViewControllers/FingerprintViewController.m b/Signal/src/ViewControllers/FingerprintViewController.m
index 0b1c7c0a0..1bb23e379 100644
--- a/Signal/src/ViewControllers/FingerprintViewController.m
+++ b/Signal/src/ViewControllers/FingerprintViewController.m
@@ -10,8 +10,8 @@
 #import "Signal-Swift.h"
 #import "UIColor+OWS.h"
 #import "UIFont+OWS.h"
-#import "UIUtil.h"
 #import "UIView+OWS.h"
+#import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSError.h>
 #import <SignalServiceKit/OWSFingerprint.h>
diff --git a/Signal/src/ViewControllers/FingerprintViewScanController.m b/Signal/src/ViewControllers/FingerprintViewScanController.m
index 8be8b9259..d238f7318 100644
--- a/Signal/src/ViewControllers/FingerprintViewScanController.m
+++ b/Signal/src/ViewControllers/FingerprintViewScanController.m
@@ -9,9 +9,9 @@
 #import "Signal-Swift.h"
 #import "UIColor+OWS.h"
 #import "UIFont+OWS.h"
-#import "UIUtil.h"
 #import "UIView+OWS.h"
 #import "UIViewController+Permissions.h"
+#import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/OWSError.h>
 #import <SignalServiceKit/OWSFingerprint.h>
 #import <SignalServiceKit/OWSFingerprintBuilder.h>
diff --git a/Signal/src/ViewControllers/HomeViewController.m b/Signal/src/ViewControllers/HomeViewController.m
index 050cd1a65..52b375728 100644
--- a/Signal/src/ViewControllers/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeViewController.m
@@ -18,10 +18,10 @@
 #import "TSDatabaseView.h"
 #import "TSGroupThread.h"
 #import "TSStorageManager.h"
-#import "UIUtil.h"
 #import "ViewControllerUtils.h"
 #import <PromiseKit/AnyPromise.h>
 #import <SignalMessaging/OWSFormat.h>
+#import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSBlockingManager.h>
 #import <SignalServiceKit/OWSMessageSender.h>
diff --git a/Signal/src/ViewControllers/NewContactThreadViewController.m b/Signal/src/ViewControllers/NewContactThreadViewController.m
index 2dc9a219c..b3422d7c8 100644
--- a/Signal/src/ViewControllers/NewContactThreadViewController.m
+++ b/Signal/src/ViewControllers/NewContactThreadViewController.m
@@ -12,9 +12,9 @@
 #import "Signal-Swift.h"
 #import "SignalApp.h"
 #import "UIColor+OWS.h"
-#import "UIUtil.h"
 #import "UIView+OWS.h"
 #import <MessageUI/MessageUI.h>
+#import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/AppVersion.h>
 #import <SignalServiceKit/PhoneNumberUtil.h>
 #import <SignalServiceKit/SignalAccount.h>
diff --git a/Signal/src/ViewControllers/NewGroupViewController.m b/Signal/src/ViewControllers/NewGroupViewController.m
index 6ade586db..85281dd26 100644
--- a/Signal/src/ViewControllers/NewGroupViewController.m
+++ b/Signal/src/ViewControllers/NewGroupViewController.m
@@ -5,27 +5,27 @@
 #import "NewGroupViewController.h"
 #import "AddToGroupViewController.h"
 #import "AvatarViewHelper.h"
-#import "BlockListUIUtils.h"
-#import "ContactTableViewCell.h"
-#import "ContactsViewHelper.h"
-#import "Environment.h"
-#import "NSString+OWS.h"
-#import "OWSContactsManager.h"
 #import "OWSNavigationController.h"
-#import "OWSTableViewController.h"
 #import "Signal-Swift.h"
 #import "SignalApp.h"
-#import "SignalKeyingStorage.h"
-#import "TSOutgoingMessage.h"
-#import "UIUtil.h"
-#import "UIView+OWS.h"
-#import "UIViewController+OWS.h"
+#import <SignalMessaging/BlockListUIUtils.h>
+#import <SignalMessaging/ContactTableViewCell.h>
+#import <SignalMessaging/ContactsViewHelper.h>
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/NSString+OWS.h>
+#import <SignalMessaging/OWSContactsManager.h>
+#import <SignalMessaging/OWSTableViewController.h>
+#import <SignalMessaging/SignalKeyingStorage.h>
+#import <SignalMessaging/UIUtil.h>
+#import <SignalMessaging/UIView+OWS.h>
+#import <SignalMessaging/UIViewController+OWS.h>
 #import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSMessageSender.h>
 #import <SignalServiceKit/SecurityUtils.h>
 #import <SignalServiceKit/SignalAccount.h>
 #import <SignalServiceKit/TSGroupModel.h>
 #import <SignalServiceKit/TSGroupThread.h>
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/ViewControllers/OWSAddToContactViewController.m b/Signal/src/ViewControllers/OWSAddToContactViewController.m
index 3f6acc38d..70fb25053 100644
--- a/Signal/src/ViewControllers/OWSAddToContactViewController.m
+++ b/Signal/src/ViewControllers/OWSAddToContactViewController.m
@@ -3,10 +3,10 @@
 //
 
 #import "OWSAddToContactViewController.h"
-#import "ContactsViewHelper.h"
 #import "Environment.h"
 #import "OWSContactsManager.h"
-#import "UIUtil.h"
+#import <SignalMessaging/ContactsViewHelper.h>
+#import <SignalMessaging/UIUtil.h>
 
 @import ContactsUI;
 
diff --git a/Signal/src/ViewControllers/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsViewController.m
index 2be9265ec..afacae8f2 100644
--- a/Signal/src/ViewControllers/OWSConversationSettingsViewController.m
+++ b/Signal/src/ViewControllers/OWSConversationSettingsViewController.m
@@ -8,18 +8,18 @@
 #import "Environment.h"
 #import "FingerprintViewController.h"
 #import "OWSAddToContactViewController.h"
-#import "OWSAvatarBuilder.h"
 #import "OWSBlockingManager.h"
 #import "OWSContactsManager.h"
 #import "PhoneNumber.h"
 #import "ShowGroupMembersViewController.h"
 #import "Signal-Swift.h"
 #import "UIFont+OWS.h"
-#import "UIUtil.h"
 #import "UIView+OWS.h"
 #import "UpdateGroupViewController.h"
 #import <Curve25519Kit/Curve25519.h>
+#import <SignalMessaging/OWSAvatarBuilder.h>
 #import <SignalMessaging/OWSProfileManager.h>
+#import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
 #import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
diff --git a/Signal/src/ViewControllers/SelectRecipientViewController.m b/Signal/src/ViewControllers/SelectRecipientViewController.m
index 1b6a5dc80..dd241fbb1 100644
--- a/Signal/src/ViewControllers/SelectRecipientViewController.m
+++ b/Signal/src/ViewControllers/SelectRecipientViewController.m
@@ -3,18 +3,18 @@
 //
 
 #import "SelectRecipientViewController.h"
-#import "ContactTableViewCell.h"
-#import "ContactsViewHelper.h"
 #import "CountryCodeViewController.h"
 #import "Environment.h"
 #import "OWSContactsManager.h"
-#import "OWSTableViewController.h"
 #import "PhoneNumber.h"
 #import "Signal-Swift.h"
-#import "UIFont+OWS.h"
-#import "UIUtil.h"
-#import "UIView+OWS.h"
 #import "ViewControllerUtils.h"
+#import <SignalMessaging/ContactTableViewCell.h>
+#import <SignalMessaging/ContactsViewHelper.h>
+#import <SignalMessaging/OWSTableViewController.h>
+#import <SignalMessaging/UIFont+OWS.h>
+#import <SignalMessaging/UIUtil.h>
+#import <SignalMessaging/UIView+OWS.h>
 #import <SignalServiceKit/ContactsUpdater.h>
 #import <SignalServiceKit/OWSBlockingManager.h>
 #import <SignalServiceKit/PhoneNumberUtil.h>
diff --git a/Signal/src/ViewControllers/ShowGroupMembersViewController.m b/Signal/src/ViewControllers/ShowGroupMembersViewController.m
index f43b142f4..eac8aa94b 100644
--- a/Signal/src/ViewControllers/ShowGroupMembersViewController.m
+++ b/Signal/src/ViewControllers/ShowGroupMembersViewController.m
@@ -3,17 +3,17 @@
 //
 
 #import "ShowGroupMembersViewController.h"
-#import "BlockListUIUtils.h"
-#import "ContactTableViewCell.h"
-#import "ContactsViewHelper.h"
 #import "Environment.h"
 #import "HomeViewController.h"
-#import "OWSContactsManager.h"
 #import "Signal-Swift.h"
 #import "SignalApp.h"
-#import "UIUtil.h"
 #import "ViewControllerUtils.h"
 #import <AddressBookUI/AddressBookUI.h>
+#import <SignalMessaging/BlockListUIUtils.h>
+#import <SignalMessaging/ContactTableViewCell.h>
+#import <SignalMessaging/ContactsViewHelper.h>
+#import <SignalMessaging/OWSContactsManager.h>
+#import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/OWSBlockingManager.h>
 #import <SignalServiceKit/SignalAccount.h>
 #import <SignalServiceKit/TSGroupModel.h>
diff --git a/Signal/src/ViewControllers/SignalsNavigationController.m b/Signal/src/ViewControllers/SignalsNavigationController.m
index ea7c0bd65..3de711276 100644
--- a/Signal/src/ViewControllers/SignalsNavigationController.m
+++ b/Signal/src/ViewControllers/SignalsNavigationController.m
@@ -3,7 +3,7 @@
 //
 
 #import "SignalsNavigationController.h"
-#import "UIUtil.h"
+#import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/NSTimer+OWS.h>
 #import <SignalServiceKit/OWSSignalService.h>
 #import <SignalServiceKit/TSSocketManager.h>
diff --git a/Signal/src/ViewControllers/UpdateGroupViewController.m b/Signal/src/ViewControllers/UpdateGroupViewController.m
index 42dea3041..5d2f3f9c0 100644
--- a/Signal/src/ViewControllers/UpdateGroupViewController.m
+++ b/Signal/src/ViewControllers/UpdateGroupViewController.m
@@ -5,27 +5,27 @@
 #import "UpdateGroupViewController.h"
 #import "AddToGroupViewController.h"
 #import "AvatarViewHelper.h"
-#import "BlockListUIUtils.h"
-#import "ContactTableViewCell.h"
-#import "ContactsViewHelper.h"
-#import "Environment.h"
-#import "NSString+OWS.h"
-#import "OWSContactsManager.h"
 #import "OWSNavigationController.h"
-#import "OWSTableViewController.h"
 #import "Signal-Swift.h"
-#import "SignalKeyingStorage.h"
-#import "TSOutgoingMessage.h"
-#import "UIUtil.h"
-#import "UIView+OWS.h"
-#import "UIViewController+OWS.h"
 #import "ViewControllerUtils.h"
+#import <SignalMessaging/BlockListUIUtils.h>
+#import <SignalMessaging/ContactTableViewCell.h>
+#import <SignalMessaging/ContactsViewHelper.h>
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/NSString+OWS.h>
+#import <SignalMessaging/OWSContactsManager.h>
+#import <SignalMessaging/OWSTableViewController.h>
+#import <SignalMessaging/SignalKeyingStorage.h>
+#import <SignalMessaging/UIUtil.h>
+#import <SignalMessaging/UIView+OWS.h>
+#import <SignalMessaging/UIViewController+OWS.h>
 #import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSMessageSender.h>
 #import <SignalServiceKit/SecurityUtils.h>
 #import <SignalServiceKit/SignalAccount.h>
 #import <SignalServiceKit/TSGroupModel.h>
 #import <SignalServiceKit/TSGroupThread.h>
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/util/UIViewController+Permissions.m b/Signal/src/util/UIViewController+Permissions.m
index 0a14fe5e9..a9dc43888 100644
--- a/Signal/src/util/UIViewController+Permissions.m
+++ b/Signal/src/util/UIViewController+Permissions.m
@@ -3,9 +3,9 @@
 //
 
 #import "Signal-Swift.h"
-#import "UIUtil.h"
 #import "UIViewController+Permissions.h"
 #import <AVFoundation/AVFoundation.h>
+#import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/Threading.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalMessaging/SignalMessaging.h b/SignalMessaging/SignalMessaging.h
index 9d9900e8d..b049c7e2e 100644
--- a/SignalMessaging/SignalMessaging.h
+++ b/SignalMessaging/SignalMessaging.h
@@ -12,22 +12,33 @@ FOUNDATION_EXPORT const unsigned char SignalMessagingVersionString[];
 
 // The public headers of the framework
 #import <SignalMessaging/AppSetup.h>
+#import <SignalMessaging/AttachmentSharing.h>
+#import <SignalMessaging/BlockListUIUtils.h>
+#import <SignalMessaging/ContactTableViewCell.h>
+#import <SignalMessaging/ContactsViewHelper.h>
 #import <SignalMessaging/DebugLogger.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/FullImageViewController.h>
 #import <SignalMessaging/NSString+OWS.h>
 #import <SignalMessaging/OWSAudioAttachmentPlayer.h>
+#import <SignalMessaging/OWSContactAvatarBuilder.h>
+#import <SignalMessaging/OWSContactOffersInteraction.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/OWSDatabaseMigration.h>
 #import <SignalMessaging/OWSFormat.h>
 #import <SignalMessaging/OWSLogger.h>
 #import <SignalMessaging/OWSMath.h>
 #import <SignalMessaging/OWSProfileManager.h>
+#import <SignalMessaging/OWSTableViewController.h>
 #import <SignalMessaging/Release.h>
 #import <SignalMessaging/SharingThreadPickerViewController.h>
+#import <SignalMessaging/SignalKeyingStorage.h>
+#import <SignalMessaging/TSUnreadIndicatorInteraction.h>
+#import <SignalMessaging/ThreadUtil.h>
 #import <SignalMessaging/UIColor+OWS.h>
 #import <SignalMessaging/UIFont+OWS.h>
 #import <SignalMessaging/UIImage+OWS.h>
+#import <SignalMessaging/UIUtil.h>
 #import <SignalMessaging/UIView+OWS.h>
 #import <SignalMessaging/UIViewController+OWS.h>
 #import <SignalMessaging/VersionMigrations.h>
diff --git a/SignalMessaging/attachments/AttachmentSharing.m b/SignalMessaging/attachments/AttachmentSharing.m
index 7341e1a4b..2989ae3a0 100644
--- a/SignalMessaging/attachments/AttachmentSharing.m
+++ b/SignalMessaging/attachments/AttachmentSharing.m
@@ -3,9 +3,9 @@
 //
 
 #import "AttachmentSharing.h"
-#import "TSAttachmentStream.h"
 #import "UIUtil.h"
 #import <SignalServiceKit/AppContext.h>
+#import <SignalServiceKit/TSAttachmentStream.h>
 #import <SignalServiceKit/Threading.h>
 
 @implementation AttachmentSharing
diff --git a/SignalMessaging/environment/SignalKeyingStorage.h b/SignalMessaging/environment/SignalKeyingStorage.h
index a1eee50be..83e93f4ee 100644
--- a/SignalMessaging/environment/SignalKeyingStorage.h
+++ b/SignalMessaging/environment/SignalKeyingStorage.h
@@ -2,8 +2,6 @@
 //  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //
 
-#import "PhoneNumber.h"
-
 #define LOCAL_NUMBER_KEY @"Number"
 #define PASSWORD_COUNTER_KEY @"PasswordCounter"
 #define SIGNALING_MAC_KEY @"Signaling Mac Key"
diff --git a/SignalMessaging/environment/SignalKeyingStorage.m b/SignalMessaging/environment/SignalKeyingStorage.m
index b2c1ba590..67963c1d0 100644
--- a/SignalMessaging/environment/SignalKeyingStorage.m
+++ b/SignalMessaging/environment/SignalKeyingStorage.m
@@ -3,8 +3,8 @@
 //
 
 #import "SignalKeyingStorage.h"
-#import "SecurityUtils.h"
-#import "TSStorageManager.h"
+#import <SignalServiceKit/SecurityUtils.h>
+#import <SignalServiceKit/TSStorageManager.h>
 
 #define SignalKeyingCollection @"SignalKeyingCollection"