diff --git a/include/dav1d/headers.rs b/include/dav1d/headers.rs
index 5ba888780..5edcd8476 100644
--- a/include/dav1d/headers.rs
+++ b/include/dav1d/headers.rs
@@ -458,34 +458,63 @@ impl Rav1dFrameType {
 }
 
 pub type Dav1dColorPrimaries = c_uint;
-pub const DAV1D_COLOR_PRI_RESERVED: Dav1dColorPrimaries = 255;
-pub const DAV1D_COLOR_PRI_EBU3213: Dav1dColorPrimaries = 22;
-pub const DAV1D_COLOR_PRI_SMPTE432: Dav1dColorPrimaries = 12;
-pub const DAV1D_COLOR_PRI_SMPTE431: Dav1dColorPrimaries = 11;
-pub const DAV1D_COLOR_PRI_XYZ: Dav1dColorPrimaries = 10;
-pub const DAV1D_COLOR_PRI_BT2020: Dav1dColorPrimaries = 9;
-pub const DAV1D_COLOR_PRI_FILM: Dav1dColorPrimaries = 8;
-pub const DAV1D_COLOR_PRI_SMPTE240: Dav1dColorPrimaries = 7;
-pub const DAV1D_COLOR_PRI_BT601: Dav1dColorPrimaries = 6;
-pub const DAV1D_COLOR_PRI_BT470BG: Dav1dColorPrimaries = 5;
-pub const DAV1D_COLOR_PRI_BT470M: Dav1dColorPrimaries = 4;
-pub const DAV1D_COLOR_PRI_UNKNOWN: Dav1dColorPrimaries = 2;
-pub const DAV1D_COLOR_PRI_BT709: Dav1dColorPrimaries = 1;
-
-pub(crate) type Rav1dColorPrimaries = c_uint;
-pub(crate) const _RAV1D_COLOR_PRI_RESERVED: Rav1dColorPrimaries = DAV1D_COLOR_PRI_RESERVED;
-pub(crate) const _RAV1D_COLOR_PRI_EBU3213: Rav1dColorPrimaries = DAV1D_COLOR_PRI_EBU3213;
-pub(crate) const _RAV1D_COLOR_PRI_SMPTE432: Rav1dColorPrimaries = DAV1D_COLOR_PRI_SMPTE432;
-pub(crate) const _RAV1D_COLOR_PRI_SMPTE431: Rav1dColorPrimaries = DAV1D_COLOR_PRI_SMPTE431;
-pub(crate) const _RAV1D_COLOR_PRI_XYZ: Rav1dColorPrimaries = DAV1D_COLOR_PRI_XYZ;
-pub(crate) const _RAV1D_COLOR_PRI_BT2020: Rav1dColorPrimaries = DAV1D_COLOR_PRI_BT2020;
-pub(crate) const _RAV1D_COLOR_PRI_FILM: Rav1dColorPrimaries = DAV1D_COLOR_PRI_FILM;
-pub(crate) const _RAV1D_COLOR_PRI_SMPTE240: Rav1dColorPrimaries = DAV1D_COLOR_PRI_SMPTE240;
-pub(crate) const _RAV1D_COLOR_PRI_BT601: Rav1dColorPrimaries = DAV1D_COLOR_PRI_BT601;
-pub(crate) const _RAV1D_COLOR_PRI_BT470BG: Rav1dColorPrimaries = DAV1D_COLOR_PRI_BT470BG;
-pub(crate) const _RAV1D_COLOR_PRI_BT470M: Rav1dColorPrimaries = DAV1D_COLOR_PRI_BT470M;
-pub(crate) const RAV1D_COLOR_PRI_UNKNOWN: Rav1dColorPrimaries = DAV1D_COLOR_PRI_UNKNOWN;
-pub(crate) const RAV1D_COLOR_PRI_BT709: Rav1dColorPrimaries = DAV1D_COLOR_PRI_BT709;
+pub const DAV1D_COLOR_PRI_BT709: Dav1dColorPrimaries =
+    Rav1dColorPrimaries::Bt709 as Dav1dColorPrimaries;
+pub const DAV1D_COLOR_PRI_UNKNOWN: Dav1dColorPrimaries =
+    Rav1dColorPrimaries::Unknown as Dav1dColorPrimaries;
+pub const DAV1D_COLOR_PRI_BT470M: Dav1dColorPrimaries =
+    Rav1dColorPrimaries::_Bt470m as Dav1dColorPrimaries;
+pub const DAV1D_COLOR_PRI_BT470BG: Dav1dColorPrimaries =
+    Rav1dColorPrimaries::_Bt470bg as Dav1dColorPrimaries;
+pub const DAV1D_COLOR_PRI_BT601: Dav1dColorPrimaries =
+    Rav1dColorPrimaries::_Bt601 as Dav1dColorPrimaries;
+pub const DAV1D_COLOR_PRI_SMPTE240: Dav1dColorPrimaries =
+    Rav1dColorPrimaries::_Smpte240 as Dav1dColorPrimaries;
+pub const DAV1D_COLOR_PRI_FILM: Dav1dColorPrimaries =
+    Rav1dColorPrimaries::_Film as Dav1dColorPrimaries;
+pub const DAV1D_COLOR_PRI_BT2020: Dav1dColorPrimaries =
+    Rav1dColorPrimaries::_Bt2020 as Dav1dColorPrimaries;
+pub const DAV1D_COLOR_PRI_XYZ: Dav1dColorPrimaries =
+    Rav1dColorPrimaries::_Xyz as Dav1dColorPrimaries;
+pub const DAV1D_COLOR_PRI_SMPTE431: Dav1dColorPrimaries =
+    Rav1dColorPrimaries::_Smpte431 as Dav1dColorPrimaries;
+pub const DAV1D_COLOR_PRI_SMPTE432: Dav1dColorPrimaries =
+    Rav1dColorPrimaries::_Smpte432 as Dav1dColorPrimaries;
+pub const DAV1D_COLOR_PRI_EBU3213: Dav1dColorPrimaries =
+    Rav1dColorPrimaries::_Ebu3213 as Dav1dColorPrimaries;
+pub const DAV1D_COLOR_PRI_RESERVED: Dav1dColorPrimaries =
+    Rav1dColorPrimaries::_Reserved as Dav1dColorPrimaries;
+
+#[derive(Clone, Copy, PartialEq, Eq, FromRepr)]
+pub enum Rav1dColorPrimaries {
+    Bt709 = 1,
+    Unknown = 2,
+    _Bt470m = 4,
+    _Bt470bg = 5,
+    _Bt601 = 6,
+    _Smpte240 = 7,
+    _Film = 8,
+    _Bt2020 = 9,
+    _Xyz = 10,
+    _Smpte431 = 11,
+    _Smpte432 = 12,
+    _Ebu3213 = 22,
+    _Reserved = 255,
+}
+
+impl From<Rav1dColorPrimaries> for Dav1dColorPrimaries {
+    fn from(value: Rav1dColorPrimaries) -> Self {
+        value as Dav1dColorPrimaries
+    }
+}
+
+impl TryFrom<Dav1dColorPrimaries> for Rav1dColorPrimaries {
+    type Error = ();
+
+    fn try_from(value: Dav1dColorPrimaries) -> Result<Self, Self::Error> {
+        Self::from_repr(value as usize).ok_or(())
+    }
+}
 
 pub type Dav1dTransferCharacteristics = c_uint;
 pub const DAV1D_TRC_RESERVED: Dav1dTransferCharacteristics = 255;
