diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 61c0e0e96..5c24c0adf 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -7,27 +7,27 @@
 #import "AppUpdateNag.h"
 #import "CodeVerificationViewController.h"
 #import "DebugLogger.h"
-#import "Environment.h"
 #import "MainAppContext.h"
 #import "NotificationsManager.h"
-#import "OWSContactsManager.h"
-#import "OWSContactsSyncing.h"
 #import "OWSNavigationController.h"
-#import "OWSPreferences.h"
 #import "Pastelog.h"
 #import "PushManager.h"
 #import "RegistrationViewController.h"
-#import "Release.h"
 #import "Signal-Swift.h"
 #import "SignalApp.h"
 #import "SignalsNavigationController.h"
-#import "VersionMigrations.h"
 #import "ViewControllerUtils.h"
 #import <AxolotlKit/SessionCipher.h>
 #import <SignalMessaging/AppSetup.h>
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSContactsManager.h>
+#import <SignalMessaging/OWSContactsSyncing.h>
 #import <SignalMessaging/OWSMath.h>
+#import <SignalMessaging/OWSPreferences.h>
 #import <SignalMessaging/OWSProfileManager.h>
+#import <SignalMessaging/Release.h>
 #import <SignalMessaging/SignalMessaging.h>
+#import <SignalMessaging/VersionMigrations.h>
 #import <SignalServiceKit/NSUserDefaults+OWS.h>
 #import <SignalServiceKit/OWSBatchMessageProcessor.h>
 #import <SignalServiceKit/OWSDisappearingMessagesJob.h>
diff --git a/Signal/src/Signal-Bridging-Header.h b/Signal/src/Signal-Bridging-Header.h
index 398df3b68..a60b35755 100644
--- a/Signal/src/Signal-Bridging-Header.h
+++ b/Signal/src/Signal-Bridging-Header.h
@@ -13,16 +13,13 @@
 #import "FingerprintViewController.h"
 #import "FullImageViewController.h"
 #import "HomeViewController.h"
-#import "NSString+OWS.h"
 #import "NotificationsManager.h"
 #import "OWSAnyTouchGestureRecognizer.h"
 #import "OWSAudioAttachmentPlayer.h"
 #import "OWSBezierPathView.h"
 #import "OWSCallNotificationsAdaptee.h"
 #import "OWSDatabaseMigration.h"
-#import "OWSLogger.h"
 #import "OWSNavigationController.h"
-#import "OWSPreferences.h"
 #import "OWSProgressView.h"
 #import "OWSViewController.h"
 #import "OWSWebRTCDataProtos.pb.h"
@@ -45,9 +42,12 @@
 #import <SignalMessaging/AttachmentSharing.h>
 #import <SignalMessaging/ContactTableViewCell.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/NSString+OWS.h>
 #import <SignalMessaging/OWSContactAvatarBuilder.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/OWSFormat.h>
+#import <SignalMessaging/OWSLogger.h>
+#import <SignalMessaging/OWSPreferences.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/Release.h>
 #import <SignalMessaging/ThreadUtil.h>
diff --git a/Signal/src/ViewControllers/AboutTableViewController.m b/Signal/src/ViewControllers/AboutTableViewController.m
index b9e15015a..3e50c9c27 100644
--- a/Signal/src/ViewControllers/AboutTableViewController.m
+++ b/Signal/src/ViewControllers/AboutTableViewController.m
@@ -3,10 +3,10 @@
 //
 
 #import "AboutTableViewController.h"
-#import "Environment.h"
-#import "OWSPreferences.h"
 #import "Signal-Swift.h"
 #import "UIView+OWS.h"
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSPreferences.h>
 #import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/TSDatabaseView.h>
 #import <SignalServiceKit/TSStorageManager.h>
diff --git a/Signal/src/ViewControllers/AddToBlockListViewController.m b/Signal/src/ViewControllers/AddToBlockListViewController.m
index db100400e..f0469b474 100644
--- a/Signal/src/ViewControllers/AddToBlockListViewController.m
+++ b/Signal/src/ViewControllers/AddToBlockListViewController.m
@@ -5,7 +5,7 @@
 #import "AddToBlockListViewController.h"
 #import "BlockListUIUtils.h"
 #import "ContactsViewHelper.h"
