diff --git a/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m b/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m
index 1655bf814..62ff70a2a 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugContactsUtils.m
@@ -5,7 +5,7 @@
 #import "DebugContactsUtils.h"
 #import "Signal-Swift.h"
 #import <Contacts/Contacts.h>
-#import <Curve25519Kit/Randomness.h>
+#import <SignalCoreKit/Randomness.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalMessaging/utils/OWSGroupAvatarBuilder.m b/SignalMessaging/utils/OWSGroupAvatarBuilder.m
index 5b74a62ff..4e56cd2a6 100644
--- a/SignalMessaging/utils/OWSGroupAvatarBuilder.m
+++ b/SignalMessaging/utils/OWSGroupAvatarBuilder.m
@@ -8,6 +8,7 @@
 #import "UIColor+OWS.h"
 #import <SignalMessaging/SignalMessaging-Swift.h>
 #import <SignalServiceKit/SSKEnvironment.h>
+#import <SignalCoreKit/NSData+OWS.h>
 
 NS_ASSUME_NONNULL_BEGIN