diff --git a/include/swift/Basic/Compiler.h b/include/swift/Basic/Compiler.h
index 680f8096988b2..45157ed6b2efe 100644
--- a/include/swift/Basic/Compiler.h
+++ b/include/swift/Basic/Compiler.h
@@ -200,7 +200,7 @@
 #if defined(__cplusplus)
 #if defined(__cpp_char8_t)
 inline constexpr char operator""_swift_u8(char8_t c) { return c; }
-inline const char *operator""_swift_u8(const char8_t *p, std::size_t) {
+inline const char *operator""_swift_u8(const char8_t *p, size_t) {
   return reinterpret_cast<const char *>(p);
 }
 #define SWIFT_UTF8(literal) u8##literal##_swift_u8
diff --git a/include/swift/RemoteInspection/MetadataSource.h b/include/swift/RemoteInspection/MetadataSource.h
index e9086983f499b..bccbab00bc622 100644
--- a/include/swift/RemoteInspection/MetadataSource.h
+++ b/include/swift/RemoteInspection/MetadataSource.h
@@ -29,6 +29,7 @@ using llvm::cast;
 
 #include <cerrno>
 #include <climits>
+#include <cstdlib>
 #include <string>
 
 namespace swift {