-#import "OWSContactsManager.h"
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalServiceKit/SignalAccount.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Signal/src/ViewControllers/AddToGroupViewController.m b/Signal/src/ViewControllers/AddToGroupViewController.m
index 8dd4fb3bf..6c164ab1c 100644
--- a/Signal/src/ViewControllers/AddToGroupViewController.m
+++ b/Signal/src/ViewControllers/AddToGroupViewController.m
@@ -5,8 +5,8 @@
 #import "AddToGroupViewController.h"
 #import "BlockListUIUtils.h"
 #import "ContactsViewHelper.h"
-#import "OWSContactsManager.h"
 #import "Signal-Swift.h"
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalServiceKit/SignalAccount.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Signal/src/ViewControllers/AdvancedSettingsTableViewController.m b/Signal/src/ViewControllers/AdvancedSettingsTableViewController.m
index 069e6dad3..7bc0553e3 100644
--- a/Signal/src/ViewControllers/AdvancedSettingsTableViewController.m
+++ b/Signal/src/ViewControllers/AdvancedSettingsTableViewController.m
@@ -5,15 +5,15 @@
 #import "AdvancedSettingsTableViewController.h"
 #import "DebugLogger.h"
 #import "DomainFrontingCountryViewController.h"
-#import "Environment.h"
 #import "OWSCountryMetadata.h"
-#import "OWSPreferences.h"
 #import "Pastelog.h"
 #import "PushManager.h"
 #import "Signal-Swift.h"
 #import "TSAccountManager.h"
 #import <PromiseKit/AnyPromise.h>
 #import <Reachability/Reachability.h>
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSPreferences.h>
 #import <SignalServiceKit/OWSSignalService.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Signal/src/ViewControllers/AppSettingsViewController.m b/Signal/src/ViewControllers/AppSettingsViewController.m
index 6fcca5912..1a93ab87a 100644
--- a/Signal/src/ViewControllers/AppSettingsViewController.m
+++ b/Signal/src/ViewControllers/AppSettingsViewController.m
@@ -6,15 +6,15 @@
 #import "AboutTableViewController.h"
 #import "AdvancedSettingsTableViewController.h"
 #import "DebugUITableViewController.h"
-#import "Environment.h"
 #import "NotificationSettingsViewController.h"
-#import "OWSContactsManager.h"
 #import "OWSLinkedDevicesTableViewController.h"
 #import "OWSNavigationController.h"
 #import "PrivacySettingsTableViewController.h"
 #import "ProfileViewController.h"
 #import "PushManager.h"
 #import "Signal-Swift.h"
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSContactsManager.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 be2bb59cb..dbb11e00c 100644
--- a/Signal/src/ViewControllers/AvatarViewHelper.m
+++ b/Signal/src/ViewControllers/AvatarViewHelper.m
@@ -3,10 +3,10 @@
 //
 
 #import "AvatarViewHelper.h"
-#import "OWSContactsManager.h"
 #import "OWSNavigationController.h"
 #import "Signal-Swift.h"
 #import <MobileCoreServices/UTCoreTypes.h>
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/PhoneNumber.h>
 #import <SignalServiceKit/TSGroupModel.h>
diff --git a/Signal/src/ViewControllers/BlockListViewController.m b/Signal/src/ViewControllers/BlockListViewController.m
index 26275737d..b745ead90 100644
--- a/Signal/src/ViewControllers/BlockListViewController.m
+++ b/Signal/src/ViewControllers/BlockListViewController.m
@@ -7,12 +7,12 @@
 #import "BlockListUIUtils.h"
 #import "ContactTableViewCell.h"
 #import "ContactsViewHelper.h"
-#import "Environment.h"
-#import "OWSContactsManager.h"
 #import "OWSTableViewController.h"
 #import "PhoneNumber.h"
 #import "UIFont+OWS.h"
 #import "UIView+OWS.h"
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalServiceKit/OWSBlockingManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m
index af4e20804..65c8a9ae1 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m
@@ -3,13 +3,13 @@
 //
 
 #import "OWSGenericAttachmentView.h"