@@ -1086,7 +1115,7 @@ impl From<Dav1dSequenceHeader> for Rav1dSequenceHeader {
             max_width,
             max_height,
             layout: layout.try_into().unwrap(),
-            pri,
+            pri: pri.try_into().unwrap(),
             trc,
             mtrx: mtrx.try_into().unwrap(),
             chr: chr.try_into().unwrap(),
@@ -1201,7 +1230,7 @@ impl From<Rav1dSequenceHeader> for Dav1dSequenceHeader {
             max_width,
             max_height,
             layout: layout.into(),
-            pri,
+            pri: pri.into(),
             trc,
             mtrx: mtrx.into(),
             chr: chr.into(),
diff --git a/src/obu.rs b/src/obu.rs
index 289f904fa..c4979adf2 100644
--- a/src/obu.rs
+++ b/src/obu.rs
@@ -41,8 +41,6 @@ use crate::include::dav1d::headers::Rav1dSequenceHeaderOperatingPoint;
 use crate::include::dav1d::headers::Rav1dTransferCharacteristics;
 use crate::include::dav1d::headers::Rav1dTxfmMode;
 use crate::include::dav1d::headers::Rav1dWarpedMotionParams;
-use crate::include::dav1d::headers::RAV1D_COLOR_PRI_BT709;
-use crate::include::dav1d::headers::RAV1D_COLOR_PRI_UNKNOWN;
 use crate::include::dav1d::headers::RAV1D_MAX_CDEF_STRENGTHS;
 use crate::include::dav1d::headers::RAV1D_MAX_OPERATING_POINTS;
 use crate::include::dav1d::headers::RAV1D_MAX_TILE_COLS;
@@ -394,11 +392,11 @@ fn parse_seq_hdr(c: &mut Rav1dContext, gb: &mut GetBits) -> Rav1dResult<Rav1dSeq
     let trc;
     let mtrx;
     if color_description_present != 0 {
-        pri = gb.get_bits(8) as Rav1dColorPrimaries;
+        pri = Rav1dColorPrimaries::from_repr(gb.get_bits(8) as usize).unwrap();
         trc = gb.get_bits(8) as Rav1dTransferCharacteristics;
         mtrx = Rav1dMatrixCoefficients::from_repr(gb.get_bits(8) as usize).unwrap();
     } else {
-        pri = RAV1D_COLOR_PRI_UNKNOWN;
+        pri = Rav1dColorPrimaries::Unknown;
         trc = RAV1D_TRC_UNKNOWN;
         mtrx = Rav1dMatrixCoefficients::Unknown;
     }
@@ -413,7 +411,7 @@ fn parse_seq_hdr(c: &mut Rav1dContext, gb: &mut GetBits) -> Rav1dResult<Rav1dSeq
         ss_ver = 1;
         ss_hor = ss_ver;
         chr = Rav1dChromaSamplePosition::Unknown;
-    } else if pri == RAV1D_COLOR_PRI_BT709
+    } else if pri == Rav1dColorPrimaries::Bt709
         && trc == RAV1D_TRC_SRGB
         && mtrx == Rav1dMatrixCoefficients::Identity
     {