diff --git a/Package.swift b/Package.swift
index d67f7cafb..d84fa7905 100644
--- a/Package.swift
+++ b/Package.swift
@@ -15,7 +15,11 @@ var package = Package(name: "aws-crt-swift",
 )
 
 let cSettings: [CSetting] = [
-    .define("DEBUG_BUILD", .when(configuration: .debug))
+    .define("DEBUG_BUILD", .when(configuration: .debug)),
+/* Disable Intel VTune tracing API here since aws-crt-swift doesn't use CMake */
+    .define("INTEL_NO_ITTNOTIFY_API"),
+/* Don't use APIs forbidden by App Stores (e.g. non-public system APIs) */
+    .defien("AWS_APPSTORE_SAFE"),
 ]
 
 //////////////////////////////////////////////////////////////////////
diff --git a/aws-common-runtime/aws-c-auth b/aws-common-runtime/aws-c-auth
index d78952529..52bf59161 160000
--- a/aws-common-runtime/aws-c-auth
+++ b/aws-common-runtime/aws-c-auth
@@ -1 +1 @@
-Subproject commit d7895252915259d037f10be223369eb99e837471
+Subproject commit 52bf591613d1a001c43ec99af7376f871759c5fe
diff --git a/aws-common-runtime/aws-c-cal b/aws-common-runtime/aws-c-cal
index bc0d71b66..77ca3aea8 160000
--- a/aws-common-runtime/aws-c-cal
+++ b/aws-common-runtime/aws-c-cal
@@ -1 +1 @@
-Subproject commit bc0d71b66deea9e1a2d3a073c9f1ece9286b9e60
+Subproject commit 77ca3aea879bc768082fe7ec715adcde8e98c332
diff --git a/aws-common-runtime/aws-c-common b/aws-common-runtime/aws-c-common
index 2add521b7..672cc0032 160000
--- a/aws-common-runtime/aws-c-common
+++ b/aws-common-runtime/aws-c-common
@@ -1 +1 @@
-Subproject commit 2add521b78d69f9f043a701232e751f43cf123e6
+Subproject commit 672cc0032eb28d69fbdd22c9463253c89d7a6f30
diff --git a/aws-common-runtime/aws-c-event-stream b/aws-common-runtime/aws-c-event-stream
index 1a70c50f7..1b3825fc9 160000
--- a/aws-common-runtime/aws-c-event-stream
+++ b/aws-common-runtime/aws-c-event-stream
@@ -1 +1 @@
-Subproject commit 1a70c50f78a6e706f1f91a4ed138478271b6d9d3
+Subproject commit 1b3825fc9cae2e9c7ed7479ee5d354d52ebdf7a0
diff --git a/aws-common-runtime/aws-c-http b/aws-common-runtime/aws-c-http
index a2fb16c43..4e74ab1e3 160000
--- a/aws-common-runtime/aws-c-http
+++ b/aws-common-runtime/aws-c-http
@@ -1 +1 @@
-Subproject commit a2fb16c431152bd677093f9910f405a37533ad5a
+Subproject commit 4e74ab1e3702763e0b87bd1752f5a37c2f0400ac
diff --git a/aws-common-runtime/config/aws/common/config.h b/aws-common-runtime/config/aws/common/config.h
index 7fc013617..4208ebc8b 100644
--- a/aws-common-runtime/config/aws/common/config.h
+++ b/aws-common-runtime/config/aws/common/config.h
@@ -1,48 +1,19 @@
-#ifdef __APPLE__
-#    include <TargetConditionals.h>
-#endif
-
-#ifndef AWS_COMMON_CONFIG_H
-#    define AWS_COMMON_CONFIG_H
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0.
  */
+
+#ifndef AWS_COMMON_CONFIG_H
+#define AWS_COMMON_CONFIG_H
 /*
  * This header exposes compiler feature test results determined during cmake
  * configure time to inline function implementations. The macros defined here
  * should be considered to be an implementation detail, and can change at any
  * time.
  */
-#    if TARGET_OS_IPHONE
-#        define AWS_HAVE_GCC_OVERFLOW_MATH_EXTENSIONS
-#        define AWS_HAVE_GCC_INLINE_ASM
-/* #undef AWS_HAVE_MSVC_MULX */
-#        define AWS_C_CAL_OPENSSLCRYPTO_COMMON_H
-#    elif TARGET_OS_SIMULATOR
-#        define AWS_HAVE_GCC_OVERFLOW_MATH_EXTENSIONS
-#        define AWS_HAVE_GCC_INLINE_ASM
-/* #undef AWS_HAVE_MSVC_MULX */
-#        define AWS_C_CAL_OPENSSLCRYPTO_COMMON_H
-#    elif TARGET_OS_MAC
-#        define AWS_HAVE_GCC_OVERFLOW_MATH_EXTENSIONS
-#        define AWS_HAVE_GCC_INLINE_ASM
-/* #undef AWS_HAVE_MSVC_MULX */
-#        define AWS_C_CAL_OPENSSLCRYPTO_COMMON_H
-#    endif
-#else
-#    define AWS_HAVE_GCC_OVERFLOW_MATH_EXTENSIONS
-#    define AWS_HAVE_GCC_INLINE_ASM
-/* #undef AWS_HAVE_MSVC_MULX */
-#    define AWS_C_CAL_OPENSSLCRYPTO_COMMON_H
-#endif
+#define AWS_HAVE_GCC_OVERFLOW_MATH_EXTENSIONS
+#define AWS_HAVE_GCC_INLINE_ASM
 #define AWS_UNSTABLE_TESTING_API 1
-
 #define AWS_AFFINITY_METHOD 0
-
 #define AWS_HAVE_EXECINFO 1
-/* Disable Intel VTune tracing API here since aws-crt-swift doesn't use CMake */
-#define INTEL_NO_ITTNOTIFY_API
-
-/* Don't use APIs forbidden by App Stores (e.g. non-public system APIs) */
-#define AWS_APPSTORE_SAFE 1
+#endif
diff --git a/aws-common-runtime/s2n b/aws-common-runtime/s2n
index 138e3ece9..87f4a0585 160000
--- a/aws-common-runtime/s2n
+++ b/aws-common-runtime/s2n
@@ -1 +1 @@
-Subproject commit 138e3ece9e457c2f824a85b63095737f30d624a9
+Subproject commit 87f4a0585dc3056433f193b9305f587cff239be3