-#import "NSString+OWS.h"
 #import "OWSBezierPathView.h"
 #import "UIColor+JSQMessages.h"
 #import "UIColor+OWS.h"
 #import "UIFont+OWS.h"
 #import "UIView+OWS.h"
 #import "ViewControllerUtils.h"
+#import <SignalMessaging/NSString+OWS.h>
 #import <SignalMessaging/OWSFormat.h>
 #import <SignalServiceKit/MimeTypeUtil.h>
 #import <SignalServiceKit/TSAttachmentStream.h>
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m
index f0617644c..cdcf5c455 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m
@@ -4,13 +4,13 @@
 
 #import "OWSSystemMessageCell.h"
 #import "ConversationViewItem.h"
-#import "Environment.h"
 #import "NSBundle+JSQMessages.h"
-#import "OWSContactsManager.h"
 #import "UIColor+OWS.h"
 #import "UIFont+OWS.h"
 #import "UIView+OWS.h"
 #import <JSQMessagesViewController/UIView+JSQMessages.h>
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalServiceKit/OWSVerificationStateChangeMessage.h>
 #import <SignalServiceKit/TSCall.h>
 #import <SignalServiceKit/TSErrorMessage.h>
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
index 2f92c56ed..e7e793677 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
@@ -3,8 +3,8 @@
 //
 
 #import "ConversationInputTextView.h"
-#import "NSString+OWS.h"
 #import "Signal-Swift.h"
+#import <SignalMessaging/NSString+OWS.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 1c2cf567b..12e26c61a 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -17,15 +17,12 @@
 #import "ConversationViewLayout.h"
 #import "DateUtil.h"
 #import "DebugUITableViewController.h"
-#import "Environment.h"
 #import "FingerprintViewController.h"
 #import "FullImageViewController.h"
 #import "NSAttributedString+OWS.h"
-#import "NSString+OWS.h"
 #import "NewGroupViewController.h"
 #import "OWSAudioAttachmentPlayer.h"
 #import "OWSContactOffersCell.h"
-#import "OWSContactsManager.h"
 #import "OWSConversationSettingsViewController.h"
 #import "OWSConversationSettingsViewDelegate.h"
 #import "OWSDisappearingMessagesJob.h"
@@ -63,7 +60,10 @@
 #import <MediaPlayer/MediaPlayer.h>
 #import <MobileCoreServices/UTCoreTypes.h>
 #import <PromiseKit/AnyPromise.h>
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/NSString+OWS.h>
 #import <SignalMessaging/OWSContactOffersInteraction.h>
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/OWSFormat.h>
 #import <SignalMessaging/OWSUserProfile.h>
 #import <SignalMessaging/TSUnreadIndicatorInteraction.h>
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
index f76371323..bf95f5f7a 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
@@ -3,7 +3,6 @@
 //
 
 #import "ConversationViewItem.h"
-#import "NSString+OWS.h"
 #import "OWSAudioMessageView.h"
 #import "OWSContactOffersCell.h"
 #import "OWSMessageCell.h"
@@ -11,6 +10,7 @@
 #import "OWSUnreadIndicatorCell.h"
 #import "Signal-Swift.h"
 #import <AssetsLibrary/AssetsLibrary.h>
+#import <SignalMessaging/NSString+OWS.h>
 #import <SignalServiceKit/TSInteraction.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Signal/src/ViewControllers/CountryCodeViewController.m b/Signal/src/ViewControllers/CountryCodeViewController.m
index 0acad149c..7f3d38008 100644
--- a/Signal/src/ViewControllers/CountryCodeViewController.m
+++ b/Signal/src/ViewControllers/CountryCodeViewController.m
@@ -3,11 +3,11 @@
 //
 
 #import "CountryCodeViewController.h"
-#import "NSString+OWS.h"
 #import "PhoneNumberUtil.h"
 #import "UIColor+OWS.h"
 #import "UIFont+OWS.h"
 #import "UIView+OWS.h"
+#import <SignalMessaging/NSString+OWS.h>
 
 @interface CountryCodeViewController () <OWSTableViewControllerDelegate, UISearchBarDelegate>
 
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
index 6709fd7f4..1d27f52f9 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
@@ -4,13 +4,13 @@
 
 #import "DebugUIMessages.h"
 #import "DebugUIContacts.h"
