diff --git a/Cartfile b/Cartfile
index 02e6a2e23..f96df7698 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,8 +1,8 @@
 # Used for HTTP routing
-github "marekcirkos/RoutingHTTPServer"
+github "appium/RoutingHTTPServer"
 
 # Used by the element cache
 github "appium/YYCache"
 
 # Used by screenshots broadcaster
-github "robbiehanson/CocoaAsyncSocket"
\ No newline at end of file
+github "robbiehanson/CocoaAsyncSocket"
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 16fae125a..aa83891cd 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,3 +1,3 @@
+github "appium/RoutingHTTPServer" "v1.0.2"
 github "appium/YYCache" "1.0.5"
-github "marekcirkos/RoutingHTTPServer" "v1.0.1"
 github "robbiehanson/CocoaAsyncSocket" "7.6.3"
diff --git a/Configurations/ProjectSettings.xcconfig b/Configurations/ProjectSettings.xcconfig
index fb84bcae7..95d1a06ee 100644
--- a/Configurations/ProjectSettings.xcconfig
+++ b/Configurations/ProjectSettings.xcconfig
@@ -11,6 +11,7 @@ GCC_WARN_UNUSED_PARAMETER = YES
 GCC_WARN_UNUSED_VALUE = YES
 GCC_WARN_UNUSED_VARIABLE = YES
 GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = YES
+CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES
 
 CLANG_ANALYZER_NONNULL = YES
 CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES
diff --git a/PrivateHeaders/XCTest/XCEventGenerator.h b/PrivateHeaders/XCTest/XCEventGenerator.h
index ce28481fc..2394bb269 100644
--- a/PrivateHeaders/XCTest/XCEventGenerator.h
+++ b/PrivateHeaders/XCTest/XCEventGenerator.h
@@ -43,6 +43,9 @@ typedef void (^XCEventGeneratorHandler)(XCSynthesizedEventRecord *record, NSErro
 // iOS 10.3 specific
 - (double)forcePressAtPoint:(struct CGPoint)arg1 orientation:(long long)arg2 handler:(CDUnknownBlockType)arg3;
 
+#elif TARGET_OS_TV
+// TODO: tvOS-specific headers
+
 #elif TARGET_OS_MAC
 - (double)sendKeyboardInputs:(id)arg1 layout:(id)arg2 handler:(CDUnknownBlockType)arg3;
 - (double)sendKey:(id)arg1 modifierFlags:(unsigned long long)arg2 handler:(CDUnknownBlockType)arg3;
diff --git a/PrivateHeaders/XCTest/XCSynthesizedEventRecord.h b/PrivateHeaders/XCTest/XCSynthesizedEventRecord.h
index 529ff95f3..279eee3f0 100644
--- a/PrivateHeaders/XCTest/XCSynthesizedEventRecord.h
+++ b/PrivateHeaders/XCTest/XCSynthesizedEventRecord.h
@@ -10,15 +10,21 @@
 {
     NSMutableArray *_eventPaths;
     NSString *_name;
+#if !TARGET_OS_TV
     UIInterfaceOrientation _interfaceOrientation;
+#endif
 }
+#if !TARGET_OS_TV
 @property(readonly) UIInterfaceOrientation interfaceOrientation; // @synthesize interfaceOrientation=_interfaceOrientation;
+#endif
 @property(readonly, copy) NSString *name; // @synthesize name=_name;
 @property(readonly) double maximumOffset;
 @property(readonly) NSArray *eventPaths;
 
 - (void)addPointerEventPath:(XCPointerEventPath *)arg1;
+#if !TARGET_OS_TV
 - (id)initWithName:(NSString *)arg1 interfaceOrientation:(UIInterfaceOrientation)arg2;
+#endif
 - (id)init;
 - (BOOL)synthesizeWithError:(NSError **)arg1;
 
diff --git a/PrivateHeaders/XCTest/XCUIApplication.h b/PrivateHeaders/XCTest/XCUIApplication.h
index 8234f392c..2760117f1 100644
--- a/PrivateHeaders/XCTest/XCUIApplication.h
+++ b/PrivateHeaders/XCTest/XCUIApplication.h
@@ -31,7 +31,9 @@
 @property(getter=isIdleAnimationWaitEnabled) BOOL idleAnimationWaitEnabled; // @synthesize idleAnimationWaitEnabled=_idleAnimationWaitEnabled;
 @property(nonatomic) BOOL doesNotHandleUIInterruptions; // @synthesize doesNotHandleUIInterruptions=_doesNotHandleUIInterruptions;
 @property(readonly) BOOL fauxCollectionViewCellsEnabled;
+#if !TARGET_OS_TV
 @property(readonly, nonatomic) UIInterfaceOrientation interfaceOrientation; //TODO tvos
+#endif
 @property(readonly, nonatomic) BOOL running;
 @property(nonatomic) pid_t processID; // @synthesize processID=_processID;
 @property(readonly) XCAccessibilityElement *accessibilityElement;
diff --git a/PrivateHeaders/XCTest/XCUIElement.h b/PrivateHeaders/XCTest/XCUIElement.h
index 8826420eb..3f3126584 100644
--- a/PrivateHeaders/XCTest/XCUIElement.h
+++ b/PrivateHeaders/XCTest/XCUIElement.h
@@ -18,7 +18,9 @@
 @property BOOL safeQueryResolutionEnabled; // @synthesize safeQueryResolutionEnabled=_safeQueryResolutionEnabled;
 @property(retain) XCElementSnapshot *lastSnapshot; // @synthesize lastSnapshot=_lastSnapshot;
 @property(readonly) XCUIElementQuery *query; // @synthesize query=_query;
+#if !TARGET_OS_TV
 @property(readonly, nonatomic) UIInterfaceOrientation interfaceOrientation;
+#endif
 @property(readonly, copy) XCUICoordinate *hitPointCoordinate;
 @property(readonly) BOOL isTopLevelTouchBarElement;
 @property(readonly) BOOL isTouchBarElement;