diff --git a/Cartfile b/Cartfile
index aa7ad1305..0c52b3a30 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,5 +1,5 @@
 # Used by the HTTP server
-github "robbiehanson/CocoaAsyncSocket"
+github "robbiehanson/CocoaAsyncSocket" "72e0fa9"
 
 # Used by the element cache
 github "appium/YYCache"
diff --git a/Cartfile.resolved b/Cartfile.resolved
index d22df2cbb..ff9d2a43d 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "robbiehanson/CocoaAsyncSocket" "7.6.4"
 github "appium/YYCache" "1.1.0"
+github "robbiehanson/CocoaAsyncSocket" "72e0fa9e62d56e5bbb3f67e9cfd5aa85841735bc"
diff --git a/WebDriverAgentLib/Routing/FBTCPSocket.h b/WebDriverAgentLib/Routing/FBTCPSocket.h
index c9ac88941..abe9adf1f 100644
--- a/WebDriverAgentLib/Routing/FBTCPSocket.h
+++ b/WebDriverAgentLib/Routing/FBTCPSocket.h
@@ -7,10 +7,6 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#if __has_warning("-Watimport-in-framework-header")
-#pragma clang diagnostic ignored "-Watimport-in-framework-header"
-#endif
-
 #import <CocoaAsyncSocket/GCDAsyncSocket.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/WebDriverAgentLib/Vendor/CocoaHTTPServer/HTTPConnection.m b/WebDriverAgentLib/Vendor/CocoaHTTPServer/HTTPConnection.m
index 6c9e38cf9..663cde932 100644
--- a/WebDriverAgentLib/Vendor/CocoaHTTPServer/HTTPConnection.m
+++ b/WebDriverAgentLib/Vendor/CocoaHTTPServer/HTTPConnection.m
@@ -5,11 +5,6 @@
 #import "DDNumber.h"
 #import "DDRange.h"
 #import "HTTPLogging.h"
-
-#if __has_warning("-Watimport-in-framework-header")
-#pragma clang diagnostic ignored "-Watimport-in-framework-header"
-#endif
-
 #import <CocoaAsyncSocket/GCDAsyncSocket.h>
 
 #if ! __has_feature(objc_arc)
diff --git a/WebDriverAgentLib/Vendor/CocoaHTTPServer/HTTPServer.m b/WebDriverAgentLib/Vendor/CocoaHTTPServer/HTTPServer.m
index efb54fe8d..f99db50b7 100644
--- a/WebDriverAgentLib/Vendor/CocoaHTTPServer/HTTPServer.m
+++ b/WebDriverAgentLib/Vendor/CocoaHTTPServer/HTTPServer.m
@@ -1,11 +1,6 @@
 #import "HTTPServer.h"
 #import "HTTPConnection.h"
 #import "HTTPLogging.h"
-
-#if __has_warning("-Watimport-in-framework-header")
-#pragma clang diagnostic ignored "-Watimport-in-framework-header"
-#endif
-
 #import <CocoaAsyncSocket/GCDAsyncSocket.h>
 
 #if ! __has_feature(objc_arc)
diff --git a/WebDriverAgentLib/Vendor/RoutingHTTPServer/RoutingHTTPServer.h b/WebDriverAgentLib/Vendor/RoutingHTTPServer/RoutingHTTPServer.h
index 6087cf3db..c24b62a38 100644
--- a/WebDriverAgentLib/Vendor/RoutingHTTPServer/RoutingHTTPServer.h
+++ b/WebDriverAgentLib/Vendor/RoutingHTTPServer/RoutingHTTPServer.h
@@ -12,11 +12,6 @@ FOUNDATION_EXPORT const unsigned char RoutingHTTPServerVersionString[];
 #import "RouteResponse.h"
 #import "RouteRequest.h"
 #import "RoutingConnection.h"
-
-#if __has_warning("-Watimport-in-framework-header")
-#pragma clang diagnostic ignored "-Watimport-in-framework-header"
-#endif
-
 #import <CocoaAsyncSocket/GCDAsyncSocket.h>
 
 typedef void (^RequestHandler)(RouteRequest *request, RouteResponse *response);