-#import "Environment.h"
 #import "OWSTableViewController.h"
 #import "Signal-Swift.h"
 #import "ThreadUtil.h"
 #import <AFNetworking/AFNetworking.h>
 #import <AxolotlKit/PreKeyBundle.h>
 #import <Curve25519Kit/Randomness.h>
+#import <SignalMessaging/Environment.h>
 #import <SignalServiceKit/OWSBatchMessageProcessor.h>
 #import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
 #import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
index 29f0a0009..beaec9be2 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
@@ -3,7 +3,6 @@
 //
 
 #import "DebugUIMisc.h"
-#import "Environment.h"
 #import "OWSCountryMetadata.h"
 #import "OWSTableViewController.h"
 #import "RegistrationViewController.h"
@@ -11,6 +10,7 @@
 #import "ThreadUtil.h"
 #import <AFNetworking/AFNetworking.h>
 #import <AxolotlKit/PreKeyBundle.h>
+#import <SignalMessaging/Environment.h>
 #import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
 #import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
 #import <SignalServiceKit/OWSVerificationStateChangeMessage.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIStress.m b/Signal/src/ViewControllers/DebugUI/DebugUIStress.m
index 3f9903dcf..df510bc74 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIStress.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIStress.m
@@ -3,11 +3,11 @@
 //
 
 #import "DebugUIStress.h"
-#import "Environment.h"
 #import "OWSMessageSender.h"
 #import "OWSTableViewController.h"
 #import "SignalApp.h"
 #import "ThreadUtil.h"
+#import <SignalMessaging/Environment.h>
 #import <SignalServiceKit/Cryptography.h>
 #import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSDynamicOutgoingMessage.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
index f5d3918f4..51cb890db 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
@@ -4,13 +4,13 @@
 
 #import "DebugUISyncMessages.h"
 #import "DebugUIContacts.h"
-#import "Environment.h"
 #import "OWSTableViewController.h"
 #import "Signal-Swift.h"
 #import "ThreadUtil.h"
 #import <AFNetworking/AFNetworking.h>
 #import <AxolotlKit/PreKeyBundle.h>
 #import <Curve25519Kit/Randomness.h>
+#import <SignalMessaging/Environment.h>
 #import <SignalServiceKit/OWSBatchMessageProcessor.h>
 #import <SignalServiceKit/OWSBlockingManager.h>
 #import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
diff --git a/Signal/src/ViewControllers/FingerprintViewController.m b/Signal/src/ViewControllers/FingerprintViewController.m
index de3c58301..355c57c7b 100644
--- a/Signal/src/ViewControllers/FingerprintViewController.m
+++ b/Signal/src/ViewControllers/FingerprintViewController.m
@@ -3,14 +3,14 @@
 //
 
 #import "FingerprintViewController.h"
-#import "Environment.h"
 #import "FingerprintViewScanController.h"
 #import "OWSBezierPathView.h"
-#import "OWSContactsManager.h"
 #import "Signal-Swift.h"
 #import "UIColor+OWS.h"
 #import "UIFont+OWS.h"
 #import "UIView+OWS.h"
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSError.h>
diff --git a/Signal/src/ViewControllers/FingerprintViewScanController.m b/Signal/src/ViewControllers/FingerprintViewScanController.m
index d238f7318..fa95c2c06 100644
--- a/Signal/src/ViewControllers/FingerprintViewScanController.m
+++ b/Signal/src/ViewControllers/FingerprintViewScanController.m
@@ -3,14 +3,14 @@
 //
 
 #import "FingerprintViewScanController.h"
-#import "Environment.h"
-#import "OWSContactsManager.h"
 #import "OWSQRCodeScanningViewController.h"
 #import "Signal-Swift.h"
 #import "UIColor+OWS.h"
 #import "UIFont+OWS.h"
 #import "UIView+OWS.h"
 #import "UIViewController+Permissions.h"
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/OWSError.h>
 #import <SignalServiceKit/OWSFingerprint.h>
