diff --git a/sys/dev/xen/bus/xen_intr.c b/sys/dev/xen/bus/xen_intr.c
index db166a62561..b70b0fa835b 100644
--- a/sys/dev/xen/bus/xen_intr.c
+++ b/sys/dev/xen/bus/xen_intr.c
@@ -866,7 +866,7 @@ xen_intr_bind_virq(device_t dev, u_int virq, u_int cpu,
 	if (error != 0) {
 		evtchn_close_t close = { .port = bind_virq.port };
 
-		xen_intr_unbind(*port_handlep);
+		xen_intr_unbind(port_handlep);
 		if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close))
 			panic("EVTCHNOP_close failed");
 		return (error);
@@ -923,7 +923,7 @@ xen_intr_alloc_and_bind_ipi(u_int cpu, driver_filter_t filter,
 	if (error != 0) {
 		evtchn_close_t close = { .port = bind_ipi.port };
 
-		xen_intr_unbind(*port_handlep);
+		xen_intr_unbind(port_handlep);
 		if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close))
 			panic("EVTCHNOP_close failed");
 		return (error);
diff --git a/sys/dev/xen/timer/xen_timer.c b/sys/dev/xen/timer/xen_timer.c
index 93cab090c59..f42ed5fd252 100644
--- a/sys/dev/xen/timer/xen_timer.c
+++ b/sys/dev/xen/timer/xen_timer.c
@@ -84,7 +84,7 @@
 struct xentimer_pcpu_data {
 	uint64_t timer;
 	uint64_t last_processed;
-	void *irq_handle;
+	xen_intr_handle_t irq_handle;
 };
 
 DPCPU_DEFINE(struct xentimer_pcpu_data, xentimer_pcpu);