diff --git a/src/common/HashUtils.h b/src/common/HashUtils.h
index e0cd6e7b80..c42b60e02e 100644
--- a/src/common/HashUtils.h
+++ b/src/common/HashUtils.h
@@ -17,6 +17,7 @@
 
 #include "common/Platform.h"
 
+#include <bitset>
 #include <functional>
 
 // Wrapper around std::hash to make it a templated function instead of a functor. It is marginally
diff --git a/src/dawn_native/Buffer.cpp b/src/dawn_native/Buffer.cpp
index 4930e28a60..9f7239e5aa 100644
--- a/src/dawn_native/Buffer.cpp
+++ b/src/dawn_native/Buffer.cpp
@@ -19,6 +19,7 @@
 #include "dawn_native/DynamicUploader.h"
 #include "dawn_native/ValidationUtils_autogen.h"
 
+#include <string.h>
 #include <cstdio>
 #include <utility>
 
diff --git a/src/dawn_native/Buffer.h b/src/dawn_native/Buffer.h
index 52ea2c3bca..bcb6a0da52 100644
--- a/src/dawn_native/Buffer.h
+++ b/src/dawn_native/Buffer.h
@@ -21,6 +21,8 @@
 
 #include "dawn_native/dawn_platform.h"
 
+#include <memory>
+
 namespace dawn_native {
 
     MaybeError ValidateBufferDescriptor(DeviceBase* device, const BufferDescriptor* descriptor);
diff --git a/src/dawn_native/RingBuffer.cpp b/src/dawn_native/RingBuffer.cpp
index cae3170647..90b92138bd 100644
--- a/src/dawn_native/RingBuffer.cpp
+++ b/src/dawn_native/RingBuffer.cpp
@@ -15,6 +15,8 @@
 #include "dawn_native/RingBuffer.h"
 #include "dawn_native/Device.h"
 
+#include <limits>
+
 // Note: Current RingBuffer implementation uses two indices (start and end) to implement a circular
 // queue. However, this approach defines a full queue when one element is still unused.
 //
@@ -145,4 +147,4 @@ namespace dawn_native {
 
         return uploadHandle;
     }
-}  // namespace dawn_native
\ No newline at end of file
+}  // namespace dawn_native