diff --git a/src/dawn_native/Device.cpp b/src/dawn_native/Device.cpp
index 03fe3b9977..fef1331ea0 100644
--- a/src/dawn_native/Device.cpp
+++ b/src/dawn_native/Device.cpp
@@ -24,7 +24,6 @@
 #include "dawn_native/CommandBuffer.h"
 #include "dawn_native/CommandEncoder.h"
 #include "dawn_native/CompilationMessages.h"
-#include "dawn_native/ComputePipeline.h"
 #include "dawn_native/CreatePipelineAsyncTask.h"
 #include "dawn_native/DynamicUploader.h"
 #include "dawn_native/ErrorData.h"
@@ -35,13 +34,10 @@
 #include "dawn_native/InternalPipelineStore.h"
 #include "dawn_native/ObjectType_autogen.h"
 #include "dawn_native/PersistentCache.h"
-#include "dawn_native/PipelineLayout.h"
 #include "dawn_native/QuerySet.h"
 #include "dawn_native/Queue.h"
 #include "dawn_native/RenderBundleEncoder.h"
-#include "dawn_native/RenderPipeline.h"
 #include "dawn_native/Sampler.h"
-#include "dawn_native/ShaderModule.h"
 #include "dawn_native/Surface.h"
 #include "dawn_native/SwapChain.h"
 #include "dawn_native/Texture.h"
diff --git a/src/dawn_native/Device.h b/src/dawn_native/Device.h
index 92c1cd3b64..1fc37f03b8 100644
--- a/src/dawn_native/Device.h
+++ b/src/dawn_native/Device.h
@@ -16,6 +16,7 @@
 #define DAWNNATIVE_DEVICE_H_
 
 #include "dawn_native/Commands.h"
+#include "dawn_native/ComputePipeline.h"
 #include "dawn_native/Error.h"
 #include "dawn_native/Features.h"
 #include "dawn_native/Format.h"
diff --git a/src/tests/unittests/native/mocks/DeviceMock.h b/src/tests/unittests/native/mocks/DeviceMock.h
index e83e37a2f9..26d600b0e6 100644
--- a/src/tests/unittests/native/mocks/DeviceMock.h
+++ b/src/tests/unittests/native/mocks/DeviceMock.h
@@ -63,8 +63,8 @@ namespace dawn_native {
                     CreateBufferImpl,
                     (const BufferDescriptor*),
                     (override));
-        MOCK_METHOD(ResultOrError<Ref<ComputePipelineBase>>,
-                    CreateComputePipelineImpl,
+        MOCK_METHOD(Ref<ComputePipelineBase>,
+                    CreateUninitializedComputePipelineImpl,
                     (const ComputePipelineDescriptor*),
                     (override));
         MOCK_METHOD(ResultOrError<Ref<PipelineLayoutBase>>,