diff --git a/src/dawn/common/AlignedAlloc.cpp b/src/dawn/common/AlignedAlloc.cpp
index d3eca92..364cc20 100644
--- a/src/dawn/common/AlignedAlloc.cpp
+++ b/src/dawn/common/AlignedAlloc.cpp
@@ -27,6 +27,7 @@
 
 #include "dawn/common/AlignedAlloc.h"
 
+#include <cstdlib>
 #include "dawn/common/Assert.h"
 #include "dawn/common/Math.h"
 #include "dawn/common/Platform.h"
diff --git a/src/dawn/wire/client/Instance.cpp b/src/dawn/wire/client/Instance.cpp
index 19bdf82..27e2091 100644
--- a/src/dawn/wire/client/Instance.cpp
+++ b/src/dawn/wire/client/Instance.cpp
@@ -33,6 +33,7 @@
 
 #include "dawn/common/Log.h"
 #include "dawn/common/WGSLFeatureMapping.h"
+#include "dawn/wire/client/ApiObjects_autogen.h"
 #include "dawn/wire/client/Client.h"
 #include "dawn/wire/client/EventManager.h"
 #include "partition_alloc/pointers/raw_ptr.h"
diff --git a/src/dawn/wire/server/ServerAdapter.cpp b/src/dawn/wire/server/ServerAdapter.cpp
index 7bd5c53..9d78db1 100644
--- a/src/dawn/wire/server/ServerAdapter.cpp
+++ b/src/dawn/wire/server/ServerAdapter.cpp
@@ -28,6 +28,8 @@
 #include <vector>
 
 #include "dawn/wire/SupportedFeatures.h"
+#include "dawn/wire/WireResult.h"
+#include "dawn/wire/server/ObjectStorage.h"
 #include "dawn/wire/server/Server.h"
 
 namespace dawn::wire::server {
diff --git a/src/dawn/wire/server/ServerBuffer.cpp b/src/dawn/wire/server/ServerBuffer.cpp
index 5f4b6ff..3a3642f 100644
--- a/src/dawn/wire/server/ServerBuffer.cpp
+++ b/src/dawn/wire/server/ServerBuffer.cpp
@@ -31,6 +31,7 @@
 #include "dawn/common/Assert.h"
 #include "dawn/wire/BufferConsumer_impl.h"
 #include "dawn/wire/WireCmd_autogen.h"
+#include "dawn/wire/WireResult.h"
 #include "dawn/wire/server/Server.h"
 
 namespace dawn::wire::server {
diff --git a/src/dawn/wire/server/ServerDevice.cpp b/src/dawn/wire/server/ServerDevice.cpp
index f481838..1d561f1 100644
--- a/src/dawn/wire/server/ServerDevice.cpp
+++ b/src/dawn/wire/server/ServerDevice.cpp
@@ -27,6 +27,9 @@
 
 #include "dawn/wire/server/Server.h"
 
+#include "dawn/wire/Wire.h"
+#include "dawn/wire/WireResult.h"
+
 namespace dawn::wire::server {
 
 void Server::OnUncapturedError(ObjectHandle device, WGPUErrorType type, const char* message) {
diff --git a/src/dawn/wire/server/ServerInstance.cpp b/src/dawn/wire/server/ServerInstance.cpp
index ca939c7..e47c09f 100644
--- a/src/dawn/wire/server/ServerInstance.cpp
+++ b/src/dawn/wire/server/ServerInstance.cpp
@@ -29,6 +29,7 @@
 #include <vector>
 
 #include "dawn/wire/SupportedFeatures.h"
+#include "dawn/wire/server/ObjectStorage.h"
 #include "dawn/wire/server/Server.h"
 
 namespace dawn::wire::server {