diff --git a/src/xrt/drivers/vive/vive_config.c b/src/xrt/drivers/vive/vive_config.c
index 218c47caf..cd4cbaad8 100644
--- a/src/xrt/drivers/vive/vive_config.c
+++ b/src/xrt/drivers/vive/vive_config.c
@@ -220,7 +220,7 @@ vive_config_parse(struct vive_device *d, char *json_string)
 
 	cJSON *json = cJSON_Parse(json_string);
 	if (!cJSON_IsObject(json)) {
-		U_LOG_E("Could not parse JSON data.");
+		VIVE_ERROR(d, "Could not parse JSON data.");
 		return false;
 	}
 
@@ -263,7 +263,7 @@ vive_config_parse(struct vive_device *d, char *json_string)
 
 		d->display.imuref = imu_to_head;
 	} break;
-	default: U_LOG_E("Unknown Vive variant."); return false;
+	default: VIVE_ERROR(d, "Unknown Vive variant."); return false;
 	}
 
 	JSON_STRING(json, "model_number", d->firmware.model_number);
diff --git a/src/xrt/drivers/vive/vive_device.c b/src/xrt/drivers/vive/vive_device.c
index fa7cd8215..5f7e2c8e6 100644
--- a/src/xrt/drivers/vive/vive_device.c
+++ b/src/xrt/drivers/vive/vive_device.c
@@ -388,7 +388,7 @@ update_imu(struct vive_device *d, struct vive_imu_report *report)
 			angular_velocity_fixed.z = -angular_velocity.z;
 			angular_velocity = angular_velocity_fixed;
 		} break;
-		default: U_LOG_E("Unhandled Vive variant"); return;
+		default: VIVE_ERROR(d, "Unhandled Vive variant"); return;
 		}
 
 		d->imu.time_ns += dt_ns;
@@ -421,20 +421,23 @@ vive_mainboard_read_one_msg(struct vive_device *d)
 		return true;
 	}
 	if (ret < 0) {
-		U_LOG_E("Failed to read device '%i'!", ret);
+		VIVE_ERROR(d, "Failed to read device '%i'!", ret);
 		return false;
 	}
 
 	switch (buffer[0]) {
 	case VIVE_MAINBOARD_STATUS_REPORT_ID:
 		if (ret != sizeof(struct vive_mainboard_status_report)) {
-			U_LOG_E("Mainboard status report has invalid size.");
+			VIVE_ERROR(d,
+			           "Mainboard status report has invalid size.");
 			return false;
 		}
 		vive_mainboard_decode_message(
 		    d, (struct vive_mainboard_status_report *)buffer);
 		break;
-	default: U_LOG_E("Unknown mainboard message type %d", buffer[0]); break;
+	default:
+		VIVE_ERROR(d, "Unknown mainboard message type %d", buffer[0]);
+		break;
 	}
 
 	return true;
@@ -478,19 +481,21 @@ vive_sensors_read_one_msg(struct vive_device *d)
 		return true;
 	}
 	if (ret < 0) {
-		U_LOG_E("Failed to read device '%i'!", ret);
+		VIVE_ERROR(d, "Failed to read device '%i'!", ret);
 		return false;
 	}
 
 	switch (buffer[0]) {
 	case VIVE_IMU_REPORT_ID:
 		if (ret != 52) {
-			U_LOG_E("Wrong IMU report size: %d", ret);
+			VIVE_ERROR(d, "Wrong IMU report size: %d", ret);
 			return false;
 		}
 		update_imu(d, (struct vive_imu_report *)buffer);
 		break;
-	default: U_LOG_E("Unknown sensor message type %d", buffer[0]); break;
+	default:
+		VIVE_ERROR(d, "Unknown sensor message type %d", buffer[0]);
+		break;
 	}
 
 	return true;
@@ -670,8 +675,8 @@ vive_device_create(struct os_hid_device *mainboard_dev,
 		        fov, h_meters,
 		        (double)d->base.hmd->views[eye].lens_center.y_meters, 0,
 		        &d->base.hmd->views[eye].fov)) {
-			U_LOG_E(
-			    "Failed to compute the partial fields of view.");
+			VIVE_ERROR(
+			    d, "Failed to compute the partial fields of view.");
 			free(d);
 			return NULL;
 		}
@@ -698,7 +703,7 @@ vive_device_create(struct os_hid_device *mainboard_dev,
 		ret = os_thread_helper_start(&d->mainboard_thread,
 		                             vive_mainboard_run_thread, d);
 		if (ret != 0) {
-			U_LOG_E("Failed to start mainboard thread!");
+			VIVE_ERROR(d, "Failed to start mainboard thread!");
 			vive_device_destroy((struct xrt_device *)d);
 			return NULL;
 		}
@@ -707,7 +712,7 @@ vive_device_create(struct os_hid_device *mainboard_dev,
 	ret = os_thread_helper_start(&d->sensors_thread,
 	                             vive_sensors_run_thread, d);
 	if (ret != 0) {
-		U_LOG_E("Failed to start sensors thread!");
+		VIVE_ERROR(d, "Failed to start sensors thread!");
 		vive_device_destroy((struct xrt_device *)d);
 		return NULL;
 	}