diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index a49e6827f8..2a7db36126 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -72,7 +72,7 @@ if (WIN32)
     )
 endif()
 
-target_link_libraries(dawn_common PRIVATE dawn_internal_config)
+target_link_libraries(dawn_common PUBLIC dawncpp_headers PRIVATE dawn_internal_config)
 
 # TODO Android Log support
 # TODO Vulkan headers support
diff --git a/src/common/VertexFormatUtils.h b/src/common/VertexFormatUtils.h
index 632ca7fba7..06fc08101a 100644
--- a/src/common/VertexFormatUtils.h
+++ b/src/common/VertexFormatUtils.h
@@ -19,6 +19,9 @@
 
 #include <dawn/webgpu_cpp.h>
 
+// TODO(dawn:695): Remove the dawncpp_headers CMake dependency when VertexFormatUtils is deleted,
+// assuming no other dependencies have been added in other project files.
+
 namespace dawn {
 
     static constexpr std::array<wgpu::VertexFormat, 30> kAllVertexFormats = {