diff --git a/common/hdr_util.cc b/common/hdr_util.cc
index 1752236..4587b2e 100644
--- a/common/hdr_util.cc
+++ b/common/hdr_util.cc
@@ -7,6 +7,11 @@
 // be found in the AUTHORS file in the root of the source tree.
 #include "hdr_util.h"
 
+#include <cstddef>
+#include <new>
+
+#include "../mkvparser.hpp"
+
 namespace libwebm {
 bool CopyPrimaryChromaticity(const mkvparser::PrimaryChromaticity& parser_pc,
                              PrimaryChromaticityPtr* muxer_pc) {
diff --git a/common/hdr_util.h b/common/hdr_util.h
index d8b2305..fce055b 100644
--- a/common/hdr_util.h
+++ b/common/hdr_util.h
@@ -11,7 +11,12 @@
 #include <memory>
 
 #include "../mkvmuxer.hpp"
-#include "../mkvparser.hpp"
+
+namespace mkvparser {
+struct Colour;
+struct MasteringMetadata;
+struct PrimaryChromaticity;
+}  // namespace mkvparser
 
 namespace libwebm {