diff --git a/Signal/src/ViewControllers/HomeViewController.m b/Signal/src/ViewControllers/HomeViewController.m
index 0b593b3ea..82da34dec 100644
--- a/Signal/src/ViewControllers/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeViewController.m
@@ -8,7 +8,6 @@
 #import "ConversationViewController.h"
 #import "InboxTableViewCell.h"
 #import "NewContactThreadViewController.h"
-#import "OWSContactsManager.h"
 #import "OWSNavigationController.h"
 #import "ProfileViewController.h"
 #import "PushManager.h"
@@ -20,6 +19,7 @@
 #import "TSStorageManager.h"
 #import "ViewControllerUtils.h"
 #import <PromiseKit/AnyPromise.h>
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/OWSFormat.h>
 #import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/NSDate+OWS.h>
diff --git a/Signal/src/ViewControllers/NewContactThreadViewController.m b/Signal/src/ViewControllers/NewContactThreadViewController.m
index 6368f4f9b..2b45d83bc 100644
--- a/Signal/src/ViewControllers/NewContactThreadViewController.m
+++ b/Signal/src/ViewControllers/NewContactThreadViewController.m
@@ -5,7 +5,6 @@
 #import "NewContactThreadViewController.h"
 #import "ContactTableViewCell.h"
 #import "ContactsViewHelper.h"
-#import "Environment.h"
 #import "NewGroupViewController.h"
 #import "NewNonContactConversationViewController.h"
 #import "OWSTableViewController.h"
@@ -14,6 +13,7 @@
 #import "UIColor+OWS.h"
 #import "UIView+OWS.h"
 #import <MessageUI/MessageUI.h>
+#import <SignalMessaging/Environment.h>
 #import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/AppVersion.h>
 #import <SignalServiceKit/PhoneNumberUtil.h>
diff --git a/Signal/src/ViewControllers/NewNonContactConversationViewController.m b/Signal/src/ViewControllers/NewNonContactConversationViewController.m
index 62cc3bfed..5e8918a5b 100644
--- a/Signal/src/ViewControllers/NewNonContactConversationViewController.m
+++ b/Signal/src/ViewControllers/NewNonContactConversationViewController.m
@@ -5,7 +5,7 @@
 #import "NewNonContactConversationViewController.h"
 #import "BlockListUIUtils.h"
 #import "ContactsViewHelper.h"
-#import "OWSContactsManager.h"
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalServiceKit/SignalAccount.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Signal/src/ViewControllers/NotificationSettingsOptionsViewController.m b/Signal/src/ViewControllers/NotificationSettingsOptionsViewController.m
index 0e13bc786..628e6501e 100644
--- a/Signal/src/ViewControllers/NotificationSettingsOptionsViewController.m
+++ b/Signal/src/ViewControllers/NotificationSettingsOptionsViewController.m
@@ -3,7 +3,7 @@
 //
 
 #import "NotificationSettingsOptionsViewController.h"
-#import "Environment.h"
+#import <SignalMessaging/Environment.h>
 
 @implementation NotificationSettingsOptionsViewController
 
diff --git a/Signal/src/ViewControllers/NotificationSettingsViewController.m b/Signal/src/ViewControllers/NotificationSettingsViewController.m
index a00e3e894..aa4ce9b76 100644
--- a/Signal/src/ViewControllers/NotificationSettingsViewController.m
+++ b/Signal/src/ViewControllers/NotificationSettingsViewController.m
@@ -3,9 +3,9 @@
 //
 
 #import "NotificationSettingsViewController.h"
-#import "Environment.h"
 #import "NotificationSettingsOptionsViewController.h"
-#import "OWSPreferences.h"
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSPreferences.h>
 
 @implementation NotificationSettingsViewController
 
diff --git a/Signal/src/ViewControllers/OWSAddToContactViewController.m b/Signal/src/ViewControllers/OWSAddToContactViewController.m
index 70fb25053..783cd0bb4 100644
--- a/Signal/src/ViewControllers/OWSAddToContactViewController.m
+++ b/Signal/src/ViewControllers/OWSAddToContactViewController.m
@@ -3,9 +3,9 @@
 //
 
 #import "OWSAddToContactViewController.h"
