diff --git a/.github/workflows/two-human-reviewers.yml b/.github/workflows/two-human-reviewers.yml
index f8254d54..51f6aa41 100644
--- a/.github/workflows/two-human-reviewers.yml
+++ b/.github/workflows/two-human-reviewers.yml
@@ -45,6 +45,6 @@ jobs:
   two-human-reviewers:
     # Pin to a tag or commit SHA instead of a branch if you need the gate's behaviour to change only when
     # you choose to update it.
-    uses: Azure/c-build-tools/.github/workflows/two-human-reviewers.yml@e5ade18fce434f142d4e88060f0b893217e44ec1
+    uses: Azure/c-build-tools/.github/workflows/two-human-reviewers.yml@d78d8f3b254fdef08300b4eebfbd5c848627eafe
     with:
       pr: ${{ github.event.pull_request.number || inputs.pr }}
diff --git a/build/devops_gated.yml b/build/devops_gated.yml
index a92b5b21..97f7f420 100644
--- a/build/devops_gated.yml
+++ b/build/devops_gated.yml
@@ -22,7 +22,7 @@ resources:
     type: github
     name: azure/c-build-tools
     endpoint: github.com_azure
-    ref: e5ade18fce434f142d4e88060f0b893217e44ec1
+    ref: d78d8f3b254fdef08300b4eebfbd5c848627eafe
 
 jobs:
 - template: /pipeline_templates/build_all_flavors.yml@c_build_tools
diff --git a/c_pal_ll/interfaces/reals/real_sync.h b/c_pal_ll/interfaces/reals/real_sync.h
index 9e487474..d38dea4e 100644
--- a/c_pal_ll/interfaces/reals/real_sync.h
+++ b/c_pal_ll/interfaces/reals/real_sync.h
@@ -5,7 +5,6 @@
 #define REAL_SYNC_H
 
 #ifdef __cplusplus
-#include <cstdbool>
 #include <cstdint>
 #else
 #include <stdbool.h>
diff --git a/deps/c-build-tools b/deps/c-build-tools
index e5ade18f..d78d8f3b 160000
--- a/deps/c-build-tools
+++ b/deps/c-build-tools
@@ -1 +1 @@
-Subproject commit e5ade18fce434f142d4e88060f0b893217e44ec1
+Subproject commit d78d8f3b254fdef08300b4eebfbd5c848627eafe
diff --git a/interfaces/inc/c_pal/malloc_multi_flex.h b/interfaces/inc/c_pal/malloc_multi_flex.h
index 1c657837..c0f91225 100644
--- a/interfaces/inc/c_pal/malloc_multi_flex.h
+++ b/interfaces/inc/c_pal/malloc_multi_flex.h
@@ -6,7 +6,6 @@
 #ifdef __cplusplus
 #include <cstddef>
 #include <cstdint>
-#include <cstdalign>
 #else
 #include <stddef.h>
 #include <stdint.h>
diff --git a/interfaces/inc/c_pal/srw_lock.h b/interfaces/inc/c_pal/srw_lock.h
index 79024f9e..c33802a0 100644
--- a/interfaces/inc/c_pal/srw_lock.h
+++ b/interfaces/inc/c_pal/srw_lock.h
@@ -4,7 +4,6 @@
 #define SRW_LOCK_H
 
 #ifdef __cplusplus
-#include <cstdbool>
 #else
 #include <stdbool.h>
 #endif
diff --git a/interfaces/inc/c_pal/srw_lock_ll.h b/interfaces/inc/c_pal/srw_lock_ll.h
index 08c9e323..2dd06197 100644
--- a/interfaces/inc/c_pal/srw_lock_ll.h
+++ b/interfaces/inc/c_pal/srw_lock_ll.h
@@ -4,7 +4,6 @@
 #define SRW_LOCK_LL_H
 
 #ifdef __cplusplus
-#include <cstdbool>
 #else
 #include <stdbool.h>
 #endif
diff --git a/interfaces/inc/c_pal/uuid.h b/interfaces/inc/c_pal/uuid.h
index 8708381a..405d127c 100644
--- a/interfaces/inc/c_pal/uuid.h
+++ b/interfaces/inc/c_pal/uuid.h
@@ -6,8 +6,6 @@
 
 #ifdef __cplusplus
 #include <cinttypes>
-#include <cstdbool>
-#include <cstdalign>
 #else
 #include <inttypes.h>
 #include <stdbool.h>
diff --git a/interfaces/reals/real_srw_lock.h b/interfaces/reals/real_srw_lock.h
index 9134f4fe..f1e82bb2 100644
--- a/interfaces/reals/real_srw_lock.h
+++ b/interfaces/reals/real_srw_lock.h
@@ -5,7 +5,6 @@
 #define REAL_SRW_LOCK_H
 
 #ifdef __cplusplus
-#include <cstdbool>
 #else
 #include <stdbool.h>
 #endif
diff --git a/interfaces/reals/real_srw_lock_ll.h b/interfaces/reals/real_srw_lock_ll.h
index 017f68f0..b4500f19 100644
--- a/interfaces/reals/real_srw_lock_ll.h
+++ b/interfaces/reals/real_srw_lock_ll.h
@@ -5,7 +5,6 @@
 #define REAL_SRW_LOCK_LL_H
 
 #ifdef __cplusplus
-#include <cstdbool>
 #else
 #include <stdbool.h>
 #endif
diff --git a/interfaces/reals/real_string_utils.h b/interfaces/reals/real_string_utils.h
index 910e2e17..3735a150 100644
--- a/interfaces/reals/real_string_utils.h
+++ b/interfaces/reals/real_string_utils.h
@@ -5,7 +5,6 @@
 #define REAL_STRING_UTILS_H
 
 #ifdef __cplusplus
-#include <cstdbool>
 #else
 #include <stdbool.h>
 #endif