Respond to CR.

Signal/src/ViewControllers/ConversationView/ConversationViewController.m

@@ -89,6 +89,7 @@
 #import <SignalServiceKit/TSInvalidIdentityKeyReceivingErrorMessage.h>
 #import <SignalServiceKit/TSNetworkManager.h>
 #import <SignalServiceKit/Threading.h>
+#import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseViewChange.h>
 #import <YapDatabase/YapDatabaseViewConnection.h>
 

Signal/src/ViewControllers/HomeViewController.m

@@ -27,6 +27,7 @@
 #import <SignalServiceKit/OWSMessageSender.h>
 #import <SignalServiceKit/TSOutgoingMessage.h>
 #import <SignalServiceKit/Threading.h>
+#import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseViewChange.h>
 #import <YapDatabase/YapDatabaseViewConnection.h>
 

Signal/src/ViewControllers/OWSLinkedDevicesTableViewController.m

@@ -12,7 +12,7 @@
 #import <SignalServiceKit/OWSDevicesService.h>
 #import <SignalServiceKit/TSDatabaseView.h>
 #import <SignalServiceKit/TSStorageManager.h>
-#import <YapDatabase/YapDatabaseTransaction.h>
+#import <YapDatabase/YapDatabase.h>
 #import <YapDatabase/YapDatabaseViewConnection.h>
 #import <YapDatabase/YapDatabaseViewMappings.h>
 

SignalMessaging/Views/ThreadViewHelper.m

@@ -8,6 +8,8 @@
 #import <SignalServiceKit/TSStorageManager.h>
 #import <SignalServiceKit/TSThread.h>
 #import <YapDatabase/YapDatabase.h>
+#import <YapDatabase/YapDatabaseViewChange.h>
+#import <YapDatabase/YapDatabaseViewConnection.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Account/TSAccountManager.m

@@ -14,6 +14,7 @@
 #import "TSSocketManager.h"
 #import "TSStorageManager+SessionStore.h"
 #import "YapDatabaseConnection+OWS.h"
+#import <YapDatabase/YapDatabase.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m

@@ -9,6 +9,8 @@
 #import "TSStorageManager.h"
 #import "TSThread.h"
 #import <YapDatabase/YapDatabase.h>
+#import <YapDatabase/YapDatabaseQuery.h>
+#import <YapDatabase/YapDatabaseSecondaryIndex.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Messages/OWSFailedAttachmentDownloadsJob.m

@@ -6,6 +6,8 @@
 #import "TSAttachmentPointer.h"
 #import "TSStorageManager.h"
 #import <YapDatabase/YapDatabase.h>
+#import <YapDatabase/YapDatabaseQuery.h>
+#import <YapDatabase/YapDatabaseSecondaryIndex.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Messages/OWSFailedMessagesJob.m

@@ -7,6 +7,8 @@
 #import "TSOutgoingMessage.h"
 #import "TSStorageManager.h"
 #import <YapDatabase/YapDatabase.h>
+#import <YapDatabase/YapDatabaseQuery.h>
+#import <YapDatabase/YapDatabaseSecondaryIndex.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Messages/OWSIdentityManager.m

@@ -23,6 +23,7 @@
 #import "YapDatabaseConnection+OWS.h"
 #import <AxolotlKit/NSData+keyVersionByte.h>
 #import <Curve25519Kit/Curve25519.h>
+#import <YapDatabase/YapDatabase.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+SignedPreKeyStore.m

@@ -10,6 +10,7 @@
 #import <AxolotlKit/AxolotlExceptions.h>
 #import <AxolotlKit/NSData+keyVersionByte.h>
 #import <Curve25519Kit/Ed25519.h>
+#import <YapDatabase/YapDatabase.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Storage/OWSIncomingMessageFinder.m

@@ -6,6 +6,7 @@
 #import "TSIncomingMessage.h"
 #import "TSStorageManager.h"
 #import <YapDatabase/YapDatabase.h>
+#import <YapDatabase/YapDatabaseSecondaryIndex.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

SignalServiceKit/src/Storage/YapDatabaseConnection+OWS.h

@@ -2,7 +2,7 @@
 //  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //
 
-#import <YapDatabase/YapDatabase.h>
+#import <YapDatabase/YapDatabaseConnection.h>
 
 @class ECKeyPair;
 @class PreKeyRecord;