-#import "Environment.h"
-#import "OWSContactsManager.h"
 #import <SignalMessaging/ContactsViewHelper.h>
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/UIUtil.h>
 
 @import ContactsUI;
diff --git a/Signal/src/ViewControllers/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsViewController.m
index 2ce53adec..99c91e312 100644
--- a/Signal/src/ViewControllers/OWSConversationSettingsViewController.m
+++ b/Signal/src/ViewControllers/OWSConversationSettingsViewController.m
@@ -5,11 +5,9 @@
 #import "OWSConversationSettingsViewController.h"
 #import "BlockListUIUtils.h"
 #import "ContactsViewHelper.h"
-#import "Environment.h"
 #import "FingerprintViewController.h"
 #import "OWSAddToContactViewController.h"
 #import "OWSBlockingManager.h"
-#import "OWSContactsManager.h"
 #import "PhoneNumber.h"
 #import "ShowGroupMembersViewController.h"
 #import "Signal-Swift.h"
@@ -17,7 +15,9 @@
 #import "UIView+OWS.h"
 #import "UpdateGroupViewController.h"
 #import <Curve25519Kit/Curve25519.h>
+#import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSAvatarBuilder.h>
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/OWSUserProfile.h>
 #import <SignalMessaging/UIUtil.h>
diff --git a/Signal/src/ViewControllers/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/PrivacySettingsTableViewController.m
index 9f16f7a1e..8c32e799c 100644
--- a/Signal/src/ViewControllers/PrivacySettingsTableViewController.m
+++ b/Signal/src/ViewControllers/PrivacySettingsTableViewController.m
@@ -4,9 +4,9 @@
 
 #import "PrivacySettingsTableViewController.h"
 #import "BlockListViewController.h"
-#import "Environment.h"
-#import "OWSPreferences.h"
 #import "Signal-Swift.h"
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSPreferences.h>
 #import <SignalServiceKit/OWSReadReceiptManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m
index e91c40764..48459054c 100644
--- a/Signal/src/ViewControllers/ProfileViewController.m
+++ b/Signal/src/ViewControllers/ProfileViewController.m
@@ -6,7 +6,6 @@
 #import "AppDelegate.h"
 #import "AvatarViewHelper.h"
 #import "HomeViewController.h"
-#import "NSString+OWS.h"
 #import "OWSNavigationController.h"
 #import "Signal-Swift.h"
 #import "SignalsNavigationController.h"
@@ -14,6 +13,7 @@
 #import "UIFont+OWS.h"
 #import "UIView+OWS.h"
 #import "UIViewController+OWS.h"
+#import <SignalMessaging/NSString+OWS.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/TSStorageManager.h>
diff --git a/Signal/src/ViewControllers/RegistrationViewController.m b/Signal/src/ViewControllers/RegistrationViewController.m
index e760d862b..69247f72b 100644
--- a/Signal/src/ViewControllers/RegistrationViewController.m
+++ b/Signal/src/ViewControllers/RegistrationViewController.m
@@ -5,7 +5,6 @@
 #import "RegistrationViewController.h"
 #import "CodeVerificationViewController.h"
 #import "CountryCodeViewController.h"
-#import "NSString+OWS.h"
 #import "PhoneNumber.h"
 #import "PhoneNumberUtil.h"
 #import "Signal-Swift.h"
@@ -14,6 +13,7 @@
 #import "ViewControllerUtils.h"
 #import <SAMKeychain/SAMKeychain.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/NSString+OWS.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/ViewControllers/SelectRecipientViewController.m b/Signal/src/ViewControllers/SelectRecipientViewController.m
index c1f92aa3b..04f48809f 100644
--- a/Signal/src/ViewControllers/SelectRecipientViewController.m
+++ b/Signal/src/ViewControllers/SelectRecipientViewController.m
@@ -4,13 +4,13 @@
 
 #import "SelectRecipientViewController.h"
 #import "CountryCodeViewController.h"
-#import "Environment.h"
-#import "OWSContactsManager.h"
 #import "PhoneNumber.h"
 #import "Signal-Swift.h"
 #import "ViewControllerUtils.h"
 #import <SignalMessaging/ContactTableViewCell.h>
 #import <SignalMessaging/ContactsViewHelper.h>
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/OWSTableViewController.h>
 #import <SignalMessaging/UIFont+OWS.h>
 #import <SignalMessaging/UIUtil.h>
