diff --git a/.travis.yml b/.travis.yml
index 365376637..fe20bf9ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: objective-c
 cache: cocoapods # pod install somtimes takes >20 minutes, so lets cache this
 
-osx_image: xcode8
+osx_image: xcode8.2
 
 env:
   -EARLY_START_SIMULATOR=1 # early starting simulator reduces false negatives due to test timeouts
diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj
index bacb906cd..cea499c0f 100644
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@@ -3593,6 +3593,7 @@
 					"\"$(SRCROOT)/libtomcrypt/headers\"",
 					"\"$(SRCROOT)/spandsp/spandsp/spandsp\"",
 					"\"$(SRCROOT)/Libraries\"/**",
+					"\"$(TARGET_TEMP_DIR)/../$(PROJECT_NAME).build/DerivedSources\"",
 				);
 				INFOPLIST_FILE = "Signal/test/Supporting Files/SignalTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -3650,6 +3651,7 @@
 					"\"$(SRCROOT)/libtomcrypt/headers\"",
 					"\"$(SRCROOT)/spandsp/spandsp/spandsp\"",
 					"\"$(SRCROOT)/Libraries\"/**",
+					"\"$(TARGET_TEMP_DIR)/../$(PROJECT_NAME).build/DerivedSources\"",
 				);
 				INFOPLIST_FILE = "Signal/test/Supporting Files/SignalTests-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
diff --git a/Signal/src/Signal-Bridging-Header.h b/Signal/src/Signal-Bridging-Header.h
index 293ff4969..b6504d326 100644
--- a/Signal/src/Signal-Bridging-Header.h
+++ b/Signal/src/Signal-Bridging-Header.h
@@ -3,9 +3,7 @@
 //
 #import <Foundation/Foundation.h>
 
-#import "Cryptography.h"
 #import "Environment.h"
-#import "NSData+Base64.h"
 #import "OWSContactAvatarBuilder.h"
 #import "OWSContactsManager.h"
 #import "OWSLogger.h"
@@ -17,6 +15,8 @@
 #import "UIFont+OWS.h"
 #import "UIUtil.h"
 #import <SignalServiceKit/Contact.h>
+#import <SignalServiceKit/Cryptography.h>
+#import <SignalServiceKit/NSData+Base64.h>
 #import <SignalServiceKit/NSDate+millisecondTimeStamp.h>
 #import <SignalServiceKit/OWSAcknowledgeMessageDeliveryRequest.h>
 #import <SignalServiceKit/OWSEndSessionMessage.h>