Merge branch 'swarms' of github.com:loki-project/loki-messenger-ios into swarms

SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.h

@@ -1,9 +1,8 @@
 #import "OWSPrimaryStorage.h"
+#import <AxolotlKit/PreKeyRecord.h>
+#import <AxolotlKit/PreKeyBundle.h>
 #import <YapDatabase/YapDatabase.h>
 
-@class PreKeyRecord;
-@class PreKeyBundle;
-
 NS_ASSUME_NONNULL_BEGIN
 
 @interface OWSPrimaryStorage (Loki)

SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.m

@@ -5,8 +5,6 @@
 #import "OWSDevice.h"
 #import "OWSIdentityManager.h"
 #import "NSDate+OWS.h"
-#import "PreKeyRecord.h"
-#import "PreKeyBundle.h"
 #import "TSAccountManager.h"
 #import "TSPreKeyManager.h"
 #import "YapDatabaseConnection+OWS.h"