diff --git a/src/xrt/drivers/ohmd/oh_device.c b/src/xrt/drivers/ohmd/oh_device.c
index a72cf40aa..ab0831e39 100644
--- a/src/xrt/drivers/ohmd/oh_device.c
+++ b/src/xrt/drivers/ohmd/oh_device.c
@@ -326,13 +326,15 @@ oh_device_create(ohmd_context *ctx,
 	}
 
 	// Which blend modes does the device support.
-	ohd->base.blend_mode |= XRT_BLEND_MODE_OPAQUE;
+	ohd->base.blend_mode = XRT_BLEND_MODE_OPAQUE;
 	if (quirk_video_see_through) {
-		ohd->base.blend_mode |= XRT_BLEND_MODE_ALPHA_BLEND;
+		ohd->base.blend_mode = (enum xrt_blend_mode)(
+		    ohd->base.blend_mode | XRT_BLEND_MODE_ALPHA_BLEND);
 	}
 
 	if (quirk_video_distortion_vive) {
-		ohd->base.distortion.models |= XRT_DISTORTION_MODEL_VIVE;
+		ohd->base.distortion.models = (enum xrt_distortion_model)(
+		    ohd->base.distortion.models | XRT_DISTORTION_MODEL_VIVE);
 		ohd->base.distortion.preferred = XRT_DISTORTION_MODEL_VIVE;
 
 		// clang-format off
diff --git a/src/xrt/drivers/ohmd/oh_device.h b/src/xrt/drivers/ohmd/oh_device.h
index 02974ffb3..59ce86019 100644
--- a/src/xrt/drivers/ohmd/oh_device.h
+++ b/src/xrt/drivers/ohmd/oh_device.h
@@ -8,10 +8,14 @@
 
 #pragma once
 
+#include <xrt/xrt_device.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+typedef struct ohmd_context ohmd_context;
+typedef struct ohmd_device ohmd_device;
 
 struct oh_device
 {