diff --git a/Signal/src/ViewControllers/ShowGroupMembersViewController.m b/Signal/src/ViewControllers/ShowGroupMembersViewController.m
index 04c708583..0b65a8d17 100644
--- a/Signal/src/ViewControllers/ShowGroupMembersViewController.m
+++ b/Signal/src/ViewControllers/ShowGroupMembersViewController.m
@@ -3,7 +3,6 @@
 //
 
 #import "ShowGroupMembersViewController.h"
-#import "Environment.h"
 #import "HomeViewController.h"
 #import "Signal-Swift.h"
 #import "SignalApp.h"
@@ -12,6 +11,7 @@
 #import <SignalMessaging/BlockListUIUtils.h>
 #import <SignalMessaging/ContactTableViewCell.h>
 #import <SignalMessaging/ContactsViewHelper.h>
+#import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/UIUtil.h>
 #import <SignalServiceKit/OWSBlockingManager.h>
diff --git a/Signal/src/ViewControllers/ViewControllerUtils.m b/Signal/src/ViewControllers/ViewControllerUtils.m
index 71185855c..5c4077500 100644
--- a/Signal/src/ViewControllers/ViewControllerUtils.m
+++ b/Signal/src/ViewControllers/ViewControllerUtils.m
@@ -3,11 +3,11 @@
 //
 
 #import "ViewControllerUtils.h"
-#import "Environment.h"
 #import "HomeViewController.h"
 #import "PhoneNumber.h"
 #import "Signal-Swift.h"
 #import <AVFoundation/AVFoundation.h>
+#import <SignalMessaging/Environment.h>
 #import <SignalServiceKit/PhoneNumberUtil.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Signal/src/environment/NotificationsManager.m b/Signal/src/environment/NotificationsManager.m
index c34e20739..8cc67bb1a 100644
--- a/Signal/src/environment/NotificationsManager.m
+++ b/Signal/src/environment/NotificationsManager.m
@@ -3,13 +3,13 @@
 //
 
 #import "NotificationsManager.h"
-#import "Environment.h"
-#import "NSString+OWS.h"
-#import "OWSContactsManager.h"
-#import "OWSPreferences.h"
 #import "PushManager.h"
 #import "Signal-Swift.h"
 #import <AudioToolbox/AudioServices.h>
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/NSString+OWS.h>
+#import <SignalMessaging/OWSContactsManager.h>
+#import <SignalMessaging/OWSPreferences.h>
 #import <SignalServiceKit/TSCall.h>
 #import <SignalServiceKit/TSContactThread.h>
 #import <SignalServiceKit/TSErrorMessage.h>
diff --git a/Signal/src/network/PushManager.m b/Signal/src/network/PushManager.m
index 97d616d0f..cf61d5b95 100644
--- a/Signal/src/network/PushManager.m
+++ b/Signal/src/network/PushManager.m
@@ -5,10 +5,10 @@
 #import "PushManager.h"
 #import "AppDelegate.h"
 #import "NotificationsManager.h"
-#import "OWSContactsManager.h"
 #import "Signal-Swift.h"
 #import "SignalApp.h"
 #import "ThreadUtil.h"
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSDevice.h>
 #import <SignalServiceKit/OWSMessageReceiver.h>
diff --git a/Signal/test/TestUtil.h b/Signal/test/TestUtil.h
index b327f0845..3e73e8bc1 100644
--- a/Signal/test/TestUtil.h
+++ b/Signal/test/TestUtil.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //
 
-#import "Release.h"
+#import <SignalMessaging/Release.h>
 
 #define testPhoneNumber1 [PhoneNumber phoneNumberFromE164:@"+19027777777"]
 #define testPhoneNumber2 [PhoneNumber phoneNumberFromE164:@"+19028888888"]
diff --git a/Signal/test/contact/OWSContactsManagerTest.m b/Signal/test/contact/OWSContactsManagerTest.m
index 70475b13c..133720803 100644
--- a/Signal/test/contact/OWSContactsManagerTest.m
+++ b/Signal/test/contact/OWSContactsManagerTest.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //
 
