diff --git a/Configurations/IOSSettings.xcconfig b/Configurations/IOSSettings.xcconfig
index 70ae5ec68..b9969a48b 100644
--- a/Configurations/IOSSettings.xcconfig
+++ b/Configurations/IOSSettings.xcconfig
@@ -28,4 +28,4 @@ RUN_CLANG_STATIC_ANALYZER = YES
 
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited)
 
-WARNING_CFLAGS = $(inherited) -Weverything -Wno-objc-missing-property-synthesis -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-gnu-statement-expression -Wno-language-extension-token -Wno-overriding-method-mismatch -Wno-missing-variable-declarations -Rno-module-build -Wno-auto-import -Wno-objc-interface-ivars -Wno-documentation-unknown-command -Wno-reserved-id-macro -Wno-unused-parameter -Wno-gnu-conditional-omitted-operand -Wno-explicit-ownership-type -Wno-date-time -Wno-cast-align -Wno-cstring-format-directive -Wno-double-promotion -Wno-partial-availability
+WARNING_CFLAGS = $(inherited) -Weverything -Wno-objc-missing-property-synthesis -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-gnu-statement-expression -Wno-language-extension-token -Wno-overriding-method-mismatch -Wno-missing-variable-declarations -Rno-module-build -Wno-auto-import -Wno-objc-interface-ivars -Wno-documentation-unknown-command -Wno-reserved-id-macro -Wno-unused-parameter -Wno-gnu-conditional-omitted-operand -Wno-explicit-ownership-type -Wno-date-time -Wno-cast-align -Wno-cstring-format-directive -Wno-double-promotion -Wno-partial-availability -Wno-declaration-after-statement -Wno-objc-messaging-id -Wno-direct-ivar-access -Wno-cast-qual -Wno-deprecated-declarations
diff --git a/Configurations/TVOSSettings.xcconfig b/Configurations/TVOSSettings.xcconfig
index 70ae5ec68..b9969a48b 100644
--- a/Configurations/TVOSSettings.xcconfig
+++ b/Configurations/TVOSSettings.xcconfig
@@ -28,4 +28,4 @@ RUN_CLANG_STATIC_ANALYZER = YES
 
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited)
 
-WARNING_CFLAGS = $(inherited) -Weverything -Wno-objc-missing-property-synthesis -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-gnu-statement-expression -Wno-language-extension-token -Wno-overriding-method-mismatch -Wno-missing-variable-declarations -Rno-module-build -Wno-auto-import -Wno-objc-interface-ivars -Wno-documentation-unknown-command -Wno-reserved-id-macro -Wno-unused-parameter -Wno-gnu-conditional-omitted-operand -Wno-explicit-ownership-type -Wno-date-time -Wno-cast-align -Wno-cstring-format-directive -Wno-double-promotion -Wno-partial-availability
+WARNING_CFLAGS = $(inherited) -Weverything -Wno-objc-missing-property-synthesis -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-gnu-statement-expression -Wno-language-extension-token -Wno-overriding-method-mismatch -Wno-missing-variable-declarations -Rno-module-build -Wno-auto-import -Wno-objc-interface-ivars -Wno-documentation-unknown-command -Wno-reserved-id-macro -Wno-unused-parameter -Wno-gnu-conditional-omitted-operand -Wno-explicit-ownership-type -Wno-date-time -Wno-cast-align -Wno-cstring-format-directive -Wno-double-promotion -Wno-partial-availability -Wno-declaration-after-statement -Wno-objc-messaging-id -Wno-direct-ivar-access -Wno-cast-qual -Wno-deprecated-declarations
diff --git a/WebDriverAgentLib/Utilities/FBBaseActionsParser.m b/WebDriverAgentLib/Utilities/FBBaseActionsParser.m
deleted file mode 100644
index 872dc268e..000000000
--- a/WebDriverAgentLib/Utilities/FBBaseActionsParser.m
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#import "FBBaseActionsSynthesizer.h"
-
-#import "FBErrorBuilder.h"
-
-@implementation FBBaseActionsSynthesizer
-
-- (instancetype)initWithActions:(NSArray *)actions forApplication:(XCUIApplication *)application
-{
-  self = [super init];
-  if (self) {
-    _actions = actions;
-    _application = application;
-  }
-  return self;
-}
-
-- (nullable XCSynthesizedEventRecord *)synthesizeWithError:(NSError **)error
-{
-  @throw [[FBErrorBuilder.builder withDescription:@"Override this method in subclasses"] build];
-  return nil;
-}
-
-@end
diff --git a/WebDriverAgentLib/Utilities/FBConfiguration.h b/WebDriverAgentLib/Utilities/FBConfiguration.h
index dc2018928..75275ccf6 100644
--- a/WebDriverAgentLib/Utilities/FBConfiguration.h
+++ b/WebDriverAgentLib/Utilities/FBConfiguration.h
@@ -9,10 +9,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import "AXSettings.h"
-#import "UIKeyboardImpl.h"
-#import "TIPreferencesController.h"
-
 NS_ASSUME_NONNULL_BEGIN
 
 extern NSString *const FBSnapshotMaxDepthKey;
diff --git a/WebDriverAgentLib/Utilities/FBConfiguration.m b/WebDriverAgentLib/Utilities/FBConfiguration.m
index 1d7438ae1..e91717b2d 100644
--- a/WebDriverAgentLib/Utilities/FBConfiguration.m
+++ b/WebDriverAgentLib/Utilities/FBConfiguration.m
@@ -9,6 +9,10 @@
 
 #import "FBConfiguration.h"
 
+#import "AXSettings.h"
+#import "UIKeyboardImpl.h"
+#import "TIPreferencesController.h"
+
 #include <dlfcn.h>
 #import <UIKit/UIKit.h>