From cb90e10b529f49867301bebcd9c317b3059aa66f Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 19 Oct 2021 11:41:57 -0300
Subject: [PATCH 01/10] Add script to normalize includes and imports.

---
 Scripts/import_include_normalize.py | 363 ++++++++++++++++++++++++++++
 1 file changed, 363 insertions(+)
 create mode 100755 Scripts/import_include_normalize.py

diff --git a/Scripts/import_include_normalize.py b/Scripts/import_include_normalize.py
new file mode 100755
index 0000000000..dc3cb910a5
--- /dev/null
+++ b/Scripts/import_include_normalize.py
@@ -0,0 +1,363 @@
+#!/usr/bin/env python2.7
+# -*- coding: utf-8 -*-
+
+import os
+import sys
+import subprocess
+import datetime
+import argparse
+import commands
+
+
+git_repo_path = os.path.abspath(subprocess.check_output(['git', 'rev-parse', '--show-toplevel']).strip())
+
+
+class Include:
+    def __init__(self, line, isInclude, isQuote, body, comment):
+        self.line = line
+        self.isInclude = isInclude
+        self.isQuote = isQuote
+        self.body = body
+        self.comment = comment
+
+    def format(self):
+        result = '%s %s%s%s' % (
+                                ('#include' if self.isInclude else '#import'),
+                                ('"' if self.isQuote else '<'),
+                                self.body.strip(),
+                                ('"' if self.isQuote else '>'),
+                                )
+        if self.comment.strip():
+            result += ' ' + self.comment.strip()
+        return result
+    
+    def isSystemFrameworkOrPod(self):
+        prefixes = [
+            'UIKit',
+            'Intents',
+            'SignalCoreKit',
+            'UserNotifications',
+            'WebRTC',
+            'Foundation',
+            'PureLayout',
+            'YYImage',
+            'MetalKit',
+            'objc',
+            'SSZipArchive',
+            'sys',
+            'MessageUI',
+            'Contacts',
+            'MobileCoreServices',
+            'AVKit',
+            'MediaPlayer',
+            'StoreKit',
+            'AVFoundation',
+            'XCTest',
+            'Availability',
+            'CocoaLumberjack',
+            'AudioToolbox',
+            'SignalMetadataKit',
+            'Curve25519Kit',
+            'Mantle',
+            'CoreServices',
+            'webp',
+            'AFNetworking',
+            'CommonCrypto',
+            'libPhoneNumber_iOS',
+            'openssl',
+            'Photos',
+            'ContactsUI',
+        ]
+        for prefix in prefixes:
+            if self.body.startswith(prefix + '/'):
+                return True
+        systemFrameworkHeaders = set([
+            "zlib.h",
+            'Availability.h',
+            'notify.h',
+            'AssertMacros.h',
+        ])
+        return self.body in systemFrameworkHeaders
+
+
+def is_include_or_import(line):
+    line = line.strip()
+    if line.startswith('#include '):
+        return True
+    elif line.startswith('#import '):
+        return True
+    else:
+        return False
+
+
+def parse_include(line):
+    remainder = line.strip()
+
+    if remainder.startswith('#include '):
+        isInclude = True
+        remainder = remainder[len('#include '):]
+    elif remainder.startswith('#import '):
+        isInclude = False
+        remainder = remainder[len('#import '):]
+    elif remainder == '//':
+        return None
+    elif not remainder:
+        return None
+    else:
+        return None
+
+    comment = None
+    if remainder.startswith('"'):
+        isQuote = True
+        endIndex = remainder.find('"', 1)
+        if endIndex < 0:
+            print ('Unexpected import or include: '+ line)
+            sys.exit(1)
+        body = remainder[1:endIndex]
+        comment = remainder[endIndex+1:]
+    elif remainder.startswith('<'):
+        isQuote = False
+        endIndex = remainder.find('>', 1)
+        if endIndex < 0:
+            print ('Unexpected import or include: '+ line)
+            sys.exit(1)
+        body = remainder[1:endIndex]
+        comment = remainder[endIndex+1:]
+    else:
+        print ('Unexpected import or include: '+ remainder)
+        sys.exit(1)
+
+    return Include(line, isInclude, isQuote, body, comment)
+
+
+class Target:
+    def __init__(self, name, path, is_test_target=False):
+        self.name = name
+        self.path = path
+        self.is_test_target = is_test_target
+
+
+class Header:
+    def __init__(self, targetName, path, filename):
+        self.targetName = targetName
+        self.path = path
+        self.filename = filename
+
+
+class SwiftHeader:
+    def __init__(self, targetName, filename):
+        self.targetName = targetName
+        self.filename = filename
+
+
+class HeaderSet:
+    def __init__(self, targets, headers):
+        self.targets = targets
+        self.headers = headers
+        
+        headerMap = {}
+        for header in headers:
+            if header.filename in headerMap:
+                otherHeader = headerMap[header.filename]
+                print 'Header conflict:', header.filename
+                print 'Header 1:', header.path
+                print 'Header 2:', otherHeader.path
+                sys.exit(1)
+            else:
+                headerMap[header.filename] = header
+                
+        self.headerMap = headerMap
+                
+        swiftHeaderMap = {}
+        for target in targets:
+            swiftHeader = SwiftHeader(target.name, target.name + '-Swift.h')
+            swiftHeaderMap[swiftHeader.filename] = swiftHeader
+        self.swiftHeaderMap = swiftHeaderMap
+        
+
+    def find_header(self, text):
+        splits = text.split('/')
+        filename = splits[-1]
+        if filename is None or len(filename) < 1:
+            return None
+        print 'filename:', filename
+        if filename not in self.headerMap:
+            return None
+        header = self.headerMap[filename]
+        return header
+        
+
+    def find_swift_header(self, text):
+        splits = text.split('/')
+        filename = splits[-1]
+        if filename is None or len(filename) < 1:
+            return None
+        print 'filename:', filename
+        if filename not in self.swiftHeaderMap:
+            return None
+        header = self.swiftHeaderMap[filename]
+        return header
+        
+
+def find_headers(targets):
+    headers = []
+
+    for target in targets:
+        for rootdir, dirnames, filenames in os.walk(target.path):
+            for filename in filenames:
+                if not filename.endswith('.h'):
+                    continue
+                file_path = os.path.abspath(os.path.join(rootdir, filename))
+                headers.append(Header(target.name, file_path, filename))
+        
+    return headers
+    
+    
+def normalize_imports_and_includes(targets, headerSet):
+    
+    for target in targets:
+        for rootdir, dirnames, filenames in os.walk(target.path):
+            for filename in filenames:
+                file_ext = os.path.splitext(filename)[1]
+                if file_ext not in ('.h', '.hpp', '.cpp', '.m', '.mm', '.pch'):
+                    continue
+                file_path = os.path.abspath(os.path.join(rootdir, filename))
+                normalize_imports_and_includes_in_file(targets, target, headerSet, file_path, filename)
+                
+    
+def normalize_imports_and_includes_in_file(targets, target, headerSet, file_path, filename):
+
+    short_filepath = file_path[len(git_repo_path):]
+    if short_filepath.startswith(os.sep):
+       short_filepath = short_filepath[len(os.sep):]
+       
+    print 'Processing:', filename
+
+    with open(file_path, 'rt') as f:
+        text = f.read()
+
+    original_text = text
+
+    lines = text.split('\n')
+
+    new_lines = []
+    for line in lines:
+        include = parse_include(line)
+        if include is None:
+            new_lines.append(line)
+            continue
+            
+        print '\t', 'include or import:', include.body
+        if include.comment is not None and len(include.comment) > 0:
+            print 'Invalid include or import:', include.line
+            sys.exit(1)
+        
+        if include.isSystemFrameworkOrPod():
+            new_lines.append(line)
+            continue
+        
+        swiftHeader = headerSet.find_swift_header(include.body)
+        if swiftHeader is not None:
+            # NOTE: -Swift.h headers must always use long-form imports.
+            newline = "#import <%s/%s>" % ( swiftHeader.targetName, swiftHeader.filename, )
+            new_lines.append(newline)
+            continue
+        
+        header = headerSet.find_header(include.body)
+        if header is None:
+            print
+            print 'Unknown include or import:', include.line
+            print 'Unknown include or import:', include.body
+            print 'In file:', filename
+            print 'If this is a system framework or pod, add it to isSystemFrameworkOrPod().'
+            print
+            sys.exit(1)
+
+        if header.targetName == target.name:
+            newline = '#import "%s"' % ( header.filename, )
+        else:
+            newline = "#import <%s/%s>" % ( header.targetName, header.filename, )
+        new_lines.append(newline)
+
+    lines = new_lines
+    
+
+    # shebang = ""
+    # if lines[0].startswith('#!'):
+    #     shebang = lines[0] + '\n'
+    #     lines = lines[1:]
+
+    # while lines and lines[0].startswith('//'):
+    #     lines = lines[1:]
+    text = '\n'.join(lines)
+    text = text.strip()
+    text = text + '\n'
+
+    if original_text == text:
+        return
+
+    print 'Updating:', filename
+
+    with open(file_path, 'wt') as f:
+        f.write(text)
+    # sys.exit(0)
+    
+
+
+if __name__ == "__main__":
+
+    parser = argparse.ArgumentParser(description='Normalize imports and includes script.')
+    # parser.add_argument('--all', action='store_true', help='process all files in or below current dir')
+    # parser.add_argument('--path', help='used to specify a path to process.')
+    # parser.add_argument('--ref', help='process all files that have changed since the given ref')
+    parser.add_argument('--write-header-list', action='store_true', help='Write list of repo headers to file for debugging')
+    args = parser.parse_args()
+
+    clang_format_commit = 'HEAD'
+
+    targets = [ 
+        Target('Signal', 'Signal/src'),
+        Target('Signal', 'Signal/test', is_test_target=True),
+        Target('SignalMessaging', 'SignalMessaging'),
+        Target('SignalServiceKit', 'SignalServiceKit/src'),
+        Target('SignalServiceKit', 'SignalServiceKit/tests', is_test_target=True),
+        Target('SignalShareExtension', 'SignalShareExtension'),
+        Target('SignalUI', 'SignalUI'),
+        Target('SignalUI', 'SignalUITests', is_test_target=True),
+    ]
+    
+    headers = find_headers(targets)    
+    print 'headers:', len(headers)
+    headerSet = HeaderSet(targets, headers)
+    
+    if args.write_header_list:
+        lines = []
+        for header in headers:
+            lines.append(header.path)
+        lines.sort()
+        text = '\n'.join(lines)
+        text = text + '\n'
+
+        filename = 'import_header_paths.txt'
+        file_path = os.path.abspath(os.path.join(git_repo_path, filename))
+        print 'Header list:', filename
+        with open(file_path, 'wt') as f:
+            f.write(text)
+            
+        lines = []
+        for header in headers:
+            lines.append(header.filename)
+        lines.sort()
+        text = '\n'.join(lines)
+        text = text + '\n'
+
+        filename = 'import_header_filenames.txt'
+        file_path = os.path.abspath(os.path.join(git_repo_path, filename))
+        print 'Header list:', filename
+        with open(file_path, 'wt') as f:
+            f.write(text)
+        
+    
+    normalize_imports_and_includes(targets, headerSet)    
+
+    print 'Complete.'

From 5d780d15891f61d5074550e6f826230d75c0e5ec Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 19 Oct 2021 11:42:09 -0300
Subject: [PATCH 02/10] Apply script to normalize includes and imports.

---
 Signal/src/AppDelegate.m                      |  8 +-
 .../src/Calls/UserInterface/RemoteVideoView.m |  4 +-
 Signal/src/Signal-Bridging-Header.h           |  6 +-
 Signal/src/UserInterface/OWSWindowManager.m   |  8 +-
 .../OWSLinkDeviceViewController.m             |  2 +-
 .../Privacy/BlockListViewController.m         | 12 +--
 .../DomainFrontingCountryViewController.m     |  8 +-
 .../Cells/OWSQuotedMessageView.h              |  2 +-
 .../Cells/OWSQuotedMessageView.m              |  4 +-
 .../ConversationCollectionView.m              |  2 +-
 .../ConversationInputToolbar.m                | 12 +--
 .../ConversationScrollButton.m                |  4 +-
 .../DebugSettingsTableViewController.m        | 75 ---------------
 .../DebugUI/DebugContactsUtils.m              |  2 +-
 .../ViewControllers/DebugUI/DebugUIContacts.m |  2 +-
 .../DebugUI/DebugUIDiskUsage.m                |  4 +-
 .../ViewControllers/DebugUI/DebugUIMessages.m |  2 +-
 .../src/ViewControllers/DebugUI/DebugUIMisc.m |  6 +-
 .../DebugUI/DebugUIScreenshots.m              |  2 +-
 .../DebugUI/DebugUISessionState.m             |  2 +-
 .../ViewControllers/DebugUI/DebugUIStress.m   |  6 +-
 .../DebugUI/DebugUISyncMessages.m             |  4 +-
 .../DebugUI/DebugUITableViewController.m      |  2 +-
 .../HomeView/HomeViewController.m             |  9 +-
 .../MediaGallery/MediaDetailViewController.m  | 12 +--
 .../RecipientPickerViewController.m           |  6 +-
 .../FingerprintViewController.m               |  6 +-
 .../FingerprintViewScanController.m           |  8 +-
 Signal/src/environment/SignalApp.m            |  2 +-
 Signal/src/util/MainAppContext.m              |  2 +-
 Signal/src/util/OWSScreenLockUI.m             |  2 +-
 Signal/src/util/Pastelog.m                    |  6 +-
 Signal/src/util/RegistrationUtils.m           |  4 +-
 Signal/src/views/OWSDeviceTableViewCell.m     |  2 +-
 Signal/src/views/PinEntryView.m               |  2 +-
 Signal/test/SignalBaseTest.m                  |  2 +-
 Signal/test/mocks/MockEnvironment.h           |  4 +-
 Signal/test/mocks/MockEnvironment.m           |  2 +-
 Signal/test/util/FunctionalUtilTest.m         |  4 +-
 Signal/test/util/OWSOrphanDataCleanerTest.m   |  4 +-
 .../test/util/OWSScrubbingLogFormatterTest.m  |  2 +-
 .../util/TSStorageIdentityKeyStoreTests.m     | 95 -------------------
 Signal/test/util/TSStoragePreKeyStoreTests.m  | 63 ------------
 Signal/test/util/TSStorageSignedPreKeyStore.m | 25 -----
 Signal/test/util/UtilTest.m                   |  4 +-
 SignalMessaging/SignalMessaging-Prefix.pch    |  8 +-
 SignalMessaging/SignalMessaging.h             | 24 ++---
 SignalMessaging/contacts/OWSSyncManager.m     |  2 +-
 SignalMessaging/environment/AppSetup.m        |  2 +-
 SignalMessaging/utils/OWSOrphanDataCleaner.m  |  2 +-
 SignalMessaging/utils/ThreadUtil.m            |  2 +-
 .../src/Account/TSAccountManager.h            |  2 +-
 .../src/Account/TSAccountManager.m            | 18 ++--
 .../src/Account/TSPreKeyManager.h             |  2 +-
 .../src/Account/TSPreKeyManager.m             | 16 ++--
 SignalServiceKit/src/Contacts/Contact.m       | 10 +-
 .../OWSDisappearingMessagesConfiguration.h    |  2 +-
 .../OWSDisappearingMessagesConfiguration.m    |  2 +-
 SignalServiceKit/src/Contacts/PhoneNumber.m   |  4 +-
 .../src/Contacts/PhoneNumberUtil.h            |  2 +-
 .../src/Contacts/PhoneNumberUtil.m            |  6 +-
 SignalServiceKit/src/Contacts/SignalAccount.h |  2 +-
 SignalServiceKit/src/Contacts/SignalAccount.m | 10 +-
 .../src/Contacts/SignalRecipient.h            |  2 +-
 .../src/Contacts/SignalRecipient.m            | 10 +-
 SignalServiceKit/src/Contacts/TSGroupMember.h |  2 +-
 SignalServiceKit/src/Contacts/TSThread.h      |  2 +-
 SignalServiceKit/src/Contacts/TSThread.m      | 20 ++--
 .../src/Contacts/Threads/TSContactThread.h    |  2 +-
 .../src/Contacts/Threads/TSContactThread.m    | 10 +-
 .../src/Contacts/Threads/TSGroupThread.h      |  4 +-
 .../src/Contacts/Threads/TSGroupThread.m      |  6 +-
 .../ConversationSync/OWSChunkedOutputStream.m |  2 +-
 .../OWSContactsOutputStream.h                 |  2 +-
 .../OWSContactsOutputStream.m                 | 16 ++--
 .../ConversationSync/OWSGroupsOutputStream.h  |  2 +-
 .../ConversationSync/OWSGroupsOutputStream.m  | 12 +--
 .../Devices/OWSBlockedPhoneNumbersMessage.h   |  2 +-
 .../Devices/OWSBlockedPhoneNumbersMessage.m   |  2 +-
 SignalServiceKit/src/Devices/OWSDevice.h      |  2 +-
 SignalServiceKit/src/Devices/OWSDevice.m      | 10 +-
 .../src/Devices/OWSDeviceProvisioner.m        |  6 +-
 .../src/Devices/OWSProvisioningMessage.m      |  4 +-
 .../OWSReadReceiptsForLinkedDevicesMessage.h  |  2 +-
 .../OWSReadReceiptsForLinkedDevicesMessage.m  |  2 +-
 .../src/Devices/OWSReceiptsForSenderMessage.h |  2 +-
 .../src/Devices/OWSReceiptsForSenderMessage.m |  2 +-
 .../src/Devices/OWSRecordTranscriptJob.m      | 26 ++---
 .../src/Devices/OWSStickerPackSyncMessage.h   |  4 +-
 .../src/Devices/OWSStickerPackSyncMessage.m   |  2 +-
 .../Devices/OWSVerificationStateSyncMessage.h |  4 +-
 .../Devices/OWSVerificationStateSyncMessage.m |  4 +-
 .../OWSViewOnceMessageReadSyncMessage.h       |  2 +-
 .../OWSViewOnceMessageReadSyncMessage.m       |  2 +-
 ...OWSViewedReceiptsForLinkedDevicesMessage.h |  2 +-
 ...OWSViewedReceiptsForLinkedDevicesMessage.m |  2 +-
 .../src/Messages/Attachments/TSAttachment.h   |  2 +-
 .../src/Messages/Attachments/TSAttachment.m   |  6 +-
 .../Attachments/TSAttachmentPointer.h         |  2 +-
 .../Attachments/TSAttachmentPointer.m         |  8 +-
 .../Messages/Attachments/TSAttachmentStream.h |  4 +-
 .../Messages/Attachments/TSAttachmentStream.m | 10 +-
 .../OWSIncomingSentMessageTranscript.m        | 18 ++--
 .../OWSOutgoingSentMessageTranscript.h        |  2 +-
 .../OWSOutgoingSentMessageTranscript.m        |  6 +-
 .../DeviceSyncing/OWSOutgoingSyncMessage.h    |  2 +-
 .../DeviceSyncing/OWSOutgoingSyncMessage.m    |  2 +-
 .../OWSSyncConfigurationMessage.h             |  2 +-
 .../OWSSyncConfigurationMessage.m             |  4 +-
 .../DeviceSyncing/OWSSyncContactsMessage.h    |  2 +-
 .../DeviceSyncing/OWSSyncContactsMessage.m    | 24 ++---
 .../DeviceSyncing/OWSSyncFetchLatestMessage.h |  2 +-
 .../DeviceSyncing/OWSSyncFetchLatestMessage.m |  2 +-
 .../DeviceSyncing/OWSSyncGroupsMessage.h      |  2 +-
 .../DeviceSyncing/OWSSyncGroupsMessage.m      | 14 +--
 .../DeviceSyncing/OWSSyncKeysMessage.h        |  2 +-
 .../DeviceSyncing/OWSSyncKeysMessage.m        |  4 +-
 .../OWSSyncMessageRequestResponseMessage.h    |  2 +-
 .../OWSSyncMessageRequestResponseMessage.m    |  2 +-
 .../DeviceSyncing/OWSSyncRequestMessage.h     |  2 +-
 .../DeviceSyncing/OWSSyncRequestMessage.m     |  2 +-
 .../OutgoingPaymentSyncMessage.h              |  2 +-
 .../OutgoingPaymentSyncMessage.m              |  2 +-
 .../Interactions/OWSContact+Private.h         |  2 +-
 .../src/Messages/Interactions/OWSContact.h    |  2 +-
 .../src/Messages/Interactions/OWSContact.m    | 14 +--
 ...sappearingConfigurationUpdateInfoMessage.h |  2 +-
 ...sappearingConfigurationUpdateInfoMessage.m |  4 +-
 ...DisappearingMessagesConfigurationMessage.h |  2 +-
 ...DisappearingMessagesConfigurationMessage.m |  4 +-
 .../Interactions/OWSDynamicOutgoingMessage.h  |  2 +-
 .../Interactions/OWSEndSessionMessage.h       |  2 +-
 .../Interactions/OWSEndSessionMessage.m       |  2 +-
 .../Interactions/OWSStaticOutgoingMessage.h   |  2 +-
 .../OWSVerificationStateChangeMessage.h       |  4 +-
 .../OWSVerificationStateChangeMessage.m       |  4 +-
 .../Messages/Interactions/TSErrorMessage.h    |  4 +-
 .../Messages/Interactions/TSErrorMessage.m    |  8 +-
 .../Messages/Interactions/TSIncomingMessage.h |  4 +-
 .../Messages/Interactions/TSIncomingMessage.m | 12 +--
 .../src/Messages/Interactions/TSInfoMessage.h |  4 +-
 .../src/Messages/Interactions/TSInfoMessage.m |  6 +-
 .../src/Messages/Interactions/TSInteraction.h |  2 +-
 .../src/Messages/Interactions/TSInteraction.m |  2 +-
 .../src/Messages/Interactions/TSMention.h     |  2 +-
 .../src/Messages/Interactions/TSMention.m     |  2 +-
 .../src/Messages/Interactions/TSMessage.h     |  6 +-
 .../src/Messages/Interactions/TSMessage.m     | 18 ++--
 .../Interactions/TSOutgoingDeleteMessage.h    |  2 +-
 .../Interactions/TSOutgoingDeleteMessage.m    |  2 +-
 .../Messages/Interactions/TSOutgoingMessage.h |  4 +-
 .../Messages/Interactions/TSOutgoingMessage.m | 24 ++---
 .../Messages/Interactions/TSQuotedMessage.m   | 16 ++--
 .../TSUnreadIndicatorInteraction.h            |  4 +-
 .../TSUnreadIndicatorInteraction.m            |  2 +-
 .../TSInvalidIdentityKeyErrorMessage.h        |  2 +-
 .../TSInvalidIdentityKeyErrorMessage.m        |  4 +-
 ...SInvalidIdentityKeyReceivingErrorMessage.h |  2 +-
 ...SInvalidIdentityKeyReceivingErrorMessage.m | 16 ++--
 .../TSInvalidIdentityKeySendingErrorMessage.h |  2 +-
 .../TSInvalidIdentityKeySendingErrorMessage.m | 12 +--
 SignalServiceKit/src/Messages/MessageSender.h |  2 +-
 SignalServiceKit/src/Messages/MessageSender.m | 72 +++++++-------
 .../Messages/OWSAddToContactsOfferMessage.h   |  2 +-
 .../Messages/OWSAddToContactsOfferMessage.m   |  2 +-
 .../OWSAddToProfileWhitelistOfferMessage.h    |  2 +-
 .../OWSAddToProfileWhitelistOfferMessage.m    |  4 +-
 .../Messages/OWSDisappearingMessagesFinder.m  | 10 +-
 .../src/Messages/OWSDisappearingMessagesJob.m | 22 ++---
 .../OWSFailedAttachmentDownloadsJob.m         |  4 +-
 .../src/Messages/OWSFailedMessagesJob.m       |  6 +-
 .../src/Messages/OWSGroupCallMessage.h        |  4 +-
 .../src/Messages/OWSGroupCallMessage.m        |  4 +-
 .../src/Messages/OWSGroupInfoRequestMessage.h |  2 +-
 .../src/Messages/OWSGroupInfoRequestMessage.m |  2 +-
 .../src/Messages/OWSIdentityManager.h         |  2 +-
 .../src/Messages/OWSIdentityManager.m         | 32 +++----
 .../src/Messages/OWSIncompleteCallsJob.m      |  6 +-
 .../src/Messages/OWSMessageContentJob.h       |  2 +-
 .../src/Messages/OWSMessageContentJob.m       |  2 +-
 .../src/Messages/OWSMessageDecryptJob.h       |  2 +-
 .../src/Messages/OWSMessageDecryptJob.m       | 20 ++--
 .../src/Messages/OWSMessageHandler.m          |  2 +-
 .../src/Messages/OWSMessageManager.h          |  2 +-
 .../src/Messages/OWSMessageManager.m          | 72 +++++++-------
 .../src/Messages/OWSMessageUtils.m            | 24 ++---
 .../src/Messages/OWSOutgoingCallMessage.h     |  2 +-
 .../src/Messages/OWSOutgoingCallMessage.m     |  6 +-
 .../Messages/OWSOutgoingGroupCallMessage.h    |  2 +-
 .../Messages/OWSOutgoingGroupCallMessage.m    |  2 +-
 .../src/Messages/OWSOutgoingNullMessage.h     |  2 +-
 .../src/Messages/OWSOutgoingNullMessage.m     |  4 +-
 .../src/Messages/OWSOutgoingReceiptManager.m  | 14 +--
 .../src/Messages/OWSOutgoingResendRequest.h   |  2 +-
 .../src/Messages/OWSOutgoingResendResponse.h  |  4 +-
 .../src/Messages/OWSProfileKeyMessage.h       |  2 +-
 .../src/Messages/OWSProfileKeyMessage.m       |  8 +-
 .../src/Messages/OWSReadTracking.h            |  2 +-
 .../src/Messages/OWSReceiptManager.h          |  2 +-
 .../src/Messages/OWSReceiptManager.m          | 18 ++--
 .../OWSRecoverableDecryptionPlaceholder.h     |  2 +-
 .../OWSUnknownContactBlockOfferMessage.h      |  2 +-
 .../OWSUnknownContactBlockOfferMessage.m      |  2 +-
 .../OWSUnknownProtocolVersionMessage.h        |  2 +-
 .../OWSUnknownProtocolVersionMessage.m        |  6 +-
 .../Payments/OWSOutgoingPaymentMessage.h      |  2 +-
 .../src/Messages/PreKeyBundle+jsonDict.h      |  2 +-
 .../Reactions/OWSOutgoingReactionMessage.h    |  2 +-
 .../Reactions/OWSOutgoingReactionMessage.m    |  2 +-
 .../src/Messages/Reactions/OWSReaction.h      |  2 +-
 .../src/Messages/Reactions/OWSReaction.m      |  4 +-
 .../src/Messages/Stickers/InstalledSticker.h  |  4 +-
 .../src/Messages/Stickers/InstalledSticker.m  |  2 +-
 .../src/Messages/Stickers/KnownStickerPack.h  |  4 +-
 .../src/Messages/Stickers/KnownStickerPack.m  |  2 +-
 .../src/Messages/Stickers/StickerInfo.m       |  2 +-
 .../src/Messages/Stickers/StickerPack.h       |  4 +-
 .../src/Messages/Stickers/StickerPack.m       |  2 +-
 SignalServiceKit/src/Messages/TSCall.h        |  4 +-
 SignalServiceKit/src/Messages/TSCall.m        |  4 +-
 SignalServiceKit/src/Network/API/HTTPUtils.m  |  2 +-
 SignalServiceKit/src/Network/API/OWSUpload.m  | 16 ++--
 .../src/Network/API/OWSUploadOperation.h      |  2 +-
 .../src/Network/API/OWSUploadOperation.m      | 18 ++--
 .../src/Network/API/RESTNetworkManager.m      |  6 +-
 .../Network/API/Requests/OWSRequestFactory.h  |  2 +-
 .../Network/API/Requests/OWSRequestFactory.m  | 22 ++---
 .../src/Network/API/Requests/TSRequest.m      |  6 +-
 .../src/Network/OWSCensorshipConfiguration.m  | 10 +-
 .../src/Network/OWSCountryMetadata.m          |  4 +-
 .../src/Network/OWSSignalService.m            | 12 +--
 .../Receiving/IncomingGroupsV2MessageJob.h    |  2 +-
 .../Receiving/IncomingGroupsV2MessageJob.m    |  2 +-
 .../Receiving/SSKMessageDecryptJobRecord.h    |  2 +-
 .../Receiving/SSKMessageDecryptJobRecord.m    |  2 +-
 .../src/Payments/TSPaymentModel.h             |  4 +-
 .../src/Payments/TSPaymentModels.h            |  2 +-
 .../src/Payments/TSPaymentModels.m            |  2 +-
 .../src/Payments/TSPaymentRequestModel.h      |  4 +-
 .../src/Payments/TSPaymentRequestModel.m      |  2 +-
 SignalServiceKit/src/Protocols/ProtoUtils.m   |  8 +-
 .../Remote Attestation/RemoteAttestation.m    | 12 +--
 .../RemoteAttestationQuote.m                  |  6 +-
 .../RemoteAttestationSigningCertificate.m     |  2 +-
 SignalServiceKit/src/SSKEnvironment.m         |  8 +-
 .../src/Security/OWSFingerprint.m             |  6 +-
 .../src/Security/OWSFingerprintBuilder.m      | 10 +-
 .../src/Security/OWSHTTPSecurityPolicy.m      |  2 +-
 .../src/Security/OWSRecipientIdentity.h       |  2 +-
 .../src/Security/OWSRecipientIdentity.m       |  4 +-
 .../src/Storage/AxolotlStore/CallKitIdStore.m |  2 +-
 .../AxolotlStore/Model/LegacyChainKey.h       |  2 +-
 .../AxolotlStore/Model/LegacyChainKey.m       |  2 +-
 .../AxolotlStore/Model/LegacyMessageKeys.m    |  2 +-
 .../AxolotlStore/Model/LegacyReceivingChain.m |  2 +-
 .../AxolotlStore/Model/LegacyRootKey.m        |  4 +-
 .../AxolotlStore/Model/LegacySendingChain.m   |  4 +-
 .../AxolotlStore/Model/LegacySessionRecord.m  | 10 +-
 .../AxolotlStore/Model/LegacySessionState.h   |  4 +-
 .../AxolotlStore/Model/LegacySessionState.m   |  6 +-
 .../Storage/AxolotlStore/Model/PreKeyBundle.m |  2 +-
 .../Storage/AxolotlStore/Model/PreKeyRecord.m |  2 +-
 .../AxolotlStore/Model/SignedPrekeyRecord.h   |  2 +-
 .../AxolotlStore/Model/SignedPrekeyRecord.m   |  2 +-
 .../AxolotlStore/NSData+keyVersionByte.m      |  2 +-
 .../src/Storage/AxolotlStore/SSKPreKeyStore.m |  8 +-
 .../AxolotlStore/SSKSignedPreKeyStore.m       | 12 +--
 SignalServiceKit/src/Storage/BaseModel.h      |  2 +-
 SignalServiceKit/src/Storage/BaseModel.m      |  2 +-
 .../src/Storage/Database/SDSCrossProcess.m    |  4 +-
 .../Database/SDSDatabaseStorage+Objc.m        |  4 +-
 .../Storage/Database/SDSKeyValueStore+ObjC.m  |  2 +-
 .../Jobs/OWSBroadcastMediaMessageJobRecord.h  |  2 +-
 .../Jobs/OWSBroadcastMediaMessageJobRecord.m  |  2 +-
 .../Jobs/OWSIncomingContactSyncJobRecord.h    |  2 +-
 .../Jobs/OWSIncomingContactSyncJobRecord.m    |  2 +-
 .../Jobs/OWSIncomingGroupSyncJobRecord.h      |  2 +-
 .../Jobs/OWSIncomingGroupSyncJobRecord.m      |  2 +-
 .../Storage/Jobs/OWSSessionResetJobRecord.h   |  2 +-
 .../Storage/Jobs/OWSSessionResetJobRecord.m   |  4 +-
 .../src/Storage/Jobs/SSKJobRecord.h           |  2 +-
 .../src/Storage/Jobs/SSKJobRecord.m           |  2 +-
 .../src/Storage/SSKMessageSenderJobRecord.h   |  2 +-
 .../src/Storage/SSKMessageSenderJobRecord.m   |  4 +-
 .../src/Storage/StorageCoordinator.m          |  4 +-
 .../src/Storage/TSYapDatabaseObject.m         |  2 +-
 SignalServiceKit/src/Storage/YDBStorage.m     |  4 +-
 SignalServiceKit/src/TSPrefix.h               |  6 +-
 .../src/TestUtils/MockSSKEnvironment.h        |  2 +-
 .../src/TestUtils/MockSSKEnvironment.m        | 32 +++----
 .../src/TestUtils/OWSFakeCallMessageHandler.h |  2 +-
 .../src/TestUtils/OWSFakeCallMessageHandler.m |  2 +-
 .../src/TestUtils/OWSFakeMessageSender.h      |  2 +-
 .../src/TestUtils/OWSFakeMessageSender.m      |  2 +-
 .../src/TestUtils/OWSFakeProfileManager.h     |  2 +-
 .../src/TestUtils/OWSFakeProfileManager.m     |  4 +-
 .../src/TestUtils/TestAppContext.h            |  2 +-
 .../src/TestUtils/TestAppContext.m            |  2 +-
 SignalServiceKit/src/Util/AppContext.m        |  2 +-
 SignalServiceKit/src/Util/AppVersion.m        |  4 +-
 SignalServiceKit/src/Util/ByteParser.m        |  2 +-
 .../src/Util/DarwinNotificationCenter.m       |  2 +-
 SignalServiceKit/src/Util/DataSource.m        |  6 +-
 SignalServiceKit/src/Util/ExperienceUpgrade.h |  2 +-
 SignalServiceKit/src/Util/ExperienceUpgrade.m |  2 +-
 SignalServiceKit/src/Util/FunctionalUtil.m    |  2 +-
 SignalServiceKit/src/Util/MIMETypeUtil.m      |  4 +-
 SignalServiceKit/src/Util/NSArray+OWS.m       |  2 +-
 SignalServiceKit/src/Util/NSData+Image.m      |  4 +-
 .../src/Util/NSUserDefaults+OWS.m             |  4 +-
 SignalServiceKit/src/Util/OWS2FAManager.m     |  8 +-
 SignalServiceKit/src/Util/OWSAnalytics.h      |  2 +-
 SignalServiceKit/src/Util/OWSAnalytics.m      |  2 +-
 .../src/Util/OWSAnalyticsEvents.m             |  2 +-
 SignalServiceKit/src/Util/OWSBackgroundTask.m |  4 +-
 SignalServiceKit/src/Util/OWSBackupFragment.h |  2 +-
 SignalServiceKit/src/Util/OWSBackupFragment.m |  2 +-
 SignalServiceKit/src/Util/OWSDispatch.m       |  2 +-
 SignalServiceKit/src/Util/OWSError.m          |  2 +-
 SignalServiceKit/src/Util/OWSFileSystem.m     |  4 +-
 SignalServiceKit/src/Util/OWSOperation.m      |  6 +-
 SignalServiceKit/src/Util/OWSUserProfile.h    |  4 +-
 SignalServiceKit/src/Util/OWSUserProfile.m    | 12 +--
 SignalServiceKit/src/Util/SSKAsserts.h        |  2 +-
 SignalServiceKit/src/Util/TestModel.h         |  2 +-
 SignalServiceKit/src/Util/TestModel.m         |  2 +-
 SignalServiceKit/src/groups/TSGroupModel.h    |  2 +-
 SignalServiceKit/src/groups/TSGroupModel.m    |  4 +-
 .../tests/Account/SignedPreKeyDeletionTests.m |  8 +-
 .../tests/Contacts/ContactSortingTest.m       |  2 +-
 ...OWSDisappearingMessagesConfigurationTest.m |  4 +-
 .../tests/Contacts/PhoneNumberTest.m          |  2 +-
 .../tests/Contacts/PhoneNumberUtilTest.m      |  2 +-
 .../tests/Contacts/TSContactThreadTest.m      |  6 +-
 .../tests/Contacts/TSGroupThreadTest.m        |  2 +-
 .../tests/Contacts/TSThreadTest.m             | 14 +--
 .../Messages/Interactions/TSMessageTest.m     |  6 +-
 .../Interactions/TSOutgoingMessageTest.m      |  4 +-
 .../OWSDisappearingMessageFinderTest.m        | 16 ++--
 .../Messages/OWSDisappearingMessagesJobTest.m | 12 +--
 .../tests/Messages/OWSMessageManagerTest.m    | 22 ++---
 .../tests/Messages/OWSMessageSenderTest.m     | 24 ++---
 SignalServiceKit/tests/SSKBaseTestObjC.h      |  2 +-
 SignalServiceKit/tests/SSKBaseTestObjC.m      |  6 +-
 .../tests/Security/OWSFingerprintTest.m       |  2 +-
 .../tests/Storage/OWSIdentityManagerTests.m   |  8 +-
 .../tests/Storage/SSKPreKeyStoreTests.m       |  6 +-
 .../tests/Util/OWSAnalyticsTests.m            |  2 +-
 .../tests/Util/TSMessageStorageTests.m        | 14 +--
 .../SAEScreenLockViewController.h             |  2 +-
 .../SignalShareExtension-Prefix.pch           |  4 +-
 SignalUI/Categories/UIView+SignalUI.m         |  2 +-
 SignalUI/SignalUI-Prefix.pch                  |  6 +-
 SignalUI/SignalUI.h                           | 48 +++++-----
 SignalUI/Utils/BlockListUIUtils.m             |  4 +-
 SignalUI/Utils/OWSAudioPlayer.m               |  2 +-
 .../CountryCodeViewController.m               |  2 +-
 .../ViewControllers/OWSTableViewController.h  |  2 +-
 SignalUI/ViewControllers/OWSViewController.m  |  2 +-
 .../UIViewController+Permissions.m            |  2 +-
 .../ViewControllers/ViewControllerUtils.m     |  2 +-
 SignalUI/Views/ContactsViewHelper.m           |  2 +-
 362 files changed, 975 insertions(+), 1234 deletions(-)
 delete mode 100644 Signal/src/ViewControllers/DebugSettingsTableViewController.m
 delete mode 100644 Signal/test/util/TSStorageIdentityKeyStoreTests.m
 delete mode 100644 Signal/test/util/TSStoragePreKeyStoreTests.m
 delete mode 100644 Signal/test/util/TSStorageSignedPreKeyStore.m

diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 3d61b987e1..f5ea42186f 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -3,22 +3,21 @@
 //
 
 #import "AppDelegate.h"
-#import "DebugLogger.h"
 #import "HomeViewController.h"
 #import "MainAppContext.h"
 #import "OWSDeviceProvisioningURLParser.h"
-#import "OWSOrphanDataCleaner.h"
 #import "OWSScreenLockUI.h"
 #import "Pastelog.h"
-#import "Signal-Swift.h"
 #import "SignalApp.h"
-#import "ViewControllerUtils.h"
 #import <Intents/Intents.h>
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalCoreKit/iOSVersions.h>
 #import <SignalMessaging/AppSetup.h>
+#import <SignalMessaging/DebugLogger.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
+#import <SignalMessaging/OWSOrphanDataCleaner.h>
 #import <SignalMessaging/OWSPreferences.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/SignalMessaging.h>
@@ -38,6 +37,7 @@
 #import <SignalServiceKit/TSAccountManager.h>
 #import <SignalServiceKit/TSPreKeyManager.h>
 #import <SignalUI/OWSNavigationController.h>
+#import <SignalUI/ViewControllerUtils.h>
 #import <UserNotifications/UserNotifications.h>
 #import <WebRTC/WebRTC.h>
 
diff --git a/Signal/src/Calls/UserInterface/RemoteVideoView.m b/Signal/src/Calls/UserInterface/RemoteVideoView.m
index 2228cd8a92..9866104b24 100644
--- a/Signal/src/Calls/UserInterface/RemoteVideoView.m
+++ b/Signal/src/Calls/UserInterface/RemoteVideoView.m
@@ -3,13 +3,13 @@
 //
 
 #import "RemoteVideoView.h"
-#import "UIFont+OWS.h"
-#import "UIView+SignalUI.h"
 #import <MetalKit/MetalKit.h>
 #import <PureLayout/PureLayout.h>
 #import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
+#import <SignalUI/UIFont+OWS.h>
+#import <SignalUI/UIView+SignalUI.h>
 #import <WebRTC/RTCEAGLVideoView.h>
 #import <WebRTC/RTCMTLVideoView.h>
 #import <WebRTC/RTCVideoFrame.h>
diff --git a/Signal/src/Signal-Bridging-Header.h b/Signal/src/Signal-Bridging-Header.h
index 67ebea1723..047aea0ad9 100644
--- a/Signal/src/Signal-Bridging-Header.h
+++ b/Signal/src/Signal-Bridging-Header.h
@@ -13,7 +13,6 @@
 #import "ConversationInputToolbar.h"
 #import "ConversationScrollButton.h"
 #import "ConversationViewController.h"
-#import "DateUtil.h"
 #import "DebugContactsUtils.h"
 #import "DebugUIMessages.h"
 #import "DebugUIPage.h"
@@ -27,7 +26,6 @@
 #import "OWSBezierPathView.h"
 #import "OWSDeviceTableViewCell.h"
 #import "OWSLinkDeviceViewController.h"
-#import "OWSNavigationController.h"
 #import "OWSQuotedMessageView.h"
 #import "OWSWindowManager.h"
 #import "Pastelog.h"
@@ -36,7 +34,6 @@
 #import "RegistrationUtils.h"
 #import "RemoteVideoView.h"
 #import "SignalApp.h"
-#import "ViewControllerUtils.h"
 #import <PureLayout/PureLayout.h>
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSData+OWS.h>
@@ -45,6 +42,7 @@
 #import <SignalCoreKit/OWSAsserts.h>
 #import <SignalCoreKit/OWSLogs.h>
 #import <SignalCoreKit/Threading.h>
+#import <SignalMessaging/DateUtil.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/OWSPreferences.h>
@@ -98,12 +96,14 @@
 #import <SignalUI/AttachmentSharing.h>
 #import <SignalUI/OWSAnyTouchGestureRecognizer.h>
 #import <SignalUI/OWSAudioPlayer.h>
+#import <SignalUI/OWSNavigationController.h>
 #import <SignalUI/OWSQuotedReplyModel.h>
 #import <SignalUI/OWSViewController.h>
 #import <SignalUI/UIFont+OWS.h>
 #import <SignalUI/UIUtil.h>
 #import <SignalUI/UIView+SignalUI.h>
 #import <SignalUI/UIViewController+OWS.h>
+#import <SignalUI/ViewControllerUtils.h>
 #import <WebRTC/RTCAudioSession.h>
 #import <WebRTC/RTCCameraPreviewView.h>
 #import <YYImage/YYImage.h>
diff --git a/Signal/src/UserInterface/OWSWindowManager.m b/Signal/src/UserInterface/OWSWindowManager.m
index 39aa6659a7..22fce84d8b 100644
--- a/Signal/src/UserInterface/OWSWindowManager.m
+++ b/Signal/src/UserInterface/OWSWindowManager.m
@@ -3,13 +3,13 @@
 //
 
 #import "OWSWindowManager.h"
-#import "Environment.h"
-#import "Signal-Swift.h"
-#import "UIFont+OWS.h"
-#import "UIView+SignalUI.h"
+#import <Signal/Signal-Swift.h>
+#import <SignalMessaging/Environment.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalUI/SignalUI-Swift.h>
+#import <SignalUI/UIFont+OWS.h>
+#import <SignalUI/UIView+SignalUI.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/ViewControllers/AppSettings/Linked Devices/OWSLinkDeviceViewController.m b/Signal/src/ViewControllers/AppSettings/Linked Devices/OWSLinkDeviceViewController.m
index 2247cac8f4..54ff95479a 100644
--- a/Signal/src/ViewControllers/AppSettings/Linked Devices/OWSLinkDeviceViewController.m	
+++ b/Signal/src/ViewControllers/AppSettings/Linked Devices/OWSLinkDeviceViewController.m	
@@ -4,7 +4,7 @@
 
 #import "OWSLinkDeviceViewController.h"
 #import "OWSDeviceProvisioningURLParser.h"
-#import "Signal-Swift.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalServiceKit/OWSDevice.h>
diff --git a/Signal/src/ViewControllers/AppSettings/Privacy/BlockListViewController.m b/Signal/src/ViewControllers/AppSettings/Privacy/BlockListViewController.m
index 02f67844e8..2a94a95c57 100644
--- a/Signal/src/ViewControllers/AppSettings/Privacy/BlockListViewController.m
+++ b/Signal/src/ViewControllers/AppSettings/Privacy/BlockListViewController.m
@@ -3,17 +3,17 @@
 //
 
 #import "BlockListViewController.h"
-#import "BlockListUIUtils.h"
-#import "ContactsViewHelper.h"
-#import "PhoneNumber.h"
-#import "Signal-Swift.h"
-#import "UIFont+OWS.h"
-#import "UIView+SignalUI.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
+#import <SignalServiceKit/PhoneNumber.h>
 #import <SignalServiceKit/TSGroupThread.h>
+#import <SignalUI/BlockListUIUtils.h>
+#import <SignalUI/ContactsViewHelper.h>
 #import <SignalUI/OWSTableViewController.h>
+#import <SignalUI/UIFont+OWS.h>
+#import <SignalUI/UIView+SignalUI.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/ViewControllers/AppSettings/Privacy/DomainFrontingCountryViewController.m b/Signal/src/ViewControllers/AppSettings/Privacy/DomainFrontingCountryViewController.m
index aed2680e35..a3523dfc3f 100644
--- a/Signal/src/ViewControllers/AppSettings/Privacy/DomainFrontingCountryViewController.m
+++ b/Signal/src/ViewControllers/AppSettings/Privacy/DomainFrontingCountryViewController.m
@@ -3,13 +3,13 @@
 //
 
 #import "DomainFrontingCountryViewController.h"
-#import "OWSCountryMetadata.h"
-#import "Signal-Swift.h"
-#import "UIFont+OWS.h"
-#import "UIView+SignalUI.h"
+#import <Signal/Signal-Swift.h>
+#import <SignalServiceKit/OWSCountryMetadata.h>
 #import <SignalServiceKit/OWSSignalService.h>
 #import <SignalUI/OWSTableViewController.h>
 #import <SignalUI/Theme.h>
+#import <SignalUI/UIFont+OWS.h>
+#import <SignalUI/UIView+SignalUI.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.h b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.h
index c26b85545b..1867069def 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.h
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSBubbleView.h"
+#import <SignalUI/OWSBubbleView.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
index 63f66478b8..b47365f851 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
@@ -3,8 +3,8 @@
 //
 
 #import "OWSQuotedMessageView.h"
-#import "Environment.h"
-#import "Signal-Swift.h"
+#import <Signal/Signal-Swift.h>
+#import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/TSAttachmentStream.h>
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationCollectionView.m b/Signal/src/ViewControllers/ConversationView/ConversationCollectionView.m
index 1e7ed56a51..56521c784d 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationCollectionView.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationCollectionView.m
@@ -3,7 +3,7 @@
 //
 
 #import "ConversationCollectionView.h"
-#import "Signal-Swift.h"
+#import <Signal/Signal-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
index 76d090fbbc..34dd35de54 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
@@ -3,18 +3,18 @@
 //
 
 #import "ConversationInputToolbar.h"
-#import "Environment.h"
-#import "OWSContactsManager.h"
-#import "OWSMath.h"
-#import "Signal-Swift.h"
-#import "UIFont+OWS.h"
-#import "ViewControllerUtils.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/NSTimer+OWS.h>
+#import <SignalServiceKit/OWSMath.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSQuotedMessage.h>
+#import <SignalUI/UIFont+OWS.h>
 #import <SignalUI/UIView+SignalUI.h>
+#import <SignalUI/ViewControllerUtils.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m b/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m
index 9e6af1cc8b..92c0ebe911 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.m
@@ -3,11 +3,11 @@
 //
 
 #import "ConversationScrollButton.h"
-#import "UIFont+OWS.h"
-#import "UIView+SignalUI.h"
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalUI/SignalUI-Swift.h>
 #import <SignalUI/Theme.h>
+#import <SignalUI/UIFont+OWS.h>
+#import <SignalUI/UIView+SignalUI.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/ViewControllers/DebugSettingsTableViewController.m b/Signal/src/ViewControllers/DebugSettingsTableViewController.m
deleted file mode 100644
index 956c02187d..0000000000
--- a/Signal/src/ViewControllers/DebugSettingsTableViewController.m
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
-//
-
-#import "DebugSettingsTableViewController.h"
-#import "UIFont+OWS.h"
-#import <SignalServiceKit/TSDatabaseView.h>
-#import <SignalServiceKit/TSStorageManager.h>
-
-@implementation DebugSettingsTableViewController
-
-- (void)loadView
-{
-    self.tableViewStyle = UITableViewStylePlain;
-    [super loadView];
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-
-    [self.navigationController.navigationBar setTranslucent:NO];
-
-    self.title = @"Debugging";
-
-    [self updateTableContents];
-}
-
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-
-    [self updateTableContents];
-}
-
-- (void)dealloc
-{
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-#pragma mark - Table Contents
-
-- (void)updateTableContents
-{
-    OWSTableContents *contents = [OWSTableContents new];
-    OWSTableSection *section = [OWSTableSection new];
-
-    __block NSUInteger threadCount;
-    __block NSUInteger messageCount;
-    [TSStorageManager.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
-        threadCount = [[transaction ext:TSThreadDatabaseViewExtensionName] numberOfItemsInAllGroups];
-        messageCount = [[transaction ext:TSMessageDatabaseViewExtensionName] numberOfItemsInAllGroups];
-    }];
-
-    [section addItem:[OWSTableItem labelItemWithText:[NSString stringWithFormat:@"Threads: %zd", threadCount]]];
-    [section addItem:[OWSTableItem labelItemWithText:[NSString stringWithFormat:@"Messages: %zd", messageCount]]];
-
-    [contents addSection:section];
-
-    self.contents = contents;
-}
-
-#pragma mark - Logging
-
-+ (NSString *)tag
-{
-    return [NSString stringWithFormat:@"[%@]", self.class];
-}
-
-- (NSString *)tag
-{
-    return self.class.tag;
-}
-
-@end
diff --git a/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m b/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m
index 61ddc994e1..8d672ca60b 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m
@@ -3,8 +3,8 @@
 //
 
 #import "DebugContactsUtils.h"
-#import "Signal-Swift.h"
 #import <Contacts/Contacts.h>
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m b/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m
index 53736867f3..ae235fbf2b 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m
@@ -4,9 +4,9 @@
 
 #import "DebugUIContacts.h"
 #import "DebugContactsUtils.h"
-#import "Signal-Swift.h"
 #import "SignalApp.h"
 #import <Contacts/Contacts.h>
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalUI/OWSTableViewController.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m b/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m
index c63f02d2b1..490785b64e 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m
@@ -3,9 +3,9 @@
 //
 
 #import "DebugUIDiskUsage.h"
-#import "OWSOrphanDataCleaner.h"
-#import "Signal-Swift.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/NSDate+OWS.h>
+#import <SignalMessaging/OWSOrphanDataCleaner.h>
 #import <SignalServiceKit/TSInteraction.h>
 #import <SignalUI/OWSTableViewController.h>
 
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
index 8ca2f61cfe..a9ca6c86bb 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
@@ -7,8 +7,8 @@
 #import "DebugUIContacts.h"
 #import "DebugUIMessagesAction.h"
 #import "DebugUIMessagesAssetLoader.h"
-#import "Signal-Swift.h"
 #import <MobileCoreServices/UTCoreTypes.h>
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalMessaging/Environment.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
index 1779fbce65..86276d3c7c 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
@@ -4,11 +4,11 @@
 
 #import "DebugUIMisc.h"
 #import "DebugUIMessagesAssetLoader.h"
-#import "OWSCountryMetadata.h"
-#import "Signal-Swift.h"
-#import "ThreadUtil.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/ThreadUtil.h>
+#import <SignalServiceKit/OWSCountryMetadata.h>
 #import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSCall.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.m b/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.m
index 19c7ccc31e..37cb65866f 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.m
@@ -5,7 +5,7 @@
 #import "DebugUIScreenshots.h"
 #import "DebugContactsUtils.h"
 #import "DebugUIContacts.h"
-#import "Signal-Swift.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalMessaging/Environment.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m b/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m
index 809a7c7a3d..c9bb1d6071 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m
@@ -3,7 +3,7 @@
 //
 
 #import "DebugUISessionState.h"
-#import "Signal-Swift.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalServiceKit/OWSIdentityManager.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSContactThread.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIStress.m b/Signal/src/ViewControllers/DebugUI/DebugUIStress.m
index 665e40b5c3..7d154c71a0 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIStress.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIStress.m
@@ -3,14 +3,14 @@
 //
 
 #import "DebugUIStress.h"
-#import "MessageSender.h"
-#import "Signal-Swift.h"
 #import "SignalApp.h"
-#import "ThreadUtil.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/ThreadUtil.h>
+#import <SignalServiceKit/MessageSender.h>
 #import <SignalServiceKit/OWSDynamicOutgoingMessage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSAccountManager.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
index 5ad534aa48..1a351875d9 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
@@ -4,11 +4,11 @@
 
 #import "DebugUISyncMessages.h"
 #import "DebugUIContacts.h"
-#import "Signal-Swift.h"
-#import "ThreadUtil.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/ThreadUtil.h>
 #import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
 #import <SignalServiceKit/OWSIdentityManager.h>
 #import <SignalServiceKit/OWSReceiptManager.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m b/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m
index 6e20e4adf0..5b492c61ad 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m
@@ -11,7 +11,7 @@
 #import "DebugUISessionState.h"
 #import "DebugUIStress.h"
 #import "DebugUISyncMessages.h"
-#import "Signal-Swift.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalServiceKit/TSContactThread.h>
 #import <SignalServiceKit/TSThread.h>
 
diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index af8350d146..2cbb146a3c 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -4,13 +4,9 @@
 
 #import "HomeViewController.h"
 #import "AppDelegate.h"
-#import "OWSNavigationController.h"
 #import "RegistrationUtils.h"
-#import "Signal-Swift.h"
 #import "SignalApp.h"
-#import "TSAccountManager.h"
-#import "TSGroupThread.h"
-#import "ViewControllerUtils.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalCoreKit/Threading.h>
@@ -21,9 +17,12 @@
 #import <SignalServiceKit/OWSMessageUtils.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSAccountManager.h>
+#import <SignalServiceKit/TSGroupThread.h>
 #import <SignalServiceKit/TSOutgoingMessage.h>
+#import <SignalUI/OWSNavigationController.h>
 #import <SignalUI/Theme.h>
 #import <SignalUI/UIUtil.h>
+#import <SignalUI/ViewControllerUtils.h>
 #import <StoreKit/StoreKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.m b/Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.m
index efde9e2620..168324319c 100644
--- a/Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.m
+++ b/Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.m
@@ -3,18 +3,18 @@
 //
 
 #import "MediaDetailViewController.h"
-#import "AttachmentSharing.h"
 #import "ConversationViewController.h"
-#import "Signal-Swift.h"
-#import "TSAttachmentStream.h"
-#import "TSInteraction.h"
-#import "UIUtil.h"
-#import "UIView+SignalUI.h"
 #import <AVKit/AVKit.h>
 #import <MediaPlayer/MPMoviePlayerViewController.h>
 #import <MediaPlayer/MediaPlayer.h>
+#import <Signal/Signal-Swift.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/NSData+Image.h>
+#import <SignalServiceKit/TSAttachmentStream.h>
+#import <SignalServiceKit/TSInteraction.h>
+#import <SignalUI/AttachmentSharing.h>
+#import <SignalUI/UIUtil.h>
+#import <SignalUI/UIView+SignalUI.h>
 #import <YYImage/YYImage.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.m b/Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.m
index 2331916c4f..012b2f478d 100644
--- a/Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.m
+++ b/Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.m
@@ -3,11 +3,9 @@
 //
 
 #import "RecipientPickerViewController.h"
-#import "ContactsViewHelper.h"
-#import "Signal-Swift.h"
 #import "SignalApp.h"
-#import "UIView+SignalUI.h"
 #import <MessageUI/MessageUI.h>
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
@@ -16,8 +14,10 @@
 #import <SignalServiceKit/SignalAccount.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSAccountManager.h>
+#import <SignalUI/ContactsViewHelper.h>
 #import <SignalUI/OWSTableViewController.h>
 #import <SignalUI/UIUtil.h>
+#import <SignalUI/UIView+SignalUI.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m
index d204a0478e..239683559e 100644
--- a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m
@@ -5,9 +5,7 @@
 #import "FingerprintViewController.h"
 #import "FingerprintViewScanController.h"
 #import "OWSBezierPathView.h"
-#import "Signal-Swift.h"
-#import "UIFont+OWS.h"
-#import "UIView+SignalUI.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
@@ -17,7 +15,9 @@
 #import <SignalServiceKit/OWSIdentityManager.h>
 #import <SignalServiceKit/TSAccountManager.h>
 #import <SignalServiceKit/TSInfoMessage.h>
+#import <SignalUI/UIFont+OWS.h>
 #import <SignalUI/UIUtil.h>
+#import <SignalUI/UIView+SignalUI.h>
 
 @import SafariServices;
 
diff --git a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m
index 775f73bb6d..ab2c505534 100644
--- a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m
@@ -3,17 +3,17 @@
 //
 
 #import "FingerprintViewScanController.h"
-#import "Signal-Swift.h"
-#import "UIFont+OWS.h"
-#import "UIView+SignalUI.h"
-#import "UIViewController+Permissions.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalServiceKit/OWSError.h>
 #import <SignalServiceKit/OWSFingerprint.h>
 #import <SignalServiceKit/OWSFingerprintBuilder.h>
 #import <SignalServiceKit/OWSIdentityManager.h>
+#import <SignalUI/UIFont+OWS.h>
 #import <SignalUI/UIUtil.h>
+#import <SignalUI/UIView+SignalUI.h>
+#import <SignalUI/UIViewController+Permissions.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/environment/SignalApp.m b/Signal/src/environment/SignalApp.m
index f3a440d5b4..f37ddae6e9 100644
--- a/Signal/src/environment/SignalApp.m
+++ b/Signal/src/environment/SignalApp.m
@@ -5,7 +5,7 @@
 #import "SignalApp.h"
 #import "AppDelegate.h"
 #import "ConversationViewController.h"
-#import "Signal-Swift.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/DebugLogger.h>
 #import <SignalMessaging/Environment.h>
diff --git a/Signal/src/util/MainAppContext.m b/Signal/src/util/MainAppContext.m
index 01a77eb3df..3e882233d3 100644
--- a/Signal/src/util/MainAppContext.m
+++ b/Signal/src/util/MainAppContext.m
@@ -3,7 +3,7 @@
 //
 
 #import "MainAppContext.h"
-#import "Signal-Swift.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSProfileManager.h>
diff --git a/Signal/src/util/OWSScreenLockUI.m b/Signal/src/util/OWSScreenLockUI.m
index 97b68b1be2..ad194f12e8 100644
--- a/Signal/src/util/OWSScreenLockUI.m
+++ b/Signal/src/util/OWSScreenLockUI.m
@@ -4,7 +4,7 @@
 
 #import "OWSScreenLockUI.h"
 #import "OWSWindowManager.h"
-#import "Signal-Swift.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalUI/ScreenLockViewController.h>
 #import <SignalUI/UIView+SignalUI.h>
diff --git a/Signal/src/util/Pastelog.m b/Signal/src/util/Pastelog.m
index 2c038b0b74..aea41a7f0b 100644
--- a/Signal/src/util/Pastelog.m
+++ b/Signal/src/util/Pastelog.m
@@ -3,15 +3,15 @@
 //
 
 #import "Pastelog.h"
-#import "Signal-Swift.h"
-#import "ThreadUtil.h"
 #import "zlib.h"
 #import <SSZipArchive/SSZipArchive.h>
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/DebugLogger.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalMessaging/ThreadUtil.h>
 #import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/MimeTypeUtil.h>
+#import <SignalServiceKit/MIMETypeUtil.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSAccountManager.h>
 #import <SignalServiceKit/TSContactThread.h>
diff --git a/Signal/src/util/RegistrationUtils.m b/Signal/src/util/RegistrationUtils.m
index edd4b68eff..f4c5292bbb 100644
--- a/Signal/src/util/RegistrationUtils.m
+++ b/Signal/src/util/RegistrationUtils.m
@@ -3,13 +3,13 @@
 //
 
 #import "RegistrationUtils.h"
-#import "OWSNavigationController.h"
-#import "Signal-Swift.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSPreferences.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/TSAccountManager.h>
+#import <SignalUI/OWSNavigationController.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/views/OWSDeviceTableViewCell.m b/Signal/src/views/OWSDeviceTableViewCell.m
index d84ab39329..2b6f0515ca 100644
--- a/Signal/src/views/OWSDeviceTableViewCell.m
+++ b/Signal/src/views/OWSDeviceTableViewCell.m
@@ -3,7 +3,7 @@
 //
 
 #import "OWSDeviceTableViewCell.h"
-#import "DateUtil.h"
+#import <SignalMessaging/DateUtil.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalUI/OWSTableViewController.h>
 #import <SignalUI/SignalUI-Swift.h>
diff --git a/Signal/src/views/PinEntryView.m b/Signal/src/views/PinEntryView.m
index eedb2c2dfd..845179c54c 100644
--- a/Signal/src/views/PinEntryView.m
+++ b/Signal/src/views/PinEntryView.m
@@ -3,7 +3,7 @@
 //
 
 #import "PinEntryView.h"
-#import "Signal-Swift.h"
+#import <Signal/Signal-Swift.h>
 #import <SignalUI/UIFont+OWS.h>
 #import <SignalUI/UIView+SignalUI.h>
 #import <SignalUI/ViewControllerUtils.h>
diff --git a/Signal/test/SignalBaseTest.m b/Signal/test/SignalBaseTest.m
index e1e8aa5494..2c3f5df5ac 100644
--- a/Signal/test/SignalBaseTest.m
+++ b/Signal/test/SignalBaseTest.m
@@ -3,7 +3,7 @@
 //
 
 #import "SignalBaseTest.h"
-#import "Environment.h"
+#import <SignalMessaging/Environment.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/SDSDatabaseStorage+Objc.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
diff --git a/Signal/test/mocks/MockEnvironment.h b/Signal/test/mocks/MockEnvironment.h
index db330cf4a5..8f6aa09580 100644
--- a/Signal/test/mocks/MockEnvironment.h
+++ b/Signal/test/mocks/MockEnvironment.h
@@ -1,8 +1,8 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "Environment.h"
+#import <SignalMessaging/Environment.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/test/mocks/MockEnvironment.m b/Signal/test/mocks/MockEnvironment.m
index 067a5f33b4..b77a522ec1 100644
--- a/Signal/test/mocks/MockEnvironment.m
+++ b/Signal/test/mocks/MockEnvironment.m
@@ -3,8 +3,8 @@
 //
 
 #import "MockEnvironment.h"
-#import "OWSOrphanDataCleaner.h"
 #import "OWSWindowManager.h"
+#import <SignalMessaging/OWSOrphanDataCleaner.h>
 #import <SignalMessaging/OWSPreferences.h>
 #import <SignalMessaging/OWSSounds.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
diff --git a/Signal/test/util/FunctionalUtilTest.m b/Signal/test/util/FunctionalUtilTest.m
index a886b98815..c208858684 100644
--- a/Signal/test/util/FunctionalUtilTest.m
+++ b/Signal/test/util/FunctionalUtilTest.m
@@ -1,10 +1,10 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "FunctionalUtil.h"
 #import "SignalBaseTest.h"
 #import "TestUtil.h"
+#import <SignalServiceKit/FunctionalUtil.h>
 
 @interface FunctionalUtilTest : SignalBaseTest
 
diff --git a/Signal/test/util/OWSOrphanDataCleanerTest.m b/Signal/test/util/OWSOrphanDataCleanerTest.m
index 9a0af2eb22..cdf05d7360 100644
--- a/Signal/test/util/OWSOrphanDataCleanerTest.m
+++ b/Signal/test/util/OWSOrphanDataCleanerTest.m
@@ -1,9 +1,9 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOrphanDataCleaner.h"
 #import "SignalBaseTest.h"
+#import <SignalMessaging/OWSOrphanDataCleaner.h>
 #import <SignalServiceKit/OWSDevice.h>
 #import <SignalServiceKit/TSAttachmentStream.h>
 #import <SignalServiceKit/TSContactThread.h>
diff --git a/Signal/test/util/OWSScrubbingLogFormatterTest.m b/Signal/test/util/OWSScrubbingLogFormatterTest.m
index ade2a945b1..891366b774 100644
--- a/Signal/test/util/OWSScrubbingLogFormatterTest.m
+++ b/Signal/test/util/OWSScrubbingLogFormatterTest.m
@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSScrubbingLogFormatter.h"
 #import "SignalBaseTest.h"
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalCoreKit/Randomness.h>
+#import <SignalMessaging/OWSScrubbingLogFormatter.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSGroupThread.h>
 
diff --git a/Signal/test/util/TSStorageIdentityKeyStoreTests.m b/Signal/test/util/TSStorageIdentityKeyStoreTests.m
deleted file mode 100644
index 6a182db81b..0000000000
--- a/Signal/test/util/TSStorageIdentityKeyStoreTests.m
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-#import "OWSIdentityManager.h"
-#import "OWSPrimaryStorage.h"
-#import "OWSRecipientIdentity.h"
-#import "OWSUnitTestEnvironment.h"
-#import "SSKBaseTest.h"
-#import "SSKEnvironment.h"
-#import "SecurityUtils.h"
-#import <Curve25519Kit/Curve25519.h>
-
-@interface TSStorageIdentityKeyStoreTests : SSKBaseTest
-
-@end
-
-@implementation TSStorageIdentityKeyStoreTests
-
-- (void)setUp
-{
-    [super setUp];
-
-    [[OWSPrimaryStorage sharedManager] purgeCollection:OWSPrimaryStorageTrustedKeysCollection];
-    [OWSRecipientIdentity removeAllObjectsInCollection];
-}
-
-- (void)tearDown
-{
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-    [super tearDown];
-}
-
-- (void)testNewEmptyKey
-{
-    NSData *newKey = [SecurityUtils generateRandomBytes:32];
-    NSString *recipientId = @"test@gmail.com";
-
-    XCTAssert([[OWSIdentityManager sharedManager] isTrustedIdentityKey:newKey
-                                                           recipientId:recipientId
-                                                             direction:TSMessageDirectionOutgoing]);
-    XCTAssert([[OWSIdentityManager sharedManager] isTrustedIdentityKey:newKey
-                                                           recipientId:recipientId
-                                                             direction:TSMessageDirectionIncoming]);
-}
-
-- (void)testAlreadyRegisteredKey
-{
-    NSData *newKey = [SecurityUtils generateRandomBytes:32];
-    NSString *recipientId = @"test@gmail.com";
-
-    [[OWSIdentityManager sharedManager] saveRemoteIdentity:newKey recipientId:recipientId];
-
-    XCTAssert([[OWSIdentityManager sharedManager] isTrustedIdentityKey:newKey
-                                                           recipientId:recipientId
-                                                             direction:TSMessageDirectionOutgoing]);
-    XCTAssert([[OWSIdentityManager sharedManager] isTrustedIdentityKey:newKey
-                                                           recipientId:recipientId
-                                                             direction:TSMessageDirectionIncoming]);
-}
-
-
-- (void)testChangedKey
-{
-    NSData *originalKey = [SecurityUtils generateRandomBytes:32];
-    NSString *recipientId = @"test@protonmail.com";
-
-    [[OWSIdentityManager sharedManager] saveRemoteIdentity:originalKey recipientId:recipientId];
-
-    XCTAssert([[OWSIdentityManager sharedManager] isTrustedIdentityKey:originalKey
-                                                           recipientId:recipientId
-                                                             direction:TSMessageDirectionOutgoing]);
-    XCTAssert([[OWSIdentityManager sharedManager] isTrustedIdentityKey:originalKey
-                                                           recipientId:recipientId
-                                                             direction:TSMessageDirectionIncoming]);
-
-    NSData *otherKey = [SecurityUtils generateRandomBytes:32];
-
-    XCTAssertFalse([[OWSIdentityManager sharedManager] isTrustedIdentityKey:otherKey
-                                                                recipientId:recipientId
-                                                                  direction:TSMessageDirectionOutgoing]);
-    XCTAssert([[OWSIdentityManager sharedManager] isTrustedIdentityKey:otherKey
-                                                           recipientId:recipientId
-                                                             direction:TSMessageDirectionIncoming]);
-}
-
-
-- (void)testIdentityKey
-{
-    [[OWSIdentityManager sharedManager] generateNewIdentityKey];
-
-    XCTAssert([[[OWSIdentityManager sharedManager] identityKeyPair].publicKey length] == 32);
-}
-
-@end
diff --git a/Signal/test/util/TSStoragePreKeyStoreTests.m b/Signal/test/util/TSStoragePreKeyStoreTests.m
deleted file mode 100644
index ec42436916..0000000000
--- a/Signal/test/util/TSStoragePreKeyStoreTests.m
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-#import "OWSPrimaryStorage+PreKeyStore.h"
-#import "SSKBaseTest.h"
-
-@interface TSStoragePreKeyStoreTests : SSKBaseTest
-
-@end
-
-@implementation TSStoragePreKeyStoreTests
-
-- (void)setUp
-{
-    [super setUp];
-    // Put setup code here. This method is called before the invocation of each test method in the class.
-}
-
-- (void)tearDown
-{
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-    [super tearDown];
-}
-
-- (void)testGeneratingAndStoringPreKeys
-{
-    NSArray *generatedKeys = [[OWSPrimaryStorage sharedManager] generatePreKeyRecords];
-
-
-    XCTAssert([generatedKeys count] == 100, @"Not hundred keys generated");
-
-    [[OWSPrimaryStorage sharedManager] storePreKeyRecords:generatedKeys];
-
-    PreKeyRecord *lastPreKeyRecord = [generatedKeys lastObject];
-    PreKeyRecord *firstPreKeyRecord = [generatedKeys firstObject];
-
-    XCTAssert([[[OWSPrimaryStorage sharedManager] loadPreKey:lastPreKeyRecord.Id].keyPair.publicKey
-        isEqualToData:lastPreKeyRecord.keyPair.publicKey]);
-
-    XCTAssert([[[OWSPrimaryStorage sharedManager] loadPreKey:firstPreKeyRecord.Id].keyPair.publicKey
-        isEqualToData:firstPreKeyRecord.keyPair.publicKey]);
-}
-
-
-- (void)testRemovingPreKeys
-{
-    NSArray *generatedKeys = [[OWSPrimaryStorage sharedManager] generatePreKeyRecords];
-
-    XCTAssert([generatedKeys count] == 100, @"Not hundred keys generated");
-
-    [[OWSPrimaryStorage sharedManager] storePreKeyRecords:generatedKeys];
-
-    PreKeyRecord *lastPreKeyRecord = [generatedKeys lastObject];
-    PreKeyRecord *firstPreKeyRecord = [generatedKeys firstObject];
-
-    [[OWSPrimaryStorage sharedManager] removePreKey:lastPreKeyRecord.Id];
-
-    XCTAssertThrows([[OWSPrimaryStorage sharedManager] loadPreKey:lastPreKeyRecord.Id]);
-    XCTAssertNoThrow([[OWSPrimaryStorage sharedManager] loadPreKey:firstPreKeyRecord.Id]);
-}
-
-@end
diff --git a/Signal/test/util/TSStorageSignedPreKeyStore.m b/Signal/test/util/TSStorageSignedPreKeyStore.m
deleted file mode 100644
index d436be932d..0000000000
--- a/Signal/test/util/TSStorageSignedPreKeyStore.m
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-#import "SSKBaseTest.h"
-
-@interface TSStorageSignedPreKeyStore : SSKBaseTest
-
-@end
-
-@implementation TSStorageSignedPreKeyStore
-
-- (void)setUp
-{
-    [super setUp];
-    // Put setup code here. This method is called before the invocation of each test method in the class.
-}
-
-- (void)tearDown
-{
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-    [super tearDown];
-}
-
-@end
diff --git a/Signal/test/util/UtilTest.m b/Signal/test/util/UtilTest.m
index 567ea5e0c1..a0d6286a33 100644
--- a/Signal/test/util/UtilTest.m
+++ b/Signal/test/util/UtilTest.m
@@ -1,13 +1,13 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "UtilTest.h"
-#import "DateUtil.h"
 #import "TestUtil.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/NSObject+OWS.h>
 #import <SignalCoreKit/NSString+OWS.h>
+#import <SignalMessaging/DateUtil.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 @interface DateUtil (Test)
diff --git a/SignalMessaging/SignalMessaging-Prefix.pch b/SignalMessaging/SignalMessaging-Prefix.pch
index 5562e15e54..80e2b26447 100644
--- a/SignalMessaging/SignalMessaging-Prefix.pch
+++ b/SignalMessaging/SignalMessaging-Prefix.pch
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import <Availability.h>
@@ -17,7 +17,7 @@
 
     #import <SignalCoreKit/OWSAsserts.h>
     #import <SignalCoreKit/NSObject+OWS.h>
-    #import <SignalServiceKit/OWSAnalytics.h>
-    #import <SignalServiceKit/SSKAsserts.h>
-    #import <SignalServiceKit/SDSDatabaseStorage+Objc.h>
+#import <SignalServiceKit/OWSAnalytics.h>
+#import <SignalServiceKit/SSKAsserts.h>
+#import <SignalServiceKit/SDSDatabaseStorage+Objc.h>
 #endif
diff --git a/SignalMessaging/SignalMessaging.h b/SignalMessaging/SignalMessaging.h
index df8aa3a17d..9ea2631a84 100644
--- a/SignalMessaging/SignalMessaging.h
+++ b/SignalMessaging/SignalMessaging.h
@@ -11,16 +11,16 @@ FOUNDATION_EXPORT double SignalMessagingVersionNumber;
 FOUNDATION_EXPORT const unsigned char SignalMessagingVersionString[];
 
 // The public headers of the framework
-#import <SignalMessaging/AppSetup.h>
-#import <SignalMessaging/DateUtil.h>
-#import <SignalMessaging/DebugLogger.h>
-#import <SignalMessaging/Environment.h>
-#import <SignalMessaging/OWSContactsManager.h>
-#import <SignalMessaging/OWSOrphanDataCleaner.h>
-#import <SignalMessaging/OWSPreferences.h>
-#import <SignalMessaging/OWSProfileManager.h>
-#import <SignalMessaging/OWSSounds.h>
-#import <SignalMessaging/OWSSyncManager.h>
-#import <SignalMessaging/ThreadUtil.h>
-#import <SignalMessaging/VersionMigrations.h>
+#import "AppSetup.h"
+#import "DateUtil.h"
+#import "DebugLogger.h"
+#import "Environment.h"
+#import "OWSContactsManager.h"
+#import "OWSOrphanDataCleaner.h"
+#import "OWSPreferences.h"
+#import "OWSProfileManager.h"
+#import "OWSSounds.h"
+#import "OWSSyncManager.h"
+#import "ThreadUtil.h"
+#import "VersionMigrations.h"
 #import <SignalServiceKit/OWSUserProfile.h>
diff --git a/SignalMessaging/contacts/OWSSyncManager.m b/SignalMessaging/contacts/OWSSyncManager.m
index 6b96c26dd6..fbeba6afb0 100644
--- a/SignalMessaging/contacts/OWSSyncManager.m
+++ b/SignalMessaging/contacts/OWSSyncManager.m
@@ -7,7 +7,6 @@
 #import "OWSContactsManager.h"
 #import "OWSPreferences.h"
 #import "OWSProfileManager.h"
-#import "OWSReceiptManager.h"
 #import <Contacts/Contacts.h>
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
@@ -17,6 +16,7 @@
 #import <SignalServiceKit/MIMETypeUtil.h>
 #import <SignalServiceKit/MessageSender.h>
 #import <SignalServiceKit/OWSError.h>
+#import <SignalServiceKit/OWSReceiptManager.h>
 #import <SignalServiceKit/OWSSyncConfigurationMessage.h>
 #import <SignalServiceKit/OWSSyncContactsMessage.h>
 #import <SignalServiceKit/OWSSyncFetchLatestMessage.h>
diff --git a/SignalMessaging/environment/AppSetup.m b/SignalMessaging/environment/AppSetup.m
index 2c465c54b7..01458ba61e 100644
--- a/SignalMessaging/environment/AppSetup.m
+++ b/SignalMessaging/environment/AppSetup.m
@@ -4,8 +4,8 @@
 
 #import "AppSetup.h"
 #import "Environment.h"
+#import "OWSProfileManager.h"
 #import "VersionMigrations.h"
-#import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalMetadataKit/SignalMetadataKit-Swift.h>
 #import <SignalServiceKit/OWS2FAManager.h>
diff --git a/SignalMessaging/utils/OWSOrphanDataCleaner.m b/SignalMessaging/utils/OWSOrphanDataCleaner.m
index 5c666d126b..54c527749b 100644
--- a/SignalMessaging/utils/OWSOrphanDataCleaner.m
+++ b/SignalMessaging/utils/OWSOrphanDataCleaner.m
@@ -4,8 +4,8 @@
 
 #import "OWSOrphanDataCleaner.h"
 #import "DateUtil.h"
+#import "OWSProfileManager.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/AppReadiness.h>
 #import <SignalServiceKit/AppVersion.h>
diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m
index 9ff8e76d33..0cb6106097 100644
--- a/SignalMessaging/utils/ThreadUtil.m
+++ b/SignalMessaging/utils/ThreadUtil.m
@@ -3,9 +3,9 @@
 //
 
 #import "ThreadUtil.h"
+#import "OWSProfileManager.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
-#import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/MessageSender.h>
 #import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
diff --git a/SignalServiceKit/src/Account/TSAccountManager.h b/SignalServiceKit/src/Account/TSAccountManager.h
index 2959d8da39..f50890795c 100644
--- a/SignalServiceKit/src/Account/TSAccountManager.h
+++ b/SignalServiceKit/src/Account/TSAccountManager.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSConstants.h>
+#import "TSConstants.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Account/TSAccountManager.m b/SignalServiceKit/src/Account/TSAccountManager.m
index e952ceec42..790d5c87e8 100644
--- a/SignalServiceKit/src/Account/TSAccountManager.m
+++ b/SignalServiceKit/src/Account/TSAccountManager.m
@@ -3,18 +3,18 @@
 //
 
 #import "TSAccountManager.h"
+#import "AppContext.h"
+#import "AppReadiness.h"
+#import "HTTPUtils.h"
+#import "OWSError.h"
+#import "OWSRequestFactory.h"
+#import "ProfileManagerProtocol.h"
+#import "RemoteAttestation.h"
+#import "SSKEnvironment.h"
+#import "TSPreKeyManager.h"
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalCoreKit/Randomness.h>
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/AppReadiness.h>
-#import <SignalServiceKit/HTTPUtils.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSRequestFactory.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
-#import <SignalServiceKit/RemoteAttestation.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSPreKeyManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Account/TSPreKeyManager.h b/SignalServiceKit/src/Account/TSPreKeyManager.h
index 33c031541f..2e699a909f 100644
--- a/SignalServiceKit/src/Account/TSPreKeyManager.h
+++ b/SignalServiceKit/src/Account/TSPreKeyManager.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSAccountManager.h>
+#import "TSAccountManager.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Account/TSPreKeyManager.m b/SignalServiceKit/src/Account/TSPreKeyManager.m
index f1ccb47004..0bf49d7686 100644
--- a/SignalServiceKit/src/Account/TSPreKeyManager.m
+++ b/SignalServiceKit/src/Account/TSPreKeyManager.m
@@ -2,16 +2,16 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSPreKeyManager.h>
+#import "TSPreKeyManager.h"
+#import "AppContext.h"
+#import "HTTPUtils.h"
+#import "OWSIdentityManager.h"
+#import "SSKEnvironment.h"
+#import "SSKPreKeyStore.h"
+#import "SSKSignedPreKeyStore.h"
+#import "SignedPrekeyRecord.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/HTTPUtils.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/SSKEnvironment.h>
-#import <SignalServiceKit/SSKPreKeyStore.h>
-#import <SignalServiceKit/SSKSignedPreKeyStore.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/SignedPreKeyRecord.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/Contact.m b/SignalServiceKit/src/Contacts/Contact.m
index bc7d990121..d7bda3549b 100644
--- a/SignalServiceKit/src/Contacts/Contact.m
+++ b/SignalServiceKit/src/Contacts/Contact.m
@@ -2,15 +2,15 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "Contact.h"
+#import "PhoneNumber.h"
+#import "SSKEnvironment.h"
+#import "SignalRecipient.h"
+#import "TSAccountManager.h"
 #import <Contacts/Contacts.h>
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/Contact.h>
-#import <SignalServiceKit/PhoneNumber.h>
-#import <SignalServiceKit/SSKEnvironment.h>
-#import <SignalServiceKit/SignalRecipient.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h
index 0ba9b04351..8b2b505c42 100644
--- a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h
+++ b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m
index 8a624160b2..067c912a69 100644
--- a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m
+++ b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSDisappearingMessagesConfiguration.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Contacts/PhoneNumber.m b/SignalServiceKit/src/Contacts/PhoneNumber.m
index cc6d054063..9b264be1ca 100644
--- a/SignalServiceKit/src/Contacts/PhoneNumber.m
+++ b/SignalServiceKit/src/Contacts/PhoneNumber.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/PhoneNumber.h>
+#import "PhoneNumber.h"
 #import "NSString+SSK.h"
-#import <SignalServiceKit/PhoneNumberUtil.h>
+#import "PhoneNumberUtil.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <libPhoneNumber_iOS/NBAsYouTypeFormatter.h>
 #import <libPhoneNumber_iOS/NBMetadataHelper.h>
diff --git a/SignalServiceKit/src/Contacts/PhoneNumberUtil.h b/SignalServiceKit/src/Contacts/PhoneNumberUtil.h
index 56213df56d..e976e36bfa 100644
--- a/SignalServiceKit/src/Contacts/PhoneNumberUtil.h
+++ b/SignalServiceKit/src/Contacts/PhoneNumberUtil.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/PhoneNumber.h>
+#import "PhoneNumber.h"
 #import <libPhoneNumber_iOS/NBPhoneNumberUtil.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Contacts/PhoneNumberUtil.m b/SignalServiceKit/src/Contacts/PhoneNumberUtil.m
index 772430676c..d76d0fa5e9 100644
--- a/SignalServiceKit/src/Contacts/PhoneNumberUtil.m
+++ b/SignalServiceKit/src/Contacts/PhoneNumberUtil.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/FunctionalUtil.h>
-#import <SignalServiceKit/PhoneNumberUtil.h>
+#import "PhoneNumberUtil.h"
+#import "ContactsManagerProtocol.h"
+#import "FunctionalUtil.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <libPhoneNumber_iOS/NBPhoneNumber.h>
 
diff --git a/SignalServiceKit/src/Contacts/SignalAccount.h b/SignalServiceKit/src/Contacts/SignalAccount.h
index dfbe936159..254e60211d 100644
--- a/SignalServiceKit/src/Contacts/SignalAccount.h
+++ b/SignalServiceKit/src/Contacts/SignalAccount.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/SignalAccount.m b/SignalServiceKit/src/Contacts/SignalAccount.m
index f3002b3a57..8e3a66970d 100644
--- a/SignalServiceKit/src/Contacts/SignalAccount.m
+++ b/SignalServiceKit/src/Contacts/SignalAccount.m
@@ -2,15 +2,15 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "SignalAccount.h"
+#import "Contact.h"
+#import "ContactsManagerProtocol.h"
 #import "NSData+Image.h"
+#import "SSKEnvironment.h"
+#import "SignalRecipient.h"
 #import "UIImage+OWS.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/Contact.h>
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/SSKEnvironment.h>
-#import <SignalServiceKit/SignalAccount.h>
-#import <SignalServiceKit/SignalRecipient.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Contacts/SignalRecipient.h b/SignalServiceKit/src/Contacts/SignalRecipient.h
index a6e72d2e6c..12fc5c6c65 100644
--- a/SignalServiceKit/src/Contacts/SignalRecipient.h
+++ b/SignalServiceKit/src/Contacts/SignalRecipient.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/SignalRecipient.m b/SignalServiceKit/src/Contacts/SignalRecipient.m
index cded6cc9c1..dd6ecd8959 100644
--- a/SignalServiceKit/src/Contacts/SignalRecipient.m
+++ b/SignalServiceKit/src/Contacts/SignalRecipient.m
@@ -2,12 +2,12 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SignalRecipient.h>
-#import <SignalServiceKit/OWSDevice.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
-#import <SignalServiceKit/SSKEnvironment.h>
+#import "SignalRecipient.h"
+#import "OWSDevice.h"
+#import "ProfileManagerProtocol.h"
+#import "SSKEnvironment.h"
+#import "TSAccountManager.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/TSGroupMember.h b/SignalServiceKit/src/Contacts/TSGroupMember.h
index 8b1d11b0d3..34a3cb0237 100644
--- a/SignalServiceKit/src/Contacts/TSGroupMember.h
+++ b/SignalServiceKit/src/Contacts/TSGroupMember.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/TSThread.h b/SignalServiceKit/src/Contacts/TSThread.h
index 4ce4b0f11b..5050035246 100644
--- a/SignalServiceKit/src/Contacts/TSThread.h
+++ b/SignalServiceKit/src/Contacts/TSThread.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/TSThread.m b/SignalServiceKit/src/Contacts/TSThread.m
index 1c09b87bda..8f7cbededb 100644
--- a/SignalServiceKit/src/Contacts/TSThread.m
+++ b/SignalServiceKit/src/Contacts/TSThread.m
@@ -3,20 +3,20 @@
 //
 
 #import "TSThread.h"
+#import "AppReadiness.h"
+#import "OWSDisappearingMessagesConfiguration.h"
+#import "OWSReadTracking.h"
+#import "SSKEnvironment.h"
+#import "TSAccountManager.h"
+#import "TSIncomingMessage.h"
+#import "TSInfoMessage.h"
+#import "TSInteraction.h"
+#import "TSInvalidIdentityKeyReceivingErrorMessage.h"
+#import "TSOutgoingMessage.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/AppReadiness.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSReadTracking.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSIncomingMessage.h>
-#import <SignalServiceKit/TSInfoMessage.h>
-#import <SignalServiceKit/TSInteraction.h>
-#import <SignalServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
 
 @import Intents;
 
diff --git a/SignalServiceKit/src/Contacts/Threads/TSContactThread.h b/SignalServiceKit/src/Contacts/Threads/TSContactThread.h
index d2394f824f..d32f674113 100644
--- a/SignalServiceKit/src/Contacts/Threads/TSContactThread.h
+++ b/SignalServiceKit/src/Contacts/Threads/TSContactThread.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSThread.h>
+#import "TSThread.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/Threads/TSContactThread.m b/SignalServiceKit/src/Contacts/Threads/TSContactThread.m
index 7fe4f2dde7..9e91e0347b 100644
--- a/SignalServiceKit/src/Contacts/Threads/TSContactThread.m
+++ b/SignalServiceKit/src/Contacts/Threads/TSContactThread.m
@@ -2,12 +2,12 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/NotificationsProtocol.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/SSKEnvironment.h>
+#import "TSContactThread.h"
+#import "ContactsManagerProtocol.h"
+#import "NotificationsProtocol.h"
+#import "OWSIdentityManager.h"
+#import "SSKEnvironment.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/Threads/TSGroupThread.h b/SignalServiceKit/src/Contacts/Threads/TSGroupThread.h
index 8487f6570e..b45f1c4a01 100644
--- a/SignalServiceKit/src/Contacts/Threads/TSGroupThread.h
+++ b/SignalServiceKit/src/Contacts/Threads/TSGroupThread.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSGroupModel.h>
-#import <SignalServiceKit/TSThread.h>
+#import "TSGroupModel.h"
+#import "TSThread.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/Threads/TSGroupThread.m b/SignalServiceKit/src/Contacts/Threads/TSGroupThread.m
index e55e216c74..abb2dbc596 100644
--- a/SignalServiceKit/src/Contacts/Threads/TSGroupThread.m
+++ b/SignalServiceKit/src/Contacts/Threads/TSGroupThread.m
@@ -2,11 +2,11 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "TSGroupThread.h"
+#import "TSAccountManager.h"
+#import "TSAttachmentStream.h"
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
-#import <SignalServiceKit/TSGroupThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/ConversationSync/OWSChunkedOutputStream.m b/SignalServiceKit/src/Devices/ConversationSync/OWSChunkedOutputStream.m
index 894065336d..4d41a0d3f1 100644
--- a/SignalServiceKit/src/Devices/ConversationSync/OWSChunkedOutputStream.m
+++ b/SignalServiceKit/src/Devices/ConversationSync/OWSChunkedOutputStream.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSChunkedOutputStream.h"
 #import <SignalCoreKit/NSData+OWS.h>
-#import <SignalServiceKit/OWSChunkedOutputStream.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.h b/SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.h
index f39492790e..66e0bb760c 100644
--- a/SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.h
+++ b/SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSChunkedOutputStream.h>
+#import "OWSChunkedOutputStream.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.m b/SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.m
index 7585cd40a9..3863d66b95 100644
--- a/SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.m
+++ b/SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.m
@@ -2,19 +2,19 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSContactsOutputStream.h"
+#import "Contact.h"
+#import "ContactsManagerProtocol.h"
+#import "MIMETypeUtil.h"
 #import "NSData+Image.h"
 #import "NSData+keyVersionByte.h"
+#import "OWSDisappearingMessagesConfiguration.h"
+#import "OWSRecipientIdentity.h"
+#import "SignalAccount.h"
+#import "TSContactThread.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSData+OWS.h>
-#import <SignalServiceKit/Contact.h>
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/OWSContactsOutputStream.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSRecipientIdentity.h>
-#import <SignalServiceKit/SignalAccount.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.h b/SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.h
index 79b23a34c8..b0ae465133 100644
--- a/SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.h
+++ b/SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSChunkedOutputStream.h>
+#import "OWSChunkedOutputStream.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.m b/SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.m
index 212cdc9cc2..7d3975a989 100644
--- a/SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.m
+++ b/SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.m
@@ -2,13 +2,13 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/NSData+Image.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSGroupsOutputStream.h>
+#import "OWSGroupsOutputStream.h"
+#import "MIMETypeUtil.h"
+#import "NSData+Image.h"
+#import "OWSDisappearingMessagesConfiguration.h"
+#import "TSGroupModel.h"
+#import "TSGroupThread.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSGroupModel.h>
-#import <SignalServiceKit/TSGroupThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.h b/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.h
index 4ef341439a..79b32d7da5 100644
--- a/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.h
+++ b/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
+#import "OWSOutgoingSyncMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.m b/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.m
index a525d81da0..dce3f10443 100644
--- a/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.m
+++ b/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSBlockedPhoneNumbersMessage.h>
+#import "OWSBlockedPhoneNumbersMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Devices/OWSDevice.h b/SignalServiceKit/src/Devices/OWSDevice.h
index f7b4a5ba08..c47ef4a374 100644
--- a/SignalServiceKit/src/Devices/OWSDevice.h
+++ b/SignalServiceKit/src/Devices/OWSDevice.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "BaseModel.h"
 #import <Mantle/MTLJSONAdapter.h>
-#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSDevice.m b/SignalServiceKit/src/Devices/OWSDevice.m
index 1782ad05ef..e1837eaa2a 100644
--- a/SignalServiceKit/src/Devices/OWSDevice.m
+++ b/SignalServiceKit/src/Devices/OWSDevice.m
@@ -3,14 +3,14 @@
 //
 
 #import "OWSDevice.h"
+#import "AppReadiness.h"
+#import "OWSError.h"
+#import "OWSIdentityManager.h"
+#import "SSKEnvironment.h"
+#import "TSAccountManager.h"
 #import <Mantle/MTLValueTransformer.h>
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/AppReadiness.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSDeviceProvisioner.m b/SignalServiceKit/src/Devices/OWSDeviceProvisioner.m
index 990592b7f5..351fb4e9d3 100644
--- a/SignalServiceKit/src/Devices/OWSDeviceProvisioner.m
+++ b/SignalServiceKit/src/Devices/OWSDeviceProvisioner.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSDeviceProvisioner.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSProvisioningMessage.h>
+#import "OWSDeviceProvisioner.h"
+#import "OWSError.h"
+#import "OWSProvisioningMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Devices/OWSProvisioningMessage.m b/SignalServiceKit/src/Devices/OWSProvisioningMessage.m
index 8a96d9d9aa..3a42a453a1 100644
--- a/SignalServiceKit/src/Devices/OWSProvisioningMessage.m
+++ b/SignalServiceKit/src/Devices/OWSProvisioningMessage.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSProvisioningMessage.h"
+#import "NSData+keyVersionByte.h"
 #import <Curve25519Kit/Curve25519.h>
-#import <SignalServiceKit/NSData+keyVersionByte.h>
-#import <SignalServiceKit/OWSProvisioningMessage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.h b/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.h
index 09ffb38964..2d7b5ad921 100644
--- a/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.h
+++ b/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
+#import "OWSOutgoingSyncMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.m b/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.m
index 93af6e9280..0138724dc3 100644
--- a/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.m
+++ b/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.m
@@ -3,7 +3,7 @@
 //
 
 #import "OWSReadReceiptsForLinkedDevicesMessage.h"
-#import <SignalServiceKit/OWSLinkedDeviceReadReceipt.h>
+#import "OWSLinkedDeviceReadReceipt.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.h b/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.h
index c06fadd67d..a80cef6464 100644
--- a/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.h
+++ b/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
+#import "OWSOutgoingSyncMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.m b/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.m
index ca4ecaa504..1a6953dd7c 100644
--- a/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.m
+++ b/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.m
@@ -3,8 +3,8 @@
 //
 
 #import "OWSReceiptsForSenderMessage.h"
+#import "SignalRecipient.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/SignalRecipient.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m
index 224096209a..942091160e 100644
--- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m
+++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m
@@ -3,20 +3,20 @@
 //
 
 #import "OWSRecordTranscriptJob.h"
-#import <SignalServiceKit/FunctionalUtil.h>
-#import <SignalServiceKit/HTTPUtils.h>
-#import <SignalServiceKit/OWSDisappearingMessagesJob.h>
-#import <SignalServiceKit/OWSIncomingSentMessageTranscript.h>
-#import <SignalServiceKit/OWSReceiptManager.h>
-#import <SignalServiceKit/OWSUnknownProtocolVersionMessage.h>
-#import <SignalServiceKit/SSKEnvironment.h>
+#import "FunctionalUtil.h"
+#import "HTTPUtils.h"
+#import "OWSDisappearingMessagesJob.h"
+#import "OWSIncomingSentMessageTranscript.h"
+#import "OWSReceiptManager.h"
+#import "OWSUnknownProtocolVersionMessage.h"
+#import "SSKEnvironment.h"
+#import "TSAttachmentPointer.h"
+#import "TSGroupThread.h"
+#import "TSInfoMessage.h"
+#import "TSOutgoingMessage.h"
+#import "TSQuotedMessage.h"
+#import "TSThread.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachmentPointer.h>
-#import <SignalServiceKit/TSGroupThread.h>
-#import <SignalServiceKit/TSInfoMessage.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/TSQuotedMessage.h>
-#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.h b/SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.h
index a2dff6ddb6..6b3694cd4a 100644
--- a/SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.h
+++ b/SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
-#import <SignalServiceKit/StickerInfo.h>
+#import "OWSOutgoingSyncMessage.h"
+#import "StickerInfo.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.m b/SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.m
index b1124ce2a3..f3406dce87 100644
--- a/SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.m
+++ b/SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSStickerPackSyncMessage.h>
+#import "OWSStickerPackSyncMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.h b/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.h
index 85c08fa04e..f0b91963c8 100644
--- a/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.h
+++ b/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
-#import <SignalServiceKit/OWSRecipientIdentity.h>
+#import "OWSOutgoingSyncMessage.h"
+#import "OWSRecipientIdentity.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.m b/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.m
index 67225cb450..feaf7011e3 100644
--- a/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.m
+++ b/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSVerificationStateSyncMessage.h"
+#import "OWSIdentityManager.h"
 #import <SignalCoreKit/Cryptography.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/OWSVerificationStateSyncMessage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.h b/SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.h
index 847c37b7b4..dd31d8c315 100644
--- a/SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.h
+++ b/SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
+#import "OWSOutgoingSyncMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.m b/SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.m
index 58496c78af..e8647a5f61 100644
--- a/SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.m
+++ b/SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSViewOnceMessageReadSyncMessage.h>
+#import "OWSViewOnceMessageReadSyncMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.h b/SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.h
index f0a17de0ae..5d93550718 100644
--- a/SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.h
+++ b/SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSOutgoingSyncMessage.h"
 #import <Mantle/MTLModel.h>
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.m b/SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.m
index 701f67fa13..c5db737f4a 100644
--- a/SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.m
+++ b/SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.m
@@ -3,7 +3,7 @@
 //
 
 #import "OWSViewedReceiptsForLinkedDevicesMessage.h"
-#import <SignalServiceKit/OWSLinkedDeviceReadReceipt.h>
+#import "OWSLinkedDeviceReadReceipt.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachment.h b/SignalServiceKit/src/Messages/Attachments/TSAttachment.h
index 9574583e5f..41cc780236 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachment.h
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachment.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachment.m b/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
index fb15bf47fc..23a0ce49a5 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachment.m
@@ -3,12 +3,12 @@
 //
 
 #import "TSAttachment.h"
+#import "MIMETypeUtil.h"
+#import "TSAttachmentPointer.h"
+#import "TSMessage.h"
 #import <SignalCoreKit/NSString+OWS.h>
 #import <SignalCoreKit/iOSVersions.h>
-#import <SignalServiceKit/MIMETypeUtil.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachmentPointer.h>
-#import <SignalServiceKit/TSMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h
index 34bff12a2d..d23096d839 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSAttachment.h>
+#import "TSAttachment.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m
index f6dd12cfff..84272ec913 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.m
@@ -2,11 +2,11 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/MimeTypeUtil.h>
-#import <SignalServiceKit/OWSBackupFragment.h>
+#import "TSAttachmentPointer.h"
+#import "MIMETypeUtil.h"
+#import "OWSBackupFragment.h"
+#import "TSAttachmentStream.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachmentPointer.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h
index c4b3c244df..6734d765d7 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/DataSource.h>
-#import <SignalServiceKit/TSAttachment.h>
+#import "DataSource.h"
+#import "TSAttachment.h"
 
 #if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
index edbd32f6b8..ff1194079d 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
@@ -3,15 +3,15 @@
 //
 
 #import "TSAttachmentStream.h"
+#import "MIMETypeUtil.h"
 #import "NSData+Image.h"
+#import "OWSError.h"
+#import "OWSFileSystem.h"
+#import "TSAttachmentPointer.h"
+#import "UIImage+OWS.h"
 #import <AVFoundation/AVFoundation.h>
 #import <SignalCoreKit/Threading.h>
-#import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSFileSystem.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachmentPointer.h>
-#import <SignalServiceKit/UIImage+OWS.h>
 #import <YYImage/YYImage.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m
index df1714a4a4..7778bc1ffd 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m
@@ -2,16 +2,16 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSContact.h>
-#import <SignalServiceKit/OWSIncomingSentMessageTranscript.h>
-#import <SignalServiceKit/OWSMessageManager.h>
+#import "OWSIncomingSentMessageTranscript.h"
+#import "OWSContact.h"
+#import "OWSMessageManager.h"
+#import "TSContactThread.h"
+#import "TSGroupModel.h"
+#import "TSGroupThread.h"
+#import "TSOutgoingMessage.h"
+#import "TSQuotedMessage.h"
+#import "TSThread.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSGroupModel.h>
-#import <SignalServiceKit/TSGroupThread.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/TSQuotedMessage.h>
-#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.h
index f3a08aaf75..786a966454 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
+#import "OWSOutgoingSyncMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m
index 0897f6d281..28b612dea1 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.m
@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSentMessageTranscript.h>
+#import "OWSOutgoingSentMessageTranscript.h"
+#import "TSOutgoingMessage.h"
+#import "TSThread.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.h
index 26d7925d55..495f5833ff 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSOutgoingMessage.h>
+#import "TSOutgoingMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m
index c741bd2eb5..8af2ee381c 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m
@@ -3,9 +3,9 @@
 //
 
 #import "OWSOutgoingSyncMessage.h"
+#import "ProtoUtils.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/ProtoUtils.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.h
index c82f767af7..433d6f4c38 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
+#import "OWSOutgoingSyncMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.m
index bfacc31c16..c2b8dc010d 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSProvisioningMessage.h>
-#import <SignalServiceKit/OWSSyncConfigurationMessage.h>
+#import "OWSSyncConfigurationMessage.h"
+#import "OWSProvisioningMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.h
index e65fa9a552..9c3a911ce1 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
+#import "OWSOutgoingSyncMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m
index 5dfc0db967..4263d51623 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m
@@ -2,21 +2,21 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSSyncContactsMessage.h"
+#import "Contact.h"
+#import "ContactsManagerProtocol.h"
+#import "OWSContactsOutputStream.h"
+#import "OWSIdentityManager.h"
+#import "ProfileManagerProtocol.h"
+#import "SSKEnvironment.h"
+#import "SignalAccount.h"
+#import "TSAccountManager.h"
+#import "TSAttachment.h"
+#import "TSAttachmentStream.h"
+#import "TSContactThread.h"
 #import <Contacts/Contacts.h>
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/Contact.h>
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/OWSContactsOutputStream.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/OWSSyncContactsMessage.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
-#import <SignalServiceKit/SSKEnvironment.h>
-#import <SignalServiceKit/SignalAccount.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSAttachment.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
-#import <SignalServiceKit/TSContactThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.h
index 856771c2a0..a7c0b08ade 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
+#import "OWSOutgoingSyncMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.m
index 0134434186..19e1a7ad89 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSSyncFetchLatestMessage.h>
+#import "OWSSyncFetchLatestMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.h
index 3adb7a6475..e265369167 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
+#import "OWSOutgoingSyncMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m
index 59e6f32385..d3de338c9b 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m
@@ -2,15 +2,15 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSSyncGroupsMessage.h>
+#import "OWSSyncGroupsMessage.h"
+#import "OWSGroupsOutputStream.h"
+#import "TSAttachment.h"
+#import "TSAttachmentStream.h"
+#import "TSContactThread.h"
+#import "TSGroupModel.h"
+#import "TSGroupThread.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSGroupsOutputStream.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachment.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSGroupModel.h>
-#import <SignalServiceKit/TSGroupThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.h
index 7d9b792f69..1a1fb8e27c 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
+#import "OWSOutgoingSyncMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.m
index 79cfe1aca4..2c33232228 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSProvisioningMessage.h>
-#import <SignalServiceKit/OWSSyncKeysMessage.h>
+#import "OWSSyncKeysMessage.h"
+#import "OWSProvisioningMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.h
index d6086c45f2..14b599a7d6 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
+#import "OWSOutgoingSyncMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.m
index 827c4d5c6b..1896e0f68d 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSSyncMessageRequestResponseMessage.h>
+#import "OWSSyncMessageRequestResponseMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.h
index a6d0a3cc08..f8992ac9ce 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
+#import "OWSOutgoingSyncMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.m
index 8daf67d6bb..24bc45b35f 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSSyncRequestMessage.h>
+#import "OWSSyncRequestMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.h
index b9b8e2eea1..d6d63cc5db 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
+#import "OWSOutgoingSyncMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.m
index 62aee5ba76..8bd210685c 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OutgoingPaymentSyncMessage.h>
+#import "OutgoingPaymentSyncMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSContact+Private.h b/SignalServiceKit/src/Messages/Interactions/OWSContact+Private.h
index a662fbecd8..3f6d3310af 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSContact+Private.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSContact+Private.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSContact.h>
+#import "OWSContact.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSContact.h b/SignalServiceKit/src/Messages/Interactions/OWSContact.h
index 1316417708..6dd41ea94c 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSContact.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSContact.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "ContactsManagerProtocol.h"
 #import <Mantle/MTLModel.h>
-#import <SignalServiceKit/ContactsManagerProtocol.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSContact.m b/SignalServiceKit/src/Messages/Interactions/OWSContact.m
index 4912aea8d5..b5f4a6046f 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSContact.m
+++ b/SignalServiceKit/src/Messages/Interactions/OWSContact.m
@@ -2,17 +2,17 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSContact.h"
+#import "Contact.h"
+#import "MIMETypeUtil.h"
 #import "OWSContact+Private.h"
+#import "PhoneNumber.h"
+#import "TSAttachment.h"
+#import "TSAttachmentPointer.h"
+#import "TSAttachmentStream.h"
 #import <Contacts/Contacts.h>
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/Contact.h>
-#import <SignalServiceKit/MimeTypeUtil.h>
-#import <SignalServiceKit/OWSContact.h>
-#import <SignalServiceKit/PhoneNumber.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachment.h>
-#import <SignalServiceKit/TSAttachmentPointer.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.h b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.h
index 50d39285a9..079d479cff 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSInfoMessage.h>
+#import "TSInfoMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.m
index 3705325eb1..737c2c7915 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSDisappearingConfigurationUpdateInfoMessage.h"
+#import "OWSDisappearingMessagesConfiguration.h"
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.h b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.h
index 7378ca8b90..851f8f9be8 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSOutgoingMessage.h>
+#import "TSOutgoingMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m
index 8f0ca6aa0d..14beaa98ee 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSDisappearingMessagesConfigurationMessage.h"
+#import "OWSDisappearingMessagesConfiguration.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfigurationMessage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h b/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h
index ac5068f462..406ca85ac1 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSOutgoingMessage.h>
+#import "TSOutgoingMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.h b/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.h
index bdea5ede7f..fddd88e0b5 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSOutgoingMessage.h>
+#import "TSOutgoingMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m
index 9cf6b87424..515901e4ad 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSEndSessionMessage.h>
+#import "OWSEndSessionMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSStaticOutgoingMessage.h b/SignalServiceKit/src/Messages/Interactions/OWSStaticOutgoingMessage.h
index 581d63b619..a21708c9f1 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSStaticOutgoingMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSStaticOutgoingMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSOutgoingMessage.h>
+#import "TSOutgoingMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.h b/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.h
index 3b2e9e6e58..2fe9d96af6 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSRecipientIdentity.h>
-#import <SignalServiceKit/TSInfoMessage.h>
+#import "OWSRecipientIdentity.h"
+#import "TSInfoMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.m
index 3a5eac2fe4..145fa911a6 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSVerificationStateChangeMessage.h>
+#import "OWSVerificationStateChangeMessage.h"
+#import "OWSDisappearingMessagesConfiguration.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.h b/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.h
index db8863aabd..41baa9c8ad 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSReadTracking.h>
-#import <SignalServiceKit/TSMessage.h>
+#import "OWSReadTracking.h"
+#import "TSMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m b/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m
index d904194283..4ac5ee037d 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m
@@ -3,12 +3,12 @@
 //
 
 #import "TSErrorMessage.h"
+#import "ContactsManagerProtocol.h"
+#import "OWSMessageManager.h"
+#import "SSKEnvironment.h"
+#import "TSContactThread.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/OWSMessageManager.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h
index a3e261d3d6..b8a17a3ed2 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSReadTracking.h>
-#import <SignalServiceKit/TSMessage.h>
+#import "OWSReadTracking.h"
+#import "TSMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m
index 6ec77c101e..1bfc0a7f61 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m
@@ -3,14 +3,14 @@
 //
 
 #import "TSIncomingMessage.h"
+#import "OWSDisappearingMessagesConfiguration.h"
+#import "OWSDisappearingMessagesJob.h"
+#import "OWSReceiptManager.h"
+#import "TSAttachmentPointer.h"
+#import "TSContactThread.h"
+#import "TSGroupThread.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSDisappearingMessagesJob.h>
-#import <SignalServiceKit/OWSReceiptManager.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachmentPointer.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSGroupThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.h b/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.h
index 05ff03ac7e..55d68d2b94 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSReadTracking.h>
-#import <SignalServiceKit/TSMessage.h>
+#import "OWSReadTracking.h"
+#import "TSMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m b/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m
index 38cc8cc922..2957959093 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m
@@ -2,11 +2,11 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "TSInfoMessage.h"
+#import "ContactsManagerProtocol.h"
+#import "SSKEnvironment.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSInfoMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction.h b/SignalServiceKit/src/Messages/Interactions/TSInteraction.h
index b612e2863f..858e66cea3 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
index 78916c5045..82e67b8c47 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
@@ -3,9 +3,9 @@
 //
 
 #import "TSInteraction.h"
+#import "TSThread.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSMention.h b/SignalServiceKit/src/Messages/Interactions/TSMention.h
index 5567c71cbd..09b229cdc8 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSMention.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSMention.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSMention.m b/SignalServiceKit/src/Messages/Interactions/TSMention.m
index e52cba14be..edaf29cf25 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSMention.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSMention.m
@@ -3,7 +3,7 @@
 //
 
 #import "TSMention.h"
-#import "SignalServiceKit/SignalServiceKit-Swift.h"
+#import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 @implementation TSMention
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.h b/SignalServiceKit/src/Messages/Interactions/TSMessage.h
index b7ef385759..0f4aee1515 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.h
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSContact.h>
-#import <SignalServiceKit/TSInteraction.h>
-#import <SignalServiceKit/TSQuotedMessage.h>
+#import "OWSContact.h"
+#import "TSInteraction.h"
+#import "TSQuotedMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.m b/SignalServiceKit/src/Messages/Interactions/TSMessage.m
index 8b30e252a2..1393aa9419 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.m
@@ -3,18 +3,18 @@
 //
 
 #import "TSMessage.h"
+#import "AppContext.h"
+#import "MIMETypeUtil.h"
+#import "OWSContact.h"
+#import "OWSDisappearingMessagesConfiguration.h"
+#import "OWSDisappearingMessagesJob.h"
+#import "TSAttachment.h"
+#import "TSAttachmentStream.h"
+#import "TSQuotedMessage.h"
+#import "TSThread.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/OWSContact.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSDisappearingMessagesJob.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachment.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
-#import <SignalServiceKit/TSQuotedMessage.h>
-#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingDeleteMessage.h b/SignalServiceKit/src/Messages/Interactions/TSOutgoingDeleteMessage.h
index 26d3c49b21..982b2d38a3 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingDeleteMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingDeleteMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSOutgoingMessage.h>
+#import "TSOutgoingMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingDeleteMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingDeleteMessage.m
index ff66a145a4..31c4907645 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingDeleteMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingDeleteMessage.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "TSOutgoingDeleteMessage.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSOutgoingDeleteMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h
index 21687560a5..cea699f8ae 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSMessage.h>
-#import <SignalServiceKit/TSPaymentModels.h>
+#import "TSMessage.h"
+#import "TSPaymentModels.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
index 95fa75d7f4..2132391be1 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
@@ -3,21 +3,21 @@
 //
 
 #import "TSOutgoingMessage.h"
+#import "AppReadiness.h"
+#import "MessageSender.h"
+#import "OWSContact.h"
+#import "OWSOutgoingSyncMessage.h"
+#import "ProtoUtils.h"
+#import "SSKEnvironment.h"
+#import "SignalRecipient.h"
+#import "TSAccountManager.h"
+#import "TSAttachmentStream.h"
+#import "TSContactThread.h"
+#import "TSGroupThread.h"
+#import "TSQuotedMessage.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/AppReadiness.h>
-#import <SignalServiceKit/MessageSender.h>
-#import <SignalServiceKit/OWSContact.h>
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
-#import <SignalServiceKit/ProtoUtils.h>
-#import <SignalServiceKit/SSKEnvironment.h>
-#import <SignalServiceKit/SignalRecipient.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSGroupThread.h>
-#import <SignalServiceKit/TSQuotedMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m b/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m
index f1199d2b02..f313488b5a 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m
@@ -3,15 +3,15 @@
 //
 
 #import "TSQuotedMessage.h"
+#import "TSAccountManager.h"
+#import "TSAttachment.h"
+#import "TSAttachmentPointer.h"
+#import "TSAttachmentStream.h"
+#import "TSIncomingMessage.h"
+#import "TSInteraction.h"
+#import "TSOutgoingMessage.h"
+#import "TSThread.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSAttachment.h>
-#import <SignalServiceKit/TSAttachmentPointer.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
-#import <SignalServiceKit/TSIncomingMessage.h>
-#import <SignalServiceKit/TSInteraction.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction.h b/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction.h
index c395f064ba..704749fc3c 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction.h
@@ -1,8 +1,8 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSInteraction.h>
+#import "TSInteraction.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction.m b/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction.m
index cb76cf84b0..be515cf1f7 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSUnreadIndicatorInteraction.h>
+#import "TSUnreadIndicatorInteraction.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage.h b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage.h
index 928cf939d6..8aee5e5b21 100644
--- a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage.h
+++ b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSErrorMessage.h>
+#import "TSErrorMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage.m b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage.m
index 865e28919f..b99724e9e5 100644
--- a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage.m
+++ b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSInvalidIdentityKeyErrorMessage.h>
-#import <SignalServiceKit/OWSError.h>
+#import "TSInvalidIdentityKeyErrorMessage.h"
+#import "OWSError.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.h b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.h
index 9986f0874c..ed53227f62 100644
--- a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.h
+++ b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSInvalidIdentityKeyErrorMessage.h>
+#import "TSInvalidIdentityKeyErrorMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.m b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.m
index d0f65aafe2..2c9ab25b9a 100644
--- a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.m
+++ b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.m
@@ -2,15 +2,15 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
-#import <SignalServiceKit/AxolotlExceptions.h>
-#import <SignalServiceKit/NSData+keyVersionByte.h>
-#import <SignalServiceKit/OWSFingerprint.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/OWSMessageManager.h>
-#import <SignalServiceKit/SSKEnvironment.h>
+#import "TSInvalidIdentityKeyReceivingErrorMessage.h"
+#import "AxolotlExceptions.h"
+#import "NSData+keyVersionByte.h"
+#import "OWSFingerprint.h"
+#import "OWSIdentityManager.h"
+#import "OWSMessageManager.h"
+#import "SSKEnvironment.h"
+#import "TSContactThread.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.h b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.h
index effae9d7c9..4eb94ce95e 100644
--- a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.h
+++ b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSInvalidIdentityKeyErrorMessage.h>
+#import "TSInvalidIdentityKeyErrorMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.m b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.m
index 2867190268..00a66b3ef7 100644
--- a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.m
+++ b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.m
@@ -2,14 +2,14 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "TSInvalidIdentityKeySendingErrorMessage.h"
+#import "NSData+keyVersionByte.h"
+#import "OWSFingerprint.h"
+#import "OWSIdentityManager.h"
 #import "PreKeyBundle+jsonDict.h"
-#import <SignalServiceKit/NSData+keyVersionByte.h>
-#import <SignalServiceKit/OWSFingerprint.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
+#import "TSContactThread.h"
+#import "TSOutgoingMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSInvalidIdentityKeySendingErrorMessage.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/MessageSender.h b/SignalServiceKit/src/Messages/MessageSender.h
index 7da1bdb201..9f2c905cbb 100644
--- a/SignalServiceKit/src/Messages/MessageSender.h
+++ b/SignalServiceKit/src/Messages/MessageSender.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/DataSource.h>
+#import "DataSource.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/MessageSender.m b/SignalServiceKit/src/Messages/MessageSender.m
index bd36ea0c01..c16dbb7b6b 100644
--- a/SignalServiceKit/src/Messages/MessageSender.m
+++ b/SignalServiceKit/src/Messages/MessageSender.m
@@ -3,50 +3,50 @@
 //
 
 #import "MessageSender.h"
+#import "AppContext.h"
+#import "AxolotlExceptions.h"
+#import "FunctionalUtil.h"
+#import "HTTPUtils.h"
 #import "NSData+keyVersionByte.h"
-#import "NSData+messagePadding.h"
+#import "OWSBackgroundTask.h"
+#import "OWSContact.h"
+#import "OWSDevice.h"
+#import "OWSDisappearingMessagesJob.h"
+#import "OWSDispatch.h"
+#import "OWSError.h"
+#import "OWSIdentityManager.h"
+#import "OWSOperation.h"
+#import "OWSOutgoingCallMessage.h"
+#import "OWSOutgoingGroupCallMessage.h"
+#import "OWSOutgoingReactionMessage.h"
+#import "OWSOutgoingSenderKeyDistributionMessage.h"
+#import "OWSOutgoingSentMessageTranscript.h"
+#import "OWSOutgoingSyncMessage.h"
+#import "OWSUploadOperation.h"
 #import "PreKeyBundle+jsonDict.h"
+#import "ProfileManagerProtocol.h"
+#import "SSKEnvironment.h"
+#import "SSKPreKeyStore.h"
+#import "SSKSignedPreKeyStore.h"
+#import "SignalRecipient.h"
+#import "TSAccountManager.h"
+#import "TSAttachmentStream.h"
+#import "TSContactThread.h"
+#import "TSGroupThread.h"
+#import "TSIncomingMessage.h"
+#import "TSInfoMessage.h"
+#import "TSOutgoingMessage.h"
+#import "TSPreKeyManager.h"
+#import "TSQuotedMessage.h"
+#import "TSRequest.h"
+#import "TSThread.h"
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/SCKExceptionWrapper.h>
 #import <SignalCoreKit/Threading.h>
+#import <SignalMetadataKit/NSData+messagePadding.h>
 #import <SignalMetadataKit/SignalMetadataKit-Swift.h>
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/AxolotlExceptions.h>
-#import <SignalServiceKit/FunctionalUtil.h>
-#import <SignalServiceKit/HTTPUtils.h>
-#import <SignalServiceKit/OWSBackgroundTask.h>
-#import <SignalServiceKit/OWSContact.h>
-#import <SignalServiceKit/OWSDevice.h>
-#import <SignalServiceKit/OWSDisappearingMessagesJob.h>
-#import <SignalServiceKit/OWSDispatch.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/OWSOperation.h>
-#import <SignalServiceKit/OWSOutgoingCallMessage.h>
-#import <SignalServiceKit/OWSOutgoingGroupCallMessage.h>
-#import <SignalServiceKit/OWSOutgoingReactionMessage.h>
-#import <SignalServiceKit/OWSOutgoingSenderKeyDistributionMessage.h>
-#import <SignalServiceKit/OWSOutgoingSentMessageTranscript.h>
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
-#import <SignalServiceKit/OWSUploadOperation.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
-#import <SignalServiceKit/SSKEnvironment.h>
-#import <SignalServiceKit/SSKPreKeyStore.h>
-#import <SignalServiceKit/SSKSignedPreKeyStore.h>
-#import <SignalServiceKit/SignalRecipient.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSGroupThread.h>
-#import <SignalServiceKit/TSIncomingMessage.h>
-#import <SignalServiceKit/TSInfoMessage.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/TSPreKeyManager.h>
-#import <SignalServiceKit/TSQuotedMessage.h>
-#import <SignalServiceKit/TSRequest.h>
-#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage.h b/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage.h
index f08e473ebf..5e81467da3 100644
--- a/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage.h
+++ b/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSInfoMessage.h>
+#import "TSInfoMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage.m b/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage.m
index d21af806d5..01c4097b5a 100644
--- a/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage.m
+++ b/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSAddToContactsOfferMessage.h>
+#import "OWSAddToContactsOfferMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.h b/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.h
index 8a30929dde..9f586f6e77 100644
--- a/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.h
+++ b/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSInfoMessage.h>
+#import "TSInfoMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.m b/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.m
index 8dcafe9f9b..cbf1086e1d 100644
--- a/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.m
+++ b/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSAddToProfileWhitelistOfferMessage.h>
-#import <SignalServiceKit/TSThread.h>
+#import "OWSAddToProfileWhitelistOfferMessage.h"
+#import "TSThread.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m b/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m
index 621685a39b..228d163d28 100644
--- a/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m
+++ b/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m
@@ -2,13 +2,13 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSDisappearingMessagesFinder.h"
+#import "TSIncomingMessage.h"
+#import "TSMessage.h"
+#import "TSOutgoingMessage.h"
+#import "TSThread.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSDisappearingMessagesFinder.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSIncomingMessage.h>
-#import <SignalServiceKit/TSMessage.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m b/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m
index f26012bb39..afe1ab0f1f 100644
--- a/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m
+++ b/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m
@@ -2,20 +2,20 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSDisappearingMessagesJob.h>
+#import "OWSDisappearingMessagesJob.h"
+#import "AppContext.h"
+#import "AppReadiness.h"
+#import "ContactsManagerProtocol.h"
 #import "NSTimer+OWS.h"
+#import "OWSBackgroundTask.h"
+#import "OWSDisappearingMessagesConfiguration.h"
+#import "OWSDisappearingMessagesFinder.h"
+#import "SSKEnvironment.h"
+#import "TSIncomingMessage.h"
+#import "TSMessage.h"
+#import "TSThread.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/AppReadiness.h>
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/OWSBackgroundTask.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSDisappearingMessagesFinder.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSIncomingMessage.h>
-#import <SignalServiceKit/TSMessage.h>
-#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSFailedAttachmentDownloadsJob.m b/SignalServiceKit/src/Messages/OWSFailedAttachmentDownloadsJob.m
index 2ff2f189ac..d9076ce6ad 100644
--- a/SignalServiceKit/src/Messages/OWSFailedAttachmentDownloadsJob.m
+++ b/SignalServiceKit/src/Messages/OWSFailedAttachmentDownloadsJob.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSFailedAttachmentDownloadsJob.h>
+#import "OWSFailedAttachmentDownloadsJob.h"
+#import "TSAttachmentPointer.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachmentPointer.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSFailedMessagesJob.m b/SignalServiceKit/src/Messages/OWSFailedMessagesJob.m
index 9c2beb77ee..5cd403d40c 100644
--- a/SignalServiceKit/src/Messages/OWSFailedMessagesJob.m
+++ b/SignalServiceKit/src/Messages/OWSFailedMessagesJob.m
@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSFailedMessagesJob.h>
+#import "OWSFailedMessagesJob.h"
+#import "TSMessage.h"
+#import "TSOutgoingMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSMessage.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSGroupCallMessage.h b/SignalServiceKit/src/Messages/OWSGroupCallMessage.h
index c66c6537b5..7dee4b5eb9 100644
--- a/SignalServiceKit/src/Messages/OWSGroupCallMessage.h
+++ b/SignalServiceKit/src/Messages/OWSGroupCallMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSReadTracking.h>
-#import <SignalServiceKit/TSInteraction.h>
+#import "OWSReadTracking.h"
+#import "TSInteraction.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSGroupCallMessage.m b/SignalServiceKit/src/Messages/OWSGroupCallMessage.m
index cb1ae3d8a8..fb119987db 100644
--- a/SignalServiceKit/src/Messages/OWSGroupCallMessage.m
+++ b/SignalServiceKit/src/Messages/OWSGroupCallMessage.m
@@ -3,10 +3,10 @@
 //
 
 #import "OWSGroupCallMessage.h"
+#import "FunctionalUtil.h"
+#import "TSGroupThread.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/FunctionalUtil.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSGroupThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSGroupInfoRequestMessage.h b/SignalServiceKit/src/Messages/OWSGroupInfoRequestMessage.h
index a1ebcb2174..ae7dad6098 100644
--- a/SignalServiceKit/src/Messages/OWSGroupInfoRequestMessage.h
+++ b/SignalServiceKit/src/Messages/OWSGroupInfoRequestMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSOutgoingMessage.h>
+#import "TSOutgoingMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSGroupInfoRequestMessage.m b/SignalServiceKit/src/Messages/OWSGroupInfoRequestMessage.m
index c6650107b6..a0226cff72 100644
--- a/SignalServiceKit/src/Messages/OWSGroupInfoRequestMessage.m
+++ b/SignalServiceKit/src/Messages/OWSGroupInfoRequestMessage.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSGroupInfoRequestMessage.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSGroupInfoRequestMessage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/OWSIdentityManager.h b/SignalServiceKit/src/Messages/OWSIdentityManager.h
index afcf035fba..b7417afd52 100644
--- a/SignalServiceKit/src/Messages/OWSIdentityManager.h
+++ b/SignalServiceKit/src/Messages/OWSIdentityManager.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSRecipientIdentity.h>
+#import "OWSRecipientIdentity.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSIdentityManager.m b/SignalServiceKit/src/Messages/OWSIdentityManager.m
index 3168c96745..5a2d1be6f4 100644
--- a/SignalServiceKit/src/Messages/OWSIdentityManager.m
+++ b/SignalServiceKit/src/Messages/OWSIdentityManager.m
@@ -3,26 +3,26 @@
 //
 
 #import "OWSIdentityManager.h"
+#import "AppContext.h"
+#import "AppReadiness.h"
+#import "MessageSender.h"
+#import "NSData+keyVersionByte.h"
+#import "NotificationsProtocol.h"
+#import "OWSError.h"
+#import "OWSFileSystem.h"
+#import "OWSOutgoingNullMessage.h"
+#import "OWSRecipientIdentity.h"
+#import "OWSVerificationStateChangeMessage.h"
+#import "OWSVerificationStateSyncMessage.h"
+#import "SSKEnvironment.h"
+#import "TSAccountManager.h"
+#import "TSContactThread.h"
+#import "TSErrorMessage.h"
+#import "TSGroupThread.h"
 #import <Curve25519Kit/Curve25519.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/SCKExceptionWrapper.h>
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/AppReadiness.h>
-#import <SignalServiceKit/MessageSender.h>
-#import <SignalServiceKit/NSData+keyVersionByte.h>
-#import <SignalServiceKit/NotificationsProtocol.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSFileSystem.h>
-#import <SignalServiceKit/OWSOutgoingNullMessage.h>
-#import <SignalServiceKit/OWSRecipientIdentity.h>
-#import <SignalServiceKit/OWSVerificationStateChangeMessage.h>
-#import <SignalServiceKit/OWSVerificationStateSyncMessage.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSErrorMessage.h>
-#import <SignalServiceKit/TSGroupThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSIncompleteCallsJob.m b/SignalServiceKit/src/Messages/OWSIncompleteCallsJob.m
index 273b5f1290..f75adbc1fd 100644
--- a/SignalServiceKit/src/Messages/OWSIncompleteCallsJob.m
+++ b/SignalServiceKit/src/Messages/OWSIncompleteCallsJob.m
@@ -2,11 +2,11 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSIncompleteCallsJob.h"
+#import "AppContext.h"
+#import "TSCall.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/OWSIncompleteCallsJob.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSCall.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSMessageContentJob.h b/SignalServiceKit/src/Messages/OWSMessageContentJob.h
index b84e16f0c3..ea057a7278 100644
--- a/SignalServiceKit/src/Messages/OWSMessageContentJob.h
+++ b/SignalServiceKit/src/Messages/OWSMessageContentJob.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSMessageContentJob.m b/SignalServiceKit/src/Messages/OWSMessageContentJob.m
index 3464e706cb..467a933301 100644
--- a/SignalServiceKit/src/Messages/OWSMessageContentJob.m
+++ b/SignalServiceKit/src/Messages/OWSMessageContentJob.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSMessageContentJob.h>
+#import "OWSMessageContentJob.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/OWSMessageDecryptJob.h b/SignalServiceKit/src/Messages/OWSMessageDecryptJob.h
index b4e247d2c5..8a4fbd34b4 100644
--- a/SignalServiceKit/src/Messages/OWSMessageDecryptJob.h
+++ b/SignalServiceKit/src/Messages/OWSMessageDecryptJob.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSMessageDecryptJob.m b/SignalServiceKit/src/Messages/OWSMessageDecryptJob.m
index 61a8bc79da..fd2e70907e 100644
--- a/SignalServiceKit/src/Messages/OWSMessageDecryptJob.m
+++ b/SignalServiceKit/src/Messages/OWSMessageDecryptJob.m
@@ -2,20 +2,20 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSMessageDecryptJob.h>
+#import "OWSMessageDecryptJob.h"
+#import "AppContext.h"
+#import "AppReadiness.h"
 #import "NSArray+OWS.h"
+#import "NotificationsProtocol.h"
+#import "OWSBackgroundTask.h"
+#import "OWSQueues.h"
+#import "ProfileManagerProtocol.h"
+#import "SSKEnvironment.h"
+#import "TSAccountManager.h"
+#import "TSErrorMessage.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/Threading.h>
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/AppReadiness.h>
-#import <SignalServiceKit/NotificationsProtocol.h>
-#import <SignalServiceKit/OWSBackgroundTask.h>
-#import <SignalServiceKit/OWSQueues.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSErrorMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSMessageHandler.m b/SignalServiceKit/src/Messages/OWSMessageHandler.m
index 61a8481359..83183b2efe 100644
--- a/SignalServiceKit/src/Messages/OWSMessageHandler.m
+++ b/SignalServiceKit/src/Messages/OWSMessageHandler.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSMessageHandler.h>
+#import "OWSMessageHandler.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.h b/SignalServiceKit/src/Messages/OWSMessageManager.h
index 4dd21b3185..e3111b76e9 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.h
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSMessageHandler.h>
+#import "OWSMessageHandler.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index 85acbf2ebf..3ead028e75 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -3,47 +3,47 @@
 //
 
 #import "OWSMessageManager.h"
+#import "AppContext.h"
+#import "AppReadiness.h"
+#import "ContactsManagerProtocol.h"
+#import "HTTPUtils.h"
+#import "MIMETypeUtil.h"
+#import "MessageSender.h"
+#import "NSData+Image.h"
+#import "NotificationsProtocol.h"
+#import "OWSCallMessageHandler.h"
+#import "OWSContact.h"
+#import "OWSDevice.h"
+#import "OWSDisappearingConfigurationUpdateInfoMessage.h"
+#import "OWSDisappearingMessagesConfiguration.h"
+#import "OWSDisappearingMessagesJob.h"
+#import "OWSGroupInfoRequestMessage.h"
+#import "OWSIdentityManager.h"
+#import "OWSIncomingSentMessageTranscript.h"
+#import "OWSMessageUtils.h"
+#import "OWSOutgoingReceiptManager.h"
+#import "OWSReceiptManager.h"
+#import "OWSRecordTranscriptJob.h"
+#import "OWSUnknownProtocolVersionMessage.h"
+#import "ProfileManagerProtocol.h"
+#import "SSKEnvironment.h"
+#import "SignalRecipient.h"
+#import "TSAccountManager.h"
+#import "TSAttachment.h"
+#import "TSAttachmentPointer.h"
+#import "TSAttachmentStream.h"
+#import "TSContactThread.h"
+#import "TSGroupModel.h"
+#import "TSGroupThread.h"
+#import "TSIncomingMessage.h"
+#import "TSInfoMessage.h"
+#import "TSOutgoingMessage.h"
+#import "TSQuotedMessage.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/AppReadiness.h>
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/HTTPUtils.h>
-#import <SignalServiceKit/MessageSender.h>
-#import <SignalServiceKit/MimeTypeUtil.h>
-#import <SignalServiceKit/NSData+Image.h>
-#import <SignalServiceKit/NotificationsProtocol.h>
-#import <SignalServiceKit/OWSCallMessageHandler.h>
-#import <SignalServiceKit/OWSContact.h>
-#import <SignalServiceKit/OWSDevice.h>
-#import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSDisappearingMessagesJob.h>
-#import <SignalServiceKit/OWSGroupInfoRequestMessage.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/OWSIncomingSentMessageTranscript.h>
-#import <SignalServiceKit/OWSMessageUtils.h>
-#import <SignalServiceKit/OWSOutgoingReceiptManager.h>
-#import <SignalServiceKit/OWSReceiptManager.h>
-#import <SignalServiceKit/OWSRecordTranscriptJob.h>
-#import <SignalServiceKit/OWSUnknownProtocolVersionMessage.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
-#import <SignalServiceKit/SSKEnvironment.h>
-#import <SignalServiceKit/SignalRecipient.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSAttachment.h>
-#import <SignalServiceKit/TSAttachmentPointer.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSGroupModel.h>
-#import <SignalServiceKit/TSGroupThread.h>
-#import <SignalServiceKit/TSIncomingMessage.h>
-#import <SignalServiceKit/TSInfoMessage.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/TSQuotedMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSMessageUtils.m b/SignalServiceKit/src/Messages/OWSMessageUtils.m
index 5ac456ee8c..f1914e6a5b 100644
--- a/SignalServiceKit/src/Messages/OWSMessageUtils.m
+++ b/SignalServiceKit/src/Messages/OWSMessageUtils.m
@@ -2,20 +2,20 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSMessageUtils.h"
+#import "AppContext.h"
+#import "MIMETypeUtil.h"
+#import "MessageSender.h"
+#import "TSAccountManager.h"
+#import "TSAttachment.h"
+#import "TSAttachmentStream.h"
+#import "TSIncomingMessage.h"
+#import "TSMessage.h"
+#import "TSOutgoingMessage.h"
+#import "TSQuotedMessage.h"
+#import "TSThread.h"
 #import "UIImage+OWS.h"
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/MessageSender.h>
-#import <SignalServiceKit/OWSMessageUtils.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSAttachment.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
-#import <SignalServiceKit/TSIncomingMessage.h>
-#import <SignalServiceKit/TSMessage.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/TSQuotedMessage.h>
-#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.h b/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.h
index d71a2099e8..99fa863933 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.h
+++ b/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSOutgoingMessage.h>
+#import "TSOutgoingMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m b/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m
index b4a9ddce87..a8567bb571 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m
+++ b/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m
@@ -3,11 +3,11 @@
 //
 
 #import "OWSOutgoingCallMessage.h"
+#import "ProtoUtils.h"
+#import "SignalRecipient.h"
+#import "TSContactThread.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/ProtoUtils.h>
-#import <SignalServiceKit/SignalRecipient.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingGroupCallMessage.h b/SignalServiceKit/src/Messages/OWSOutgoingGroupCallMessage.h
index 1284fc7dfb..6d89ee4559 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingGroupCallMessage.h
+++ b/SignalServiceKit/src/Messages/OWSOutgoingGroupCallMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSOutgoingMessage.h>
+#import "TSOutgoingMessage.h"
 
 @class TSGroupThread;
 
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingGroupCallMessage.m b/SignalServiceKit/src/Messages/OWSOutgoingGroupCallMessage.m
index 212e5e026f..1e2c842d0a 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingGroupCallMessage.m
+++ b/SignalServiceKit/src/Messages/OWSOutgoingGroupCallMessage.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOutgoingGroupCallMessage.h>
+#import "OWSOutgoingGroupCallMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 @interface OWSOutgoingGroupCallMessage ()
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.h b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.h
index aef59ef817..0966adb5f5 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.h
+++ b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSOutgoingMessage.h>
+#import "TSOutgoingMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m
index d549a22c40..e0a46efa5a 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m
+++ b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m
@@ -3,11 +3,11 @@
 //
 
 #import "OWSOutgoingNullMessage.h"
+#import "OWSVerificationStateSyncMessage.h"
+#import "TSContactThread.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSVerificationStateSyncMessage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingReceiptManager.m b/SignalServiceKit/src/Messages/OWSOutgoingReceiptManager.m
index b3ab1cb03b..0c1755e20f 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingReceiptManager.m
+++ b/SignalServiceKit/src/Messages/OWSOutgoingReceiptManager.m
@@ -3,14 +3,14 @@
 //
 
 #import "OWSOutgoingReceiptManager.h"
-#import <SignalServiceKit/AppReadiness.h>
-#import <SignalServiceKit/MessageSender.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSReceiptsForSenderMessage.h>
-#import <SignalServiceKit/SSKEnvironment.h>
+#import "AppReadiness.h"
+#import "MessageSender.h"
+#import "OWSError.h"
+#import "OWSReceiptsForSenderMessage.h"
+#import "SSKEnvironment.h"
+#import "TSContactThread.h"
+#import "TSYapDatabaseObject.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSYapDatabaseObject.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingResendRequest.h b/SignalServiceKit/src/Messages/OWSOutgoingResendRequest.h
index abb7042971..a8b8af5bac 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingResendRequest.h
+++ b/SignalServiceKit/src/Messages/OWSOutgoingResendRequest.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSOutgoingMessage.h>
+#import "TSOutgoingMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingResendResponse.h b/SignalServiceKit/src/Messages/OWSOutgoingResendResponse.h
index 0f1e7e6c83..38f8cbafd4 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingResendResponse.h
+++ b/SignalServiceKit/src/Messages/OWSOutgoingResendResponse.h
@@ -1,8 +1,8 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SignalServiceKit.h>
+#import "SignalServiceKit.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSProfileKeyMessage.h b/SignalServiceKit/src/Messages/OWSProfileKeyMessage.h
index 3271385e8d..1f4db5c745 100644
--- a/SignalServiceKit/src/Messages/OWSProfileKeyMessage.h
+++ b/SignalServiceKit/src/Messages/OWSProfileKeyMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSOutgoingMessage.h>
+#import "TSOutgoingMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m b/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m
index c152d34d64..31150a5d1b 100644
--- a/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m
+++ b/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m
@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSProfileKeyMessage.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
-#import <SignalServiceKit/ProtoUtils.h>
-#import <SignalServiceKit/SSKEnvironment.h>
+#import "OWSProfileKeyMessage.h"
+#import "ProfileManagerProtocol.h"
+#import "ProtoUtils.h"
+#import "SSKEnvironment.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/OWSReadTracking.h b/SignalServiceKit/src/Messages/OWSReadTracking.h
index 68ea3e120d..132982aa8b 100644
--- a/SignalServiceKit/src/Messages/OWSReadTracking.h
+++ b/SignalServiceKit/src/Messages/OWSReadTracking.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSReceiptManager.h>
+#import "OWSReceiptManager.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSReceiptManager.h b/SignalServiceKit/src/Messages/OWSReceiptManager.h
index 54c236ba1e..0bc8335a28 100644
--- a/SignalServiceKit/src/Messages/OWSReceiptManager.h
+++ b/SignalServiceKit/src/Messages/OWSReceiptManager.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSReceiptManager.m b/SignalServiceKit/src/Messages/OWSReceiptManager.m
index 47a61ce29e..aa4e3fe688 100644
--- a/SignalServiceKit/src/Messages/OWSReceiptManager.m
+++ b/SignalServiceKit/src/Messages/OWSReceiptManager.m
@@ -3,18 +3,18 @@
 //
 
 #import "OWSReceiptManager.h"
+#import "AppReadiness.h"
+#import "MessageSender.h"
+#import "OWSOutgoingReceiptManager.h"
+#import "OWSReadReceiptsForLinkedDevicesMessage.h"
+#import "OWSReceiptsForSenderMessage.h"
+#import "SSKEnvironment.h"
+#import "TSAccountManager.h"
+#import "TSContactThread.h"
+#import "TSIncomingMessage.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/Threading.h>
-#import <SignalServiceKit/AppReadiness.h>
-#import <SignalServiceKit/MessageSender.h>
-#import <SignalServiceKit/OWSOutgoingReceiptManager.h>
-#import <SignalServiceKit/OWSReadReceiptsForLinkedDevicesMessage.h>
-#import <SignalServiceKit/OWSReceiptsForSenderMessage.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSIncomingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSRecoverableDecryptionPlaceholder.h b/SignalServiceKit/src/Messages/OWSRecoverableDecryptionPlaceholder.h
index aaea6374a6..a9ae2b01c9 100644
--- a/SignalServiceKit/src/Messages/OWSRecoverableDecryptionPlaceholder.h
+++ b/SignalServiceKit/src/Messages/OWSRecoverableDecryptionPlaceholder.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSErrorMessage.h>
+#import "TSErrorMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.h b/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.h
index a36f5157de..2e53039255 100644
--- a/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.h
+++ b/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSErrorMessage.h>
+#import "TSErrorMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.m b/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.m
index 4f3b45e455..296b8f528d 100644
--- a/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.m
+++ b/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSUnknownContactBlockOfferMessage.h>
+#import "OWSUnknownContactBlockOfferMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage.h b/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage.h
index 6cea14ee5d..63c2916b88 100644
--- a/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage.h
+++ b/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSInfoMessage.h>
+#import "TSInfoMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage.m b/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage.m
index 8dc0083570..1ea240f88d 100644
--- a/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage.m
+++ b/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/OWSUnknownProtocolVersionMessage.h>
-#import <SignalServiceKit/SSKEnvironment.h>
+#import "OWSUnknownProtocolVersionMessage.h"
+#import "ContactsManagerProtocol.h"
+#import "SSKEnvironment.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/Payments/OWSOutgoingPaymentMessage.h b/SignalServiceKit/src/Messages/Payments/OWSOutgoingPaymentMessage.h
index 200ea26966..1352d79163 100644
--- a/SignalServiceKit/src/Messages/Payments/OWSOutgoingPaymentMessage.h
+++ b/SignalServiceKit/src/Messages/Payments/OWSOutgoingPaymentMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSOutgoingMessage.h>
+#import "TSOutgoingMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.h b/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.h
index 12901739af..688e5e74bb 100644
--- a/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.h
+++ b/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/PreKeyBundle.h>
+#import "PreKeyBundle.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Reactions/OWSOutgoingReactionMessage.h b/SignalServiceKit/src/Messages/Reactions/OWSOutgoingReactionMessage.h
index 8256b0304e..b5a047855e 100644
--- a/SignalServiceKit/src/Messages/Reactions/OWSOutgoingReactionMessage.h
+++ b/SignalServiceKit/src/Messages/Reactions/OWSOutgoingReactionMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSOutgoingMessage.h>
+#import "TSOutgoingMessage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Reactions/OWSOutgoingReactionMessage.m b/SignalServiceKit/src/Messages/Reactions/OWSOutgoingReactionMessage.m
index b915425092..9dcab271b1 100644
--- a/SignalServiceKit/src/Messages/Reactions/OWSOutgoingReactionMessage.m
+++ b/SignalServiceKit/src/Messages/Reactions/OWSOutgoingReactionMessage.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSOutgoingReactionMessage.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSOutgoingReactionMessage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/Reactions/OWSReaction.h b/SignalServiceKit/src/Messages/Reactions/OWSReaction.h
index 2db98ab02c..f7699d84df 100644
--- a/SignalServiceKit/src/Messages/Reactions/OWSReaction.h
+++ b/SignalServiceKit/src/Messages/Reactions/OWSReaction.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Reactions/OWSReaction.m b/SignalServiceKit/src/Messages/Reactions/OWSReaction.m
index 4267aebf0b..7ff7fdd139 100644
--- a/SignalServiceKit/src/Messages/Reactions/OWSReaction.m
+++ b/SignalServiceKit/src/Messages/Reactions/OWSReaction.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "SignalServiceKit/SignalServiceKit-Swift.h"
-#import <SignalServiceKit/OWSReaction.h>
+#import "OWSReaction.h"
+#import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 @interface OWSReaction ()
 
diff --git a/SignalServiceKit/src/Messages/Stickers/InstalledSticker.h b/SignalServiceKit/src/Messages/Stickers/InstalledSticker.h
index 83369c0c2d..b440e6c4be 100644
--- a/SignalServiceKit/src/Messages/Stickers/InstalledSticker.h
+++ b/SignalServiceKit/src/Messages/Stickers/InstalledSticker.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
-#import <SignalServiceKit/StickerInfo.h>
+#import "BaseModel.h"
+#import "StickerInfo.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Stickers/InstalledSticker.m b/SignalServiceKit/src/Messages/Stickers/InstalledSticker.m
index e530f80d10..c3803340d2 100644
--- a/SignalServiceKit/src/Messages/Stickers/InstalledSticker.m
+++ b/SignalServiceKit/src/Messages/Stickers/InstalledSticker.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/InstalledSticker.h>
+#import "InstalledSticker.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/Stickers/KnownStickerPack.h b/SignalServiceKit/src/Messages/Stickers/KnownStickerPack.h
index 9daa84c3e8..78bf7c732a 100644
--- a/SignalServiceKit/src/Messages/Stickers/KnownStickerPack.h
+++ b/SignalServiceKit/src/Messages/Stickers/KnownStickerPack.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
-#import <SignalServiceKit/StickerInfo.h>
+#import "BaseModel.h"
+#import "StickerInfo.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Stickers/KnownStickerPack.m b/SignalServiceKit/src/Messages/Stickers/KnownStickerPack.m
index 4e40f1b909..e1c4385d80 100644
--- a/SignalServiceKit/src/Messages/Stickers/KnownStickerPack.m
+++ b/SignalServiceKit/src/Messages/Stickers/KnownStickerPack.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/KnownStickerPack.h>
+#import "KnownStickerPack.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Stickers/StickerInfo.m b/SignalServiceKit/src/Messages/Stickers/StickerInfo.m
index 97e3bdde45..737f3eb898 100644
--- a/SignalServiceKit/src/Messages/Stickers/StickerInfo.m
+++ b/SignalServiceKit/src/Messages/Stickers/StickerInfo.m
@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "StickerInfo.h"
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/StickerInfo.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Stickers/StickerPack.h b/SignalServiceKit/src/Messages/Stickers/StickerPack.h
index e16a9bf55d..40e82fcdb3 100644
--- a/SignalServiceKit/src/Messages/Stickers/StickerPack.h
+++ b/SignalServiceKit/src/Messages/Stickers/StickerPack.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
-#import <SignalServiceKit/StickerInfo.h>
+#import "BaseModel.h"
+#import "StickerInfo.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Stickers/StickerPack.m b/SignalServiceKit/src/Messages/Stickers/StickerPack.m
index b4fd39f6c2..23ddd0982a 100644
--- a/SignalServiceKit/src/Messages/Stickers/StickerPack.m
+++ b/SignalServiceKit/src/Messages/Stickers/StickerPack.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "StickerPack.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/StickerPack.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/TSCall.h b/SignalServiceKit/src/Messages/TSCall.h
index 8c83fc5db3..a706fc1888 100644
--- a/SignalServiceKit/src/Messages/TSCall.h
+++ b/SignalServiceKit/src/Messages/TSCall.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSReadTracking.h>
-#import <SignalServiceKit/TSInteraction.h>
+#import "OWSReadTracking.h"
+#import "TSInteraction.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/TSCall.m b/SignalServiceKit/src/Messages/TSCall.m
index effc9fc038..6c63c24657 100644
--- a/SignalServiceKit/src/Messages/TSCall.m
+++ b/SignalServiceKit/src/Messages/TSCall.m
@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "TSCall.h"
+#import "TSContactThread.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSCall.h>
-#import <SignalServiceKit/TSContactThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/API/HTTPUtils.m b/SignalServiceKit/src/Network/API/HTTPUtils.m
index cbc5cb3fcb..12f5b267da 100644
--- a/SignalServiceKit/src/Network/API/HTTPUtils.m
+++ b/SignalServiceKit/src/Network/API/HTTPUtils.m
@@ -3,7 +3,7 @@
 //
 
 #import "HTTPUtils.h"
-#import <SignalServiceKit/MIMETypeUtil.h>
+#import "MIMETypeUtil.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Network/API/OWSUpload.m b/SignalServiceKit/src/Network/API/OWSUpload.m
index 07d3f329b7..ae59d2b0d5 100644
--- a/SignalServiceKit/src/Network/API/OWSUpload.m
+++ b/SignalServiceKit/src/Network/API/OWSUpload.m
@@ -2,18 +2,18 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSUpload.h>
+#import "OWSUpload.h"
+#import "HTTPUtils.h"
+#import "MIMETypeUtil.h"
+#import "OWSError.h"
+#import "OWSRequestFactory.h"
+#import "OWSSignalService.h"
+#import "SSKEnvironment.h"
+#import "TSAttachmentStream.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/HTTPUtils.h>
-#import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSRequestFactory.h>
-#import <SignalServiceKit/OWSSignalService.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/API/OWSUploadOperation.h b/SignalServiceKit/src/Network/API/OWSUploadOperation.h
index 2f6ee6c027..37fa23c5d1 100644
--- a/SignalServiceKit/src/Network/API/OWSUploadOperation.h
+++ b/SignalServiceKit/src/Network/API/OWSUploadOperation.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOperation.h>
+#import "OWSOperation.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/API/OWSUploadOperation.m b/SignalServiceKit/src/Network/API/OWSUploadOperation.m
index 10f7df4c98..8cfcb1a0d6 100644
--- a/SignalServiceKit/src/Network/API/OWSUploadOperation.m
+++ b/SignalServiceKit/src/Network/API/OWSUploadOperation.m
@@ -2,17 +2,17 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSUploadOperation.h>
+#import "OWSUploadOperation.h"
+#import "HTTPUtils.h"
+#import "MIMETypeUtil.h"
+#import "OWSDispatch.h"
+#import "OWSError.h"
+#import "OWSOperation.h"
+#import "OWSUpload.h"
+#import "SSKEnvironment.h"
+#import "TSAttachmentStream.h"
 #import <SignalCoreKit/Cryptography.h>
-#import <SignalServiceKit/HTTPUtils.h>
-#import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/OWSDispatch.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSOperation.h>
-#import <SignalServiceKit/OWSUpload.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/API/RESTNetworkManager.m b/SignalServiceKit/src/Network/API/RESTNetworkManager.m
index 0dbcdec77e..c5dff3c89c 100644
--- a/SignalServiceKit/src/Network/API/RESTNetworkManager.m
+++ b/SignalServiceKit/src/Network/API/RESTNetworkManager.m
@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/RESTNetworkManager.h>
-#import <SignalServiceKit/OWSQueues.h>
+#import "RESTNetworkManager.h"
+#import "OWSQueues.h"
+#import "TSRequest.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSRequest.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h
index f6ef98a237..f383a76ab0 100644
--- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h
+++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/RemoteAttestation.h>
+#import "RemoteAttestation.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m
index 0505a1bf3d..6b532e20e8 100644
--- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m
+++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m
@@ -3,22 +3,22 @@
 //
 
 #import "OWSRequestFactory.h"
+#import "NSData+keyVersionByte.h"
+#import "OWS2FAManager.h"
+#import "OWSDevice.h"
+#import "OWSIdentityManager.h"
+#import "ProfileManagerProtocol.h"
+#import "RemoteAttestation.h"
+#import "SSKEnvironment.h"
+#import "SignedPrekeyRecord.h"
+#import "TSAccountManager.h"
+#import "TSConstants.h"
+#import "TSRequest.h"
 #import <Curve25519Kit/Curve25519.h>
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalMetadataKit/SignalMetadataKit-Swift.h>
-#import <SignalServiceKit/NSData+keyVersionByte.h>
-#import <SignalServiceKit/OWS2FAManager.h>
-#import <SignalServiceKit/OWSDevice.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
-#import <SignalServiceKit/RemoteAttestation.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/SignedPreKeyRecord.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSConstants.h>
-#import <SignalServiceKit/TSRequest.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/API/Requests/TSRequest.m b/SignalServiceKit/src/Network/API/Requests/TSRequest.m
index 97d1c8edaa..4c7d7d5e66 100644
--- a/SignalServiceKit/src/Network/API/Requests/TSRequest.m
+++ b/SignalServiceKit/src/Network/API/Requests/TSRequest.m
@@ -3,12 +3,12 @@
 //
 
 #import "TSRequest.h"
+#import "SSKEnvironment.h"
+#import "TSAccountManager.h"
+#import "TSConstants.h"
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalMetadataKit/SignalMetadataKit-Swift.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSConstants.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m b/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m
index b277c5df57..35c000a7ae 100644
--- a/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m
+++ b/SignalServiceKit/src/Network/OWSCensorshipConfiguration.m
@@ -2,12 +2,12 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSCensorshipConfiguration.h>
-#import <SignalServiceKit/OWSCountryMetadata.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSHTTPSecurityPolicy.h>
+#import "OWSCensorshipConfiguration.h"
+#import "OWSCountryMetadata.h"
+#import "OWSError.h"
+#import "OWSHTTPSecurityPolicy.h"
+#import "TSConstants.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSConstants.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/OWSCountryMetadata.m b/SignalServiceKit/src/Network/OWSCountryMetadata.m
index d9507cfb34..33ac56970b 100644
--- a/SignalServiceKit/src/Network/OWSCountryMetadata.m
+++ b/SignalServiceKit/src/Network/OWSCountryMetadata.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSCensorshipConfiguration.h>
-#import <SignalServiceKit/OWSCountryMetadata.h>
+#import "OWSCountryMetadata.h"
+#import "OWSCensorshipConfiguration.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/OWSSignalService.m b/SignalServiceKit/src/Network/OWSSignalService.m
index 3e52a94788..f2630cfd0a 100644
--- a/SignalServiceKit/src/Network/OWSSignalService.m
+++ b/SignalServiceKit/src/Network/OWSSignalService.m
@@ -2,13 +2,13 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSSignalService.h>
-#import <SignalServiceKit/OWSCensorshipConfiguration.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSHTTPSecurityPolicy.h>
+#import "OWSSignalService.h"
+#import "OWSCensorshipConfiguration.h"
+#import "OWSError.h"
+#import "OWSHTTPSecurityPolicy.h"
+#import "TSAccountManager.h"
+#import "TSConstants.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSConstants.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/Receiving/IncomingGroupsV2MessageJob.h b/SignalServiceKit/src/Network/Receiving/IncomingGroupsV2MessageJob.h
index 9f9f318784..33aea621f0 100644
--- a/SignalServiceKit/src/Network/Receiving/IncomingGroupsV2MessageJob.h
+++ b/SignalServiceKit/src/Network/Receiving/IncomingGroupsV2MessageJob.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/Receiving/IncomingGroupsV2MessageJob.m b/SignalServiceKit/src/Network/Receiving/IncomingGroupsV2MessageJob.m
index 5cedfc51e9..4e83e67b2a 100644
--- a/SignalServiceKit/src/Network/Receiving/IncomingGroupsV2MessageJob.m
+++ b/SignalServiceKit/src/Network/Receiving/IncomingGroupsV2MessageJob.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/IncomingGroupsV2MessageJob.h>
+#import "IncomingGroupsV2MessageJob.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord.h b/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord.h
index 24d5a9c97d..c8b16cc1c8 100644
--- a/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord.h
+++ b/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SSKJobRecord.h>
+#import "SSKJobRecord.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord.m b/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord.m
index 2ffb6a2ace..ed8bcfe02e 100644
--- a/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord.m
+++ b/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SSKMessageDecryptJobRecord.h>
+#import "SSKMessageDecryptJobRecord.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Payments/TSPaymentModel.h b/SignalServiceKit/src/Payments/TSPaymentModel.h
index 50c7e4b5e1..57854659a0 100644
--- a/SignalServiceKit/src/Payments/TSPaymentModel.h
+++ b/SignalServiceKit/src/Payments/TSPaymentModel.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
-#import <SignalServiceKit/TSPaymentModels.h>
+#import "BaseModel.h"
+#import "TSPaymentModels.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Payments/TSPaymentModels.h b/SignalServiceKit/src/Payments/TSPaymentModels.h
index 331c1c4a11..395abe7afa 100644
--- a/SignalServiceKit/src/Payments/TSPaymentModels.h
+++ b/SignalServiceKit/src/Payments/TSPaymentModels.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Payments/TSPaymentModels.m b/SignalServiceKit/src/Payments/TSPaymentModels.m
index 469189d47c..367583ec2a 100644
--- a/SignalServiceKit/src/Payments/TSPaymentModels.m
+++ b/SignalServiceKit/src/Payments/TSPaymentModels.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "TSPaymentModels.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSPaymentModels.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Payments/TSPaymentRequestModel.h b/SignalServiceKit/src/Payments/TSPaymentRequestModel.h
index f6b05ff85b..ffff41f2e5 100644
--- a/SignalServiceKit/src/Payments/TSPaymentRequestModel.h
+++ b/SignalServiceKit/src/Payments/TSPaymentRequestModel.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
-#import <SignalServiceKit/TSPaymentModels.h>
+#import "BaseModel.h"
+#import "TSPaymentModels.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Payments/TSPaymentRequestModel.m b/SignalServiceKit/src/Payments/TSPaymentRequestModel.m
index f66928347c..2cb35e1375 100644
--- a/SignalServiceKit/src/Payments/TSPaymentRequestModel.m
+++ b/SignalServiceKit/src/Payments/TSPaymentRequestModel.m
@@ -3,9 +3,9 @@
 //
 
 #import "TSPaymentRequestModel.h"
+#import "TSPaymentModels.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSPaymentModels.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Protocols/ProtoUtils.m b/SignalServiceKit/src/Protocols/ProtoUtils.m
index ba641f1abb..8e1268296a 100644
--- a/SignalServiceKit/src/Protocols/ProtoUtils.m
+++ b/SignalServiceKit/src/Protocols/ProtoUtils.m
@@ -2,12 +2,12 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "ProtoUtils.h"
+#import "ProfileManagerProtocol.h"
+#import "SSKEnvironment.h"
+#import "TSThread.h"
 #import <SignalCoreKit/Cryptography.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
-#import <SignalServiceKit/ProtoUtils.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Remote Attestation/RemoteAttestation.m b/SignalServiceKit/src/Remote Attestation/RemoteAttestation.m
index a3f5ae7a15..e455c84313 100644
--- a/SignalServiceKit/src/Remote Attestation/RemoteAttestation.m	
+++ b/SignalServiceKit/src/Remote Attestation/RemoteAttestation.m	
@@ -2,16 +2,16 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/RemoteAttestation.h>
+#import "RemoteAttestation.h"
+#import "HTTPUtils.h"
+#import "OWSError.h"
+#import "RemoteAttestationQuote.h"
+#import "RemoteAttestationSigningCertificate.h"
+#import "SSKEnvironment.h"
 #import <Curve25519Kit/Curve25519.h>
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/HTTPUtils.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/RemoteAttestationQuote.h>
-#import <SignalServiceKit/RemoteAttestationSigningCertificate.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Remote Attestation/RemoteAttestationQuote.m b/SignalServiceKit/src/Remote Attestation/RemoteAttestationQuote.m
index 3bf151259d..01f9a58925 100644
--- a/SignalServiceKit/src/Remote Attestation/RemoteAttestationQuote.m	
+++ b/SignalServiceKit/src/Remote Attestation/RemoteAttestationQuote.m	
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/RemoteAttestationQuote.h>
-#import <SignalServiceKit/ByteParser.h>
-#import <SignalServiceKit/OWSError.h>
+#import "RemoteAttestationQuote.h"
+#import "ByteParser.h"
+#import "OWSError.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Remote Attestation/RemoteAttestationSigningCertificate.m b/SignalServiceKit/src/Remote Attestation/RemoteAttestationSigningCertificate.m
index d01bc8d5da..c6e6a0bc53 100644
--- a/SignalServiceKit/src/Remote Attestation/RemoteAttestationSigningCertificate.m	
+++ b/SignalServiceKit/src/Remote Attestation/RemoteAttestationSigningCertificate.m	
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/RemoteAttestationSigningCertificate.h>
+#import "RemoteAttestationSigningCertificate.h"
 #import <CommonCrypto/CommonCrypto.h>
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSData+OWS.h>
diff --git a/SignalServiceKit/src/SSKEnvironment.m b/SignalServiceKit/src/SSKEnvironment.m
index d95c567dee..0e606235fd 100644
--- a/SignalServiceKit/src/SSKEnvironment.m
+++ b/SignalServiceKit/src/SSKEnvironment.m
@@ -2,11 +2,11 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SSKEnvironment.h>
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
+#import "SSKEnvironment.h"
+#import "AppContext.h"
+#import "ProfileManagerProtocol.h"
+#import "TSAccountManager.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Security/OWSFingerprint.m b/SignalServiceKit/src/Security/OWSFingerprint.m
index 2b545971f6..93330799ee 100644
--- a/SignalServiceKit/src/Security/OWSFingerprint.m
+++ b/SignalServiceKit/src/Security/OWSFingerprint.m
@@ -2,11 +2,11 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSFingerprint.h"
+#import "NSData+keyVersionByte.h"
+#import "OWSError.h"
 #import <CommonCrypto/CommonDigest.h>
 #import <SignalCoreKit/NSData+OWS.h>
-#import <SignalServiceKit/NSData+keyVersionByte.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSFingerprint.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <UIKit/UIImage.h>
 
diff --git a/SignalServiceKit/src/Security/OWSFingerprintBuilder.m b/SignalServiceKit/src/Security/OWSFingerprintBuilder.m
index 4a1133047a..2501013cc9 100644
--- a/SignalServiceKit/src/Security/OWSFingerprintBuilder.m
+++ b/SignalServiceKit/src/Security/OWSFingerprintBuilder.m
@@ -2,13 +2,13 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSFingerprintBuilder.h"
+#import "ContactsManagerProtocol.h"
+#import "OWSFingerprint.h"
+#import "OWSIdentityManager.h"
+#import "TSAccountManager.h"
 #import <Curve25519Kit/Curve25519.h>
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/OWSFingerprint.h>
-#import <SignalServiceKit/OWSFingerprintBuilder.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Security/OWSHTTPSecurityPolicy.m b/SignalServiceKit/src/Security/OWSHTTPSecurityPolicy.m
index 60284464b4..7f883c497e 100644
--- a/SignalServiceKit/src/Security/OWSHTTPSecurityPolicy.m
+++ b/SignalServiceKit/src/Security/OWSHTTPSecurityPolicy.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSHTTPSecurityPolicy.h"
 #import <AssertMacros.h>
-#import <SignalServiceKit/OWSHTTPSecurityPolicy.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Security/OWSRecipientIdentity.h b/SignalServiceKit/src/Security/OWSRecipientIdentity.h
index 445f5d8f36..6d178cabbf 100644
--- a/SignalServiceKit/src/Security/OWSRecipientIdentity.h
+++ b/SignalServiceKit/src/Security/OWSRecipientIdentity.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Security/OWSRecipientIdentity.m b/SignalServiceKit/src/Security/OWSRecipientIdentity.m
index 17f3f96074..8a85f6f1be 100644
--- a/SignalServiceKit/src/Security/OWSRecipientIdentity.m
+++ b/SignalServiceKit/src/Security/OWSRecipientIdentity.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSRecipientIdentity.h"
+#import "OWSIdentityManager.h"
 #import <SignalCoreKit/Cryptography.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/OWSRecipientIdentity.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/CallKitIdStore.m b/SignalServiceKit/src/Storage/AxolotlStore/CallKitIdStore.m
index e5016dc5b5..e751950323 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/CallKitIdStore.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/CallKitIdStore.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/CallKitIdStore.h>
+#import "CallKitIdStore.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyChainKey.h b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyChainKey.h
index 41ae26b9bb..50bf45a637 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyChainKey.h
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyChainKey.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "LegacyMessageKeys.h"
 #import <Foundation/Foundation.h>
-#import <SignalServiceKit/LegacyMessageKeys.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyChainKey.m b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyChainKey.m
index 422a1120e2..615ccb0c41 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyChainKey.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyChainKey.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "LegacyChainKey.h"
 #import <CommonCrypto/CommonCrypto.h>
 #import <Curve25519Kit/Curve25519.h>
-#import <SignalServiceKit/LegacyChainKey.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyMessageKeys.m b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyMessageKeys.m
index aeae0cda7c..83b983ea69 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyMessageKeys.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyMessageKeys.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/LegacyMessageKeys.h>
+#import "LegacyMessageKeys.h"
 
 static NSString* const kCoderMessageKeysCipherKey = @"kCoderMessageKeysCipherKey";
 static NSString* const kCoderMessageKeysMacKey    = @"kCoderMessageKeysMacKey";
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyReceivingChain.m b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyReceivingChain.m
index e4f4f92a8e..ad8a6d9a31 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyReceivingChain.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyReceivingChain.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/LegacyReceivingChain.h>
+#import "LegacyReceivingChain.h"
 
 @interface LegacyReceivingChain ()
 
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyRootKey.m b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyRootKey.m
index 6f9d13b824..46d10b59de 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyRootKey.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyRootKey.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "LegacyRootKey.h"
+#import "LegacyChainKey.h"
 #import <Curve25519Kit/Curve25519.h>
-#import <SignalServiceKit/LegacyChainKey.h>
-#import <SignalServiceKit/LegacyRootKey.h>
 
 static NSString* const kCoderData      = @"kCoderData";
 
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySendingChain.m b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySendingChain.m
index 07ae51beb5..3c5291c3a5 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySendingChain.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySendingChain.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/LegacyChainKey.h>
-#import <SignalServiceKit/LegacySendingChain.h>
+#import "LegacySendingChain.h"
+#import "LegacyChainKey.h"
 
 @interface LegacySendingChain ()
 
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionRecord.m b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionRecord.m
index 3accda426e..ceb6bf7d01 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionRecord.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionRecord.m
@@ -2,11 +2,11 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/LegacySessionRecord.h>
-#import <SignalServiceKit/LegacyChainKey.h>
-#import <SignalServiceKit/LegacyReceivingChain.h>
-#import <SignalServiceKit/LegacySendingChain.h>
-#import <SignalServiceKit/LegacySessionState.h>
+#import "LegacySessionRecord.h"
+#import "LegacyChainKey.h"
+#import "LegacyReceivingChain.h"
+#import "LegacySendingChain.h"
+#import "LegacySessionState.h"
 
 #define ARCHIVED_STATES_MAX_LENGTH 40
 
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionState.h b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionState.h
index 8bfc7e1d0e..e934fde810 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionState.h
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionState.h
@@ -8,8 +8,8 @@
 @class LegacyChainKey;
 @class LegacyReceivingChain;
 
-#import <SignalServiceKit/LegacyMessageKeys.h>
-#import <SignalServiceKit/LegacyRootKey.h>
+#import "LegacyMessageKeys.h"
+#import "LegacyRootKey.h"
 
 /**
  *  Pending PreKeys
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionState.m b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionState.m
index 2a04871612..85538d500a 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionState.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionState.m
@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "LegacySessionState.h"
+#import "LegacyReceivingChain.h"
+#import "LegacySendingChain.h"
 #import <Curve25519Kit/Curve25519.h>
-#import <SignalServiceKit/LegacyReceivingChain.h>
-#import <SignalServiceKit/LegacySendingChain.h>
-#import <SignalServiceKit/LegacySessionState.h>
 
 @implementation LegacyPendingPreKey
 
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/PreKeyBundle.m b/SignalServiceKit/src/Storage/AxolotlStore/Model/PreKeyBundle.m
index a517fd0c12..3743e897f1 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/PreKeyBundle.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/PreKeyBundle.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/PreKeyBundle.h>
+#import "PreKeyBundle.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/PreKeyRecord.m b/SignalServiceKit/src/Storage/AxolotlStore/Model/PreKeyRecord.m
index 573cd60e6e..23d56118b8 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/PreKeyRecord.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/PreKeyRecord.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/PreKeyRecord.h>
+#import "PreKeyRecord.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/SignedPrekeyRecord.h b/SignalServiceKit/src/Storage/AxolotlStore/Model/SignedPrekeyRecord.h
index 302bdfdd99..216ef5fe46 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/SignedPrekeyRecord.h
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/SignedPrekeyRecord.h
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "PreKeyRecord.h"
 #import <Curve25519Kit/Curve25519.h>
 #import <Foundation/Foundation.h>
-#import <SignalServiceKit/PreKeyRecord.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/SignedPrekeyRecord.m b/SignalServiceKit/src/Storage/AxolotlStore/Model/SignedPrekeyRecord.m
index 40c949e466..cb1b3fce4a 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/SignedPrekeyRecord.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/SignedPrekeyRecord.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SignedPrekeyRecord.h>
+#import "SignedPrekeyRecord.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/NSData+keyVersionByte.m b/SignalServiceKit/src/Storage/AxolotlStore/NSData+keyVersionByte.m
index 094725ffbe..053383bc5a 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/NSData+keyVersionByte.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/NSData+keyVersionByte.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "AxolotlExceptions.h"
 #import "NSData+keyVersionByte.h"
 #import <SignalCoreKit/SCKExceptionWrapper.h>
-#import <SignalServiceKit/AxolotlExceptions.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/SSKPreKeyStore.m b/SignalServiceKit/src/Storage/AxolotlStore/SSKPreKeyStore.m
index 5caad6c691..aacfa2879b 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/SSKPreKeyStore.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/SSKPreKeyStore.m
@@ -2,13 +2,13 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "SSKPreKeyStore.h"
+#import "AxolotlExceptions.h"
+#import "PreKeyRecord.h"
 #import "SDSKeyValueStore+ObjC.h"
+#import "TSStorageKeys.h"
 #import <SignalCoreKit/Cryptography.h>
-#import <SignalServiceKit/AxolotlExceptions.h>
-#import <SignalServiceKit/PreKeyRecord.h>
-#import <SignalServiceKit/SSKPreKeyStore.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSStorageKeys.h>
 
 #define BATCH_SIZE 100
 
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/SSKSignedPreKeyStore.m b/SignalServiceKit/src/Storage/AxolotlStore/SSKSignedPreKeyStore.m
index 75e22b4f6e..c100fe84e8 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/SSKSignedPreKeyStore.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/SSKSignedPreKeyStore.m
@@ -2,15 +2,15 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "SSKSignedPreKeyStore.h"
+#import "AxolotlExceptions.h"
+#import "NSData+keyVersionByte.h"
+#import "OWSIdentityManager.h"
 #import "SDSKeyValueStore+ObjC.h"
+#import "SSKPreKeyStore.h"
+#import "SignedPrekeyRecord.h"
 #import <Curve25519Kit/Ed25519.h>
-#import <SignalServiceKit/AxolotlExceptions.h>
-#import <SignalServiceKit/NSData+keyVersionByte.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/SSKPreKeyStore.h>
-#import <SignalServiceKit/SSKSignedPreKeyStore.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/SignedPreKeyRecord.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/BaseModel.h b/SignalServiceKit/src/Storage/BaseModel.h
index 4fc4fccb32..a29adc7991 100644
--- a/SignalServiceKit/src/Storage/BaseModel.h
+++ b/SignalServiceKit/src/Storage/BaseModel.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TSYapDatabaseObject.h>
+#import "TSYapDatabaseObject.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/BaseModel.m b/SignalServiceKit/src/Storage/BaseModel.m
index 4077345498..8b782cca08 100644
--- a/SignalServiceKit/src/Storage/BaseModel.m
+++ b/SignalServiceKit/src/Storage/BaseModel.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/Database/SDSCrossProcess.m b/SignalServiceKit/src/Storage/Database/SDSCrossProcess.m
index 9a2b4b1470..1a82947160 100644
--- a/SignalServiceKit/src/Storage/Database/SDSCrossProcess.m
+++ b/SignalServiceKit/src/Storage/Database/SDSCrossProcess.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "SDSCrossProcess.h"
+#import "DarwinNotificationCenter.h"
 #import <SignalCoreKit/OWSAsserts.h>
-#import <SignalServiceKit/DarwinNotificationCenter.h>
-#import <SignalServiceKit/SDSCrossProcess.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Storage/Database/SDSDatabaseStorage+Objc.m b/SignalServiceKit/src/Storage/Database/SDSDatabaseStorage+Objc.m
index 1945935f0d..d8ed2921e7 100644
--- a/SignalServiceKit/src/Storage/Database/SDSDatabaseStorage+Objc.m
+++ b/SignalServiceKit/src/Storage/Database/SDSDatabaseStorage+Objc.m
@@ -1,8 +1,8 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SDSDatabaseStorage+Objc.h>
+#import "SDSDatabaseStorage+Objc.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 #pragma clang diagnostic push
diff --git a/SignalServiceKit/src/Storage/Database/SDSKeyValueStore+ObjC.m b/SignalServiceKit/src/Storage/Database/SDSKeyValueStore+ObjC.m
index ea61153155..6ef8f63c66 100644
--- a/SignalServiceKit/src/Storage/Database/SDSKeyValueStore+ObjC.m
+++ b/SignalServiceKit/src/Storage/Database/SDSKeyValueStore+ObjC.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "SDSKeyValueStore+ObjC.h"
diff --git a/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord.h b/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord.h
index f33213283f..fbdaf16998 100644
--- a/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord.h
+++ b/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SSKJobRecord.h>
+#import "SSKJobRecord.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord.m b/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord.m
index 6370741056..2cc737c63b 100644
--- a/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord.m
+++ b/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSBroadcastMediaMessageJobRecord.h>
+#import "OWSBroadcastMediaMessageJobRecord.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/Jobs/OWSIncomingContactSyncJobRecord.h b/SignalServiceKit/src/Storage/Jobs/OWSIncomingContactSyncJobRecord.h
index fb34867d0f..ea8ea64950 100644
--- a/SignalServiceKit/src/Storage/Jobs/OWSIncomingContactSyncJobRecord.h
+++ b/SignalServiceKit/src/Storage/Jobs/OWSIncomingContactSyncJobRecord.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SSKJobRecord.h>
+#import "SSKJobRecord.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/Jobs/OWSIncomingContactSyncJobRecord.m b/SignalServiceKit/src/Storage/Jobs/OWSIncomingContactSyncJobRecord.m
index c430b9b42e..4b395d00c6 100644
--- a/SignalServiceKit/src/Storage/Jobs/OWSIncomingContactSyncJobRecord.m
+++ b/SignalServiceKit/src/Storage/Jobs/OWSIncomingContactSyncJobRecord.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSIncomingContactSyncJobRecord.h>
+#import "OWSIncomingContactSyncJobRecord.h"
 
 @implementation OWSIncomingContactSyncJobRecord
 
diff --git a/SignalServiceKit/src/Storage/Jobs/OWSIncomingGroupSyncJobRecord.h b/SignalServiceKit/src/Storage/Jobs/OWSIncomingGroupSyncJobRecord.h
index 71b155f2d5..ac61bd400f 100644
--- a/SignalServiceKit/src/Storage/Jobs/OWSIncomingGroupSyncJobRecord.h
+++ b/SignalServiceKit/src/Storage/Jobs/OWSIncomingGroupSyncJobRecord.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SSKJobRecord.h>
+#import "SSKJobRecord.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/Jobs/OWSIncomingGroupSyncJobRecord.m b/SignalServiceKit/src/Storage/Jobs/OWSIncomingGroupSyncJobRecord.m
index f802abfd80..27f3222c85 100644
--- a/SignalServiceKit/src/Storage/Jobs/OWSIncomingGroupSyncJobRecord.m
+++ b/SignalServiceKit/src/Storage/Jobs/OWSIncomingGroupSyncJobRecord.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSIncomingGroupSyncJobRecord.h>
+#import "OWSIncomingGroupSyncJobRecord.h"
 
 @implementation OWSIncomingGroupSyncJobRecord
 
diff --git a/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord.h b/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord.h
index 86f7dfb73b..0ab6a50587 100644
--- a/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord.h
+++ b/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SSKJobRecord.h>
+#import "SSKJobRecord.h"
 
 @class TSContactThread;
 
diff --git a/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord.m b/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord.m
index 9570fcabd3..c789822349 100644
--- a/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord.m
+++ b/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSSessionResetJobRecord.h>
-#import <SignalServiceKit/TSContactThread.h>
+#import "OWSSessionResetJobRecord.h"
+#import "TSContactThread.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/Jobs/SSKJobRecord.h b/SignalServiceKit/src/Storage/Jobs/SSKJobRecord.h
index 7bd9d95f69..e6eb1b61e3 100644
--- a/SignalServiceKit/src/Storage/Jobs/SSKJobRecord.h
+++ b/SignalServiceKit/src/Storage/Jobs/SSKJobRecord.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/Jobs/SSKJobRecord.m b/SignalServiceKit/src/Storage/Jobs/SSKJobRecord.m
index e7dfea6968..f8f7dbaa38 100644
--- a/SignalServiceKit/src/Storage/Jobs/SSKJobRecord.m
+++ b/SignalServiceKit/src/Storage/Jobs/SSKJobRecord.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SSKJobRecord.h>
+#import "SSKJobRecord.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.h b/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.h
index 1b3202d803..10c4d02b74 100644
--- a/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.h
+++ b/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SSKJobRecord.h>
+#import "SSKJobRecord.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.m b/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.m
index 942fbfc279..9d7cd77871 100644
--- a/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.m
+++ b/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SSKMessageSenderJobRecord.h>
+#import "SSKMessageSenderJobRecord.h"
+#import "TSOutgoingMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/StorageCoordinator.m b/SignalServiceKit/src/Storage/StorageCoordinator.m
index d913785bd2..c2a51a27cf 100644
--- a/SignalServiceKit/src/Storage/StorageCoordinator.m
+++ b/SignalServiceKit/src/Storage/StorageCoordinator.m
@@ -3,9 +3,9 @@
 //
 
 #import "StorageCoordinator.h"
-#import <SignalServiceKit/AppReadiness.h>
+#import "AppReadiness.h"
+#import "YDBStorage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/YDBStorage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/TSYapDatabaseObject.m b/SignalServiceKit/src/Storage/TSYapDatabaseObject.m
index 82ffbb4ab8..bdbe348122 100644
--- a/SignalServiceKit/src/Storage/TSYapDatabaseObject.m
+++ b/SignalServiceKit/src/Storage/TSYapDatabaseObject.m
@@ -3,7 +3,7 @@
 //
 
 #import "TSYapDatabaseObject.h"
-#import <SignalServiceKit/SSKEnvironment.h>
+#import "SSKEnvironment.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Storage/YDBStorage.m b/SignalServiceKit/src/Storage/YDBStorage.m
index c527f98052..bc73861416 100644
--- a/SignalServiceKit/src/Storage/YDBStorage.m
+++ b/SignalServiceKit/src/Storage/YDBStorage.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSFileSystem.h>
+#import "YDBStorage.h"
+#import "OWSFileSystem.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/YDBStorage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/TSPrefix.h b/SignalServiceKit/src/TSPrefix.h
index 6fea49ec94..0ce736eb06 100644
--- a/SignalServiceKit/src/TSPrefix.h
+++ b/SignalServiceKit/src/TSPrefix.h
@@ -10,8 +10,8 @@ static const NSUInteger ddLogLevel = DDLogLevelAll;
 #else
 static const NSUInteger ddLogLevel = DDLogLevelInfo;
 #endif
+#import "OWSAnalytics.h"
+#import "SSKAsserts.h"
+#import "TSConstants.h"
 #import <SignalCoreKit/NSObject+OWS.h>
 #import <SignalCoreKit/OWSAsserts.h>
-#import <SignalServiceKit/OWSAnalytics.h>
-#import <SignalServiceKit/SSKAsserts.h>
-#import <SignalServiceKit/TSConstants.h>
diff --git a/SignalServiceKit/src/TestUtils/MockSSKEnvironment.h b/SignalServiceKit/src/TestUtils/MockSSKEnvironment.h
index c9e2ccef59..6ea910ceb2 100644
--- a/SignalServiceKit/src/TestUtils/MockSSKEnvironment.h
+++ b/SignalServiceKit/src/TestUtils/MockSSKEnvironment.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/SSKEnvironment.h>
+#import "SSKEnvironment.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/TestUtils/MockSSKEnvironment.m b/SignalServiceKit/src/TestUtils/MockSSKEnvironment.m
index 1f06a0128b..4fa68d770c 100644
--- a/SignalServiceKit/src/TestUtils/MockSSKEnvironment.m
+++ b/SignalServiceKit/src/TestUtils/MockSSKEnvironment.m
@@ -2,23 +2,23 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/MockSSKEnvironment.h>
-#import <SignalServiceKit/OWS2FAManager.h>
-#import <SignalServiceKit/OWSBackgroundTask.h>
-#import <SignalServiceKit/OWSDisappearingMessagesJob.h>
-#import <SignalServiceKit/OWSFakeCallMessageHandler.h>
-#import <SignalServiceKit/OWSFakeMessageSender.h>
-#import <SignalServiceKit/OWSFakeProfileManager.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/OWSMessageManager.h>
-#import <SignalServiceKit/OWSOutgoingReceiptManager.h>
-#import <SignalServiceKit/OWSReceiptManager.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
-#import <SignalServiceKit/SSKPreKeyStore.h>
-#import <SignalServiceKit/SSKSignedPreKeyStore.h>
+#import "MockSSKEnvironment.h"
+#import "OWS2FAManager.h"
+#import "OWSBackgroundTask.h"
+#import "OWSDisappearingMessagesJob.h"
+#import "OWSFakeCallMessageHandler.h"
+#import "OWSFakeMessageSender.h"
+#import "OWSFakeProfileManager.h"
+#import "OWSIdentityManager.h"
+#import "OWSMessageManager.h"
+#import "OWSOutgoingReceiptManager.h"
+#import "OWSReceiptManager.h"
+#import "ProfileManagerProtocol.h"
+#import "SSKPreKeyStore.h"
+#import "SSKSignedPreKeyStore.h"
+#import "StorageCoordinator.h"
+#import "TSAccountManager.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/StorageCoordinator.h>
-#import <SignalServiceKit/TSAccountManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.h b/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.h
index e73a594432..c319c5b948 100644
--- a/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.h
+++ b/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSCallMessageHandler.h>
+#import "OWSCallMessageHandler.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.m b/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.m
index 1cb8c8ab3d..abcaca49f9 100644
--- a/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.m
+++ b/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSFakeCallMessageHandler.h>
+#import "OWSFakeCallMessageHandler.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.h b/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.h
index b2de668814..0864677b21 100644
--- a/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.h
+++ b/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/MessageSender.h>
+#import "MessageSender.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.m b/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.m
index 02ba7ac480..57a29efd05 100644
--- a/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.m
+++ b/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSFakeMessageSender.h>
+#import "OWSFakeMessageSender.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.h b/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.h
index 868c63c4ae..763df6d189 100644
--- a/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.h
+++ b/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/ProfileManagerProtocol.h>
+#import "ProfileManagerProtocol.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.m b/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.m
index 9820b2f8a8..e898515929 100644
--- a/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.m
+++ b/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.m
@@ -2,11 +2,11 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSFakeProfileManager.h>
+#import "OWSFakeProfileManager.h"
+#import "TSThread.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/TestUtils/TestAppContext.h b/SignalServiceKit/src/TestUtils/TestAppContext.h
index 71ed8c367f..aa40b7f563 100644
--- a/SignalServiceKit/src/TestUtils/TestAppContext.h
+++ b/SignalServiceKit/src/TestUtils/TestAppContext.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/AppContext.h>
+#import "AppContext.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/TestUtils/TestAppContext.m b/SignalServiceKit/src/TestUtils/TestAppContext.m
index 8e38c1e410..9ebe2c324d 100644
--- a/SignalServiceKit/src/TestUtils/TestAppContext.m
+++ b/SignalServiceKit/src/TestUtils/TestAppContext.m
@@ -3,7 +3,7 @@
 //
 
 #import "TestAppContext.h"
-#import <SignalServiceKit/OWSFileSystem.h>
+#import "OWSFileSystem.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Util/AppContext.m b/SignalServiceKit/src/Util/AppContext.m
index d24b28ab90..f5642f0235 100755
--- a/SignalServiceKit/src/Util/AppContext.m
+++ b/SignalServiceKit/src/Util/AppContext.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/AppContext.h>
+#import "AppContext.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/AppVersion.m b/SignalServiceKit/src/Util/AppVersion.m
index 262fc102d2..44809e417b 100755
--- a/SignalServiceKit/src/Util/AppVersion.m
+++ b/SignalServiceKit/src/Util/AppVersion.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/AppVersion.h>
-#import <SignalServiceKit/NSUserDefaults+OWS.h>
+#import "AppVersion.h"
+#import "NSUserDefaults+OWS.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Util/ByteParser.m b/SignalServiceKit/src/Util/ByteParser.m
index 6097d90912..46767b5003 100644
--- a/SignalServiceKit/src/Util/ByteParser.m
+++ b/SignalServiceKit/src/Util/ByteParser.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/ByteParser.h>
+#import "ByteParser.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/DarwinNotificationCenter.m b/SignalServiceKit/src/Util/DarwinNotificationCenter.m
index 374cd691e0..28b7b79e10 100644
--- a/SignalServiceKit/src/Util/DarwinNotificationCenter.m
+++ b/SignalServiceKit/src/Util/DarwinNotificationCenter.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/DarwinNotificationCenter.h>
+#import "DarwinNotificationCenter.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <notify.h>
 
diff --git a/SignalServiceKit/src/Util/DataSource.m b/SignalServiceKit/src/Util/DataSource.m
index 0fdc4d35cb..48e384a461 100755
--- a/SignalServiceKit/src/Util/DataSource.m
+++ b/SignalServiceKit/src/Util/DataSource.m
@@ -3,12 +3,12 @@
 //
 
 #import "DataSource.h"
+#import "MIMETypeUtil.h"
 #import "NSData+Image.h"
+#import "OWSError.h"
+#import "OWSFileSystem.h"
 #import <SignalCoreKit/NSString+OWS.h>
 #import <SignalCoreKit/iOSVersions.h>
-#import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSFileSystem.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Util/ExperienceUpgrade.h b/SignalServiceKit/src/Util/ExperienceUpgrade.h
index 8bb15cf319..8e561dafd4 100644
--- a/SignalServiceKit/src/Util/ExperienceUpgrade.h
+++ b/SignalServiceKit/src/Util/ExperienceUpgrade.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/ExperienceUpgrade.m b/SignalServiceKit/src/Util/ExperienceUpgrade.m
index b6e47dfd88..f5112600a9 100644
--- a/SignalServiceKit/src/Util/ExperienceUpgrade.m
+++ b/SignalServiceKit/src/Util/ExperienceUpgrade.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/ExperienceUpgrade.h>
+#import "ExperienceUpgrade.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/FunctionalUtil.m b/SignalServiceKit/src/Util/FunctionalUtil.m
index b83d94f3cb..8dbce775e8 100644
--- a/SignalServiceKit/src/Util/FunctionalUtil.m
+++ b/SignalServiceKit/src/Util/FunctionalUtil.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/FunctionalUtil.h>
+#import "FunctionalUtil.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/MIMETypeUtil.m b/SignalServiceKit/src/Util/MIMETypeUtil.m
index c92d051d7f..12779531d5 100644
--- a/SignalServiceKit/src/Util/MIMETypeUtil.m
+++ b/SignalServiceKit/src/Util/MIMETypeUtil.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/OWSFileSystem.h>
+#import "MIMETypeUtil.h"
+#import "OWSFileSystem.h"
 
 #if TARGET_OS_IPHONE
 #import <MobileCoreServices/MobileCoreServices.h>
diff --git a/SignalServiceKit/src/Util/NSArray+OWS.m b/SignalServiceKit/src/Util/NSArray+OWS.m
index 683932b90a..1a279fd3ce 100644
--- a/SignalServiceKit/src/Util/NSArray+OWS.m
+++ b/SignalServiceKit/src/Util/NSArray+OWS.m
@@ -3,7 +3,7 @@
 //
 
 #import "NSArray+OWS.h"
-#import <SignalServiceKit/TSYapDatabaseObject.h>
+#import "TSYapDatabaseObject.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/NSData+Image.m b/SignalServiceKit/src/Util/NSData+Image.m
index ac484569c8..07ef6d813d 100644
--- a/SignalServiceKit/src/Util/NSData+Image.m
+++ b/SignalServiceKit/src/Util/NSData+Image.m
@@ -2,12 +2,12 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "MIMETypeUtil.h"
 #import "NSData+Image.h"
+#import "OWSFileSystem.h"
 #import "webp/decode.h"
 #import "webp/demux.h"
 #import <AVFoundation/AVFoundation.h>
-#import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/OWSFileSystem.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <YYImage/YYImage.h>
 
diff --git a/SignalServiceKit/src/Util/NSUserDefaults+OWS.m b/SignalServiceKit/src/Util/NSUserDefaults+OWS.m
index 12569f29bb..28e666ef3e 100644
--- a/SignalServiceKit/src/Util/NSUserDefaults+OWS.m
+++ b/SignalServiceKit/src/Util/NSUserDefaults+OWS.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "AppContext.h"
 #import "NSUserDefaults+OWS.h"
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/TSConstants.h>
+#import "TSConstants.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/OWS2FAManager.m b/SignalServiceKit/src/Util/OWS2FAManager.m
index 4d0f648a68..c7d0c31683 100644
--- a/SignalServiceKit/src/Util/OWS2FAManager.m
+++ b/SignalServiceKit/src/Util/OWS2FAManager.m
@@ -3,11 +3,11 @@
 //
 
 #import "OWS2FAManager.h"
-#import <SignalServiceKit/AppReadiness.h>
-#import <SignalServiceKit/HTTPUtils.h>
-#import <SignalServiceKit/SSKEnvironment.h>
+#import "AppReadiness.h"
+#import "HTTPUtils.h"
+#import "SSKEnvironment.h"
+#import "TSAccountManager.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/OWSAnalytics.h b/SignalServiceKit/src/Util/OWSAnalytics.h
index 47f76a2b86..4e43cb2213 100755
--- a/SignalServiceKit/src/Util/OWSAnalytics.h
+++ b/SignalServiceKit/src/Util/OWSAnalytics.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSAnalyticsEvents.h>
+#import "OWSAnalyticsEvents.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/OWSAnalytics.m b/SignalServiceKit/src/Util/OWSAnalytics.m
index c62a2a0f40..d6da6f7e17 100755
--- a/SignalServiceKit/src/Util/OWSAnalytics.m
+++ b/SignalServiceKit/src/Util/OWSAnalytics.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSAnalytics.h"
 #import <CocoaLumberjack/CocoaLumberjack.h>
-#import <SignalServiceKit/OWSAnalytics.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/OWSAnalyticsEvents.m b/SignalServiceKit/src/Util/OWSAnalyticsEvents.m
index c280b49862..07403927ef 100755
--- a/SignalServiceKit/src/Util/OWSAnalyticsEvents.m
+++ b/SignalServiceKit/src/Util/OWSAnalyticsEvents.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSAnalyticsEvents.h>
+#import "OWSAnalyticsEvents.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/OWSBackgroundTask.m b/SignalServiceKit/src/Util/OWSBackgroundTask.m
index 54438f943c..9d59c7e640 100644
--- a/SignalServiceKit/src/Util/OWSBackgroundTask.m
+++ b/SignalServiceKit/src/Util/OWSBackgroundTask.m
@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSBackgroundTask.h"
+#import "AppContext.h"
 #import "NSTimer+OWS.h"
 #import <SignalCoreKit/Threading.h>
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/OWSBackgroundTask.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/OWSBackupFragment.h b/SignalServiceKit/src/Util/OWSBackupFragment.h
index 8d3ad7d8cf..7717741ebf 100644
--- a/SignalServiceKit/src/Util/OWSBackupFragment.h
+++ b/SignalServiceKit/src/Util/OWSBackupFragment.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/OWSBackupFragment.m b/SignalServiceKit/src/Util/OWSBackupFragment.m
index 33bfb6fc3d..26358aa4d4 100644
--- a/SignalServiceKit/src/Util/OWSBackupFragment.m
+++ b/SignalServiceKit/src/Util/OWSBackupFragment.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSBackupFragment.h>
+#import "OWSBackupFragment.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/OWSDispatch.m b/SignalServiceKit/src/Util/OWSDispatch.m
index cdb61e5d64..c60b495b94 100644
--- a/SignalServiceKit/src/Util/OWSDispatch.m
+++ b/SignalServiceKit/src/Util/OWSDispatch.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSDispatch.h>
+#import "OWSDispatch.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Util/OWSError.m b/SignalServiceKit/src/Util/OWSError.m
index ec01a63bfa..0e3b62dda3 100644
--- a/SignalServiceKit/src/Util/OWSError.m
+++ b/SignalServiceKit/src/Util/OWSError.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSError.h>
+#import "OWSError.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Util/OWSFileSystem.m b/SignalServiceKit/src/Util/OWSFileSystem.m
index da05ebb2db..969f66750f 100644
--- a/SignalServiceKit/src/Util/OWSFileSystem.m
+++ b/SignalServiceKit/src/Util/OWSFileSystem.m
@@ -3,10 +3,10 @@
 //
 
 #import "OWSFileSystem.h"
+#import "OWSError.h"
+#import "TSConstants.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSError.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSConstants.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/OWSOperation.m b/SignalServiceKit/src/Util/OWSOperation.m
index d1a3d92723..e04b8f81c1 100644
--- a/SignalServiceKit/src/Util/OWSOperation.m
+++ b/SignalServiceKit/src/Util/OWSOperation.m
@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSOperation.h>
+#import "OWSOperation.h"
 #import "NSTimer+OWS.h"
-#import <SignalServiceKit/OWSBackgroundTask.h>
-#import <SignalServiceKit/OWSError.h>
+#import "OWSBackgroundTask.h"
+#import "OWSError.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Util/OWSUserProfile.h b/SignalServiceKit/src/Util/OWSUserProfile.h
index 22a42b57d8..eb7119639d 100644
--- a/SignalServiceKit/src/Util/OWSUserProfile.h
+++ b/SignalServiceKit/src/Util/OWSUserProfile.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
+#import "BaseModel.h"
+#import "ProfileManagerProtocol.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/OWSUserProfile.m b/SignalServiceKit/src/Util/OWSUserProfile.m
index 23be501f8c..a6e071b4cd 100644
--- a/SignalServiceKit/src/Util/OWSUserProfile.m
+++ b/SignalServiceKit/src/Util/OWSUserProfile.m
@@ -2,16 +2,16 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/OWSUserProfile.h>
+#import "OWSUserProfile.h"
+#import "AppContext.h"
+#import "OWSFileSystem.h"
+#import "ProfileManagerProtocol.h"
+#import "SSKEnvironment.h"
+#import "TSAccountManager.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalCoreKit/NSString+OWS.h>
-#import <SignalServiceKit/AppContext.h>
-#import <SignalServiceKit/OWSFileSystem.h>
-#import <SignalServiceKit/ProfileManagerProtocol.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/SSKAsserts.h b/SignalServiceKit/src/Util/SSKAsserts.h
index 3562ee5ac5..1ed49e6ef4 100755
--- a/SignalServiceKit/src/Util/SSKAsserts.h
+++ b/SignalServiceKit/src/Util/SSKAsserts.h
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "AppContext.h"
 #import <SignalCoreKit/NSObject+OWS.h>
 #import <SignalCoreKit/OWSAsserts.h>
-#import <SignalServiceKit/AppContext.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/TestModel.h b/SignalServiceKit/src/Util/TestModel.h
index 10e304426e..5b2831f521 100644
--- a/SignalServiceKit/src/Util/TestModel.h
+++ b/SignalServiceKit/src/Util/TestModel.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/BaseModel.h>
+#import "BaseModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/TestModel.m b/SignalServiceKit/src/Util/TestModel.m
index eaa189b1e2..c20243e306 100644
--- a/SignalServiceKit/src/Util/TestModel.m
+++ b/SignalServiceKit/src/Util/TestModel.m
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/TestModel.h>
+#import "TestModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/groups/TSGroupModel.h b/SignalServiceKit/src/groups/TSGroupModel.h
index 7ca5443f45..35c6c1a43a 100644
--- a/SignalServiceKit/src/groups/TSGroupModel.h
+++ b/SignalServiceKit/src/groups/TSGroupModel.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "ContactsManagerProtocol.h"
 #import <Mantle/MTLModel+NSCoding.h>
-#import <SignalServiceKit/ContactsManagerProtocol.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/groups/TSGroupModel.m b/SignalServiceKit/src/groups/TSGroupModel.m
index 0e6db1b781..c6a18e5438 100644
--- a/SignalServiceKit/src/groups/TSGroupModel.m
+++ b/SignalServiceKit/src/groups/TSGroupModel.m
@@ -2,14 +2,14 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "TSGroupModel.h"
+#import "FunctionalUtil.h"
 #import "NSData+Image.h"
 #import "UIImage+OWS.h"
 #import <SignalCoreKit/NSData+OWS.h>
 #import <SignalCoreKit/NSString+OWS.h>
 #import <SignalCoreKit/Randomness.h>
-#import <SignalServiceKit/FunctionalUtil.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSGroupModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/tests/Account/SignedPreKeyDeletionTests.m b/SignalServiceKit/tests/Account/SignedPreKeyDeletionTests.m
index 65b212828b..f853045fd2 100644
--- a/SignalServiceKit/tests/Account/SignedPreKeyDeletionTests.m
+++ b/SignalServiceKit/tests/Account/SignedPreKeyDeletionTests.m
@@ -2,12 +2,12 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "SDSDatabaseStorage+Objc.h"
 #import "SSKBaseTestObjC.h"
-#import <SignalServiceKit/SDSDatabaseStorage+Objc.h>
-#import <SignalServiceKit/SSKSignedPreKeyStore.h>
+#import "SSKSignedPreKeyStore.h"
+#import "SignedPrekeyRecord.h"
+#import "TSPreKeyManager.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/SignedPrekeyRecord.h>
-#import <SignalServiceKit/TSPreKeyManager.h>
 
 @interface TSPreKeyManager (Testing)
 
diff --git a/SignalServiceKit/tests/Contacts/ContactSortingTest.m b/SignalServiceKit/tests/Contacts/ContactSortingTest.m
index b23fa42328..faf7f75914 100644
--- a/SignalServiceKit/tests/Contacts/ContactSortingTest.m
+++ b/SignalServiceKit/tests/Contacts/ContactSortingTest.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "Contact.h"
 #import "SSKBaseTestObjC.h"
 #import <Contacts/Contacts.h>
-#import <SignalServiceKit/Contact.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/tests/Contacts/OWSDisappearingMessagesConfigurationTest.m b/SignalServiceKit/tests/Contacts/OWSDisappearingMessagesConfigurationTest.m
index ca38192b3b..061faa29fa 100644
--- a/SignalServiceKit/tests/Contacts/OWSDisappearingMessagesConfigurationTest.m
+++ b/SignalServiceKit/tests/Contacts/OWSDisappearingMessagesConfigurationTest.m
@@ -2,11 +2,11 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSDisappearingMessagesConfiguration.h"
 #import "SSKBaseTestObjC.h"
+#import "TSContactThread.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/tests/Contacts/PhoneNumberTest.m b/SignalServiceKit/tests/Contacts/PhoneNumberTest.m
index 82588d247a..6469abf305 100644
--- a/SignalServiceKit/tests/Contacts/PhoneNumberTest.m
+++ b/SignalServiceKit/tests/Contacts/PhoneNumberTest.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "PhoneNumber.h"
 #import "SSKBaseTestObjC.h"
-#import <SignalServiceKit/PhoneNumber.h>
 
 @interface PhoneNumberTest : SSKBaseTestObjC
 
diff --git a/SignalServiceKit/tests/Contacts/PhoneNumberUtilTest.m b/SignalServiceKit/tests/Contacts/PhoneNumberUtilTest.m
index 348158efbd..79e362328f 100644
--- a/SignalServiceKit/tests/Contacts/PhoneNumberUtilTest.m
+++ b/SignalServiceKit/tests/Contacts/PhoneNumberUtilTest.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "PhoneNumberUtil.h"
 #import "SSKBaseTestObjC.h"
-#import <SignalServiceKit/PhoneNumberUtil.h>
 
 @interface PhoneNumberUtilTest : SSKBaseTestObjC
 
diff --git a/SignalServiceKit/tests/Contacts/TSContactThreadTest.m b/SignalServiceKit/tests/Contacts/TSContactThreadTest.m
index 2de764712f..c14e684697 100644
--- a/SignalServiceKit/tests/Contacts/TSContactThreadTest.m
+++ b/SignalServiceKit/tests/Contacts/TSContactThreadTest.m
@@ -2,11 +2,11 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "TSContactThread.h"
+#import "MockSSKEnvironment.h"
+#import "OWSIdentityManager.h"
 #import "SSKBaseTestObjC.h"
-#import <SignalServiceKit/MockSSKEnvironment.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/tests/Contacts/TSGroupThreadTest.m b/SignalServiceKit/tests/Contacts/TSGroupThreadTest.m
index 8f4c19c1c0..12075a674a 100644
--- a/SignalServiceKit/tests/Contacts/TSGroupThreadTest.m
+++ b/SignalServiceKit/tests/Contacts/TSGroupThreadTest.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "TSGroupThread.h"
 #import "SSKBaseTestObjC.h"
-#import <SignalServiceKit/TSGroupThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/tests/Contacts/TSThreadTest.m b/SignalServiceKit/tests/Contacts/TSThreadTest.m
index c4a86b366d..052b734122 100644
--- a/SignalServiceKit/tests/Contacts/TSThreadTest.m
+++ b/SignalServiceKit/tests/Contacts/TSThreadTest.m
@@ -2,15 +2,15 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "MIMETypeUtil.h"
+#import "OWSDevice.h"
 #import "SSKBaseTestObjC.h"
-#import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/OWSDevice.h>
+#import "TSAttachmentStream.h"
+#import "TSContactThread.h"
+#import "TSIncomingMessage.h"
+#import "TSOutgoingMessage.h"
+#import "TestAppContext.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSIncomingMessage.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/TestAppContext.h>
 
 @interface TSThreadTest : SSKBaseTestObjC
 
diff --git a/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m b/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m
index 944a6cb265..5ef2b92c32 100644
--- a/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m
+++ b/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m
@@ -2,12 +2,12 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "TSMessage.h"
 #import "SSKBaseTestObjC.h"
+#import "TSAttachmentStream.h"
+#import "TSContactThread.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAttachmentStream.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/tests/Messages/Interactions/TSOutgoingMessageTest.m b/SignalServiceKit/tests/Messages/Interactions/TSOutgoingMessageTest.m
index ad6e04b30e..9f0914e5fa 100644
--- a/SignalServiceKit/tests/Messages/Interactions/TSOutgoingMessageTest.m
+++ b/SignalServiceKit/tests/Messages/Interactions/TSOutgoingMessageTest.m
@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "TSOutgoingMessage.h"
 #import "SSKBaseTestObjC.h"
+#import "TSContactThread.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/tests/Messages/OWSDisappearingMessageFinderTest.m b/SignalServiceKit/tests/Messages/OWSDisappearingMessageFinderTest.m
index fe78d31816..40e96c1a87 100644
--- a/SignalServiceKit/tests/Messages/OWSDisappearingMessageFinderTest.m
+++ b/SignalServiceKit/tests/Messages/OWSDisappearingMessageFinderTest.m
@@ -2,17 +2,17 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "MockSSKEnvironment.h"
+#import "OWSDisappearingMessagesFinder.h"
+#import "SSKAccessors+SDS.h"
 #import "SSKBaseTestObjC.h"
+#import "StorageCoordinator.h"
+#import "TSContactThread.h"
+#import "TSIncomingMessage.h"
+#import "TSOutgoingMessage.h"
+#import "TestAppContext.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/MockSSKEnvironment.h>
-#import <SignalServiceKit/OWSDisappearingMessagesFinder.h>
-#import <SignalServiceKit/SSKAccessors+SDS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/StorageCoordinator.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSIncomingMessage.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/TestAppContext.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m b/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m
index 23e87fab8d..4006a4d3d4 100644
--- a/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m
+++ b/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m
@@ -2,15 +2,15 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSDisappearingMessagesJob.h"
+#import "OWSDisappearingMessagesConfiguration.h"
+#import "OWSDisappearingMessagesFinder.h"
 #import "SSKBaseTestObjC.h"
+#import "TSContactThread.h"
+#import "TSIncomingMessage.h"
+#import "TSMessage.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSDisappearingMessagesFinder.h>
-#import <SignalServiceKit/OWSDisappearingMessagesJob.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSIncomingMessage.h>
-#import <SignalServiceKit/TSMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m b/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m
index 1bb3dff2d1..7ec8571c42 100644
--- a/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m
+++ b/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m
@@ -2,20 +2,20 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSMessageManager.h"
+#import "ContactsManagerProtocol.h"
+#import "HTTPUtils.h"
+#import "MessageSender.h"
+#import "MockSSKEnvironment.h"
+#import "OWSFakeCallMessageHandler.h"
+#import "OWSFakeMessageSender.h"
+#import "OWSIdentityManager.h"
+#import "OWSSyncGroupsMessage.h"
 #import "SSKBaseTestObjC.h"
+#import "TSAccountManager.h"
+#import "TSGroupThread.h"
 #import <SignalCoreKit/Cryptography.h>
-#import <SignalServiceKit/ContactsManagerProtocol.h>
-#import <SignalServiceKit/HTTPUtils.h>
-#import <SignalServiceKit/MessageSender.h>
-#import <SignalServiceKit/MockSSKEnvironment.h>
-#import <SignalServiceKit/OWSFakeCallMessageHandler.h>
-#import <SignalServiceKit/OWSFakeMessageSender.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/OWSMessageManager.h>
-#import <SignalServiceKit/OWSSyncGroupsMessage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSGroupThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m b/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m
index 2c9219c7dc..e9e72325e2 100644
--- a/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m
+++ b/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m
@@ -2,20 +2,20 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "AxolotlExceptions.h"
+#import "HTTPUtils.h"
+#import "MessageSender.h"
+#import "OWSDisappearingMessagesConfiguration.h"
+#import "OWSError.h"
+#import "OWSUploadOperation.h"
 #import "SSKBaseTestObjC.h"
+#import "TSAccountManager.h"
+#import "TSContactThread.h"
+#import "TSGroupModel.h"
+#import "TSGroupThread.h"
+#import "TSOutgoingMessage.h"
+#import "TSRequest.h"
 #import <SignalCoreKit/Cryptography.h>
-#import <SignalServiceKit/AxolotlExceptions.h>
-#import <SignalServiceKit/HTTPUtils.h>
-#import <SignalServiceKit/MessageSender.h>
-#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
-#import <SignalServiceKit/OWSError.h>
-#import <SignalServiceKit/OWSUploadOperation.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSGroupModel.h>
-#import <SignalServiceKit/TSGroupThread.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/TSRequest.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/tests/SSKBaseTestObjC.h b/SignalServiceKit/tests/SSKBaseTestObjC.h
index 56de4874ee..6a47aa9ca4 100644
--- a/SignalServiceKit/tests/SSKBaseTestObjC.h
+++ b/SignalServiceKit/tests/SSKBaseTestObjC.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalServiceKit/MockSSKEnvironment.h>
+#import "MockSSKEnvironment.h"
 #import <XCTest/XCTest.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/tests/SSKBaseTestObjC.m b/SignalServiceKit/tests/SSKBaseTestObjC.m
index 106952e27b..593f7c9e30 100644
--- a/SignalServiceKit/tests/SSKBaseTestObjC.m
+++ b/SignalServiceKit/tests/SSKBaseTestObjC.m
@@ -3,12 +3,12 @@
 //
 
 #import "SSKBaseTestObjC.h"
+#import "SDSDatabaseStorage+Objc.h"
+#import "SSKEnvironment.h"
+#import "TestAppContext.h"
 #import <CocoaLumberjack/CocoaLumberjack.h>
 #import <CocoaLumberjack/DDTTYLogger.h>
-#import <SignalServiceKit/SDSDatabaseStorage+Objc.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TestAppContext.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/tests/Security/OWSFingerprintTest.m b/SignalServiceKit/tests/Security/OWSFingerprintTest.m
index fc1b5491e2..4622f4bdee 100644
--- a/SignalServiceKit/tests/Security/OWSFingerprintTest.m
+++ b/SignalServiceKit/tests/Security/OWSFingerprintTest.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSFingerprint.h"
 #import "SSKBaseTestObjC.h"
 #import <Curve25519Kit/Curve25519.h>
-#import <SignalServiceKit/OWSFingerprint.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 @interface OWSFingerprintTest : SSKBaseTestObjC
diff --git a/SignalServiceKit/tests/Storage/OWSIdentityManagerTests.m b/SignalServiceKit/tests/Storage/OWSIdentityManagerTests.m
index 69ea78848e..94b4c21e09 100644
--- a/SignalServiceKit/tests/Storage/OWSIdentityManagerTests.m
+++ b/SignalServiceKit/tests/Storage/OWSIdentityManagerTests.m
@@ -2,13 +2,13 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "MockSSKEnvironment.h"
+#import "OWSIdentityManager.h"
+#import "OWSRecipientIdentity.h"
 #import "SSKBaseTestObjC.h"
+#import "SSKEnvironment.h"
 #import <Curve25519Kit/Curve25519.h>
 #import <SignalCoreKit/Randomness.h>
-#import <SignalServiceKit/MockSSKEnvironment.h>
-#import <SignalServiceKit/OWSIdentityManager.h>
-#import <SignalServiceKit/OWSRecipientIdentity.h>
-#import <SignalServiceKit/SSKEnvironment.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 @interface OWSIdentityManagerTests : SSKBaseTestObjC
diff --git a/SignalServiceKit/tests/Storage/SSKPreKeyStoreTests.m b/SignalServiceKit/tests/Storage/SSKPreKeyStoreTests.m
index 0a065f6236..a0e160d6d6 100644
--- a/SignalServiceKit/tests/Storage/SSKPreKeyStoreTests.m
+++ b/SignalServiceKit/tests/Storage/SSKPreKeyStoreTests.m
@@ -2,11 +2,11 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "SDSDatabaseStorage+Objc.h"
 #import "SSKBaseTestObjC.h"
-#import <SignalServiceKit/SDSDatabaseStorage+Objc.h>
-#import <SignalServiceKit/SSKPreKeyStore.h>
+#import "SSKPreKeyStore.h"
+#import "SignedPrekeyRecord.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/SignedPreKeyRecord.h>
 
 @interface SSKPreKeyStoreTests : SSKBaseTestObjC
 
diff --git a/SignalServiceKit/tests/Util/OWSAnalyticsTests.m b/SignalServiceKit/tests/Util/OWSAnalyticsTests.m
index a98e723c90..19911f987a 100644
--- a/SignalServiceKit/tests/Util/OWSAnalyticsTests.m
+++ b/SignalServiceKit/tests/Util/OWSAnalyticsTests.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSAnalytics.h"
 #import "SSKBaseTestObjC.h"
 #import <SignalCoreKit/NSData+OWS.h>
-#import <SignalServiceKit/OWSAnalytics.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/tests/Util/TSMessageStorageTests.m b/SignalServiceKit/tests/Util/TSMessageStorageTests.m
index f8bc1fb835..f725b07596 100644
--- a/SignalServiceKit/tests/Util/TSMessageStorageTests.m
+++ b/SignalServiceKit/tests/Util/TSMessageStorageTests.m
@@ -3,15 +3,15 @@
 //
 
 #import "SSKBaseTestObjC.h"
+#import "TSAccountManager.h"
+#import "TSContactThread.h"
+#import "TSGroupThread.h"
+#import "TSIncomingMessage.h"
+#import "TSMessage.h"
+#import "TSOutgoingMessage.h"
+#import "TSThread.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSContactThread.h>
-#import <SignalServiceKit/TSGroupThread.h>
-#import <SignalServiceKit/TSIncomingMessage.h>
-#import <SignalServiceKit/TSMessage.h>
-#import <SignalServiceKit/TSOutgoingMessage.h>
-#import <SignalServiceKit/TSThread.h>
 
 @interface TSMessageStorageTests : SSKBaseTestObjC
 
diff --git a/SignalShareExtension/SAEScreenLockViewController.h b/SignalShareExtension/SAEScreenLockViewController.h
index 1d8e88cd48..ce65bbc302 100644
--- a/SignalShareExtension/SAEScreenLockViewController.h
+++ b/SignalShareExtension/SAEScreenLockViewController.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSViewController.h"
+#import <SignalUI/OWSViewController.h>
 #import <SignalUI/ScreenLockViewController.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalShareExtension/SignalShareExtension-Prefix.pch b/SignalShareExtension/SignalShareExtension-Prefix.pch
index 27cb938382..c1de748d31 100644
--- a/SignalShareExtension/SignalShareExtension-Prefix.pch
+++ b/SignalShareExtension/SignalShareExtension-Prefix.pch
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import <Availability.h>
@@ -16,6 +16,6 @@
     #endif
 
     #import <SignalCoreKit/OWSAsserts.h>
-    #import <SignalServiceKit/OWSAnalytics.h>
+#import <SignalServiceKit/OWSAnalytics.h>
     #import <SignalCoreKit/NSObject+OWS.h>
 #endif
diff --git a/SignalUI/Categories/UIView+SignalUI.m b/SignalUI/Categories/UIView+SignalUI.m
index 11924e6da5..7782e8600b 100644
--- a/SignalUI/Categories/UIView+SignalUI.m
+++ b/SignalUI/Categories/UIView+SignalUI.m
@@ -2,11 +2,11 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSMath.h"
 #import "UIView+SignalUI.h"
 #import <SignalCoreKit/iOSVersions.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/AppContext.h>
+#import <SignalServiceKit/OWSMath.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalUI/SignalUI-Prefix.pch b/SignalUI/SignalUI-Prefix.pch
index 3e5ebeabf4..80e2b26447 100644
--- a/SignalUI/SignalUI-Prefix.pch
+++ b/SignalUI/SignalUI-Prefix.pch
@@ -17,7 +17,7 @@
 
     #import <SignalCoreKit/OWSAsserts.h>
     #import <SignalCoreKit/NSObject+OWS.h>
-    #import <SignalServiceKit/OWSAnalytics.h>
-    #import <SignalServiceKit/SSKAsserts.h>
-    #import <SignalServiceKit/SDSDatabaseStorage+Objc.h>
+#import <SignalServiceKit/OWSAnalytics.h>
+#import <SignalServiceKit/SSKAsserts.h>
+#import <SignalServiceKit/SDSDatabaseStorage+Objc.h>
 #endif
diff --git a/SignalUI/SignalUI.h b/SignalUI/SignalUI.h
index b7d763e94b..e9e5f764fa 100644
--- a/SignalUI/SignalUI.h
+++ b/SignalUI/SignalUI.h
@@ -11,27 +11,27 @@ FOUNDATION_EXPORT double SignalUIVersionNumber;
 FOUNDATION_EXPORT const unsigned char SignalUIVersionString[];
 
 // The public headers of the framework
-#import <SignalUI/AttachmentSharing.h>
-#import <SignalUI/BlockListUIUtils.h>
-#import <SignalUI/CVItemViewModel.h>
-#import <SignalUI/ContactsViewHelper.h>
-#import <SignalUI/CountryCodeViewController.h>
-#import <SignalUI/OWSAnyTouchGestureRecognizer.h>
-#import <SignalUI/OWSAudioPlayer.h>
-#import <SignalUI/OWSBubbleView.h>
-#import <SignalUI/OWSNavigationController.h>
-#import <SignalUI/OWSProfileManager+SignalUI.h>
-#import <SignalUI/OWSQuotedReplyModel.h>
-#import <SignalUI/OWSSearchBar.h>
-#import <SignalUI/OWSTableViewController.h>
-#import <SignalUI/OWSTextField.h>
-#import <SignalUI/OWSTextView.h>
-#import <SignalUI/ScreenLockViewController.h>
-#import <SignalUI/Theme.h>
-#import <SignalUI/ThreadViewHelper.h>
-#import <SignalUI/UIFont+OWS.h>
-#import <SignalUI/UIUtil.h>
-#import <SignalUI/UIView+SignalUI.h>
-#import <SignalUI/UIViewController+OWS.h>
-#import <SignalUI/UIViewController+Permissions.h>
-#import <SignalUI/ViewControllerUtils.h>
+#import "AttachmentSharing.h"
+#import "BlockListUIUtils.h"
+#import "CVItemViewModel.h"
+#import "ContactsViewHelper.h"
+#import "CountryCodeViewController.h"
+#import "OWSAnyTouchGestureRecognizer.h"
+#import "OWSAudioPlayer.h"
+#import "OWSBubbleView.h"
+#import "OWSNavigationController.h"
+#import "OWSProfileManager+SignalUI.h"
+#import "OWSQuotedReplyModel.h"
+#import "OWSSearchBar.h"
+#import "OWSTableViewController.h"
+#import "OWSTextField.h"
+#import "OWSTextView.h"
+#import "ScreenLockViewController.h"
+#import "Theme.h"
+#import "ThreadViewHelper.h"
+#import "UIFont+OWS.h"
+#import "UIUtil.h"
+#import "UIView+SignalUI.h"
+#import "UIViewController+OWS.h"
+#import "UIViewController+Permissions.h"
+#import "ViewControllerUtils.h"
diff --git a/SignalUI/Utils/BlockListUIUtils.m b/SignalUI/Utils/BlockListUIUtils.m
index e61f7fff87..fd7818316d 100644
--- a/SignalUI/Utils/BlockListUIUtils.m
+++ b/SignalUI/Utils/BlockListUIUtils.m
@@ -3,9 +3,9 @@
 //
 
 #import "BlockListUIUtils.h"
-#import "OWSContactsManager.h"
-#import "PhoneNumber.h"
+#import <SignalMessaging/OWSContactsManager.h>
 #import <SignalServiceKit/Contact.h>
+#import <SignalServiceKit/PhoneNumber.h>
 #import <SignalServiceKit/SignalAccount.h>
 #import <SignalServiceKit/TSAccountManager.h>
 #import <SignalServiceKit/TSContactThread.h>
diff --git a/SignalUI/Utils/OWSAudioPlayer.m b/SignalUI/Utils/OWSAudioPlayer.m
index 83b85fd995..b11fe2af81 100644
--- a/SignalUI/Utils/OWSAudioPlayer.m
+++ b/SignalUI/Utils/OWSAudioPlayer.m
@@ -3,9 +3,9 @@
 //
 
 #import "OWSAudioPlayer.h"
-#import "TSAttachmentStream.h"
 #import <AVFoundation/AVFoundation.h>
 #import <SignalServiceKit/NSTimer+OWS.h>
+#import <SignalServiceKit/TSAttachmentStream.h>
 #import <SignalUI/SignalUI-Swift.h>
 
 @import MediaPlayer;
diff --git a/SignalUI/ViewControllers/CountryCodeViewController.m b/SignalUI/ViewControllers/CountryCodeViewController.m
index b9541fed0c..0c2bbd304d 100644
--- a/SignalUI/ViewControllers/CountryCodeViewController.m
+++ b/SignalUI/ViewControllers/CountryCodeViewController.m
@@ -4,11 +4,11 @@
 
 #import "CountryCodeViewController.h"
 #import "OWSSearchBar.h"
-#import "PhoneNumberUtil.h"
 #import "Theme.h"
 #import "UIFont+OWS.h"
 #import "UIView+SignalUI.h"
 #import <SignalCoreKit/NSString+OWS.h>
+#import <SignalServiceKit/PhoneNumberUtil.h>
 #import <SignalUI/SignalUI-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalUI/ViewControllers/OWSTableViewController.h b/SignalUI/ViewControllers/OWSTableViewController.h
index 2cd552a566..ed97f2da32 100644
--- a/SignalUI/ViewControllers/OWSTableViewController.h
+++ b/SignalUI/ViewControllers/OWSTableViewController.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import <SignalUI/OWSViewController.h>
+#import "OWSViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalUI/ViewControllers/OWSViewController.m b/SignalUI/ViewControllers/OWSViewController.m
index b803fd3edd..e3c9bc0208 100644
--- a/SignalUI/ViewControllers/OWSViewController.m
+++ b/SignalUI/ViewControllers/OWSViewController.m
@@ -3,9 +3,9 @@
 //
 
 #import "OWSViewController.h"
+#import "Theme.h"
 #import "UIView+SignalUI.h"
 #import <SignalUI/SignalUI-Swift.h>
-#import <SignalUI/Theme.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalUI/ViewControllers/UIViewController+Permissions.m b/SignalUI/ViewControllers/UIViewController+Permissions.m
index f0552c5499..c16d69d090 100644
--- a/SignalUI/ViewControllers/UIViewController+Permissions.m
+++ b/SignalUI/ViewControllers/UIViewController+Permissions.m
@@ -2,12 +2,12 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "UIUtil.h"
 #import "UIViewController+Permissions.h"
 #import <AVFoundation/AVFoundation.h>
 #import <Photos/Photos.h>
 #import <SignalCoreKit/Threading.h>
 #import <SignalUI/SignalUI-Swift.h>
-#import <SignalUI/UIUtil.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalUI/ViewControllers/ViewControllerUtils.m b/SignalUI/ViewControllers/ViewControllerUtils.m
index a4143ae0f9..a7673b2f27 100644
--- a/SignalUI/ViewControllers/ViewControllerUtils.m
+++ b/SignalUI/ViewControllers/ViewControllerUtils.m
@@ -3,10 +3,10 @@
 //
 
 #import "ViewControllerUtils.h"
-#import "PhoneNumber.h"
 #import <AVFoundation/AVFoundation.h>
 #import <SignalCoreKit/NSString+OWS.h>
 #import <SignalMessaging/Environment.h>
+#import <SignalServiceKit/PhoneNumber.h>
 #import <SignalServiceKit/PhoneNumberUtil.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalUI/Views/ContactsViewHelper.m b/SignalUI/Views/ContactsViewHelper.m
index 518e145829..b1131bfa52 100644
--- a/SignalUI/Views/ContactsViewHelper.m
+++ b/SignalUI/Views/ContactsViewHelper.m
@@ -3,10 +3,10 @@
 //
 
 #import "ContactsViewHelper.h"
-#import "Environment.h"
 #import "UIUtil.h"
 #import <ContactsUI/ContactsUI.h>
 #import <SignalCoreKit/NSString+OWS.h>
+#import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalServiceKit/AppContext.h>
 #import <SignalServiceKit/Contact.h>

From 3d7e8a0ba41fd338d4c82e21b2fbab418661c0ef Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 19 Oct 2021 14:10:28 -0300
Subject: [PATCH 03/10] Add script to normalize includes and imports.

---
 Scripts/import_include_normalize.py                   | 11 +++++++++--
 Signal.xcodeproj/project.pbxproj                      |  2 +-
 Signal/src/AppDelegate.m                              |  2 +-
 Signal/src/UserInterface/OWSWindowManager.m           |  2 +-
 .../Linked Devices/OWSLinkDeviceViewController.m      |  2 +-
 .../AppSettings/Privacy/BlockListViewController.m     |  2 +-
 .../Privacy/DomainFrontingCountryViewController.m     |  2 +-
 .../ConversationView/Cells/OWSQuotedMessageView.m     |  2 +-
 .../ConversationView/ConversationCollectionView.m     |  2 +-
 .../ConversationView/ConversationInputToolbar.m       |  2 +-
 .../src/ViewControllers/DebugUI/DebugContactsUtils.m  |  2 +-
 Signal/src/ViewControllers/DebugUI/DebugUIContacts.m  |  2 +-
 Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m |  2 +-
 Signal/src/ViewControllers/DebugUI/DebugUIMessages.m  |  2 +-
 Signal/src/ViewControllers/DebugUI/DebugUIMisc.m      |  2 +-
 .../src/ViewControllers/DebugUI/DebugUIScreenshots.m  |  2 +-
 .../src/ViewControllers/DebugUI/DebugUISessionState.m |  2 +-
 Signal/src/ViewControllers/DebugUI/DebugUIStress.m    |  2 +-
 .../src/ViewControllers/DebugUI/DebugUISyncMessages.m |  2 +-
 .../DebugUI/DebugUITableViewController.m              |  2 +-
 .../src/ViewControllers/HomeView/HomeViewController.m |  2 +-
 .../MediaGallery/MediaDetailViewController.m          |  2 +-
 .../RecipientPicker/RecipientPickerViewController.m   |  2 +-
 .../ThreadSettings/FingerprintViewController.m        |  2 +-
 .../ThreadSettings/FingerprintViewScanController.m    |  2 +-
 Signal/src/environment/SignalApp.m                    |  2 +-
 Signal/src/util/MainAppContext.m                      |  2 +-
 Signal/src/util/OWSScreenLockUI.m                     |  2 +-
 Signal/src/util/Pastelog.m                            |  2 +-
 Signal/src/util/RegistrationUtils.m                   |  2 +-
 Signal/src/views/PinEntryView.m                       |  2 +-
 31 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/Scripts/import_include_normalize.py b/Scripts/import_include_normalize.py
index dc3cb910a5..ff2b7216ea 100755
--- a/Scripts/import_include_normalize.py
+++ b/Scripts/import_include_normalize.py
@@ -258,9 +258,16 @@ def normalize_imports_and_includes_in_file(targets, target, headerSet, file_path
         
         swiftHeader = headerSet.find_swift_header(include.body)
         if swiftHeader is not None:
-            # NOTE: -Swift.h headers must always use long-form imports.
-            newline = "#import <%s/%s>" % ( swiftHeader.targetName, swiftHeader.filename, )
+            # NOTE: -Swift.h headers in development pods must always use long-form imports.
+            if target.name != 'Signal':
+                newline = "#import <%s/%s>" % ( swiftHeader.targetName, swiftHeader.filename, )
+            elif swiftHeader.targetName == target.name:
+                newline = '#import "%s"' % ( swiftHeader.filename, )
+            else:
+                newline = "#import <%s/%s>" % ( swiftHeader.targetName, swiftHeader.filename, )
             new_lines.append(newline)
+            # newline = "#import <%s/%s>" % ( swiftHeader.targetName, swiftHeader.filename, )
+            # new_lines.append(newline)
             continue
         
         header = headerSet.find_header(include.body)
diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj
index 2850d5917d..a2385b59e2 100644
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@@ -251,7 +251,7 @@
 		34480B361FD0929200BC14EF /* ShareAppExtensionContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B351FD0929200BC14EF /* ShareAppExtensionContext.m */; };
 		34480B551FD0A7A400BC14EF /* DebugLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B4D1FD0A7A300BC14EF /* DebugLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34480B561FD0A7A400BC14EF /* DebugLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B4E1FD0A7A300BC14EF /* DebugLogger.m */; };
-		34480B571FD0A7A400BC14EF /* OWSScrubbingLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B4F1FD0A7A300BC14EF /* OWSScrubbingLogFormatter.h */; };
+		34480B571FD0A7A400BC14EF /* OWSScrubbingLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B4F1FD0A7A300BC14EF /* OWSScrubbingLogFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34480B591FD0A7A400BC14EF /* OWSScrubbingLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B511FD0A7A400BC14EF /* OWSScrubbingLogFormatter.m */; };
 		34480B5B1FD0A7E300BC14EF /* SignalMessaging-Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 34480B5A1FD0A7E300BC14EF /* SignalMessaging-Prefix.pch */; };
 		3448E15C22133274004B052E /* OnboardingPermissionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3448E15B22133274004B052E /* OnboardingPermissionsViewController.swift */; };
diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index f5ea42186f..347daa1bef 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -8,9 +8,9 @@
 #import "OWSDeviceProvisioningURLParser.h"
 #import "OWSScreenLockUI.h"
 #import "Pastelog.h"
+#import "Signal-Swift.h"
 #import "SignalApp.h"
 #import <Intents/Intents.h>
-#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalCoreKit/iOSVersions.h>
 #import <SignalMessaging/AppSetup.h>
diff --git a/Signal/src/UserInterface/OWSWindowManager.m b/Signal/src/UserInterface/OWSWindowManager.m
index 22fce84d8b..1961f31b91 100644
--- a/Signal/src/UserInterface/OWSWindowManager.m
+++ b/Signal/src/UserInterface/OWSWindowManager.m
@@ -3,7 +3,7 @@
 //
 
 #import "OWSWindowManager.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
diff --git a/Signal/src/ViewControllers/AppSettings/Linked Devices/OWSLinkDeviceViewController.m b/Signal/src/ViewControllers/AppSettings/Linked Devices/OWSLinkDeviceViewController.m
index 54ff95479a..2247cac8f4 100644
--- a/Signal/src/ViewControllers/AppSettings/Linked Devices/OWSLinkDeviceViewController.m	
+++ b/Signal/src/ViewControllers/AppSettings/Linked Devices/OWSLinkDeviceViewController.m	
@@ -4,7 +4,7 @@
 
 #import "OWSLinkDeviceViewController.h"
 #import "OWSDeviceProvisioningURLParser.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalServiceKit/OWSDevice.h>
diff --git a/Signal/src/ViewControllers/AppSettings/Privacy/BlockListViewController.m b/Signal/src/ViewControllers/AppSettings/Privacy/BlockListViewController.m
index 2a94a95c57..aa956b030f 100644
--- a/Signal/src/ViewControllers/AppSettings/Privacy/BlockListViewController.m
+++ b/Signal/src/ViewControllers/AppSettings/Privacy/BlockListViewController.m
@@ -3,7 +3,7 @@
 //
 
 #import "BlockListViewController.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
diff --git a/Signal/src/ViewControllers/AppSettings/Privacy/DomainFrontingCountryViewController.m b/Signal/src/ViewControllers/AppSettings/Privacy/DomainFrontingCountryViewController.m
index a3523dfc3f..1503d54a97 100644
--- a/Signal/src/ViewControllers/AppSettings/Privacy/DomainFrontingCountryViewController.m
+++ b/Signal/src/ViewControllers/AppSettings/Privacy/DomainFrontingCountryViewController.m
@@ -3,7 +3,7 @@
 //
 
 #import "DomainFrontingCountryViewController.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalServiceKit/OWSCountryMetadata.h>
 #import <SignalServiceKit/OWSSignalService.h>
 #import <SignalUI/OWSTableViewController.h>
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
index b47365f851..5901d55e9d 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
@@ -3,7 +3,7 @@
 //
 
 #import "OWSQuotedMessageView.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationCollectionView.m b/Signal/src/ViewControllers/ConversationView/ConversationCollectionView.m
index 56521c784d..1e7ed56a51 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationCollectionView.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationCollectionView.m
@@ -3,7 +3,7 @@
 //
 
 #import "ConversationCollectionView.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
index 34dd35de54..4f36713a2c 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
@@ -3,7 +3,7 @@
 //
 
 #import "ConversationInputToolbar.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m b/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m
index 8d672ca60b..61ddc994e1 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m
@@ -3,8 +3,8 @@
 //
 
 #import "DebugContactsUtils.h"
+#import "Signal-Swift.h"
 #import <Contacts/Contacts.h>
-#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m b/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m
index ae235fbf2b..53736867f3 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIContacts.m
@@ -4,9 +4,9 @@
 
 #import "DebugUIContacts.h"
 #import "DebugContactsUtils.h"
+#import "Signal-Swift.h"
 #import "SignalApp.h"
 #import <Contacts/Contacts.h>
-#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalUI/OWSTableViewController.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m b/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m
index 490785b64e..8b42a6b34c 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.m
@@ -3,7 +3,7 @@
 //
 
 #import "DebugUIDiskUsage.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalMessaging/OWSOrphanDataCleaner.h>
 #import <SignalServiceKit/TSInteraction.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
index a9ca6c86bb..8ca2f61cfe 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
@@ -7,8 +7,8 @@
 #import "DebugUIContacts.h"
 #import "DebugUIMessagesAction.h"
 #import "DebugUIMessagesAssetLoader.h"
+#import "Signal-Swift.h"
 #import <MobileCoreServices/UTCoreTypes.h>
-#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalMessaging/Environment.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
index 86276d3c7c..3fcad7ec80 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
@@ -4,7 +4,7 @@
 
 #import "DebugUIMisc.h"
 #import "DebugUIMessagesAssetLoader.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalCoreKit/Randomness.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/ThreadUtil.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.m b/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.m
index 37cb65866f..19c7ccc31e 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.m
@@ -5,7 +5,7 @@
 #import "DebugUIScreenshots.h"
 #import "DebugContactsUtils.h"
 #import "DebugUIContacts.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/Randomness.h>
 #import <SignalMessaging/Environment.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m b/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m
index c9bb1d6071..809a7c7a3d 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m
@@ -3,7 +3,7 @@
 //
 
 #import "DebugUISessionState.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalServiceKit/OWSIdentityManager.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSContactThread.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIStress.m b/Signal/src/ViewControllers/DebugUI/DebugUIStress.m
index 7d154c71a0..54f6af6ba6 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIStress.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIStress.m
@@ -3,8 +3,8 @@
 //
 
 #import "DebugUIStress.h"
+#import "Signal-Swift.h"
 #import "SignalApp.h"
-#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/Randomness.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
index 1a351875d9..e87286ecae 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.m
@@ -4,7 +4,7 @@
 
 #import "DebugUISyncMessages.h"
 #import "DebugUIContacts.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalCoreKit/Randomness.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalMessaging/Environment.h>
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m b/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m
index 5b492c61ad..6e20e4adf0 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.m
@@ -11,7 +11,7 @@
 #import "DebugUISessionState.h"
 #import "DebugUIStress.h"
 #import "DebugUISyncMessages.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalServiceKit/TSContactThread.h>
 #import <SignalServiceKit/TSThread.h>
 
diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index 2cbb146a3c..106f79e13a 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -5,8 +5,8 @@
 #import "HomeViewController.h"
 #import "AppDelegate.h"
 #import "RegistrationUtils.h"
+#import "Signal-Swift.h"
 #import "SignalApp.h"
-#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalCoreKit/Threading.h>
diff --git a/Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.m b/Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.m
index 168324319c..dc8dabc669 100644
--- a/Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.m
+++ b/Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.m
@@ -4,10 +4,10 @@
 
 #import "MediaDetailViewController.h"
 #import "ConversationViewController.h"
+#import "Signal-Swift.h"
 #import <AVKit/AVKit.h>
 #import <MediaPlayer/MPMoviePlayerViewController.h>
 #import <MediaPlayer/MediaPlayer.h>
-#import <Signal/Signal-Swift.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/NSData+Image.h>
 #import <SignalServiceKit/TSAttachmentStream.h>
diff --git a/Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.m b/Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.m
index 012b2f478d..293002552a 100644
--- a/Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.m
+++ b/Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.m
@@ -3,9 +3,9 @@
 //
 
 #import "RecipientPickerViewController.h"
+#import "Signal-Swift.h"
 #import "SignalApp.h"
 #import <MessageUI/MessageUI.h>
-#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
diff --git a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m
index 239683559e..4854ba81e2 100644
--- a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.m
@@ -5,7 +5,7 @@
 #import "FingerprintViewController.h"
 #import "FingerprintViewScanController.h"
 #import "OWSBezierPathView.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
diff --git a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m
index ab2c505534..49c2b6b2f6 100644
--- a/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.m
@@ -3,7 +3,7 @@
 //
 
 #import "FingerprintViewScanController.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalServiceKit/OWSError.h>
diff --git a/Signal/src/environment/SignalApp.m b/Signal/src/environment/SignalApp.m
index f37ddae6e9..f3a440d5b4 100644
--- a/Signal/src/environment/SignalApp.m
+++ b/Signal/src/environment/SignalApp.m
@@ -5,7 +5,7 @@
 #import "SignalApp.h"
 #import "AppDelegate.h"
 #import "ConversationViewController.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/DebugLogger.h>
 #import <SignalMessaging/Environment.h>
diff --git a/Signal/src/util/MainAppContext.m b/Signal/src/util/MainAppContext.m
index 3e882233d3..01a77eb3df 100644
--- a/Signal/src/util/MainAppContext.m
+++ b/Signal/src/util/MainAppContext.m
@@ -3,7 +3,7 @@
 //
 
 #import "MainAppContext.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSProfileManager.h>
diff --git a/Signal/src/util/OWSScreenLockUI.m b/Signal/src/util/OWSScreenLockUI.m
index ad194f12e8..97b68b1be2 100644
--- a/Signal/src/util/OWSScreenLockUI.m
+++ b/Signal/src/util/OWSScreenLockUI.m
@@ -4,7 +4,7 @@
 
 #import "OWSScreenLockUI.h"
 #import "OWSWindowManager.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalUI/ScreenLockViewController.h>
 #import <SignalUI/UIView+SignalUI.h>
diff --git a/Signal/src/util/Pastelog.m b/Signal/src/util/Pastelog.m
index aea41a7f0b..5b7d80adcb 100644
--- a/Signal/src/util/Pastelog.m
+++ b/Signal/src/util/Pastelog.m
@@ -3,9 +3,9 @@
 //
 
 #import "Pastelog.h"
+#import "Signal-Swift.h"
 #import "zlib.h"
 #import <SSZipArchive/SSZipArchive.h>
-#import <Signal/Signal-Swift.h>
 #import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/DebugLogger.h>
 #import <SignalMessaging/Environment.h>
diff --git a/Signal/src/util/RegistrationUtils.m b/Signal/src/util/RegistrationUtils.m
index f4c5292bbb..99e7091c8e 100644
--- a/Signal/src/util/RegistrationUtils.m
+++ b/Signal/src/util/RegistrationUtils.m
@@ -3,7 +3,7 @@
 //
 
 #import "RegistrationUtils.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalCoreKit/SignalCoreKit-Swift.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSPreferences.h>
diff --git a/Signal/src/views/PinEntryView.m b/Signal/src/views/PinEntryView.m
index 845179c54c..eedb2c2dfd 100644
--- a/Signal/src/views/PinEntryView.m
+++ b/Signal/src/views/PinEntryView.m
@@ -3,7 +3,7 @@
 //
 
 #import "PinEntryView.h"
-#import <Signal/Signal-Swift.h>
+#import "Signal-Swift.h"
 #import <SignalUI/UIFont+OWS.h>
 #import <SignalUI/UIView+SignalUI.h>
 #import <SignalUI/ViewControllerUtils.h>

From 29cdf51db55abffd4b0842d455bfc4f5a2d86d91 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 19 Oct 2021 14:25:27 -0300
Subject: [PATCH 04/10] Add script to normalize includes and imports.

---
 Scripts/import_include_normalize.py | 20 +++++++++++++-------
 Signal/test/util/ProtoParsingTest.m |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Scripts/import_include_normalize.py b/Scripts/import_include_normalize.py
index ff2b7216ea..a766546485 100755
--- a/Scripts/import_include_normalize.py
+++ b/Scripts/import_include_normalize.py
@@ -135,6 +135,10 @@ class Target:
         self.name = name
         self.path = path
         self.is_test_target = is_test_target
+    
+    def isAppOrAppExtension(self):
+        appOrAppExtensionTargets = [ 'Signal', 'SignalShareExtension','NotificationServiceExtension' ]
+        return self.name in appOrAppExtensionTargets
 
 
 class Header:
@@ -258,16 +262,17 @@ def normalize_imports_and_includes_in_file(targets, target, headerSet, file_path
         
         swiftHeader = headerSet.find_swift_header(include.body)
         if swiftHeader is not None:
-            # NOTE: -Swift.h headers in development pods must always use long-form imports.
-            if target.name != 'Signal':
-                newline = "#import <%s/%s>" % ( swiftHeader.targetName, swiftHeader.filename, )
-            elif swiftHeader.targetName == target.name:
-                newline = '#import "%s"' % ( swiftHeader.filename, )
+            # NOTE: Apps and app extensions import the -Swift.h header for their
+            #       own target using short form improts.
+            #       Otherwise we should always use long-form importsfor  -Swift.h headers.
+            if swiftHeader.targetName == target.name:
+                if target.isAppOrAppExtension():
+                    newline = '#import "%s"' % ( swiftHeader.filename, )
+                else:
+                    newline = "#import <%s/%s>" % ( swiftHeader.targetName, swiftHeader.filename, )
             else:
                 newline = "#import <%s/%s>" % ( swiftHeader.targetName, swiftHeader.filename, )
             new_lines.append(newline)
-            # newline = "#import <%s/%s>" % ( swiftHeader.targetName, swiftHeader.filename, )
-            # new_lines.append(newline)
             continue
         
         header = headerSet.find_header(include.body)
@@ -331,6 +336,7 @@ if __name__ == "__main__":
         Target('SignalShareExtension', 'SignalShareExtension'),
         Target('SignalUI', 'SignalUI'),
         Target('SignalUI', 'SignalUITests', is_test_target=True),
+        Target('NotificationServiceExtension', 'NotificationServiceExtension'),
     ]
     
     headers = find_headers(targets)    
diff --git a/Signal/test/util/ProtoParsingTest.m b/Signal/test/util/ProtoParsingTest.m
index 92ece683d7..8af8e3b298 100644
--- a/Signal/test/util/ProtoParsingTest.m
+++ b/Signal/test/util/ProtoParsingTest.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "SignalBaseTest.h"

From 42db0731ed66bf53aad7fdd8b590754f6653ecee Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 19 Oct 2021 14:59:10 -0300
Subject: [PATCH 05/10] Fix build break.

---
 Signal.xcodeproj/project.pbxproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj
index a2385b59e2..6fa221f1e4 100644
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@@ -1232,10 +1232,8 @@
 		342FFE6F271EF580000AC89F /* UIApplication+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIApplication+OWS.swift"; sourceTree = "<group>"; };
 		342FFE70271EF580000AC89F /* CNContactViewController+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CNContactViewController+OWS.h"; sourceTree = "<group>"; };
 		342FFE71271EF580000AC89F /* AVAudioSession+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AVAudioSession+OWS.m"; sourceTree = "<group>"; };
-		342FFE72271EF580000AC89F /* CNContactViewController+OWS.m.sdsjson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "CNContactViewController+OWS.m.sdsjson"; sourceTree = "<group>"; };
 		342FFE73271EF580000AC89F /* UIResponder+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIResponder+OWS.swift"; sourceTree = "<group>"; };
 		342FFE74271EF580000AC89F /* UIStoryboard+OWS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIStoryboard+OWS.swift"; sourceTree = "<group>"; };
-		342FFE75271EF580000AC89F /* AVAudioSession+OWS.m.sdsjson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "AVAudioSession+OWS.m.sdsjson"; sourceTree = "<group>"; };
 		342FFE7D271EF5B1000AC89F /* ReturnToCallViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReturnToCallViewController.swift; sourceTree = "<group>"; };
 		34330A591E7875FB00DF2FB9 /* fontawesome-webfont.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "fontawesome-webfont.ttf"; sourceTree = "<group>"; };
 		343417F02530A7480034FE0C /* CVComponentReactions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CVComponentReactions.swift; sourceTree = "<group>"; };
@@ -2575,10 +2573,8 @@
 				342FFE6F271EF580000AC89F /* UIApplication+OWS.swift */,
 				342FFE70271EF580000AC89F /* CNContactViewController+OWS.h */,
 				342FFE71271EF580000AC89F /* AVAudioSession+OWS.m */,
-				342FFE72271EF580000AC89F /* CNContactViewController+OWS.m.sdsjson */,
 				342FFE73271EF580000AC89F /* UIResponder+OWS.swift */,
 				342FFE74271EF580000AC89F /* UIStoryboard+OWS.swift */,
-				342FFE75271EF580000AC89F /* AVAudioSession+OWS.m.sdsjson */,
 			);
 			name = Categories;
 			path = ViewControllers/Categories;

From 91ad7d1df7991a8e41811523ce2c52ecd89f7894 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 20 Oct 2021 11:26:50 -0300
Subject: [PATCH 06/10] Respond to CR.

---
 Scripts/import_include_normalize.py           |  40 +-
 .../ViewControllers/DebugUI/DebugUIContacts.h |   2 +-
 .../DebugUI/DebugUIDiskUsage.h                |   2 +-
 .../ViewControllers/DebugUI/DebugUIMessages.h |   2 +-
 .../DebugUI/DebugUIMessagesAction.h           |   2 +-
 .../src/ViewControllers/DebugUI/DebugUIMisc.h |   2 +-
 .../DebugUI/DebugUIScreenshots.h              |   2 +-
 .../DebugUI/DebugUISessionState.h             |   2 +-
 .../ViewControllers/DebugUI/DebugUIStress.h   |   2 +-
 .../DebugUI/DebugUISyncMessages.h             |   2 +-
 Signal/test/SignalTests-Bridging-Header.h     |   2 +-
 Signal/test/util/ExceptionsTest.h             |   2 +-
 Signal/test/util/UtilTest.h                   |   2 +-
 SignalMessaging/SignalMessaging.h             |  25 +-
 .../src/Account/TSAccountManager.h            |   2 +-
 .../src/Account/TSPreKeyManager.h             |   2 +-
 .../OWSDisappearingMessagesConfiguration.h    |   2 +-
 .../src/Contacts/PhoneNumberUtil.h            |   2 +-
 SignalServiceKit/src/Contacts/SignalAccount.h |   2 +-
 .../src/Contacts/SignalRecipient.h            |   2 +-
 SignalServiceKit/src/Contacts/TSGroupMember.h |   2 +-
 SignalServiceKit/src/Contacts/TSThread.h      |   2 +-
 .../src/Contacts/Threads/TSContactThread.h    |   2 +-
 .../src/Contacts/Threads/TSGroupThread.h      |   4 +-
 .../OWSContactsOutputStream.h                 |   2 +-
 .../ConversationSync/OWSGroupsOutputStream.h  |   2 +-
 .../Devices/OWSBlockedPhoneNumbersMessage.h   |   2 +-
 SignalServiceKit/src/Devices/OWSDevice.h      |   2 +-
 .../OWSReadReceiptsForLinkedDevicesMessage.h  |   2 +-
 .../src/Devices/OWSReceiptsForSenderMessage.h |   2 +-
 .../src/Devices/OWSStickerPackSyncMessage.h   |   4 +-
 .../Devices/OWSVerificationStateSyncMessage.h |   4 +-
 .../OWSViewOnceMessageReadSyncMessage.h       |   2 +-
 ...OWSViewedReceiptsForLinkedDevicesMessage.h |   2 +-
 .../src/Messages/Attachments/TSAttachment.h   |   2 +-
 .../Attachments/TSAttachmentPointer.h         |   2 +-
 .../Messages/Attachments/TSAttachmentStream.h |   4 +-
 .../OWSOutgoingSentMessageTranscript.h        |   2 +-
 .../DeviceSyncing/OWSOutgoingSyncMessage.h    |   2 +-
 .../OWSSyncConfigurationMessage.h             |   2 +-
 .../DeviceSyncing/OWSSyncContactsMessage.h    |   2 +-
 .../DeviceSyncing/OWSSyncFetchLatestMessage.h |   2 +-
 .../DeviceSyncing/OWSSyncGroupsMessage.h      |   2 +-
 .../DeviceSyncing/OWSSyncKeysMessage.h        |   2 +-
 .../OWSSyncMessageRequestResponseMessage.h    |   2 +-
 .../DeviceSyncing/OWSSyncRequestMessage.h     |   2 +-
 .../OutgoingPaymentSyncMessage.h              |   2 +-
 .../Interactions/OWSContact+Private.h         |   2 +-
 .../src/Messages/Interactions/OWSContact.h    |   2 +-
 ...sappearingConfigurationUpdateInfoMessage.h |   2 +-
 ...DisappearingMessagesConfigurationMessage.h |   2 +-
 .../Interactions/OWSDynamicOutgoingMessage.h  |   2 +-
 .../Interactions/OWSEndSessionMessage.h       |   2 +-
 .../Interactions/OWSStaticOutgoingMessage.h   |   2 +-
 .../OWSVerificationStateChangeMessage.h       |   4 +-
 .../Messages/Interactions/TSErrorMessage.h    |   4 +-
 .../Messages/Interactions/TSIncomingMessage.h |   4 +-
 .../src/Messages/Interactions/TSInfoMessage.h |   4 +-
 .../src/Messages/Interactions/TSInteraction.h |   2 +-
 .../src/Messages/Interactions/TSMention.h     |   2 +-
 .../src/Messages/Interactions/TSMessage.h     |   6 +-
 .../Interactions/TSOutgoingDeleteMessage.h    |   2 +-
 .../Messages/Interactions/TSOutgoingMessage.h |   4 +-
 .../TSUnreadIndicatorInteraction.h            |   2 +-
 .../TSInvalidIdentityKeyErrorMessage.h        |   2 +-
 ...SInvalidIdentityKeyReceivingErrorMessage.h |   2 +-
 .../TSInvalidIdentityKeySendingErrorMessage.h |   2 +-
 SignalServiceKit/src/Messages/MessageSender.h |   2 +-
 .../Messages/OWSAddToContactsOfferMessage.h   |   2 +-
 .../OWSAddToProfileWhitelistOfferMessage.h    |   2 +-
 .../src/Messages/OWSGroupCallMessage.h        |   4 +-
 .../src/Messages/OWSGroupInfoRequestMessage.h |   2 +-
 .../src/Messages/OWSIdentityManager.h         |   2 +-
 .../src/Messages/OWSMessageContentJob.h       |   2 +-
 .../src/Messages/OWSMessageDecryptJob.h       |   2 +-
 .../src/Messages/OWSMessageManager.h          |   2 +-
 .../src/Messages/OWSOutgoingCallMessage.h     |   2 +-
 .../Messages/OWSOutgoingGroupCallMessage.h    |   2 +-
 .../src/Messages/OWSOutgoingNullMessage.h     |   2 +-
 .../src/Messages/OWSOutgoingResendRequest.h   |   2 +-
 .../src/Messages/OWSOutgoingResendResponse.h  |   2 +-
 .../OWSOutgoingSenderKeyDistributionMessage.h |   2 +-
 .../src/Messages/OWSProfileKeyMessage.h       |   2 +-
 .../src/Messages/OWSReadTracking.h            |   2 +-
 .../src/Messages/OWSReceiptManager.h          |   2 +-
 .../OWSRecoverableDecryptionPlaceholder.h     |   2 +-
 .../OWSUnknownContactBlockOfferMessage.h      |   2 +-
 .../OWSUnknownProtocolVersionMessage.h        |   2 +-
 .../Payments/OWSOutgoingPaymentMessage.h      |   2 +-
 .../src/Messages/PreKeyBundle+jsonDict.h      |   2 +-
 .../Reactions/OWSOutgoingReactionMessage.h    |   2 +-
 .../src/Messages/Reactions/OWSReaction.h      |   2 +-
 .../src/Messages/Stickers/InstalledSticker.h  |   4 +-
 .../src/Messages/Stickers/KnownStickerPack.h  |   4 +-
 .../src/Messages/Stickers/StickerPack.h       |   4 +-
 SignalServiceKit/src/Messages/TSCall.h        |   4 +-
 .../src/Network/API/OWSUploadOperation.h      |   2 +-
 .../Network/API/Requests/OWSRequestFactory.h  |   2 +-
 .../Receiving/IncomingGroupsV2MessageJob.h    |   2 +-
 .../Receiving/SSKMessageDecryptJobRecord.h    |   2 +-
 .../src/Payments/TSPaymentModel.h             |   4 +-
 .../src/Payments/TSPaymentModels.h            |   2 +-
 .../src/Payments/TSPaymentRequestModel.h      |   4 +-
 .../src/Security/OWSRecipientIdentity.h       |   2 +-
 .../AxolotlStore/Model/LegacyChainKey.h       |   2 +-
 .../AxolotlStore/Model/LegacySessionState.h   |   4 +-
 .../AxolotlStore/Model/SignedPrekeyRecord.h   |   2 +-
 SignalServiceKit/src/Storage/BaseModel.h      |   2 +-
 .../Jobs/OWSBroadcastMediaMessageJobRecord.h  |   2 +-
 .../Jobs/OWSIncomingContactSyncJobRecord.h    |   2 +-
 .../Jobs/OWSIncomingGroupSyncJobRecord.h      |   2 +-
 .../Storage/Jobs/OWSSessionResetJobRecord.h   |   2 +-
 .../src/Storage/Jobs/SSKJobRecord.h           |   2 +-
 .../src/Storage/SSKMessageSenderJobRecord.h   |   2 +-
 SignalServiceKit/src/TSPrefix.h               |   6 +-
 .../src/TestUtils/MockSSKEnvironment.h        |   2 +-
 .../src/TestUtils/OWSFakeCallMessageHandler.h |   2 +-
 .../src/TestUtils/OWSFakeMessageSender.h      |   2 +-
 .../src/TestUtils/OWSFakeProfileManager.h     |   2 +-
 .../src/TestUtils/TestAppContext.h            |   2 +-
 SignalServiceKit/src/Util/ExperienceUpgrade.h |   2 +-
 SignalServiceKit/src/Util/OWSAnalytics.h      |   2 +-
 SignalServiceKit/src/Util/OWSBackupFragment.h |   2 +-
 SignalServiceKit/src/Util/OWSUserProfile.h    |   4 +-
 SignalServiceKit/src/Util/SSKAsserts.h        |   2 +-
 SignalServiceKit/src/Util/TestModel.h         |   2 +-
 SignalServiceKit/src/groups/TSGroupModel.h    |   2 +-
 SignalServiceKit/tests/SSKBaseTestObjC.h      |   2 +-
 SignalUI/SignalUI.h                           |  48 +-
 SignalUI/UI/UIUtil.h                          |   2 +-
 .../CountryCodeViewController.h               |   2 +-
 .../ViewControllers/OWSTableViewController.h  |   2 +-
 SignalUI/ViewModels/OWSQuotedReplyModel.h     |   2 +-
 import_header_filenames.txt                   | 578 ++++++++++++++++++
 import_header_paths.txt                       | 578 ++++++++++++++++++
 135 files changed, 1367 insertions(+), 206 deletions(-)
 create mode 100644 import_header_filenames.txt
 create mode 100644 import_header_paths.txt

diff --git a/Scripts/import_include_normalize.py b/Scripts/import_include_normalize.py
index a766546485..999eb5b2ee 100755
--- a/Scripts/import_include_normalize.py
+++ b/Scripts/import_include_normalize.py
@@ -235,6 +235,9 @@ def normalize_imports_and_includes_in_file(targets, target, headerSet, file_path
     if short_filepath.startswith(os.sep):
        short_filepath = short_filepath[len(os.sep):]
        
+    file_ext = os.path.splitext(filename)[1]
+    is_header_file = file_ext in ('.h', '.hpp', '.pch')
+     
     print 'Processing:', filename
 
     with open(file_path, 'rt') as f:
@@ -286,7 +289,10 @@ def normalize_imports_and_includes_in_file(targets, target, headerSet, file_path
             sys.exit(1)
 
         if header.targetName == target.name:
-            newline = '#import "%s"' % ( header.filename, )
+            if is_header_file and not target.isAppOrAppExtension():
+                newline = "#import <%s/%s>" % ( header.targetName, header.filename, )
+            else:
+                newline = '#import "%s"' % ( header.filename, )
         else:
             newline = "#import <%s/%s>" % ( header.targetName, header.filename, )
         new_lines.append(newline)
@@ -344,33 +350,31 @@ if __name__ == "__main__":
     headerSet = HeaderSet(targets, headers)
     
     if args.write_header_list:
+        def write_lines_to_file(lines, filename):
+            for header in headers:
+                lines.append(header.path)
+            lines.sort()
+            text = '\n'.join(lines)
+            text = text + '\n'
+
+            file_path = os.path.abspath(os.path.join(git_repo_path, filename))
+            print 'Header list:', filename
+            with open(file_path, 'wt') as f:
+                f.write(text)
+            
         lines = []
         for header in headers:
             lines.append(header.path)
-        lines.sort()
-        text = '\n'.join(lines)
-        text = text + '\n'
-
         filename = 'import_header_paths.txt'
-        file_path = os.path.abspath(os.path.join(git_repo_path, filename))
-        print 'Header list:', filename
-        with open(file_path, 'wt') as f:
-            f.write(text)
+        write_lines_to_file(lines, filename)
             
         lines = []
         for header in headers:
             lines.append(header.filename)
-        lines.sort()
-        text = '\n'.join(lines)
-        text = text + '\n'
-
         filename = 'import_header_filenames.txt'
-        file_path = os.path.abspath(os.path.join(git_repo_path, filename))
-        print 'Header list:', filename
-        with open(file_path, 'wt') as f:
-            f.write(text)
+        write_lines_to_file(lines, filename)
+
         
-    
     normalize_imports_and_includes(targets, headerSet)    
 
     print 'Complete.'
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.h b/Signal/src/ViewControllers/DebugUI/DebugUIContacts.h
index 6d0b982a50..31c032084d 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIContacts.h
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIContacts.h
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.h b/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.h
index 32d6e33a92..4d9e49247f 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.h
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.h
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.h b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.h
index 3420ff2682..3771297004 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.h
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.h
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAction.h b/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAction.h
index 71607fd87b..5a0cd1e7ae 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAction.h
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAction.h
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIMessagesUtils.h"
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.h b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.h
index 93ed5f3c0c..265696ea40 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.h
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.h
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.h b/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.h
index b46c4a0483..f33ddab08d 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.h
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.h
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISessionState.h b/Signal/src/ViewControllers/DebugUI/DebugUISessionState.h
index 436d00ca2e..b8f458f498 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUISessionState.h
+++ b/Signal/src/ViewControllers/DebugUI/DebugUISessionState.h
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIStress.h b/Signal/src/ViewControllers/DebugUI/DebugUIStress.h
index 61937d561f..bea11cb280 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIStress.h
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIStress.h
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.h b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.h
index e68ccd20ff..e9e73a9228 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.h
+++ b/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.h
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "DebugUIPage.h"
diff --git a/Signal/test/SignalTests-Bridging-Header.h b/Signal/test/SignalTests-Bridging-Header.h
index daa6f7e833..04775b922d 100644
--- a/Signal/test/SignalTests-Bridging-Header.h
+++ b/Signal/test/SignalTests-Bridging-Header.h
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "Signal-Bridging-Header.h"
diff --git a/Signal/test/util/ExceptionsTest.h b/Signal/test/util/ExceptionsTest.h
index 1ee996e496..2f84cc2ee2 100644
--- a/Signal/test/util/ExceptionsTest.h
+++ b/Signal/test/util/ExceptionsTest.h
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "SignalBaseTest.h"
diff --git a/Signal/test/util/UtilTest.h b/Signal/test/util/UtilTest.h
index 97e23ad656..695003f5c8 100644
--- a/Signal/test/util/UtilTest.h
+++ b/Signal/test/util/UtilTest.h
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "SignalBaseTest.h"
diff --git a/SignalMessaging/SignalMessaging.h b/SignalMessaging/SignalMessaging.h
index 9ea2631a84..39d98c51e0 100644
--- a/SignalMessaging/SignalMessaging.h
+++ b/SignalMessaging/SignalMessaging.h
@@ -11,16 +11,17 @@ FOUNDATION_EXPORT double SignalMessagingVersionNumber;
 FOUNDATION_EXPORT const unsigned char SignalMessagingVersionString[];
 
 // The public headers of the framework
-#import "AppSetup.h"
-#import "DateUtil.h"
-#import "DebugLogger.h"
-#import "Environment.h"
-#import "OWSContactsManager.h"
-#import "OWSOrphanDataCleaner.h"
-#import "OWSPreferences.h"
-#import "OWSProfileManager.h"
-#import "OWSSounds.h"
-#import "OWSSyncManager.h"
-#import "ThreadUtil.h"
-#import "VersionMigrations.h"
+#import <SignalMessaging/AppSetup.h>
+#import <SignalMessaging/DateUtil.h>
+#import <SignalMessaging/DebugLogger.h>
+#import <SignalMessaging/Environment.h>
+#import <SignalMessaging/OWSContactsManager.h>
+#import <SignalMessaging/OWSOrphanDataCleaner.h>
+#import <SignalMessaging/OWSPreferences.h>
+#import <SignalMessaging/OWSProfileManager.h>
+#import <SignalMessaging/OWSScrubbingLogFormatter.h>
+#import <SignalMessaging/OWSSounds.h>
+#import <SignalMessaging/OWSSyncManager.h>
+#import <SignalMessaging/ThreadUtil.h>
+#import <SignalMessaging/VersionMigrations.h>
 #import <SignalServiceKit/OWSUserProfile.h>
diff --git a/SignalServiceKit/src/Account/TSAccountManager.h b/SignalServiceKit/src/Account/TSAccountManager.h
index f50890795c..2959d8da39 100644
--- a/SignalServiceKit/src/Account/TSAccountManager.h
+++ b/SignalServiceKit/src/Account/TSAccountManager.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSConstants.h"
+#import <SignalServiceKit/TSConstants.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Account/TSPreKeyManager.h b/SignalServiceKit/src/Account/TSPreKeyManager.h
index 2e699a909f..33c031541f 100644
--- a/SignalServiceKit/src/Account/TSPreKeyManager.h
+++ b/SignalServiceKit/src/Account/TSPreKeyManager.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSAccountManager.h"
+#import <SignalServiceKit/TSAccountManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h
index 8b2b505c42..0ba9b04351 100644
--- a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h
+++ b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/PhoneNumberUtil.h b/SignalServiceKit/src/Contacts/PhoneNumberUtil.h
index e976e36bfa..56213df56d 100644
--- a/SignalServiceKit/src/Contacts/PhoneNumberUtil.h
+++ b/SignalServiceKit/src/Contacts/PhoneNumberUtil.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "PhoneNumber.h"
+#import <SignalServiceKit/PhoneNumber.h>
 #import <libPhoneNumber_iOS/NBPhoneNumberUtil.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Contacts/SignalAccount.h b/SignalServiceKit/src/Contacts/SignalAccount.h
index 254e60211d..dfbe936159 100644
--- a/SignalServiceKit/src/Contacts/SignalAccount.h
+++ b/SignalServiceKit/src/Contacts/SignalAccount.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/SignalRecipient.h b/SignalServiceKit/src/Contacts/SignalRecipient.h
index 12fc5c6c65..a6e72d2e6c 100644
--- a/SignalServiceKit/src/Contacts/SignalRecipient.h
+++ b/SignalServiceKit/src/Contacts/SignalRecipient.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/TSGroupMember.h b/SignalServiceKit/src/Contacts/TSGroupMember.h
index 34a3cb0237..8b1d11b0d3 100644
--- a/SignalServiceKit/src/Contacts/TSGroupMember.h
+++ b/SignalServiceKit/src/Contacts/TSGroupMember.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/TSThread.h b/SignalServiceKit/src/Contacts/TSThread.h
index 5050035246..4ce4b0f11b 100644
--- a/SignalServiceKit/src/Contacts/TSThread.h
+++ b/SignalServiceKit/src/Contacts/TSThread.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/Threads/TSContactThread.h b/SignalServiceKit/src/Contacts/Threads/TSContactThread.h
index d32f674113..d2394f824f 100644
--- a/SignalServiceKit/src/Contacts/Threads/TSContactThread.h
+++ b/SignalServiceKit/src/Contacts/Threads/TSContactThread.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSThread.h"
+#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Contacts/Threads/TSGroupThread.h b/SignalServiceKit/src/Contacts/Threads/TSGroupThread.h
index b45f1c4a01..8487f6570e 100644
--- a/SignalServiceKit/src/Contacts/Threads/TSGroupThread.h
+++ b/SignalServiceKit/src/Contacts/Threads/TSGroupThread.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSGroupModel.h"
-#import "TSThread.h"
+#import <SignalServiceKit/TSGroupModel.h>
+#import <SignalServiceKit/TSThread.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.h b/SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.h
index 66e0bb760c..f39492790e 100644
--- a/SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.h
+++ b/SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSChunkedOutputStream.h"
+#import <SignalServiceKit/OWSChunkedOutputStream.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.h b/SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.h
index b0ae465133..79b23a34c8 100644
--- a/SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.h
+++ b/SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSChunkedOutputStream.h"
+#import <SignalServiceKit/OWSChunkedOutputStream.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.h b/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.h
index 79b32d7da5..4ef341439a 100644
--- a/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.h
+++ b/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSDevice.h b/SignalServiceKit/src/Devices/OWSDevice.h
index c47ef4a374..f7b4a5ba08 100644
--- a/SignalServiceKit/src/Devices/OWSDevice.h
+++ b/SignalServiceKit/src/Devices/OWSDevice.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
 #import <Mantle/MTLJSONAdapter.h>
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.h b/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.h
index 2d7b5ad921..09ffb38964 100644
--- a/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.h
+++ b/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.h b/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.h
index a80cef6464..c06fadd67d 100644
--- a/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.h
+++ b/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.h b/SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.h
index 6b3694cd4a..a2dff6ddb6 100644
--- a/SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.h
+++ b/SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
-#import "StickerInfo.h"
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
+#import <SignalServiceKit/StickerInfo.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.h b/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.h
index f0b91963c8..85c08fa04e 100644
--- a/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.h
+++ b/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
-#import "OWSRecipientIdentity.h"
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
+#import <SignalServiceKit/OWSRecipientIdentity.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.h b/SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.h
index dd31d8c315..847c37b7b4 100644
--- a/SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.h
+++ b/SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.h b/SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.h
index 5d93550718..f0a17de0ae 100644
--- a/SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.h
+++ b/SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
 #import <Mantle/MTLModel.h>
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachment.h b/SignalServiceKit/src/Messages/Attachments/TSAttachment.h
index 41cc780236..9574583e5f 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachment.h
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachment.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h
index d23096d839..34bff12a2d 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSAttachment.h"
+#import <SignalServiceKit/TSAttachment.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h
index 6734d765d7..c4b3c244df 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "DataSource.h"
-#import "TSAttachment.h"
+#import <SignalServiceKit/DataSource.h>
+#import <SignalServiceKit/TSAttachment.h>
 
 #if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.h
index 786a966454..f3a08aaf75 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.h
index 495f5833ff..26d7925d55 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.h
index 433d6f4c38..c82f767af7 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.h
index 9c3a911ce1..e65fa9a552 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.h
index a7c0b08ade..856771c2a0 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.h
index e265369167..3adb7a6475 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.h
index 1a1fb8e27c..7d9b792f69 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.h
index 14b599a7d6..d6086c45f2 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.h
index f8992ac9ce..a6d0a3cc08 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.h b/SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.h
index d6d63cc5db..b9b8e2eea1 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.h
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOutgoingSyncMessage.h"
+#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSContact+Private.h b/SignalServiceKit/src/Messages/Interactions/OWSContact+Private.h
index 3f6d3310af..a662fbecd8 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSContact+Private.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSContact+Private.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSContact.h"
+#import <SignalServiceKit/OWSContact.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSContact.h b/SignalServiceKit/src/Messages/Interactions/OWSContact.h
index 6dd41ea94c..1316417708 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSContact.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSContact.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "ContactsManagerProtocol.h"
 #import <Mantle/MTLModel.h>
+#import <SignalServiceKit/ContactsManagerProtocol.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.h b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.h
index 079d479cff..50d39285a9 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSInfoMessage.h"
+#import <SignalServiceKit/TSInfoMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.h b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.h
index 851f8f9be8..7378ca8b90 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h b/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h
index 406ca85ac1..ac5068f462 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.h b/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.h
index fddd88e0b5..bdea5ede7f 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSStaticOutgoingMessage.h b/SignalServiceKit/src/Messages/Interactions/OWSStaticOutgoingMessage.h
index a21708c9f1..581d63b619 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSStaticOutgoingMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSStaticOutgoingMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.h b/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.h
index 2fe9d96af6..3b2e9e6e58 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSRecipientIdentity.h"
-#import "TSInfoMessage.h"
+#import <SignalServiceKit/OWSRecipientIdentity.h>
+#import <SignalServiceKit/TSInfoMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.h b/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.h
index 41baa9c8ad..db8863aabd 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSReadTracking.h"
-#import "TSMessage.h"
+#import <SignalServiceKit/OWSReadTracking.h>
+#import <SignalServiceKit/TSMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h
index b8a17a3ed2..a3e261d3d6 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSReadTracking.h"
-#import "TSMessage.h"
+#import <SignalServiceKit/OWSReadTracking.h>
+#import <SignalServiceKit/TSMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.h b/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.h
index 55d68d2b94..05ff03ac7e 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSReadTracking.h"
-#import "TSMessage.h"
+#import <SignalServiceKit/OWSReadTracking.h>
+#import <SignalServiceKit/TSMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction.h b/SignalServiceKit/src/Messages/Interactions/TSInteraction.h
index 858e66cea3..b612e2863f 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSMention.h b/SignalServiceKit/src/Messages/Interactions/TSMention.h
index 09b229cdc8..5567c71cbd 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSMention.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSMention.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.h b/SignalServiceKit/src/Messages/Interactions/TSMessage.h
index 0f4aee1515..b7ef385759 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.h
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSContact.h"
-#import "TSInteraction.h"
-#import "TSQuotedMessage.h"
+#import <SignalServiceKit/OWSContact.h>
+#import <SignalServiceKit/TSInteraction.h>
+#import <SignalServiceKit/TSQuotedMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingDeleteMessage.h b/SignalServiceKit/src/Messages/Interactions/TSOutgoingDeleteMessage.h
index 982b2d38a3..26d3c49b21 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingDeleteMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingDeleteMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h
index cea699f8ae..21687560a5 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSMessage.h"
-#import "TSPaymentModels.h"
+#import <SignalServiceKit/TSMessage.h>
+#import <SignalServiceKit/TSPaymentModels.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction.h b/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction.h
index 704749fc3c..e7ebe98422 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSInteraction.h"
+#import <SignalServiceKit/TSInteraction.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage.h b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage.h
index 8aee5e5b21..928cf939d6 100644
--- a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage.h
+++ b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSErrorMessage.h"
+#import <SignalServiceKit/TSErrorMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.h b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.h
index ed53227f62..9986f0874c 100644
--- a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.h
+++ b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSInvalidIdentityKeyErrorMessage.h"
+#import <SignalServiceKit/TSInvalidIdentityKeyErrorMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.h b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.h
index 4eb94ce95e..effae9d7c9 100644
--- a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.h
+++ b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSInvalidIdentityKeyErrorMessage.h"
+#import <SignalServiceKit/TSInvalidIdentityKeyErrorMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/MessageSender.h b/SignalServiceKit/src/Messages/MessageSender.h
index 9f2c905cbb..7da1bdb201 100644
--- a/SignalServiceKit/src/Messages/MessageSender.h
+++ b/SignalServiceKit/src/Messages/MessageSender.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "DataSource.h"
+#import <SignalServiceKit/DataSource.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage.h b/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage.h
index 5e81467da3..f08e473ebf 100644
--- a/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage.h
+++ b/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSInfoMessage.h"
+#import <SignalServiceKit/TSInfoMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.h b/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.h
index 9f586f6e77..8a30929dde 100644
--- a/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.h
+++ b/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSInfoMessage.h"
+#import <SignalServiceKit/TSInfoMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSGroupCallMessage.h b/SignalServiceKit/src/Messages/OWSGroupCallMessage.h
index 7dee4b5eb9..c66c6537b5 100644
--- a/SignalServiceKit/src/Messages/OWSGroupCallMessage.h
+++ b/SignalServiceKit/src/Messages/OWSGroupCallMessage.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSReadTracking.h"
-#import "TSInteraction.h"
+#import <SignalServiceKit/OWSReadTracking.h>
+#import <SignalServiceKit/TSInteraction.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSGroupInfoRequestMessage.h b/SignalServiceKit/src/Messages/OWSGroupInfoRequestMessage.h
index ae7dad6098..a1ebcb2174 100644
--- a/SignalServiceKit/src/Messages/OWSGroupInfoRequestMessage.h
+++ b/SignalServiceKit/src/Messages/OWSGroupInfoRequestMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSIdentityManager.h b/SignalServiceKit/src/Messages/OWSIdentityManager.h
index b7417afd52..afcf035fba 100644
--- a/SignalServiceKit/src/Messages/OWSIdentityManager.h
+++ b/SignalServiceKit/src/Messages/OWSIdentityManager.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSRecipientIdentity.h"
+#import <SignalServiceKit/OWSRecipientIdentity.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSMessageContentJob.h b/SignalServiceKit/src/Messages/OWSMessageContentJob.h
index ea057a7278..b84e16f0c3 100644
--- a/SignalServiceKit/src/Messages/OWSMessageContentJob.h
+++ b/SignalServiceKit/src/Messages/OWSMessageContentJob.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSMessageDecryptJob.h b/SignalServiceKit/src/Messages/OWSMessageDecryptJob.h
index 8a4fbd34b4..b4e247d2c5 100644
--- a/SignalServiceKit/src/Messages/OWSMessageDecryptJob.h
+++ b/SignalServiceKit/src/Messages/OWSMessageDecryptJob.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.h b/SignalServiceKit/src/Messages/OWSMessageManager.h
index e3111b76e9..4dd21b3185 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.h
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSMessageHandler.h"
+#import <SignalServiceKit/OWSMessageHandler.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.h b/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.h
index 99fa863933..d71a2099e8 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.h
+++ b/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingGroupCallMessage.h b/SignalServiceKit/src/Messages/OWSOutgoingGroupCallMessage.h
index 6d89ee4559..1284fc7dfb 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingGroupCallMessage.h
+++ b/SignalServiceKit/src/Messages/OWSOutgoingGroupCallMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 @class TSGroupThread;
 
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.h b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.h
index 0966adb5f5..aef59ef817 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.h
+++ b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingResendRequest.h b/SignalServiceKit/src/Messages/OWSOutgoingResendRequest.h
index a8b8af5bac..abb7042971 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingResendRequest.h
+++ b/SignalServiceKit/src/Messages/OWSOutgoingResendRequest.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingResendResponse.h b/SignalServiceKit/src/Messages/OWSOutgoingResendResponse.h
index 38f8cbafd4..ddd314ca05 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingResendResponse.h
+++ b/SignalServiceKit/src/Messages/OWSOutgoingResendResponse.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "SignalServiceKit.h"
+#import <SignalServiceKit/SignalServiceKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingSenderKeyDistributionMessage.h b/SignalServiceKit/src/Messages/OWSOutgoingSenderKeyDistributionMessage.h
index dd1a6f4a6f..aa0d61c491 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingSenderKeyDistributionMessage.h
+++ b/SignalServiceKit/src/Messages/OWSOutgoingSenderKeyDistributionMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 @class TSContactThread;
 
diff --git a/SignalServiceKit/src/Messages/OWSProfileKeyMessage.h b/SignalServiceKit/src/Messages/OWSProfileKeyMessage.h
index 1f4db5c745..3271385e8d 100644
--- a/SignalServiceKit/src/Messages/OWSProfileKeyMessage.h
+++ b/SignalServiceKit/src/Messages/OWSProfileKeyMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSReadTracking.h b/SignalServiceKit/src/Messages/OWSReadTracking.h
index 132982aa8b..68ea3e120d 100644
--- a/SignalServiceKit/src/Messages/OWSReadTracking.h
+++ b/SignalServiceKit/src/Messages/OWSReadTracking.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSReceiptManager.h"
+#import <SignalServiceKit/OWSReceiptManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSReceiptManager.h b/SignalServiceKit/src/Messages/OWSReceiptManager.h
index 0bc8335a28..54c236ba1e 100644
--- a/SignalServiceKit/src/Messages/OWSReceiptManager.h
+++ b/SignalServiceKit/src/Messages/OWSReceiptManager.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSRecoverableDecryptionPlaceholder.h b/SignalServiceKit/src/Messages/OWSRecoverableDecryptionPlaceholder.h
index a9ae2b01c9..aaea6374a6 100644
--- a/SignalServiceKit/src/Messages/OWSRecoverableDecryptionPlaceholder.h
+++ b/SignalServiceKit/src/Messages/OWSRecoverableDecryptionPlaceholder.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSErrorMessage.h"
+#import <SignalServiceKit/TSErrorMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.h b/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.h
index 2e53039255..a36f5157de 100644
--- a/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.h
+++ b/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSErrorMessage.h"
+#import <SignalServiceKit/TSErrorMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage.h b/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage.h
index 63c2916b88..6cea14ee5d 100644
--- a/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage.h
+++ b/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSInfoMessage.h"
+#import <SignalServiceKit/TSInfoMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Payments/OWSOutgoingPaymentMessage.h b/SignalServiceKit/src/Messages/Payments/OWSOutgoingPaymentMessage.h
index 1352d79163..200ea26966 100644
--- a/SignalServiceKit/src/Messages/Payments/OWSOutgoingPaymentMessage.h
+++ b/SignalServiceKit/src/Messages/Payments/OWSOutgoingPaymentMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.h b/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.h
index 688e5e74bb..12901739af 100644
--- a/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.h
+++ b/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "PreKeyBundle.h"
+#import <SignalServiceKit/PreKeyBundle.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Reactions/OWSOutgoingReactionMessage.h b/SignalServiceKit/src/Messages/Reactions/OWSOutgoingReactionMessage.h
index b5a047855e..8256b0304e 100644
--- a/SignalServiceKit/src/Messages/Reactions/OWSOutgoingReactionMessage.h
+++ b/SignalServiceKit/src/Messages/Reactions/OWSOutgoingReactionMessage.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
+#import <SignalServiceKit/TSOutgoingMessage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Reactions/OWSReaction.h b/SignalServiceKit/src/Messages/Reactions/OWSReaction.h
index f7699d84df..2db98ab02c 100644
--- a/SignalServiceKit/src/Messages/Reactions/OWSReaction.h
+++ b/SignalServiceKit/src/Messages/Reactions/OWSReaction.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Stickers/InstalledSticker.h b/SignalServiceKit/src/Messages/Stickers/InstalledSticker.h
index b440e6c4be..83369c0c2d 100644
--- a/SignalServiceKit/src/Messages/Stickers/InstalledSticker.h
+++ b/SignalServiceKit/src/Messages/Stickers/InstalledSticker.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
-#import "StickerInfo.h"
+#import <SignalServiceKit/BaseModel.h>
+#import <SignalServiceKit/StickerInfo.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Stickers/KnownStickerPack.h b/SignalServiceKit/src/Messages/Stickers/KnownStickerPack.h
index 78bf7c732a..9daa84c3e8 100644
--- a/SignalServiceKit/src/Messages/Stickers/KnownStickerPack.h
+++ b/SignalServiceKit/src/Messages/Stickers/KnownStickerPack.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
-#import "StickerInfo.h"
+#import <SignalServiceKit/BaseModel.h>
+#import <SignalServiceKit/StickerInfo.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/Stickers/StickerPack.h b/SignalServiceKit/src/Messages/Stickers/StickerPack.h
index 40e82fcdb3..e16a9bf55d 100644
--- a/SignalServiceKit/src/Messages/Stickers/StickerPack.h
+++ b/SignalServiceKit/src/Messages/Stickers/StickerPack.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
-#import "StickerInfo.h"
+#import <SignalServiceKit/BaseModel.h>
+#import <SignalServiceKit/StickerInfo.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Messages/TSCall.h b/SignalServiceKit/src/Messages/TSCall.h
index a706fc1888..8c83fc5db3 100644
--- a/SignalServiceKit/src/Messages/TSCall.h
+++ b/SignalServiceKit/src/Messages/TSCall.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSReadTracking.h"
-#import "TSInteraction.h"
+#import <SignalServiceKit/OWSReadTracking.h>
+#import <SignalServiceKit/TSInteraction.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/API/OWSUploadOperation.h b/SignalServiceKit/src/Network/API/OWSUploadOperation.h
index 37fa23c5d1..2f6ee6c027 100644
--- a/SignalServiceKit/src/Network/API/OWSUploadOperation.h
+++ b/SignalServiceKit/src/Network/API/OWSUploadOperation.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSOperation.h"
+#import <SignalServiceKit/OWSOperation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h
index f383a76ab0..f6ef98a237 100644
--- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h
+++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "RemoteAttestation.h"
+#import <SignalServiceKit/RemoteAttestation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/Receiving/IncomingGroupsV2MessageJob.h b/SignalServiceKit/src/Network/Receiving/IncomingGroupsV2MessageJob.h
index 33aea621f0..9f9f318784 100644
--- a/SignalServiceKit/src/Network/Receiving/IncomingGroupsV2MessageJob.h
+++ b/SignalServiceKit/src/Network/Receiving/IncomingGroupsV2MessageJob.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord.h b/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord.h
index c8b16cc1c8..24d5a9c97d 100644
--- a/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord.h
+++ b/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "SSKJobRecord.h"
+#import <SignalServiceKit/SSKJobRecord.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Payments/TSPaymentModel.h b/SignalServiceKit/src/Payments/TSPaymentModel.h
index 57854659a0..50c7e4b5e1 100644
--- a/SignalServiceKit/src/Payments/TSPaymentModel.h
+++ b/SignalServiceKit/src/Payments/TSPaymentModel.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
-#import "TSPaymentModels.h"
+#import <SignalServiceKit/BaseModel.h>
+#import <SignalServiceKit/TSPaymentModels.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Payments/TSPaymentModels.h b/SignalServiceKit/src/Payments/TSPaymentModels.h
index 395abe7afa..331c1c4a11 100644
--- a/SignalServiceKit/src/Payments/TSPaymentModels.h
+++ b/SignalServiceKit/src/Payments/TSPaymentModels.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Payments/TSPaymentRequestModel.h b/SignalServiceKit/src/Payments/TSPaymentRequestModel.h
index ffff41f2e5..f6b05ff85b 100644
--- a/SignalServiceKit/src/Payments/TSPaymentRequestModel.h
+++ b/SignalServiceKit/src/Payments/TSPaymentRequestModel.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
-#import "TSPaymentModels.h"
+#import <SignalServiceKit/BaseModel.h>
+#import <SignalServiceKit/TSPaymentModels.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Security/OWSRecipientIdentity.h b/SignalServiceKit/src/Security/OWSRecipientIdentity.h
index 6d178cabbf..445f5d8f36 100644
--- a/SignalServiceKit/src/Security/OWSRecipientIdentity.h
+++ b/SignalServiceKit/src/Security/OWSRecipientIdentity.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyChainKey.h b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyChainKey.h
index 50bf45a637..41ae26b9bb 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyChainKey.h
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyChainKey.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "LegacyMessageKeys.h"
 #import <Foundation/Foundation.h>
+#import <SignalServiceKit/LegacyMessageKeys.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionState.h b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionState.h
index e934fde810..8bfc7e1d0e 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionState.h
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionState.h
@@ -8,8 +8,8 @@
 @class LegacyChainKey;
 @class LegacyReceivingChain;
 
-#import "LegacyMessageKeys.h"
-#import "LegacyRootKey.h"
+#import <SignalServiceKit/LegacyMessageKeys.h>
+#import <SignalServiceKit/LegacyRootKey.h>
 
 /**
  *  Pending PreKeys
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/Model/SignedPrekeyRecord.h b/SignalServiceKit/src/Storage/AxolotlStore/Model/SignedPrekeyRecord.h
index 216ef5fe46..302bdfdd99 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/Model/SignedPrekeyRecord.h
+++ b/SignalServiceKit/src/Storage/AxolotlStore/Model/SignedPrekeyRecord.h
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "PreKeyRecord.h"
 #import <Curve25519Kit/Curve25519.h>
 #import <Foundation/Foundation.h>
+#import <SignalServiceKit/PreKeyRecord.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/BaseModel.h b/SignalServiceKit/src/Storage/BaseModel.h
index a29adc7991..4fc4fccb32 100644
--- a/SignalServiceKit/src/Storage/BaseModel.h
+++ b/SignalServiceKit/src/Storage/BaseModel.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSYapDatabaseObject.h"
+#import <SignalServiceKit/TSYapDatabaseObject.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord.h b/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord.h
index fbdaf16998..f33213283f 100644
--- a/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord.h
+++ b/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "SSKJobRecord.h"
+#import <SignalServiceKit/SSKJobRecord.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/Jobs/OWSIncomingContactSyncJobRecord.h b/SignalServiceKit/src/Storage/Jobs/OWSIncomingContactSyncJobRecord.h
index ea8ea64950..fb34867d0f 100644
--- a/SignalServiceKit/src/Storage/Jobs/OWSIncomingContactSyncJobRecord.h
+++ b/SignalServiceKit/src/Storage/Jobs/OWSIncomingContactSyncJobRecord.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "SSKJobRecord.h"
+#import <SignalServiceKit/SSKJobRecord.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/Jobs/OWSIncomingGroupSyncJobRecord.h b/SignalServiceKit/src/Storage/Jobs/OWSIncomingGroupSyncJobRecord.h
index ac61bd400f..71b155f2d5 100644
--- a/SignalServiceKit/src/Storage/Jobs/OWSIncomingGroupSyncJobRecord.h
+++ b/SignalServiceKit/src/Storage/Jobs/OWSIncomingGroupSyncJobRecord.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "SSKJobRecord.h"
+#import <SignalServiceKit/SSKJobRecord.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord.h b/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord.h
index 0ab6a50587..86f7dfb73b 100644
--- a/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord.h
+++ b/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "SSKJobRecord.h"
+#import <SignalServiceKit/SSKJobRecord.h>
 
 @class TSContactThread;
 
diff --git a/SignalServiceKit/src/Storage/Jobs/SSKJobRecord.h b/SignalServiceKit/src/Storage/Jobs/SSKJobRecord.h
index e6eb1b61e3..7bd9d95f69 100644
--- a/SignalServiceKit/src/Storage/Jobs/SSKJobRecord.h
+++ b/SignalServiceKit/src/Storage/Jobs/SSKJobRecord.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.h b/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.h
index 10c4d02b74..1b3202d803 100644
--- a/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.h
+++ b/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "SSKJobRecord.h"
+#import <SignalServiceKit/SSKJobRecord.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/TSPrefix.h b/SignalServiceKit/src/TSPrefix.h
index 0ce736eb06..6fea49ec94 100644
--- a/SignalServiceKit/src/TSPrefix.h
+++ b/SignalServiceKit/src/TSPrefix.h
@@ -10,8 +10,8 @@ static const NSUInteger ddLogLevel = DDLogLevelAll;
 #else
 static const NSUInteger ddLogLevel = DDLogLevelInfo;
 #endif
-#import "OWSAnalytics.h"
-#import "SSKAsserts.h"
-#import "TSConstants.h"
 #import <SignalCoreKit/NSObject+OWS.h>
 #import <SignalCoreKit/OWSAsserts.h>
+#import <SignalServiceKit/OWSAnalytics.h>
+#import <SignalServiceKit/SSKAsserts.h>
+#import <SignalServiceKit/TSConstants.h>
diff --git a/SignalServiceKit/src/TestUtils/MockSSKEnvironment.h b/SignalServiceKit/src/TestUtils/MockSSKEnvironment.h
index 6ea910ceb2..c9e2ccef59 100644
--- a/SignalServiceKit/src/TestUtils/MockSSKEnvironment.h
+++ b/SignalServiceKit/src/TestUtils/MockSSKEnvironment.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "SSKEnvironment.h"
+#import <SignalServiceKit/SSKEnvironment.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.h b/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.h
index c319c5b948..e73a594432 100644
--- a/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.h
+++ b/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSCallMessageHandler.h"
+#import <SignalServiceKit/OWSCallMessageHandler.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.h b/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.h
index 0864677b21..b2de668814 100644
--- a/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.h
+++ b/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "MessageSender.h"
+#import <SignalServiceKit/MessageSender.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.h b/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.h
index 763df6d189..868c63c4ae 100644
--- a/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.h
+++ b/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "ProfileManagerProtocol.h"
+#import <SignalServiceKit/ProfileManagerProtocol.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/TestUtils/TestAppContext.h b/SignalServiceKit/src/TestUtils/TestAppContext.h
index aa40b7f563..71ed8c367f 100644
--- a/SignalServiceKit/src/TestUtils/TestAppContext.h
+++ b/SignalServiceKit/src/TestUtils/TestAppContext.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "AppContext.h"
+#import <SignalServiceKit/AppContext.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/ExperienceUpgrade.h b/SignalServiceKit/src/Util/ExperienceUpgrade.h
index 8e561dafd4..8bb15cf319 100644
--- a/SignalServiceKit/src/Util/ExperienceUpgrade.h
+++ b/SignalServiceKit/src/Util/ExperienceUpgrade.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/OWSAnalytics.h b/SignalServiceKit/src/Util/OWSAnalytics.h
index 4e43cb2213..47f76a2b86 100755
--- a/SignalServiceKit/src/Util/OWSAnalytics.h
+++ b/SignalServiceKit/src/Util/OWSAnalytics.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSAnalyticsEvents.h"
+#import <SignalServiceKit/OWSAnalyticsEvents.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/OWSBackupFragment.h b/SignalServiceKit/src/Util/OWSBackupFragment.h
index 7717741ebf..8d3ad7d8cf 100644
--- a/SignalServiceKit/src/Util/OWSBackupFragment.h
+++ b/SignalServiceKit/src/Util/OWSBackupFragment.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/OWSUserProfile.h b/SignalServiceKit/src/Util/OWSUserProfile.h
index eb7119639d..22a42b57d8 100644
--- a/SignalServiceKit/src/Util/OWSUserProfile.h
+++ b/SignalServiceKit/src/Util/OWSUserProfile.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
-#import "ProfileManagerProtocol.h"
+#import <SignalServiceKit/BaseModel.h>
+#import <SignalServiceKit/ProfileManagerProtocol.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/SSKAsserts.h b/SignalServiceKit/src/Util/SSKAsserts.h
index 1ed49e6ef4..3562ee5ac5 100755
--- a/SignalServiceKit/src/Util/SSKAsserts.h
+++ b/SignalServiceKit/src/Util/SSKAsserts.h
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "AppContext.h"
 #import <SignalCoreKit/NSObject+OWS.h>
 #import <SignalCoreKit/OWSAsserts.h>
+#import <SignalServiceKit/AppContext.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Util/TestModel.h b/SignalServiceKit/src/Util/TestModel.h
index 5b2831f521..10e304426e 100644
--- a/SignalServiceKit/src/Util/TestModel.h
+++ b/SignalServiceKit/src/Util/TestModel.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "BaseModel.h"
+#import <SignalServiceKit/BaseModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/groups/TSGroupModel.h b/SignalServiceKit/src/groups/TSGroupModel.h
index 35c6c1a43a..7ca5443f45 100644
--- a/SignalServiceKit/src/groups/TSGroupModel.h
+++ b/SignalServiceKit/src/groups/TSGroupModel.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "ContactsManagerProtocol.h"
 #import <Mantle/MTLModel+NSCoding.h>
+#import <SignalServiceKit/ContactsManagerProtocol.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/tests/SSKBaseTestObjC.h b/SignalServiceKit/tests/SSKBaseTestObjC.h
index 6a47aa9ca4..56de4874ee 100644
--- a/SignalServiceKit/tests/SSKBaseTestObjC.h
+++ b/SignalServiceKit/tests/SSKBaseTestObjC.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "MockSSKEnvironment.h"
+#import <SignalServiceKit/MockSSKEnvironment.h>
 #import <XCTest/XCTest.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalUI/SignalUI.h b/SignalUI/SignalUI.h
index e9e5f764fa..b7d763e94b 100644
--- a/SignalUI/SignalUI.h
+++ b/SignalUI/SignalUI.h
@@ -11,27 +11,27 @@ FOUNDATION_EXPORT double SignalUIVersionNumber;
 FOUNDATION_EXPORT const unsigned char SignalUIVersionString[];
 
 // The public headers of the framework
-#import "AttachmentSharing.h"
-#import "BlockListUIUtils.h"
-#import "CVItemViewModel.h"
-#import "ContactsViewHelper.h"
-#import "CountryCodeViewController.h"
-#import "OWSAnyTouchGestureRecognizer.h"
-#import "OWSAudioPlayer.h"
-#import "OWSBubbleView.h"
-#import "OWSNavigationController.h"
-#import "OWSProfileManager+SignalUI.h"
-#import "OWSQuotedReplyModel.h"
-#import "OWSSearchBar.h"
-#import "OWSTableViewController.h"
-#import "OWSTextField.h"
-#import "OWSTextView.h"
-#import "ScreenLockViewController.h"
-#import "Theme.h"
-#import "ThreadViewHelper.h"
-#import "UIFont+OWS.h"
-#import "UIUtil.h"
-#import "UIView+SignalUI.h"
-#import "UIViewController+OWS.h"
-#import "UIViewController+Permissions.h"
-#import "ViewControllerUtils.h"
+#import <SignalUI/AttachmentSharing.h>
+#import <SignalUI/BlockListUIUtils.h>
+#import <SignalUI/CVItemViewModel.h>
+#import <SignalUI/ContactsViewHelper.h>
+#import <SignalUI/CountryCodeViewController.h>
+#import <SignalUI/OWSAnyTouchGestureRecognizer.h>
+#import <SignalUI/OWSAudioPlayer.h>
+#import <SignalUI/OWSBubbleView.h>
+#import <SignalUI/OWSNavigationController.h>
+#import <SignalUI/OWSProfileManager+SignalUI.h>
+#import <SignalUI/OWSQuotedReplyModel.h>
+#import <SignalUI/OWSSearchBar.h>
+#import <SignalUI/OWSTableViewController.h>
+#import <SignalUI/OWSTextField.h>
+#import <SignalUI/OWSTextView.h>
+#import <SignalUI/ScreenLockViewController.h>
+#import <SignalUI/Theme.h>
+#import <SignalUI/ThreadViewHelper.h>
+#import <SignalUI/UIFont+OWS.h>
+#import <SignalUI/UIUtil.h>
+#import <SignalUI/UIView+SignalUI.h>
+#import <SignalUI/UIViewController+OWS.h>
+#import <SignalUI/UIViewController+Permissions.h>
+#import <SignalUI/ViewControllerUtils.h>
diff --git a/SignalUI/UI/UIUtil.h b/SignalUI/UI/UIUtil.h
index 3aa59819e8..bd7af93757 100644
--- a/SignalUI/UI/UIUtil.h
+++ b/SignalUI/UI/UIUtil.h
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "UIFont+OWS.h"
 #import <SignalServiceKit/MIMETypeUtil.h>
 #import <SignalServiceKit/UIImage+OWS.h>
+#import <SignalUI/UIFont+OWS.h>
 
 #define ACCESSIBILITY_IDENTIFIER_WITH_NAME(_root_view, _variable_name)                                                 \
     ([NSString stringWithFormat:@"%@.%@", _root_view.class, _variable_name])
diff --git a/SignalUI/ViewControllers/CountryCodeViewController.h b/SignalUI/ViewControllers/CountryCodeViewController.h
index d4e0761ee0..1885cc9c95 100644
--- a/SignalUI/ViewControllers/CountryCodeViewController.h
+++ b/SignalUI/ViewControllers/CountryCodeViewController.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSTableViewController.h"
+#import <SignalUI/OWSTableViewController.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalUI/ViewControllers/OWSTableViewController.h b/SignalUI/ViewControllers/OWSTableViewController.h
index ed97f2da32..2cd552a566 100644
--- a/SignalUI/ViewControllers/OWSTableViewController.h
+++ b/SignalUI/ViewControllers/OWSTableViewController.h
@@ -2,7 +2,7 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSViewController.h"
+#import <SignalUI/OWSViewController.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalUI/ViewModels/OWSQuotedReplyModel.h b/SignalUI/ViewModels/OWSQuotedReplyModel.h
index 729f90f745..50d1f265b3 100644
--- a/SignalUI/ViewModels/OWSQuotedReplyModel.h
+++ b/SignalUI/ViewModels/OWSQuotedReplyModel.h
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "CVItemViewModel.h"
 #import <SignalServiceKit/TSQuotedMessage.h>
+#import <SignalUI/CVItemViewModel.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/import_header_filenames.txt b/import_header_filenames.txt
new file mode 100644
index 0000000000..9a532763fd
--- /dev/null
+++ b/import_header_filenames.txt
@@ -0,0 +1,578 @@
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/AppDelegate.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/Calls/UserInterface/RemoteVideoView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/Models/OWSDeviceProvisioningURLParser.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/Signal-Bridging-Header.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/UserInterface/OWSWindowManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/AppSettings/Linked Devices/OWSLinkDeviceViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/AppSettings/Privacy/BlockListViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/AppSettings/Privacy/DomainFrontingCountryViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/Categories/AVAudioSession+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/Categories/CNContactViewController+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ConversationView/ConversationCollectionView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ConversationView/ConversationViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIContacts.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIMessages.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAction.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAssetLoader.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIMessagesUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIMisc.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIPage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUISessionState.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIStress.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/HomeView/HomeViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/environment/SignalApp.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/util/MainAppContext.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/util/OWSScreenLockUI.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/util/Pastelog.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/util/RegistrationUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/util/UIViewController+CameraPermissions.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/views/OWSBezierPathView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/views/OWSDeviceTableViewCell.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/views/PinEntryView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/SignalBaseTest.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/SignalTests-Bridging-Header.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/TestUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/mocks/MockEnvironment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/util/ExceptionsTest.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/util/UtilTest.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/SignalMessaging.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/contacts/OWSContactsManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/contacts/OWSSyncManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/environment/AppSetup.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/environment/Environment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/environment/OWSSounds.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/environment/VersionMigrations.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/profiles/OWSProfileManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/DateUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/DebugLogger.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/OWSOrphanDataCleaner.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/OWSPreferences.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/OWSScrubbingLogFormatter.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/ThreadUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Account/TSAccountManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Account/TSPreKeyManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/Contact.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/PhoneNumber.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/PhoneNumberUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/SignalAccount.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/SignalRecipient.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/TSGroupMember.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/TSThread.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/Threads/TSContactThread.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/Threads/TSGroupThread.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/ConversationSync/OWSChunkedOutputStream.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSDevice.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSDeviceProvisioner.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSLinkedDeviceReadReceipt.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSProvisioningMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Attachments/TSAttachment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSContact+Private.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSContact.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSStaticOutgoingMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSInteraction.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSMention.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSOutgoingDeleteMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/MessageSender.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSFailedAttachmentDownloadsJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSFailedMessagesJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSGroupCallMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSGroupInfoRequestMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSIdentityManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSIncompleteCallsJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSMessageContentJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSMessageDecryptJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSMessageHandler.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSMessageManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSMessageUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingGroupCallMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingReceiptManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingResendRequest.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingResendResponse.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingSenderKeyDistributionMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSProfileKeyMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSReadTracking.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSReceiptManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSRecoverableDecryptionPlaceholder.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Payments/OWSOutgoingPaymentMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Reactions/OWSOutgoingReactionMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Reactions/OWSReaction.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Stickers/InstalledSticker.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Stickers/KnownStickerPack.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Stickers/StickerInfo.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Stickers/StickerPack.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/TSCall.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/HTTPUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/OWSUpload.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/OWSUploadOperation.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/RESTNetworkManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/Requests/TSRequest.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/OWSCensorshipConfiguration.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/OWSCountryMetadata.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/OWSSignalService.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/Receiving/IncomingGroupsV2MessageJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Payments/TSPaymentModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Payments/TSPaymentModels.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Payments/TSPaymentRequestModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Protocols/ContactsManagerProtocol.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Protocols/NotificationsProtocol.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Protocols/OWSCallMessageHandler.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Protocols/ProfileManagerProtocol.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Protocols/ProtoUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Remote Attestation/RemoteAttestation.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Remote Attestation/RemoteAttestationQuote.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Remote Attestation/RemoteAttestationSigningCertificate.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/SSKEnvironment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Security/OWSFingerprint.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Security/OWSFingerprintBuilder.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Security/OWSHTTPSecurityPolicy.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Security/OWSRecipientIdentity.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/SignalServiceKit.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/AxolotlExceptions.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/CallKitIdStore.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyChainKey.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyMessageKeys.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyReceivingChain.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyRootKey.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySendingChain.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionState.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/PreKeyBundle.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/PreKeyRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/SignedPrekeyRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/NSData+keyVersionByte.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/SSKPreKeyStore.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/SSKSignedPreKeyStore.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/BaseModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Database/SDSCrossProcess.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Database/SDSDatabaseStorage+Objc.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Database/SDSKeyValueStore+ObjC.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Database/SSKAccessors+SDS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Jobs/OWSIncomingContactSyncJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Jobs/OWSIncomingGroupSyncJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Jobs/SSKJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/StorageCoordinator.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/TSStorageKeys.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/TSYapDatabaseObject.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/YDBStorage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TSConstants.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TSPrefix.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TestUtils/MockSSKEnvironment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TestUtils/TestAppContext.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/AppContext.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/AppReadiness.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/AppVersion.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/ByteParser.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/DarwinNotificationCenter.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/DataSource.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/ExperienceUpgrade.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/FunctionalUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/MIMETypeUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/NSArray+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/NSData+Image.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/NSString+SSK.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/NSTimer+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/NSUserDefaults+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWS2FAManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSAnalytics.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSAnalyticsEvents.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSBackgroundTask.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSBackupFragment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSDispatch.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSError.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSFileSystem.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSMath.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSOperation.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSQueues.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSUserProfile.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/SSKAsserts.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/TestModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/UIImage+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/groups/TSGroupModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/tests/SSKBaseTestObjC.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalShareExtension/SAEScreenLockViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalShareExtension/SignalShareExtension-Bridging-Header.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalShareExtension/utils/NSItemProvider+TypedAccessors.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalShareExtension/utils/ShareAppExtensionContext.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Appearance/Theme.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Categories/UIFont+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Categories/UIView+SignalUI.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Categories/UIViewController+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/SignalUI.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/UI/AttachmentSharing.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/UI/UIUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Utils/BlockListUIUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Utils/OWSAnyTouchGestureRecognizer.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Utils/OWSAudioPlayer.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Utils/OWSProfileManager+SignalUI.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/CountryCodeViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/OWSNavigationController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/OWSTableViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/OWSViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/ScreenLockViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/UIViewController+Permissions.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/ViewControllerUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewModels/CVItemViewModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewModels/OWSQuotedReplyModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/ContactsViewHelper.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/OWSBubbleView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/OWSSearchBar.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/OWSTextField.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/OWSTextView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/ThreadViewHelper.h
+AVAudioSession+OWS.h
+AppContext.h
+AppDelegate.h
+AppReadiness.h
+AppSetup.h
+AppVersion.h
+AttachmentSharing.h
+AxolotlExceptions.h
+BaseModel.h
+BlockListUIUtils.h
+BlockListViewController.h
+ByteParser.h
+CNContactViewController+OWS.h
+CVItemViewModel.h
+CallKitIdStore.h
+Contact.h
+ContactsManagerProtocol.h
+ContactsViewHelper.h
+ConversationCollectionView.h
+ConversationInputToolbar.h
+ConversationScrollButton.h
+ConversationViewController.h
+CountryCodeViewController.h
+DarwinNotificationCenter.h
+DataSource.h
+DateUtil.h
+DebugContactsUtils.h
+DebugLogger.h
+DebugUIContacts.h
+DebugUIDiskUsage.h
+DebugUIMessages.h
+DebugUIMessagesAction.h
+DebugUIMessagesAssetLoader.h
+DebugUIMessagesUtils.h
+DebugUIMisc.h
+DebugUIPage.h
+DebugUIScreenshots.h
+DebugUISessionState.h
+DebugUIStress.h
+DebugUISyncMessages.h
+DebugUITableViewController.h
+DomainFrontingCountryViewController.h
+Environment.h
+ExceptionsTest.h
+ExperienceUpgrade.h
+FingerprintViewController.h
+FingerprintViewScanController.h
+FunctionalUtil.h
+HTTPUtils.h
+HomeViewController.h
+IncomingGroupsV2MessageJob.h
+InstalledSticker.h
+KnownStickerPack.h
+LegacyChainKey.h
+LegacyMessageKeys.h
+LegacyReceivingChain.h
+LegacyRootKey.h
+LegacySendingChain.h
+LegacySessionRecord.h
+LegacySessionState.h
+MIMETypeUtil.h
+MainAppContext.h
+MediaDetailViewController.h
+MessageSender.h
+MockEnvironment.h
+MockSSKEnvironment.h
+NSArray+OWS.h
+NSData+Image.h
+NSData+keyVersionByte.h
+NSItemProvider+TypedAccessors.h
+NSString+SSK.h
+NSTimer+OWS.h
+NSUserDefaults+OWS.h
+NotificationsProtocol.h
+OWS2FAManager.h
+OWSAddToContactsOfferMessage.h
+OWSAddToProfileWhitelistOfferMessage.h
+OWSAnalytics.h
+OWSAnalyticsEvents.h
+OWSAnyTouchGestureRecognizer.h
+OWSAudioPlayer.h
+OWSBackgroundTask.h
+OWSBackupFragment.h
+OWSBezierPathView.h
+OWSBlockedPhoneNumbersMessage.h
+OWSBroadcastMediaMessageJobRecord.h
+OWSBubbleView.h
+OWSCallMessageHandler.h
+OWSCensorshipConfiguration.h
+OWSChunkedOutputStream.h
+OWSContact+Private.h
+OWSContact.h
+OWSContactsManager.h
+OWSContactsOutputStream.h
+OWSCountryMetadata.h
+OWSDevice.h
+OWSDeviceProvisioner.h
+OWSDeviceProvisioningURLParser.h
+OWSDeviceTableViewCell.h
+OWSDisappearingConfigurationUpdateInfoMessage.h
+OWSDisappearingMessagesConfiguration.h
+OWSDisappearingMessagesConfigurationMessage.h
+OWSDisappearingMessagesFinder.h
+OWSDisappearingMessagesJob.h
+OWSDispatch.h
+OWSDynamicOutgoingMessage.h
+OWSEndSessionMessage.h
+OWSError.h
+OWSFailedAttachmentDownloadsJob.h
+OWSFailedMessagesJob.h
+OWSFakeCallMessageHandler.h
+OWSFakeMessageSender.h
+OWSFakeProfileManager.h
+OWSFileSystem.h
+OWSFingerprint.h
+OWSFingerprintBuilder.h
+OWSGroupCallMessage.h
+OWSGroupInfoRequestMessage.h
+OWSGroupsOutputStream.h
+OWSHTTPSecurityPolicy.h
+OWSIdentityManager.h
+OWSIncomingContactSyncJobRecord.h
+OWSIncomingGroupSyncJobRecord.h
+OWSIncomingSentMessageTranscript.h
+OWSIncompleteCallsJob.h
+OWSLinkDeviceViewController.h
+OWSLinkedDeviceReadReceipt.h
+OWSMath.h
+OWSMessageContentJob.h
+OWSMessageDecryptJob.h
+OWSMessageHandler.h
+OWSMessageManager.h
+OWSMessageUtils.h
+OWSNavigationController.h
+OWSOperation.h
+OWSOrphanDataCleaner.h
+OWSOutgoingCallMessage.h
+OWSOutgoingGroupCallMessage.h
+OWSOutgoingNullMessage.h
+OWSOutgoingPaymentMessage.h
+OWSOutgoingReactionMessage.h
+OWSOutgoingReceiptManager.h
+OWSOutgoingResendRequest.h
+OWSOutgoingResendResponse.h
+OWSOutgoingSenderKeyDistributionMessage.h
+OWSOutgoingSentMessageTranscript.h
+OWSOutgoingSyncMessage.h
+OWSPreferences.h
+OWSProfileKeyMessage.h
+OWSProfileManager+SignalUI.h
+OWSProfileManager.h
+OWSProvisioningMessage.h
+OWSQueues.h
+OWSQuotedMessageView.h
+OWSQuotedReplyModel.h
+OWSReaction.h
+OWSReadReceiptsForLinkedDevicesMessage.h
+OWSReadTracking.h
+OWSReceiptManager.h
+OWSReceiptsForSenderMessage.h
+OWSRecipientIdentity.h
+OWSRecordTranscriptJob.h
+OWSRecoverableDecryptionPlaceholder.h
+OWSRequestFactory.h
+OWSScreenLockUI.h
+OWSScrubbingLogFormatter.h
+OWSSearchBar.h
+OWSSessionResetJobRecord.h
+OWSSignalService.h
+OWSSounds.h
+OWSStaticOutgoingMessage.h
+OWSStickerPackSyncMessage.h
+OWSSyncConfigurationMessage.h
+OWSSyncContactsMessage.h
+OWSSyncFetchLatestMessage.h
+OWSSyncGroupsMessage.h
+OWSSyncKeysMessage.h
+OWSSyncManager.h
+OWSSyncMessageRequestResponseMessage.h
+OWSSyncRequestMessage.h
+OWSTableViewController.h
+OWSTextField.h
+OWSTextView.h
+OWSUnknownContactBlockOfferMessage.h
+OWSUnknownProtocolVersionMessage.h
+OWSUpload.h
+OWSUploadOperation.h
+OWSUserProfile.h
+OWSVerificationStateChangeMessage.h
+OWSVerificationStateSyncMessage.h
+OWSViewController.h
+OWSViewOnceMessageReadSyncMessage.h
+OWSViewedReceiptsForLinkedDevicesMessage.h
+OWSWindowManager.h
+OutgoingPaymentSyncMessage.h
+Pastelog.h
+PhoneNumber.h
+PhoneNumberUtil.h
+PinEntryView.h
+PreKeyBundle+jsonDict.h
+PreKeyBundle.h
+PreKeyRecord.h
+ProfileManagerProtocol.h
+ProtoUtils.h
+RESTNetworkManager.h
+RecipientPickerViewController.h
+RegistrationUtils.h
+RemoteAttestation.h
+RemoteAttestationQuote.h
+RemoteAttestationSigningCertificate.h
+RemoteVideoView.h
+SAEScreenLockViewController.h
+SDSCrossProcess.h
+SDSDatabaseStorage+Objc.h
+SDSKeyValueStore+ObjC.h
+SSKAccessors+SDS.h
+SSKAsserts.h
+SSKBaseTestObjC.h
+SSKEnvironment.h
+SSKJobRecord.h
+SSKMessageDecryptJobRecord.h
+SSKMessageSenderJobRecord.h
+SSKPreKeyStore.h
+SSKSignedPreKeyStore.h
+ScreenLockViewController.h
+ShareAppExtensionContext.h
+Signal-Bridging-Header.h
+SignalAccount.h
+SignalApp.h
+SignalBaseTest.h
+SignalMessaging.h
+SignalRecipient.h
+SignalServiceKit.h
+SignalShareExtension-Bridging-Header.h
+SignalTests-Bridging-Header.h
+SignalUI.h
+SignedPrekeyRecord.h
+StickerInfo.h
+StickerPack.h
+StorageCoordinator.h
+TSAccountManager.h
+TSAttachment.h
+TSAttachmentPointer.h
+TSAttachmentStream.h
+TSCall.h
+TSConstants.h
+TSContactThread.h
+TSErrorMessage.h
+TSGroupMember.h
+TSGroupModel.h
+TSGroupThread.h
+TSIncomingMessage.h
+TSInfoMessage.h
+TSInteraction.h
+TSInvalidIdentityKeyErrorMessage.h
+TSInvalidIdentityKeyReceivingErrorMessage.h
+TSInvalidIdentityKeySendingErrorMessage.h
+TSMention.h
+TSMessage.h
+TSOutgoingDeleteMessage.h
+TSOutgoingMessage.h
+TSPaymentModel.h
+TSPaymentModels.h
+TSPaymentRequestModel.h
+TSPreKeyManager.h
+TSPrefix.h
+TSQuotedMessage.h
+TSRequest.h
+TSStorageKeys.h
+TSThread.h
+TSUnreadIndicatorInteraction.h
+TSYapDatabaseObject.h
+TestAppContext.h
+TestModel.h
+TestUtil.h
+Theme.h
+ThreadUtil.h
+ThreadViewHelper.h
+UIFont+OWS.h
+UIImage+OWS.h
+UIUtil.h
+UIView+SignalUI.h
+UIViewController+CameraPermissions.h
+UIViewController+OWS.h
+UIViewController+Permissions.h
+UtilTest.h
+VersionMigrations.h
+ViewControllerUtils.h
+YDBStorage.h
diff --git a/import_header_paths.txt b/import_header_paths.txt
new file mode 100644
index 0000000000..366fc7920f
--- /dev/null
+++ b/import_header_paths.txt
@@ -0,0 +1,578 @@
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/AppDelegate.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/AppDelegate.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/Calls/UserInterface/RemoteVideoView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/Calls/UserInterface/RemoteVideoView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/Models/OWSDeviceProvisioningURLParser.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/Models/OWSDeviceProvisioningURLParser.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/Signal-Bridging-Header.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/Signal-Bridging-Header.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/UserInterface/OWSWindowManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/UserInterface/OWSWindowManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/AppSettings/Linked Devices/OWSLinkDeviceViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/AppSettings/Linked Devices/OWSLinkDeviceViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/AppSettings/Privacy/BlockListViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/AppSettings/Privacy/BlockListViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/AppSettings/Privacy/DomainFrontingCountryViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/AppSettings/Privacy/DomainFrontingCountryViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/Categories/AVAudioSession+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/Categories/AVAudioSession+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/Categories/CNContactViewController+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/Categories/CNContactViewController+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ConversationView/ConversationCollectionView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ConversationView/ConversationCollectionView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ConversationView/ConversationScrollButton.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ConversationView/ConversationViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ConversationView/ConversationViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIContacts.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIContacts.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIDiskUsage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIMessages.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIMessages.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAction.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAction.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAssetLoader.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIMessagesAssetLoader.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIMessagesUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIMessagesUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIMisc.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIMisc.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIPage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIPage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIScreenshots.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUISessionState.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUISessionState.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIStress.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUIStress.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUISyncMessages.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/DebugUI/DebugUITableViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/HomeView/HomeViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/HomeView/HomeViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/MediaGallery/MediaDetailViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/RecipientPicker/RecipientPickerViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ThreadSettings/FingerprintViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/ViewControllers/ThreadSettings/FingerprintViewScanController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/environment/SignalApp.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/environment/SignalApp.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/util/MainAppContext.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/util/MainAppContext.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/util/OWSScreenLockUI.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/util/OWSScreenLockUI.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/util/Pastelog.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/util/Pastelog.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/util/RegistrationUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/util/RegistrationUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/util/UIViewController+CameraPermissions.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/util/UIViewController+CameraPermissions.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/views/OWSBezierPathView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/views/OWSBezierPathView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/views/OWSDeviceTableViewCell.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/views/OWSDeviceTableViewCell.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/views/PinEntryView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/src/views/PinEntryView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/SignalBaseTest.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/SignalBaseTest.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/SignalTests-Bridging-Header.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/SignalTests-Bridging-Header.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/TestUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/TestUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/mocks/MockEnvironment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/mocks/MockEnvironment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/util/ExceptionsTest.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/util/ExceptionsTest.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/util/UtilTest.h
+/Users/matthew/code/workspace/ows/Signal-iOS/Signal/test/util/UtilTest.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/SignalMessaging.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/SignalMessaging.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/contacts/OWSContactsManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/contacts/OWSContactsManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/contacts/OWSSyncManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/contacts/OWSSyncManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/environment/AppSetup.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/environment/AppSetup.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/environment/Environment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/environment/Environment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/environment/OWSSounds.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/environment/OWSSounds.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/environment/VersionMigrations.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/environment/VersionMigrations.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/profiles/OWSProfileManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/profiles/OWSProfileManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/DateUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/DateUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/DebugLogger.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/DebugLogger.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/OWSOrphanDataCleaner.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/OWSOrphanDataCleaner.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/OWSPreferences.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/OWSPreferences.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/OWSScrubbingLogFormatter.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/OWSScrubbingLogFormatter.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/ThreadUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalMessaging/utils/ThreadUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Account/TSAccountManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Account/TSAccountManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Account/TSPreKeyManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Account/TSPreKeyManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/Contact.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/Contact.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/PhoneNumber.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/PhoneNumber.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/PhoneNumberUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/PhoneNumberUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/SignalAccount.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/SignalAccount.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/SignalRecipient.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/SignalRecipient.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/TSGroupMember.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/TSGroupMember.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/TSThread.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/TSThread.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/Threads/TSContactThread.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/Threads/TSContactThread.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/Threads/TSGroupThread.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Contacts/Threads/TSGroupThread.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/ConversationSync/OWSChunkedOutputStream.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/ConversationSync/OWSChunkedOutputStream.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/ConversationSync/OWSContactsOutputStream.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/ConversationSync/OWSGroupsOutputStream.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSBlockedPhoneNumbersMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSDevice.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSDevice.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSDeviceProvisioner.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSDeviceProvisioner.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSLinkedDeviceReadReceipt.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSLinkedDeviceReadReceipt.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSProvisioningMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSProvisioningMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSReadReceiptsForLinkedDevicesMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSReceiptsForSenderMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSStickerPackSyncMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSVerificationStateSyncMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSViewOnceMessageReadSyncMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Devices/OWSViewedReceiptsForLinkedDevicesMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Attachments/TSAttachment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Attachments/TSAttachment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSentMessageTranscript.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncConfigurationMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncFetchLatestMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncKeysMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncMessageRequestResponseMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncRequestMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/DeviceSyncing/OutgoingPaymentSyncMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSContact+Private.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSContact+Private.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSContact.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSContact.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSStaticOutgoingMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSStaticOutgoingMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSInfoMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSInteraction.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSInteraction.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSMention.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSMention.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSOutgoingDeleteMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSOutgoingDeleteMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/MessageSender.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/MessageSender.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSFailedAttachmentDownloadsJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSFailedAttachmentDownloadsJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSFailedMessagesJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSFailedMessagesJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSGroupCallMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSGroupCallMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSGroupInfoRequestMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSGroupInfoRequestMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSIdentityManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSIdentityManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSIncompleteCallsJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSIncompleteCallsJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSMessageContentJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSMessageContentJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSMessageDecryptJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSMessageDecryptJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSMessageHandler.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSMessageHandler.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSMessageManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSMessageManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSMessageUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSMessageUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingGroupCallMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingGroupCallMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingReceiptManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingReceiptManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingResendRequest.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingResendRequest.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingResendResponse.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingResendResponse.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingSenderKeyDistributionMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSOutgoingSenderKeyDistributionMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSProfileKeyMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSProfileKeyMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSReadTracking.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSReadTracking.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSReceiptManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSReceiptManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSRecoverableDecryptionPlaceholder.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSRecoverableDecryptionPlaceholder.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Payments/OWSOutgoingPaymentMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Payments/OWSOutgoingPaymentMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Reactions/OWSOutgoingReactionMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Reactions/OWSOutgoingReactionMessage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Reactions/OWSReaction.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Reactions/OWSReaction.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Stickers/InstalledSticker.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Stickers/InstalledSticker.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Stickers/KnownStickerPack.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Stickers/KnownStickerPack.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Stickers/StickerInfo.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Stickers/StickerInfo.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Stickers/StickerPack.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/Stickers/StickerPack.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/TSCall.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Messages/TSCall.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/HTTPUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/HTTPUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/OWSUpload.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/OWSUpload.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/OWSUploadOperation.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/OWSUploadOperation.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/RESTNetworkManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/RESTNetworkManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/Requests/TSRequest.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/API/Requests/TSRequest.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/OWSCensorshipConfiguration.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/OWSCensorshipConfiguration.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/OWSCountryMetadata.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/OWSCountryMetadata.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/OWSSignalService.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/OWSSignalService.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/Receiving/IncomingGroupsV2MessageJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/Receiving/IncomingGroupsV2MessageJob.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Payments/TSPaymentModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Payments/TSPaymentModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Payments/TSPaymentModels.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Payments/TSPaymentModels.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Payments/TSPaymentRequestModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Payments/TSPaymentRequestModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Protocols/ContactsManagerProtocol.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Protocols/ContactsManagerProtocol.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Protocols/NotificationsProtocol.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Protocols/NotificationsProtocol.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Protocols/OWSCallMessageHandler.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Protocols/OWSCallMessageHandler.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Protocols/ProfileManagerProtocol.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Protocols/ProfileManagerProtocol.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Protocols/ProtoUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Protocols/ProtoUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Remote Attestation/RemoteAttestation.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Remote Attestation/RemoteAttestation.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Remote Attestation/RemoteAttestationQuote.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Remote Attestation/RemoteAttestationQuote.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Remote Attestation/RemoteAttestationSigningCertificate.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Remote Attestation/RemoteAttestationSigningCertificate.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/SSKEnvironment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/SSKEnvironment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Security/OWSFingerprint.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Security/OWSFingerprint.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Security/OWSFingerprintBuilder.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Security/OWSFingerprintBuilder.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Security/OWSHTTPSecurityPolicy.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Security/OWSHTTPSecurityPolicy.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Security/OWSRecipientIdentity.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Security/OWSRecipientIdentity.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/SignalServiceKit.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/SignalServiceKit.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/AxolotlExceptions.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/AxolotlExceptions.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/CallKitIdStore.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/CallKitIdStore.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyChainKey.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyChainKey.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyMessageKeys.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyMessageKeys.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyReceivingChain.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyReceivingChain.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyRootKey.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacyRootKey.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySendingChain.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySendingChain.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionState.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/LegacySessionState.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/PreKeyBundle.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/PreKeyBundle.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/PreKeyRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/PreKeyRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/SignedPrekeyRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/Model/SignedPrekeyRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/NSData+keyVersionByte.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/NSData+keyVersionByte.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/SSKPreKeyStore.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/SSKPreKeyStore.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/SSKSignedPreKeyStore.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/AxolotlStore/SSKSignedPreKeyStore.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/BaseModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/BaseModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Database/SDSCrossProcess.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Database/SDSCrossProcess.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Database/SDSDatabaseStorage+Objc.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Database/SDSDatabaseStorage+Objc.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Database/SDSKeyValueStore+ObjC.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Database/SDSKeyValueStore+ObjC.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Database/SSKAccessors+SDS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Database/SSKAccessors+SDS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Jobs/OWSIncomingContactSyncJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Jobs/OWSIncomingContactSyncJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Jobs/OWSIncomingGroupSyncJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Jobs/OWSIncomingGroupSyncJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Jobs/SSKJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/Jobs/SSKJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/StorageCoordinator.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/StorageCoordinator.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/TSStorageKeys.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/TSStorageKeys.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/TSYapDatabaseObject.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/TSYapDatabaseObject.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/YDBStorage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Storage/YDBStorage.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TSConstants.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TSConstants.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TSPrefix.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TSPrefix.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TestUtils/MockSSKEnvironment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TestUtils/MockSSKEnvironment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TestUtils/TestAppContext.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/TestUtils/TestAppContext.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/AppContext.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/AppContext.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/AppReadiness.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/AppReadiness.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/AppVersion.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/AppVersion.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/ByteParser.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/ByteParser.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/DarwinNotificationCenter.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/DarwinNotificationCenter.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/DataSource.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/DataSource.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/ExperienceUpgrade.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/ExperienceUpgrade.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/FunctionalUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/FunctionalUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/MIMETypeUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/MIMETypeUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/NSArray+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/NSArray+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/NSData+Image.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/NSData+Image.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/NSString+SSK.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/NSString+SSK.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/NSTimer+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/NSTimer+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/NSUserDefaults+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/NSUserDefaults+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWS2FAManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWS2FAManager.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSAnalytics.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSAnalytics.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSAnalyticsEvents.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSAnalyticsEvents.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSBackgroundTask.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSBackgroundTask.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSBackupFragment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSBackupFragment.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSDispatch.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSDispatch.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSError.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSError.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSFileSystem.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSFileSystem.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSMath.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSMath.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSOperation.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSOperation.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSQueues.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSQueues.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSUserProfile.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/OWSUserProfile.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/SSKAsserts.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/SSKAsserts.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/TestModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/TestModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/UIImage+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/Util/UIImage+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/groups/TSGroupModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/src/groups/TSGroupModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/tests/SSKBaseTestObjC.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalServiceKit/tests/SSKBaseTestObjC.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalShareExtension/SAEScreenLockViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalShareExtension/SAEScreenLockViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalShareExtension/SignalShareExtension-Bridging-Header.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalShareExtension/SignalShareExtension-Bridging-Header.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalShareExtension/utils/NSItemProvider+TypedAccessors.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalShareExtension/utils/NSItemProvider+TypedAccessors.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalShareExtension/utils/ShareAppExtensionContext.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalShareExtension/utils/ShareAppExtensionContext.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Appearance/Theme.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Appearance/Theme.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Categories/UIFont+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Categories/UIFont+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Categories/UIView+SignalUI.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Categories/UIView+SignalUI.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Categories/UIViewController+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Categories/UIViewController+OWS.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/SignalUI.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/SignalUI.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/UI/AttachmentSharing.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/UI/AttachmentSharing.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/UI/UIUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/UI/UIUtil.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Utils/BlockListUIUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Utils/BlockListUIUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Utils/OWSAnyTouchGestureRecognizer.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Utils/OWSAnyTouchGestureRecognizer.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Utils/OWSAudioPlayer.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Utils/OWSAudioPlayer.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Utils/OWSProfileManager+SignalUI.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Utils/OWSProfileManager+SignalUI.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/CountryCodeViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/CountryCodeViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/OWSNavigationController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/OWSNavigationController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/OWSTableViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/OWSTableViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/OWSViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/OWSViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/ScreenLockViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/ScreenLockViewController.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/UIViewController+Permissions.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/UIViewController+Permissions.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/ViewControllerUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewControllers/ViewControllerUtils.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewModels/CVItemViewModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewModels/CVItemViewModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewModels/OWSQuotedReplyModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/ViewModels/OWSQuotedReplyModel.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/ContactsViewHelper.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/ContactsViewHelper.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/OWSBubbleView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/OWSBubbleView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/OWSSearchBar.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/OWSSearchBar.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/OWSTextField.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/OWSTextField.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/OWSTextView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/OWSTextView.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/ThreadViewHelper.h
+/Users/matthew/code/workspace/ows/Signal-iOS/SignalUI/Views/ThreadViewHelper.h

From 03abd1c3982431789a60a14fbdbae6cc181b2d21 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 20 Oct 2021 11:44:38 -0300
Subject: [PATCH 07/10] Respond to CR.

---
 Scripts/import_include_normalize.py             | 17 +++++++++--------
 SignalMessaging/SignalMessaging-Prefix.pch      |  6 +++---
 .../SignalShareExtension-Prefix.pch             |  2 +-
 SignalUI/SignalUI-Prefix.pch                    |  6 +++---
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Scripts/import_include_normalize.py b/Scripts/import_include_normalize.py
index 999eb5b2ee..3a4a4ce5f6 100755
--- a/Scripts/import_include_normalize.py
+++ b/Scripts/import_include_normalize.py
@@ -131,10 +131,9 @@ def parse_include(line):
 
 
 class Target:
-    def __init__(self, name, path, is_test_target=False):
+    def __init__(self, name, path):
         self.name = name
         self.path = path
-        self.is_test_target = is_test_target
     
     def isAppOrAppExtension(self):
         appOrAppExtensionTargets = [ 'Signal', 'SignalShareExtension','NotificationServiceExtension' ]
@@ -266,8 +265,8 @@ def normalize_imports_and_includes_in_file(targets, target, headerSet, file_path
         swiftHeader = headerSet.find_swift_header(include.body)
         if swiftHeader is not None:
             # NOTE: Apps and app extensions import the -Swift.h header for their
-            #       own target using short form improts.
-            #       Otherwise we should always use long-form importsfor  -Swift.h headers.
+            #       own target using short form imports.
+            #       Otherwise we should always use long-form imports for  -Swift.h headers.
             if swiftHeader.targetName == target.name:
                 if target.isAppOrAppExtension():
                     newline = '#import "%s"' % ( swiftHeader.filename, )
@@ -289,7 +288,9 @@ def normalize_imports_and_includes_in_file(targets, target, headerSet, file_path
             sys.exit(1)
 
         if header.targetName == target.name:
-            if is_header_file and not target.isAppOrAppExtension():
+            # if a _header_ in a _framework_ imports a header _from the same target_, use a long-form import.
+            is_framework_target = not target.isAppOrAppExtension()
+            if is_header_file and is_framework_target:
                 newline = "#import <%s/%s>" % ( header.targetName, header.filename, )
             else:
                 newline = '#import "%s"' % ( header.filename, )
@@ -335,13 +336,13 @@ if __name__ == "__main__":
 
     targets = [ 
         Target('Signal', 'Signal/src'),
-        Target('Signal', 'Signal/test', is_test_target=True),
+        Target('Signal', 'Signal/test'),
         Target('SignalMessaging', 'SignalMessaging'),
         Target('SignalServiceKit', 'SignalServiceKit/src'),
-        Target('SignalServiceKit', 'SignalServiceKit/tests', is_test_target=True),
+        Target('SignalServiceKit', 'SignalServiceKit/tests'),
         Target('SignalShareExtension', 'SignalShareExtension'),
         Target('SignalUI', 'SignalUI'),
-        Target('SignalUI', 'SignalUITests', is_test_target=True),
+        Target('SignalUI', 'SignalUITests'),
         Target('NotificationServiceExtension', 'NotificationServiceExtension'),
     ]
     
diff --git a/SignalMessaging/SignalMessaging-Prefix.pch b/SignalMessaging/SignalMessaging-Prefix.pch
index 80e2b26447..3e5ebeabf4 100644
--- a/SignalMessaging/SignalMessaging-Prefix.pch
+++ b/SignalMessaging/SignalMessaging-Prefix.pch
@@ -17,7 +17,7 @@
 
     #import <SignalCoreKit/OWSAsserts.h>
     #import <SignalCoreKit/NSObject+OWS.h>
-#import <SignalServiceKit/OWSAnalytics.h>
-#import <SignalServiceKit/SSKAsserts.h>
-#import <SignalServiceKit/SDSDatabaseStorage+Objc.h>
+    #import <SignalServiceKit/OWSAnalytics.h>
+    #import <SignalServiceKit/SSKAsserts.h>
+    #import <SignalServiceKit/SDSDatabaseStorage+Objc.h>
 #endif
diff --git a/SignalShareExtension/SignalShareExtension-Prefix.pch b/SignalShareExtension/SignalShareExtension-Prefix.pch
index c1de748d31..957b9044ff 100644
--- a/SignalShareExtension/SignalShareExtension-Prefix.pch
+++ b/SignalShareExtension/SignalShareExtension-Prefix.pch
@@ -16,6 +16,6 @@
     #endif
 
     #import <SignalCoreKit/OWSAsserts.h>
-#import <SignalServiceKit/OWSAnalytics.h>
+    #import <SignalServiceKit/OWSAnalytics.h>
     #import <SignalCoreKit/NSObject+OWS.h>
 #endif
diff --git a/SignalUI/SignalUI-Prefix.pch b/SignalUI/SignalUI-Prefix.pch
index 80e2b26447..3e5ebeabf4 100644
--- a/SignalUI/SignalUI-Prefix.pch
+++ b/SignalUI/SignalUI-Prefix.pch
@@ -17,7 +17,7 @@
 
     #import <SignalCoreKit/OWSAsserts.h>
     #import <SignalCoreKit/NSObject+OWS.h>
-#import <SignalServiceKit/OWSAnalytics.h>
-#import <SignalServiceKit/SSKAsserts.h>
-#import <SignalServiceKit/SDSDatabaseStorage+Objc.h>
+    #import <SignalServiceKit/OWSAnalytics.h>
+    #import <SignalServiceKit/SSKAsserts.h>
+    #import <SignalServiceKit/SDSDatabaseStorage+Objc.h>
 #endif

From eca3fdf26fc7f154c356d679404c155e550fe8cc Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 20 Oct 2021 11:59:01 -0300
Subject: [PATCH 08/10] Respond to CR.

---
 Scripts/import_include_normalize.py | 8 ++++++++
 Scripts/precommit.py                | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Scripts/import_include_normalize.py b/Scripts/import_include_normalize.py
index 3a4a4ce5f6..ee7c56f37b 100755
--- a/Scripts/import_include_normalize.py
+++ b/Scripts/import_include_normalize.py
@@ -262,6 +262,12 @@ def normalize_imports_and_includes_in_file(targets, target, headerSet, file_path
             new_lines.append(line)
             continue
         
+        def preserve_whitespace(newline):
+            # We only need to preserve _leading_ whitespace.
+            prefix_length = len(include.line) - len(include.line.lstrip())
+            newline = include.line[0:prefix_length] + newline
+            return newline        
+        
         swiftHeader = headerSet.find_swift_header(include.body)
         if swiftHeader is not None:
             # NOTE: Apps and app extensions import the -Swift.h header for their
@@ -274,6 +280,7 @@ def normalize_imports_and_includes_in_file(targets, target, headerSet, file_path
                     newline = "#import <%s/%s>" % ( swiftHeader.targetName, swiftHeader.filename, )
             else:
                 newline = "#import <%s/%s>" % ( swiftHeader.targetName, swiftHeader.filename, )
+            newline = preserve_whitespace(newline)
             new_lines.append(newline)
             continue
         
@@ -296,6 +303,7 @@ def normalize_imports_and_includes_in_file(targets, target, headerSet, file_path
                 newline = '#import "%s"' % ( header.filename, )
         else:
             newline = "#import <%s/%s>" % ( header.targetName, header.filename, )
+        newline = preserve_whitespace(newline)
         new_lines.append(newline)
 
     lines = new_lines
diff --git a/Scripts/precommit.py b/Scripts/precommit.py
index 91e5bd1dbc..0b14663fc7 100755
--- a/Scripts/precommit.py
+++ b/Scripts/precommit.py
@@ -497,6 +497,6 @@ if __name__ == "__main__":
 
     print 'git clang-format...'
     # we don't want to format .proto files, so we specify every other supported extension
-    print commands.getoutput('git clang-format --extensions "c,h,m,mm,cc,cp,cpp,c++,cxx,hh,hxx,cu,java,js,ts,cs" --commit %s' % clang_format_commit)
+    print commands.getoutput('git clang-format -sort-includes=false --extensions "c,h,m,mm,cc,cp,cpp,c++,cxx,hh,hxx,cu,java,js,ts,cs" --commit %s' % clang_format_commit)
 
     check_diff_for_keywords()

From a0efdc2e955ecf968a67c2f025114f32dda6bbf4 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 20 Oct 2021 12:08:10 -0300
Subject: [PATCH 09/10] Respond to CR.

---
 Scripts/precommit.py                                          | 4 ++--
 .../src/Storage/AxolotlStore/NSData+keyVersionByte.m          | 2 +-
 SignalServiceKit/src/Util/NSData+Image.m                      | 2 +-
 SignalServiceKit/src/Util/NSUserDefaults+OWS.m                | 2 +-
 SignalServiceKit/tests/Contacts/TSContactThreadTest.m         | 2 +-
 SignalServiceKit/tests/Contacts/TSGroupThreadTest.m           | 2 +-
 SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m  | 2 +-
 .../tests/Messages/Interactions/TSOutgoingMessageTest.m       | 2 +-
 .../tests/Messages/OWSDisappearingMessagesJobTest.m           | 2 +-
 SignalServiceKit/tests/Messages/OWSMessageManagerTest.m       | 2 +-
 SignalUI/Categories/UIViewController+OWS.m                    | 2 +-
 SignalUI/ViewControllers/UIViewController+Permissions.m       | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Scripts/precommit.py b/Scripts/precommit.py
index 0b14663fc7..52a287d9f3 100755
--- a/Scripts/precommit.py
+++ b/Scripts/precommit.py
@@ -497,6 +497,6 @@ if __name__ == "__main__":
 
     print 'git clang-format...'
     # we don't want to format .proto files, so we specify every other supported extension
-    print commands.getoutput('git clang-format -sort-includes=false --extensions "c,h,m,mm,cc,cp,cpp,c++,cxx,hh,hxx,cu,java,js,ts,cs" --commit %s' % clang_format_commit)
-
+    print commands.getoutput('git clang-format -style="{SortIncludes: false}" --extensions "c,h,m,mm,cc,cp,cpp,c++,cxx,hh,hxx,cu,java,js,ts,cs" --commit %s' % clang_format_commit)
+ 
     check_diff_for_keywords()
diff --git a/SignalServiceKit/src/Storage/AxolotlStore/NSData+keyVersionByte.m b/SignalServiceKit/src/Storage/AxolotlStore/NSData+keyVersionByte.m
index 053383bc5a..347aac40e2 100644
--- a/SignalServiceKit/src/Storage/AxolotlStore/NSData+keyVersionByte.m
+++ b/SignalServiceKit/src/Storage/AxolotlStore/NSData+keyVersionByte.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "AxolotlExceptions.h"
 #import "NSData+keyVersionByte.h"
+#import "AxolotlExceptions.h"
 #import <SignalCoreKit/SCKExceptionWrapper.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Util/NSData+Image.m b/SignalServiceKit/src/Util/NSData+Image.m
index 07ef6d813d..fc80a6964f 100644
--- a/SignalServiceKit/src/Util/NSData+Image.m
+++ b/SignalServiceKit/src/Util/NSData+Image.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "MIMETypeUtil.h"
 #import "NSData+Image.h"
+#import "MIMETypeUtil.h"
 #import "OWSFileSystem.h"
 #import "webp/decode.h"
 #import "webp/demux.h"
diff --git a/SignalServiceKit/src/Util/NSUserDefaults+OWS.m b/SignalServiceKit/src/Util/NSUserDefaults+OWS.m
index 28e666ef3e..f206e22211 100644
--- a/SignalServiceKit/src/Util/NSUserDefaults+OWS.m
+++ b/SignalServiceKit/src/Util/NSUserDefaults+OWS.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "AppContext.h"
 #import "NSUserDefaults+OWS.h"
+#import "AppContext.h"
 #import "TSConstants.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/tests/Contacts/TSContactThreadTest.m b/SignalServiceKit/tests/Contacts/TSContactThreadTest.m
index c14e684697..212e0d0edb 100644
--- a/SignalServiceKit/tests/Contacts/TSContactThreadTest.m
+++ b/SignalServiceKit/tests/Contacts/TSContactThreadTest.m
@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSContactThread.h"
 #import "MockSSKEnvironment.h"
 #import "OWSIdentityManager.h"
 #import "SSKBaseTestObjC.h"
+#import "TSContactThread.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/tests/Contacts/TSGroupThreadTest.m b/SignalServiceKit/tests/Contacts/TSGroupThreadTest.m
index 12075a674a..00b075774a 100644
--- a/SignalServiceKit/tests/Contacts/TSGroupThreadTest.m
+++ b/SignalServiceKit/tests/Contacts/TSGroupThreadTest.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSGroupThread.h"
 #import "SSKBaseTestObjC.h"
+#import "TSGroupThread.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m b/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m
index 5ef2b92c32..c43fa2102a 100644
--- a/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m
+++ b/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m
@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSMessage.h"
 #import "SSKBaseTestObjC.h"
 #import "TSAttachmentStream.h"
 #import "TSContactThread.h"
+#import "TSMessage.h"
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
diff --git a/SignalServiceKit/tests/Messages/Interactions/TSOutgoingMessageTest.m b/SignalServiceKit/tests/Messages/Interactions/TSOutgoingMessageTest.m
index 9f0914e5fa..dac79e6a83 100644
--- a/SignalServiceKit/tests/Messages/Interactions/TSOutgoingMessageTest.m
+++ b/SignalServiceKit/tests/Messages/Interactions/TSOutgoingMessageTest.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSOutgoingMessage.h"
 #import "SSKBaseTestObjC.h"
 #import "TSContactThread.h"
+#import "TSOutgoingMessage.h"
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m b/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m
index 4006a4d3d4..6eb92d5f6c 100644
--- a/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m
+++ b/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSDisappearingMessagesJob.h"
 #import "OWSDisappearingMessagesConfiguration.h"
 #import "OWSDisappearingMessagesFinder.h"
+#import "OWSDisappearingMessagesJob.h"
 #import "SSKBaseTestObjC.h"
 #import "TSContactThread.h"
 #import "TSIncomingMessage.h"
diff --git a/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m b/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m
index 7ec8571c42..59aa665ded 100644
--- a/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m
+++ b/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m
@@ -2,7 +2,6 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "OWSMessageManager.h"
 #import "ContactsManagerProtocol.h"
 #import "HTTPUtils.h"
 #import "MessageSender.h"
@@ -10,6 +9,7 @@
 #import "OWSFakeCallMessageHandler.h"
 #import "OWSFakeMessageSender.h"
 #import "OWSIdentityManager.h"
+#import "OWSMessageManager.h"
 #import "OWSSyncGroupsMessage.h"
 #import "SSKBaseTestObjC.h"
 #import "TSAccountManager.h"
diff --git a/SignalUI/Categories/UIViewController+OWS.m b/SignalUI/Categories/UIViewController+OWS.m
index 5a6b6c9882..d6da3cc2b4 100644
--- a/SignalUI/Categories/UIViewController+OWS.m
+++ b/SignalUI/Categories/UIViewController+OWS.m
@@ -2,10 +2,10 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "UIViewController+OWS.h"
 #import "Theme.h"
 #import "UIUtil.h"
 #import "UIView+SignalUI.h"
-#import "UIViewController+OWS.h"
 #import <SignalCoreKit/iOSVersions.h>
 #import <SignalServiceKit/AppContext.h>
 #import <SignalUI/SignalUI-Swift.h>
diff --git a/SignalUI/ViewControllers/UIViewController+Permissions.m b/SignalUI/ViewControllers/UIViewController+Permissions.m
index c16d69d090..64b2aa4c65 100644
--- a/SignalUI/ViewControllers/UIViewController+Permissions.m
+++ b/SignalUI/ViewControllers/UIViewController+Permissions.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
-#import "UIUtil.h"
 #import "UIViewController+Permissions.h"
+#import "UIUtil.h"
 #import <AVFoundation/AVFoundation.h>
 #import <Photos/Photos.h>
 #import <SignalCoreKit/Threading.h>

From 2d33e9aa2045486d793bc2383d6149a48561b31b Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 20 Oct 2021 12:31:27 -0300
Subject: [PATCH 10/10] Disable the "Quoted include in framework header" build
 warning in the project settings for the "SignalUI" and "SignalUITests"
 targets.

---
 Signal.xcodeproj/project.pbxproj | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj
index 6fa221f1e4..2ddc970507 100644
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@@ -6588,7 +6588,6 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -6664,7 +6663,6 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -6748,7 +6746,6 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -6831,7 +6828,6 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -6902,7 +6898,6 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
@@ -6966,7 +6961,6 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -7038,7 +7032,6 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -7110,7 +7103,6 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;