-#import <XCTest/XCTest.h>
 #import "TestUtil.h"
-#import "OWSContactsManager.h"
+#import <SignalMessaging/OWSContactsManager.h>
+#import <XCTest/XCTest.h>
 
 @interface OWSContactsManagerTest : XCTestCase
 
diff --git a/Signal/test/util/UtilTest.m b/Signal/test/util/UtilTest.m
index fc0692a75..1e193f9fa 100644
--- a/Signal/test/util/UtilTest.m
+++ b/Signal/test/util/UtilTest.m
@@ -3,9 +3,9 @@
 //
 
 #import "UtilTest.h"
-#import "NSString+OWS.h"
 #import "NumberUtil.h"
 #import "TestUtil.h"
+#import <SignalMessaging/NSString+OWS.h>
 
 @interface NSString (OWS_Test)
 
diff --git a/SignalMessaging/SignalMessaging.h b/SignalMessaging/SignalMessaging.h
index f8c0772e4..dce1e279d 100644
--- a/SignalMessaging/SignalMessaging.h
+++ b/SignalMessaging/SignalMessaging.h
@@ -24,6 +24,7 @@ FOUNDATION_EXPORT const unsigned char SignalMessagingVersionString[];
 #import <SignalMessaging/OWSContactAvatarBuilder.h>
 #import <SignalMessaging/OWSContactOffersInteraction.h>
 #import <SignalMessaging/OWSContactsManager.h>
+#import <SignalMessaging/OWSContactsSyncing.h>
 #import <SignalMessaging/OWSDatabaseMigration.h>
 #import <SignalMessaging/OWSFormat.h>
 #import <SignalMessaging/OWSLogger.h>
diff --git a/SignalMessaging/contacts/OWSContactsSyncing.m b/SignalMessaging/contacts/OWSContactsSyncing.m
index e19ecf04c..3df63bcac 100644
--- a/SignalMessaging/contacts/OWSContactsSyncing.m
+++ b/SignalMessaging/contacts/OWSContactsSyncing.m
@@ -6,13 +6,13 @@
 #import "Environment.h"
 #import "OWSContactsManager.h"
 #import "OWSProfileManager.h"
-#import "YapDatabaseConnection+OWS.h"
 #import <SignalServiceKit/DataSource.h>
 #import <SignalServiceKit/MIMETypeUtil.h>
 #import <SignalServiceKit/OWSMessageSender.h>
 #import <SignalServiceKit/OWSSyncContactsMessage.h>
 #import <SignalServiceKit/TSAccountManager.h>
 #import <SignalServiceKit/TSStorageManager.h>
+#import <SignalServiceKit/YapDatabaseConnection+OWS.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalMessaging/environment/SignalKeyingStorage.m b/SignalMessaging/environment/SignalKeyingStorage.m
index b584f00fe..35774d9f8 100644
--- a/SignalMessaging/environment/SignalKeyingStorage.m
+++ b/SignalMessaging/environment/SignalKeyingStorage.m
@@ -3,9 +3,9 @@
 //
 
 #import "SignalKeyingStorage.h"
-#import "YapDatabaseConnection+OWS.h"
 #import <SignalServiceKit/SecurityUtils.h>
 #import <SignalServiceKit/TSStorageManager.h>
+#import <SignalServiceKit/YapDatabaseConnection+OWS.h>
 
 #define SignalKeyingCollection @"SignalKeyingCollection"
 
diff --git a/SignalMessaging/utils/OWSPreferences.m b/SignalMessaging/utils/OWSPreferences.m
index 131292bae..8a2cc0a29 100644
--- a/SignalMessaging/utils/OWSPreferences.m
+++ b/SignalMessaging/utils/OWSPreferences.m
@@ -3,9 +3,9 @@
 //
 
 #import "OWSPreferences.h"
-#import "YapDatabaseConnection+OWS.h"
 #import <SignalServiceKit/NSUserDefaults+OWS.h>
 #import <SignalServiceKit/TSStorageHeaders.h>
+#import <SignalServiceKit/YapDatabaseConnection+OWS.h>
 
 NS_ASSUME_NONNULL_BEGIN